From dbebb59c1156f9db5e17beaecb174b1927ec8249 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Wed, 6 May 2020 11:23:11 -0500 Subject: [PATCH 01/15] eui to 23.2.0 --- package.json | 2 +- packages/kbn-ui-shared-deps/package.json | 2 +- .../plugins/kbn_tp_run_pipeline/package.json | 2 +- .../plugins/kbn_sample_panel_action/package.json | 2 +- .../plugins/kbn_tp_custom_visualizations/package.json | 2 +- .../plugins/kbn_tp_embeddable_explorer/package.json | 2 +- x-pack/package.json | 2 +- yarn.lock | 8 ++++---- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 8a92b46489308..82be73ff9a74d 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "@elastic/charts": "19.2.0", "@elastic/datemath": "5.0.3", "@elastic/ems-client": "7.8.0", - "@elastic/eui": "22.3.1", + "@elastic/eui": "23.2.0", "@elastic/filesaver": "1.1.2", "@elastic/good": "8.1.1-kibana2", "@elastic/numeral": "2.4.0", diff --git a/packages/kbn-ui-shared-deps/package.json b/packages/kbn-ui-shared-deps/package.json index 8259f251a9be3..2827aba9aae97 100644 --- a/packages/kbn-ui-shared-deps/package.json +++ b/packages/kbn-ui-shared-deps/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@elastic/charts": "19.2.0", - "@elastic/eui": "22.3.1", + "@elastic/eui": "23.2.0", "@kbn/i18n": "1.0.0", "abortcontroller-polyfill": "^1.4.0", "angular": "^1.7.9", diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json index 338e85038922d..cd9dc61ae3a16 100644 --- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json +++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json @@ -7,7 +7,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "22.3.1", + "@elastic/eui": "23.2.0", "react": "^16.12.0", "react-dom": "^16.12.0" } diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_sample_panel_action/package.json index ef94ad7444eba..1cd10f4dfe768 100644 --- a/test/plugin_functional/plugins/kbn_sample_panel_action/package.json +++ b/test/plugin_functional/plugins/kbn_sample_panel_action/package.json @@ -8,7 +8,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "22.3.1", + "@elastic/eui": "23.2.0", "react": "^16.12.0" }, "scripts": { diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json index 56addbca0c2b8..0a17058840355 100644 --- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json +++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json @@ -8,7 +8,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "22.3.1", + "@elastic/eui": "23.2.0", "react": "^16.12.0" }, "scripts": { diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json index 07bf435eeb9d8..442fe3fbc7cd6 100644 --- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json +++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json @@ -8,7 +8,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "22.3.1", + "@elastic/eui": "23.2.0", "react": "^16.12.0" }, "scripts": { diff --git a/x-pack/package.json b/x-pack/package.json index 3a3a0a94fa9ea..98ac219c9b758 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -191,7 +191,7 @@ "@elastic/apm-rum-react": "^1.1.1", "@elastic/datemath": "5.0.3", "@elastic/ems-client": "7.8.0", - "@elastic/eui": "22.3.1", + "@elastic/eui": "23.2.0", "@elastic/filesaver": "1.1.2", "@elastic/maki": "6.3.0", "@elastic/node-crypto": "1.1.1", diff --git a/yarn.lock b/yarn.lock index 1ce919e210e66..7384eb6449a0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1332,10 +1332,10 @@ tabbable "^1.1.0" uuid "^3.1.0" -"@elastic/eui@22.3.1": - version "22.3.1" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-22.3.1.tgz#d824835774476f1aaca006a466324256a56c1df6" - integrity sha512-psGMIsNhI0LApvmR19Y0DvtmV3BvvzXkd8dVXORjBiPW4Z7N2sGgsMmqpvxlZ1rfP59PyIKpQOTReJZFLSmKQQ== +"@elastic/eui@23.2.0": + version "23.2.0" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-23.2.0.tgz#ffc7d3b681e0e5efb02d8a67991c2ab558c975d7" + integrity sha512-a2wIT4sYwDEr7EOOIWAQsaKDXn1yXNf1aLGd5ekbmBw2m8TlLLlBd8jHEh2diAaBSkZ+cU6sKlwUbbN2yRehPQ== dependencies: "@types/chroma-js" "^2.0.0" "@types/enzyme" "^3.1.13" From be7bd4945be290afe56e72eb430bd7e120e6879c Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Wed, 6 May 2020 16:33:03 -0500 Subject: [PATCH 02/15] nav drawer ts updates --- src/core/public/chrome/ui/header/header.tsx | 3 +-- src/core/public/chrome/ui/header/nav_drawer.tsx | 3 +-- src/core/public/chrome/ui/header/nav_link.tsx | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/core/public/chrome/ui/header/header.tsx b/src/core/public/chrome/ui/header/header.tsx index fb94ef46cdc2c..641aafd3d9840 100644 --- a/src/core/public/chrome/ui/header/header.tsx +++ b/src/core/public/chrome/ui/header/header.tsx @@ -23,7 +23,6 @@ import { EuiHeaderSectionItem, EuiHeaderSectionItemButton, EuiIcon, - // @ts-ignore EuiNavDrawer, EuiShowFor, htmlIdGenerator, @@ -167,7 +166,7 @@ export class Header extends Component { aria-label={i18n.translate('core.ui.chrome.headerGlobalNav.toggleSideNavAriaLabel', { defaultMessage: 'Toggle side navigation', })} - onClick={() => this.navDrawerRef.current.toggleOpen()} + onClick={() => this.navDrawerRef.current && this.navDrawerRef.current.toggleOpen()} > diff --git a/src/core/public/chrome/ui/header/nav_drawer.tsx b/src/core/public/chrome/ui/header/nav_drawer.tsx index 7faee8edea43b..17df8569f6307 100644 --- a/src/core/public/chrome/ui/header/nav_drawer.tsx +++ b/src/core/public/chrome/ui/header/nav_drawer.tsx @@ -19,7 +19,6 @@ import React from 'react'; import { i18n } from '@kbn/i18n'; -// @ts-ignore import { EuiNavDrawer, EuiHorizontalRule, EuiNavDrawerGroup } from '@elastic/eui'; import { OnIsLockedUpdate } from './'; import { NavLink, RecentNavLink } from './nav_link'; @@ -34,7 +33,7 @@ export interface Props { function navDrawerRenderer( { isLocked, onIsLockedUpdate, navLinks, recentNavLinks }: Props, - ref: React.Ref + ref: React.Ref ) { return ( ) { if ( !legacyMode && // ignore when in legacy mode !legacy && // ignore links to legacy apps From 1bacf3c3a9c4142aafcb4d94fc8a2f3bb4d8dd08 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Thu, 7 May 2020 14:51:45 -0500 Subject: [PATCH 03/15] eui to 23.3.0 --- package.json | 2 +- packages/kbn-ui-shared-deps/package.json | 2 +- .../plugins/kbn_tp_run_pipeline/package.json | 2 +- .../plugins/kbn_sample_panel_action/package.json | 2 +- .../plugins/kbn_tp_custom_visualizations/package.json | 2 +- .../plugins/kbn_tp_embeddable_explorer/package.json | 2 +- x-pack/package.json | 2 +- yarn.lock | 8 ++++---- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 82be73ff9a74d..a42ff9e4d5e36 100644 --- a/package.json +++ b/package.json @@ -125,7 +125,7 @@ "@elastic/charts": "19.2.0", "@elastic/datemath": "5.0.3", "@elastic/ems-client": "7.8.0", - "@elastic/eui": "23.2.0", + "@elastic/eui": "23.3.0", "@elastic/filesaver": "1.1.2", "@elastic/good": "8.1.1-kibana2", "@elastic/numeral": "2.4.0", diff --git a/packages/kbn-ui-shared-deps/package.json b/packages/kbn-ui-shared-deps/package.json index 2827aba9aae97..035f6d25a0b27 100644 --- a/packages/kbn-ui-shared-deps/package.json +++ b/packages/kbn-ui-shared-deps/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@elastic/charts": "19.2.0", - "@elastic/eui": "23.2.0", + "@elastic/eui": "23.3.0", "@kbn/i18n": "1.0.0", "abortcontroller-polyfill": "^1.4.0", "angular": "^1.7.9", diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json index cd9dc61ae3a16..c05ef779e3969 100644 --- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json +++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json @@ -7,7 +7,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "23.2.0", + "@elastic/eui": "23.3.0", "react": "^16.12.0", "react-dom": "^16.12.0" } diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_sample_panel_action/package.json index 1cd10f4dfe768..f2fcfc1535105 100644 --- a/test/plugin_functional/plugins/kbn_sample_panel_action/package.json +++ b/test/plugin_functional/plugins/kbn_sample_panel_action/package.json @@ -8,7 +8,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "23.2.0", + "@elastic/eui": "23.3.0", "react": "^16.12.0" }, "scripts": { diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json index 0a17058840355..d2106662f4e03 100644 --- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json +++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json @@ -8,7 +8,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "23.2.0", + "@elastic/eui": "23.3.0", "react": "^16.12.0" }, "scripts": { diff --git a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json index 442fe3fbc7cd6..2101e12249530 100644 --- a/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json +++ b/test/plugin_functional/plugins/kbn_tp_embeddable_explorer/package.json @@ -8,7 +8,7 @@ }, "license": "Apache-2.0", "dependencies": { - "@elastic/eui": "23.2.0", + "@elastic/eui": "23.3.0", "react": "^16.12.0" }, "scripts": { diff --git a/x-pack/package.json b/x-pack/package.json index 98ac219c9b758..567f4738a923b 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -191,7 +191,7 @@ "@elastic/apm-rum-react": "^1.1.1", "@elastic/datemath": "5.0.3", "@elastic/ems-client": "7.8.0", - "@elastic/eui": "23.2.0", + "@elastic/eui": "23.3.0", "@elastic/filesaver": "1.1.2", "@elastic/maki": "6.3.0", "@elastic/node-crypto": "1.1.1", diff --git a/yarn.lock b/yarn.lock index 7384eb6449a0d..324dc07a30681 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1332,10 +1332,10 @@ tabbable "^1.1.0" uuid "^3.1.0" -"@elastic/eui@23.2.0": - version "23.2.0" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-23.2.0.tgz#ffc7d3b681e0e5efb02d8a67991c2ab558c975d7" - integrity sha512-a2wIT4sYwDEr7EOOIWAQsaKDXn1yXNf1aLGd5ekbmBw2m8TlLLlBd8jHEh2diAaBSkZ+cU6sKlwUbbN2yRehPQ== +"@elastic/eui@23.3.0": + version "23.3.0" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-23.3.0.tgz#9516cb3fd2c63192dbe0e1d24b2a8ffed88c06d8" + integrity sha512-DpivOF347NAj60hdOWsC70Sx6492j9fYlCmjQ9XJ/L9rfPfUaC0qRSpKS6FPtgRW0BIuw+rWuxV2++t+j4Aiog== dependencies: "@types/chroma-js" "^2.0.0" "@types/enzyme" "^3.1.13" From 9e8ff775c5367d498578c2df85c3dbaddd50c2b6 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Thu, 7 May 2020 15:12:09 -0500 Subject: [PATCH 04/15] src snapshot updates --- .../collapsible_nav.test.tsx.snap | 52 +++++++++++++------ .../saved_objects_installer.test.js.snap | 4 ++ 2 files changed, 41 insertions(+), 15 deletions(-) diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap index 14d5b2e8fdcbb..680f8dd88ab2d 100644 --- a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap +++ b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap @@ -272,6 +272,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
@@ -463,6 +465,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = ` class="euiListGroupItem__button" data-test-subj="collapsibleNavAppLink" href="discover" + rel="noreferrer" > @@ -582,6 +586,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = ` class="euiListGroupItem__button" data-test-subj="collapsibleNavAppLink" href="metrics" + rel="noreferrer" > @@ -685,6 +690,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = ` class="euiListGroupItem__button" data-test-subj="collapsibleNavAppLink" href="siem" + rel="noreferrer" >
@@ -1099,6 +1109,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = ` class="euiListGroupItem__button" data-test-subj="collapsibleNavAppLink" href="discover" + rel="noreferrer" > @@ -1218,6 +1230,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = ` class="euiListGroupItem__button" data-test-subj="collapsibleNavAppLink" href="metrics" + rel="noreferrer" > @@ -1321,6 +1334,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = ` class="euiListGroupItem__button" data-test-subj="collapsibleNavAppLink" href="siem" + rel="noreferrer" >
- - xpack.monitoring.collection.enabled -
- } - > - xpack.monitoring.collection.enabled - - - + + + xpack.monitoring.collection.enabled + is set to - - -1 -
- } - > - -1 - - - + + + -1 + diff --git a/x-pack/plugins/monitoring/public/components/no_data/explanations/collection_interval/__tests__/__snapshots__/collection_interval.test.js.snap b/x-pack/plugins/monitoring/public/components/no_data/explanations/collection_interval/__tests__/__snapshots__/collection_interval.test.js.snap index 8b3675bf32753..49cbe092e0e20 100644 --- a/x-pack/plugins/monitoring/public/components/no_data/explanations/collection_interval/__tests__/__snapshots__/collection_interval.test.js.snap +++ b/x-pack/plugins/monitoring/public/components/no_data/explanations/collection_interval/__tests__/__snapshots__/collection_interval.test.js.snap @@ -360,58 +360,24 @@ exports[`ExplainCollectionInterval collection interval setting updates should sh We checked the cluster settings and found that - - xpack.monitoring.collection.interval - - } - > - xpack.monitoring.collection.interval - - - + + + xpack.monitoring.collection.interval + is set to - - -1 - - } - > - -1 - - - + + + -1 + @@ -692,58 +658,24 @@ exports[`ExplainCollectionInterval should explain about xpack.monitoring.collect We checked the cluster settings and found that - - xpack.monitoring.collection.interval - - } - > - xpack.monitoring.collection.interval - - - + + + xpack.monitoring.collection.interval + is set to - - -1 - - } - > - -1 - - - + + + -1 + diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap index 35c566548f158..bcc9a3f14d48b 100644 --- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap +++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap @@ -251,7 +251,7 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
Use proxy mode @@ -1509,7 +1509,7 @@ Array [
Seed nodes @@ -1526,7 +1526,7 @@ Array [ class="euiFormRow__fieldWrapper" >