From 6ff576320b489925bde49ccbd3efc4527bab732c Mon Sep 17 00:00:00 2001 From: Constance Chen Date: Wed, 16 Nov 2022 16:32:46 -0800 Subject: [PATCH 1/5] Update EUI To 67.1.9 to get backport fixes --- 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 44e56c26b5a2d..638b8ba653262 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "@elastic/datemath": "5.0.3", "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.4.0-canary.1", "@elastic/ems-client": "8.3.3", - "@elastic/eui": "67.1.8", + "@elastic/eui": "67.1.9", "@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 2566c69a38796..93041fc119f63 100644 --- a/src/dev/license_checker/config.ts +++ b/src/dev/license_checker/config.ts @@ -84,6 +84,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.3.3': ['Elastic License 2.0'], - '@elastic/eui@67.1.8': ['SSPL-1.0 OR Elastic License 2.0'], + '@elastic/eui@67.1.9': ['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 529e2858b3909..63eab80cd298e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1527,10 +1527,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@67.1.8": - version "67.1.8" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-67.1.8.tgz#4b2adbc0abaf05ac10d72ebf170f62f24a34c538" - integrity sha512-dlx1OseKn1PRgZtrzsVeiswdviKEHENkpJaFSFuv3pZGSVxr+bKipDDBSB6DR6jVi4fuwWTcnlT5Dz7RoRILRA== +"@elastic/eui@67.1.9": + version "67.1.9" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-67.1.9.tgz#7d84ed27288d08e30110506a4e3177ad4c6f9520" + integrity sha512-VvMNhXMVBzMNXPCES0gF1K4xmT9uawrx5sdEjgeB8LNODVMSRFXT2jiUMZPF5mdRh23ZJrAVcy0BSAY7Tu/LJA== dependencies: "@types/chroma-js" "^2.0.0" "@types/lodash" "^4.14.160" From 5a0f3f76efed6502063d481682ec64709f30baef Mon Sep 17 00:00:00 2001 From: Constance Chen Date: Wed, 16 Nov 2022 16:40:33 -0800 Subject: [PATCH 2/5] [Maps] Fix broken facet button display --- .../add_layer_panel/flyout_body/layer_wizard_select.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/layer_wizard_select.tsx b/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/layer_wizard_select.tsx index 17cbf6239170c..d7e99bb115b9b 100644 --- a/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/layer_wizard_select.tsx +++ b/x-pack/plugins/maps/public/connected_components/add_layer_panel/flyout_body/layer_wizard_select.tsx @@ -111,6 +111,7 @@ export class LayerWizardSelect extends Component { key={category} isSelected={category === this.state.selectedCategory} onClick={() => this._filterByCategory(category)} + minWidth={false} > {getCategoryLabel(category)} @@ -123,6 +124,7 @@ export class LayerWizardSelect extends Component { key="all" isSelected={!this.state.selectedCategory} onClick={() => this._filterByCategory(null)} + minWidth={false} > From 7fef1612fcd619d5a7e9180c6ed6393a0d0287ab Mon Sep 17 00:00:00 2001 From: Constance Chen Date: Wed, 16 Nov 2022 16:58:55 -0800 Subject: [PATCH 3/5] [EuiButtonDisplay] snapshot updates --- .../__snapshots__/modal_service.test.tsx.snap | 4 ++-- .../__snapshots__/sample_data_card.test.tsx.snap | 6 +++--- .../__snapshots__/disabled_footer.test.tsx.snap | 2 +- .../__snapshots__/install_footer.test.tsx.snap | 2 +- .../__snapshots__/remove_footer.test.tsx.snap | 2 +- .../footer/__snapshots__/view_button.test.tsx.snap | 6 +++--- .../__snapshots__/list_header.test.tsx.snap | 14 +++++++------- .../__snapshots__/edit_modal.test.tsx.snap | 2 +- .../__snapshots__/menu_items.test.tsx.snap | 12 ++++++------ .../__snapshots__/add_from_library.test.tsx.snap | 2 +- .../primary/__snapshots__/primary.test.tsx.snap | 2 +- .../popover/__snapshots__/popover.test.tsx.snap | 2 +- .../toolbar/__snapshots__/toolbar.test.tsx.snap | 2 +- .../src/__snapshots__/no_data_card.test.tsx.snap | 8 ++++---- .../__snapshots__/data_view.test.tsx.snap | 4 ++-- .../saved_objects_installer.test.js.snap | 4 ++-- .../__snapshots__/no_data_card.test.tsx.snap | 4 ++-- .../components/__snapshots__/header.test.tsx.snap | 4 ++-- .../transaction_action_menu.test.tsx.snap | 2 +- .../__snapshots__/policy_table.test.tsx.snap | 2 +- .../__snapshots__/add_license.test.js.snap | 4 ++-- .../request_trial_extension.test.js.snap | 8 ++++---- .../__snapshots__/revert_to_basic.test.js.snap | 6 +++--- .../__snapshots__/start_trial.test.js.snap | 8 ++++---- .../__snapshots__/upload_license.test.tsx.snap | 10 +++++----- .../no_data/__snapshots__/no_data.test.js.snap | 4 ++-- .../__snapshots__/collection_enabled.test.js.snap | 2 +- .../__snapshots__/collection_interval.test.js.snap | 4 ++-- .../__snapshots__/reason_found.test.js.snap | 2 +- .../screen_capture_panel_content.test.tsx.snap | 6 +++--- .../overwritten_session_page.test.tsx.snap | 2 +- .../unauthenticated_page.test.tsx.snap | 2 +- .../__snapshots__/reset_session_page.test.tsx.snap | 2 +- .../__snapshots__/index.test.tsx.snap | 2 +- .../__snapshots__/ml_integerations.test.tsx.snap | 2 +- .../__snapshots__/integrations_guard.test.tsx.snap | 2 +- .../__snapshots__/take_action.test.tsx.snap | 4 ++-- 37 files changed, 78 insertions(+), 78 deletions(-) diff --git a/packages/core/overlays/core-overlays-browser-internal/src/modal/__snapshots__/modal_service.test.tsx.snap b/packages/core/overlays/core-overlays-browser-internal/src/modal/__snapshots__/modal_service.test.tsx.snap index ae55761e0cbd4..2b5f564dfb3ee 100644 --- a/packages/core/overlays/core-overlays-browser-internal/src/modal/__snapshots__/modal_service.test.tsx.snap +++ b/packages/core/overlays/core-overlays-browser-internal/src/modal/__snapshots__/modal_service.test.tsx.snap @@ -148,7 +148,7 @@ exports[`ModalService openConfirm() renders a mountpoint confirm message 2`] = ` "`; +exports[`ResetSessionPage renders as expected 1`] = `"ElasticMockedFonts

You do not have permission to access the requested page

Either go back to the previous page or log in as a different user.

Log in as different user
"`; diff --git a/x-pack/plugins/security_solution/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap index f1325280b3afb..a87a35e608883 100644 --- a/x-pack/plugins/security_solution/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap +++ b/x-pack/plugins/security_solution/public/common/components/import_data_modal/__snapshots__/index.test.tsx.snap @@ -130,7 +130,7 @@ Object {