From 66412d2896de4882eb8f8f3121f7a80684451a24 Mon Sep 17 00:00:00 2001 From: Constance Chen Date: Wed, 5 Jan 2022 12:10:28 -0800 Subject: [PATCH 1/3] Upgrade EUI to 44.0.0 --- package.json | 2 +- src/dev/license_checker/config.ts | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index f31baf75e07af6..459d756516ee6d 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath", "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.1.0-canary.2", "@elastic/ems-client": "8.0.0", - "@elastic/eui": "43.1.1", + "@elastic/eui": "44.0.0", "@elastic/filesaver": "1.1.2", "@elastic/node-crypto": "1.2.1", "@elastic/numeral": "^2.5.1", diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts index 7c76b73a27ee4b..4115f20f85a41f 100644 --- a/src/dev/license_checker/config.ts +++ b/src/dev/license_checker/config.ts @@ -77,6 +77,6 @@ export const LICENSE_OVERRIDES = { 'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts '@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint '@elastic/ems-client@8.0.0': ['Elastic License 2.0'], - '@elastic/eui@43.1.1': ['SSPL-1.0 OR Elastic License 2.0'], + '@elastic/eui@44.0.0': ['SSPL-1.0 OR Elastic License 2.0'], 'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry }; diff --git a/yarn.lock b/yarn.lock index d564d3bce5282e..6fc2159738cb27 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1633,10 +1633,10 @@ resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314" integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ== -"@elastic/eui@43.1.1": - version "43.1.1" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-43.1.1.tgz#5a4526c0a3fad45dcbe470dc33d1d9b701904494" - integrity sha512-ilVAfhM2QtrA8RiG5vgVBOW5xqyjpDeMTH2c/Nf8vEYVgebmTnDAJuaDj5lHpk01oqt2jEEelZkD40XKY2376w== +"@elastic/eui@44.0.0": + version "44.0.0" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-44.0.0.tgz#5d2dde9715fce5448b7d98367fd274dce974fe0a" + integrity sha512-Co3hSmvHn91upvylKvk5IJDR02KL+hdLQcJWU5DfRxTUv3iua3ZLmCMwG3WeoV/XE7kTsxDlNslRO5I3hk5uWg== dependencies: "@types/chroma-js" "^2.0.0" "@types/lodash" "^4.14.160" From 327e28d401e6c3ed577c1cd26e5f07b4f4137220 Mon Sep 17 00:00:00 2001 From: Constance Chen Date: Wed, 5 Jan 2022 12:10:39 -0800 Subject: [PATCH 2/3] Account for EuiSuperSelect deprecations --- .../components/synchronization/blocked_window_item.tsx | 2 +- .../timeline/search_or_filter/search_or_filter.tsx | 2 +- .../components/timeline/search_or_filter/super_select.tsx | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_item.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_item.tsx index c302cc16a40cd3..209cddb32081cb 100644 --- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_item.tsx +++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/synchronization/blocked_window_item.tsx @@ -118,7 +118,7 @@ export const BlockedWindowItem: React.FC = ({ blockedWindow, index }) => options={syncOptions} onChange={(value) => setBlockedTimeWindow(index, 'jobType', value)} itemClassName="blockedWindowSelectItem" - popoverClassName="blockedWindowSelectPopover" + popoverProps={{ className: 'blockedWindowSelectPopover' }} /> diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/search_or_filter.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/search_or_filter.tsx index 127f404a40751f..aa2905955210ae 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/search_or_filter.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/search_or_filter.tsx @@ -122,7 +122,7 @@ export const SearchOrFilter = React.memo( itemClassName={timelineSelectModeItemsClassName} onChange={handleChange} options={options} - popoverClassName={searchOrFilterPopoverClassName} + popoverProps={{ className: searchOrFilterPopoverClassName }} valueOfSelected={kqlMode} /> diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/super_select.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/super_select.tsx index 1922fb8a3b9859..2e6b486cf3e911 100644 --- a/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/super_select.tsx +++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/search_or_filter/super_select.tsx @@ -178,12 +178,12 @@ export class EuiSuperSelect extends Component extends Component Date: Wed, 5 Jan 2022 13:52:51 -0800 Subject: [PATCH 3/3] Update test snapshots --- .../asset_manager.stories.storyshot | 8 ++++++-- .../saved_elements_modal.stories.storyshot | 12 ++++++++--- .../__snapshots__/donut_chart.test.tsx.snap | 20 +++++++++++++++++++ .../use_url_params.test.tsx.snap | 4 ++-- 4 files changed, 37 insertions(+), 7 deletions(-) diff --git a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot index d47ecf71b2293b..6b63ef2602dc05 100644 --- a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot +++ b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot @@ -38,7 +38,9 @@ exports[`Storyshots components/Assets/AssetManager no assets 1`] = `
- Manage workpad assets +

+ Manage workpad assets +

- Manage workpad assets +

+ Manage workpad assets +

- My elements +

+ My elements +

- My elements +

+ My elements +

- My elements +

+ My elements +

@@ -427,7 +427,7 @@ exports[`useUrlParams gets the expected values using the context 1`] = ` }, ], }, - Symbol(Symbol.observable): [MockFunction], + "undefined": [MockFunction], } } >