Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(NA): upgrade to lodash@4 #69868

Merged
merged 60 commits into from
Jul 3, 2020
Merged
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
bd13173
chore(NA): upgrade oss to lodash4
mistic Jun 23, 2020
87a2a07
chore(NA): move x-pack and packages to lodash 4
mistic Jun 23, 2020
15dc299
chore(NA): remove mention to lodash from main package.json
mistic Jun 25, 2020
5440b91
chore(NA): remove helper alias for lodash4 and make it the default lo…
mistic Jun 25, 2020
45e3ab8
chore(NA): merge and solve conflicts with master
mistic Jun 25, 2020
e0bdfe8
chore(NA): fix last failing types in the repo
mistic Jun 25, 2020
7ebf381
chore(NA): fix public api
mistic Jun 25, 2020
a1186a1
chore(NA): merge and solve conflicts with master
mistic Jun 25, 2020
2d92668
chore(NA): fix types for agg_row.tsx
mistic Jun 25, 2020
f02be1d
chore(NA): fix increment of optimizer modules in the rollup plugin
mistic Jun 25, 2020
a507200
Merge remote-tracking branch 'upstream/master' into upgrade-lodash-4-…
mistic Jun 25, 2020
3d48011
Merge remote-tracking branch 'upstream/master' into upgrade-lodash-4-…
mistic Jun 25, 2020
aac7d7e
chore(NA): migrate `src/core/public/http/fetch.ts` (#5)
pgayvallet Jun 25, 2020
e036962
chore(NA): fixes for feedback from apm team
mistic Jun 26, 2020
ddf9e30
chore(NA): recover old behaviour on apm LoadingIndeicatorContext.tsx
mistic Jun 26, 2020
bfeeb25
chore(NA): fixes for feedback from watson
mistic Jun 26, 2020
554456d
Platform lodash4 tweaks (#6)
joshdover Jun 26, 2020
f656fad
chore(NA): fix types and behaviour on src/core/server/elasticsearch/e…
mistic Jun 26, 2020
17b1535
Canvas fixes for lodash upgrade
clintandrewhall Jun 26, 2020
2737269
chore(NA): merge and solve conflicts with master
mistic Jun 26, 2020
9a8db48
[APM] Adds unit test for APM service maps transform (#7)
ogupte Jun 28, 2020
afb1c5f
Merge branch 'master' into upgrade-lodash-4-final
elasticmachine Jun 28, 2020
dc5085b
chore(NA): update yarn.lock
mistic Jun 28, 2020
0f366ab
chore(NA): remove any and use a real type for alerts task runner
mistic Jun 29, 2020
3aad0e1
chore(NA): used named import for triggers_actions_ui file
mistic Jun 29, 2020
a2573fa
Merge branch 'master' into upgrade-lodash-4-final
elasticmachine Jun 29, 2020
e0a41df
chore(NA): fix eslint
mistic Jun 29, 2020
3325f1b
Merge remote-tracking branch 'upstream/master' into upgrade-lodash-4-…
mistic Jun 29, 2020
369c024
chore(NA): fix types
mistic Jun 29, 2020
95665f0
chore(NA): merge and solve conflicts with master
mistic Jun 29, 2020
8841eef
Delete most uptime lodash references.
justinkambic Jun 29, 2020
3ddbbd9
Simplify. Clean up types.
justinkambic Jun 29, 2020
567f1e4
[Uptime] Delete most uptime lodash references (#8)
justinkambic Jun 29, 2020
57dcad5
chore(NA): add eslint rule to avoid using lodash3
mistic Jun 29, 2020
3f1c6ad
Merge branch 'upgrade-lodash-4-final' of github.com:mistic/kibana int…
mistic Jun 29, 2020
aa47a1f
chore(NA): apply changes on feedback from es-ui team
mistic Jun 29, 2020
7c11a06
fix some types (#9)
stratoula Jun 30, 2020
6b87e55
chore(NA): merge and solve conflicts with master
mistic Jun 30, 2020
90a88df
Clean up some expressions types.
lukeelmers Jun 30, 2020
864755c
chore(NA): missing ts-expect-error statements
mistic Jun 30, 2020
6ea3923
Clean up some expressions types. (#10)
mistic Jun 30, 2020
65dc116
chore(NA): merge and solve conflicts with master
mistic Jun 30, 2020
1afef13
chore(NA): merge and solve conflicts with master
mistic Jun 30, 2020
23c1978
chore(NA): merge and solve conflicts with master
mistic Jun 30, 2020
755166e
Merge remote-tracking branch 'upstream/master' into upgrade-lodash-4-…
mistic Jun 30, 2020
912793c
Merge branch 'master' into upgrade-lodash-4-final
elasticmachine Jul 1, 2020
f5ee602
Merge branch 'master' into upgrade-lodash-4-final
elasticmachine Jul 1, 2020
ac50d48
Upgrade lodash 4 vislib (#11)
stratoula Jul 1, 2020
a265153
chore(NA): upgrade data plugin to lodash4
mistic Jul 1, 2020
a35a21a
chore(NA): remove lodash3 completely from the repo
mistic Jul 2, 2020
bdda7d5
chore(NA): merge and solve conflicts with master
mistic Jul 2, 2020
9a775d8
chore(NA): fix x-pack/test/api_integration/apis/metrics_ui/snapshot.t…
mistic Jul 2, 2020
fc13937
Merge remote-tracking branch 'upstream/master' into upgrade-lodash-4-…
mistic Jul 2, 2020
ce56693
chore(NA): fix lodash usage on apm
mistic Jul 2, 2020
b1b9502
Merge branch 'master' into upgrade-lodash-4-final
elasticmachine Jul 2, 2020
80a5f21
chore(NA): fix typecheck for maps
mistic Jul 2, 2020
15bbfee
Merge branch 'master' into upgrade-lodash-4-final
elasticmachine Jul 2, 2020
dc10eb0
Patch lodash template (#12)
kobelb Jul 2, 2020
a0327dd
Merge branch 'master' into upgrade-lodash-4-final
elasticmachine Jul 2, 2020
68796f0
Ends up `_` is a function also... I hate JavaScript
kobelb Jul 2, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore(NA): fixes for feedback from apm team
  • Loading branch information
mistic committed Jun 26, 2020

Verified

This commit was signed with the committer’s verified signature.
mistic Tiago Costa
commit e036962128c498b407a11def26202ce75fd5b8c7
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ interface Props {
function getCurrentTab(
tabs: ErrorTab[] = [],
currentTabKey: string | undefined
) {
): ErrorTab | {} {
const selectedTab = tabs.find(({ key }) => key === currentTabKey);
return selectedTab ? selectedTab : first(tabs) || {};
}
@@ -78,7 +78,7 @@ export function DetailView({ errorGroup, urlParams, location }: Props) {
}

const tabs = getTabs(error);
const currentTab = getCurrentTab(tabs, urlParams.detailTab) as any;
const currentTab = getCurrentTab(tabs, urlParams.detailTab) as ErrorTab;

const errorUrl = error.error.page?.url || error.url?.full;

Original file line number Diff line number Diff line change
@@ -58,9 +58,8 @@ function UnoptimizedManagedTable<T>(props: Props<T>) {
} = useUrlParams();

const renderedItems = useMemo(() => {
// TODO: Use _.orderBy once we upgrade to lodash 4+
const sortedItems = sortItems
? orderBy(items, sortField, sortDirection as any)
? orderBy(items, sortField, sortDirection as 'asc' | 'desc')
: items;

return sortedItems.slice(page * pageSize, (page + 1) * pageSize);
Original file line number Diff line number Diff line change
@@ -79,15 +79,15 @@ interface StackframesGroup {

export function getGroupedStackframes(stackframes: IStackframe[]) {
return stackframes.reduce((acc, stackframe) => {
const prevGroup = last(acc) as any;
const prevGroup = last(acc);
const shouldAppend =
prevGroup &&
prevGroup.isLibraryFrame === stackframe.library_frame &&
!prevGroup.excludeFromGrouping &&
!stackframe.exclude_from_grouping;

// append to group
if (shouldAppend) {
if (prevGroup && shouldAppend) {
prevGroup.stackframes.push(stackframe);
return acc;
}
4 changes: 2 additions & 2 deletions x-pack/plugins/apm/public/context/UrlParamsContext/helpers.ts
Original file line number Diff line number Diff line change
@@ -61,8 +61,8 @@ export function getPathAsArray(pathname: string = '') {
return compact(pathname.split('/'));
}

export function removeUndefinedProps<T>(obj: T): Partial<T> {
return pickBy(obj as any, (value) => value !== undefined) as any;
export function removeUndefinedProps<T extends object>(obj: T): Partial<T> {
return pickBy(obj, (value) => value !== undefined);
}

export function getPathParams(pathname: string = ''): PathParams {
4 changes: 2 additions & 2 deletions x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts
Original file line number Diff line number Diff line change
@@ -186,8 +186,8 @@ export async function getTransactionBreakdown({
// is drawn correctly.
// If we set all values to 0, the chart always displays null values as 0,
// and the chart looks weird.
const hasAnyValues = lastValues.some((value: any) => value.y !== null);
const hasNullValues = lastValues.some((value: any) => value.y === null);
const hasAnyValues = lastValues.some((value) => value?.y !== null);
const hasNullValues = lastValues.some((value) => value?.y === null);

if (hasAnyValues && hasNullValues) {
Object.values(updatedSeries).forEach((series) => {