From f83a63f5af168df29cf30eb38f11339966c52fa9 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Mon, 15 Aug 2022 11:58:33 -0500 Subject: [PATCH 01/20] eui to v62.2.0 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8e8bdcedc01c18..8fbd82a221c80f 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "@elastic/datemath": "5.0.3", "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.3.0-canary.1", "@elastic/ems-client": "8.3.3", - "@elastic/eui": "62.0.3", + "@elastic/eui": "62.2.0", "@elastic/filesaver": "1.1.2", "@elastic/node-crypto": "1.2.1", "@elastic/numeral": "^2.5.1", diff --git a/yarn.lock b/yarn.lock index bb308b0b291210..c6038bceaa8e9a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1548,10 +1548,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@62.0.3": - version "62.0.3" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-62.0.3.tgz#502f031e20bb67f544965c69d22532aa5ec273c2" - integrity sha512-CAAM73oRpkVAv/BVvgu4eTQOPZJCTOYu+omLG3OxhPLCSLlcxnESvlbKueMEBztOEipBbAEfjcydALLcGCmMmw== +"@elastic/eui@62.2.0": + version "62.2.0" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-62.2.0.tgz#0b763514c06eb31f45ba5cdbff99d39be261db83" + integrity sha512-Mgkca5kP8P2MieYTTp5JhXNn5IYXkS30QahhcyQUBWVQU/xkq3yel6RYeaaB6kYX9AVBKZ9xEM6/drSsWIcvGw== dependencies: "@types/chroma-js" "^2.0.0" "@types/lodash" "^4.14.160" From 60308a65602e2a748736a188dab43e859cd2f3ef Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Mon, 15 Aug 2022 11:58:50 -0500 Subject: [PATCH 02/20] i18n updates --- .../i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx | 5 ++--- src/dev/license_checker/config.ts | 2 +- x-pack/plugins/translations/translations/fr-FR.json | 1 - x-pack/plugins/translations/translations/ja-JP.json | 1 - x-pack/plugins/translations/translations/zh-CN.json | 1 - 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/packages/core/i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx b/packages/core/i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx index 93e73d5272d5d1..15c323ca4036d5 100644 --- a/packages/core/i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx +++ b/packages/core/i18n/core-i18n-browser-internal/src/i18n_eui_mapping.tsx @@ -103,11 +103,10 @@ export const getEuiContextMapping = (): EuiTokensObject => { defaultMessage: 'Page level controls', description: 'Screen reader announcement about heading controls', }), - 'euiBreadcrumbs.collapsedBadge.ariaLabel': i18n.translate( - 'core.euiBreadcrumbs.collapsedBadge.ariaLabel', + 'euiBreadcrumb.collapsedBadge.ariaLabel': i18n.translate( + 'core.euiBreadcrumb.collapsedBadge.ariaLabel', { defaultMessage: 'See collapsed breadcrumbs', - description: 'Displayed when one or more breadcrumbs are hidden.', } ), 'euiBreadcrumbs.nav.ariaLabel': i18n.translate('core.euiBreadcrumbs.nav.ariaLabel', { diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts index 02649c2fc5b881..16b741e4cb523a 100644 --- a/src/dev/license_checker/config.ts +++ b/src/dev/license_checker/config.ts @@ -83,6 +83,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@62.0.3': ['SSPL-1.0 OR Elastic License 2.0'], + '@elastic/eui@62.2.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/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json index 60eb4ff1a6bc1a..a9750c21d85652 100644 --- a/x-pack/plugins/translations/translations/fr-FR.json +++ b/x-pack/plugins/translations/translations/fr-FR.json @@ -1378,7 +1378,6 @@ "core.euiBottomBar.customScreenReaderAnnouncement": "Il y a un nouveau repère de région nommé {landmarkHeading} avec des commandes de niveau de page à la fin du document.", "core.euiBottomBar.screenReaderAnnouncement": "Il y a un nouveau repère de région avec des commandes de niveau de page à la fin du document.", "core.euiBottomBar.screenReaderHeading": "Commandes de niveau de page", - "core.euiBreadcrumbs.collapsedBadge.ariaLabel": "Voir le fil d’Ariane réduit", "core.euiBreadcrumbs.nav.ariaLabel": "Fil d’Ariane", "core.euiCardSelect.select": "Sélectionner", "core.euiCardSelect.selected": "Sélectionné", diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json index 28e1c216f78b2a..74638e0e3569ce 100644 --- a/x-pack/plugins/translations/translations/ja-JP.json +++ b/x-pack/plugins/translations/translations/ja-JP.json @@ -1380,7 +1380,6 @@ "core.euiBottomBar.customScreenReaderAnnouncement": "ドキュメントの最後には、新しいリージョンランドマーク{landmarkHeading}とページレベルのコントロールがあります。", "core.euiBottomBar.screenReaderAnnouncement": "ドキュメントの最後には、新しいリージョンランドマークとページレベルのコントロールがあります。", "core.euiBottomBar.screenReaderHeading": "ページレベルのコントロール", - "core.euiBreadcrumbs.collapsedBadge.ariaLabel": "折りたたまれたブレッドクラムを表示", "core.euiBreadcrumbs.nav.ariaLabel": "ブレッドクラム", "core.euiCardSelect.select": "選択してください", "core.euiCardSelect.selected": "利用不可", diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json index cb033f719dffd4..823a73b4775a64 100644 --- a/x-pack/plugins/translations/translations/zh-CN.json +++ b/x-pack/plugins/translations/translations/zh-CN.json @@ -1379,7 +1379,6 @@ "core.euiBottomBar.customScreenReaderAnnouncement": "有称作 {landmarkHeading} 且页面级别控件位于文档结尾的新地区地标。", "core.euiBottomBar.screenReaderAnnouncement": "有页面级别控件位于文档结尾的新地区地标。", "core.euiBottomBar.screenReaderHeading": "页面级别控件", - "core.euiBreadcrumbs.collapsedBadge.ariaLabel": "查看折叠的痕迹导航", "core.euiBreadcrumbs.nav.ariaLabel": "痕迹导航", "core.euiCardSelect.select": "选择", "core.euiCardSelect.selected": "已选定", From d913a99952b023a7fbc9b6e46f77e283cf15e0e2 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Mon, 15 Aug 2022 13:27:48 -0500 Subject: [PATCH 03/20] EuiDescriptionListProps imports --- .../data_frame_analytics/pages/job_map/components/controls.tsx | 2 +- .../trained_models/models_management/expanded_row.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/components/controls.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/components/controls.tsx index 8bac15adb2afb6..5df043792a7a58 100644 --- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/components/controls.tsx +++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/components/controls.tsx @@ -16,6 +16,7 @@ import { EuiContextMenuItem, EuiContextMenuPanel, EuiDescriptionList, + EuiDescriptionListProps, EuiFlexGroup, EuiFlexItem, EuiFlyout, @@ -26,7 +27,6 @@ import { EuiPortal, EuiTitle, } from '@elastic/eui'; -import { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list'; import { CytoscapeContext } from './cytoscape'; import { formatHumanReadableDateTimeSeconds } from '../../../../../../common/util/date_utils'; import { JOB_MAP_NODE_TYPES } from '../../../../../../common/constants/data_frame_analytics'; diff --git a/x-pack/plugins/ml/public/application/trained_models/models_management/expanded_row.tsx b/x-pack/plugins/ml/public/application/trained_models/models_management/expanded_row.tsx index 6c1fbbf495f94f..f2aec5b7684617 100644 --- a/x-pack/plugins/ml/public/application/trained_models/models_management/expanded_row.tsx +++ b/x-pack/plugins/ml/public/application/trained_models/models_management/expanded_row.tsx @@ -11,6 +11,7 @@ import { EuiBadge, EuiCodeBlock, EuiDescriptionList, + EuiDescriptionListProps, EuiFlexGrid, EuiFlexItem, EuiNotificationBadge, @@ -20,7 +21,6 @@ import { EuiTabbedContentTab, EuiTitle, } from '@elastic/eui'; -import type { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list'; import { FormattedMessage } from '@kbn/i18n-react'; import { FIELD_FORMAT_IDS } from '@kbn/field-formats-plugin/common'; import { isPopulatedObject } from '@kbn/ml-is-populated-object'; From e7f11a1ec24526d703018aaec2b48ce87040f9c6 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Mon, 15 Aug 2022 13:51:10 -0500 Subject: [PATCH 04/20] eui to v62.2.1 --- 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 8fbd82a221c80f..d0fa8d448ac652 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "@elastic/datemath": "5.0.3", "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.3.0-canary.1", "@elastic/ems-client": "8.3.3", - "@elastic/eui": "62.2.0", + "@elastic/eui": "62.2.1", "@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 16b741e4cb523a..62bef2562585bf 100644 --- a/src/dev/license_checker/config.ts +++ b/src/dev/license_checker/config.ts @@ -83,6 +83,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@62.2.0': ['SSPL-1.0 OR Elastic License 2.0'], + '@elastic/eui@62.2.1': ['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 c6038bceaa8e9a..034d26bae56dd7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1548,10 +1548,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@62.2.0": - version "62.2.0" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-62.2.0.tgz#0b763514c06eb31f45ba5cdbff99d39be261db83" - integrity sha512-Mgkca5kP8P2MieYTTp5JhXNn5IYXkS30QahhcyQUBWVQU/xkq3yel6RYeaaB6kYX9AVBKZ9xEM6/drSsWIcvGw== +"@elastic/eui@62.2.1": + version "62.2.1" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-62.2.1.tgz#8a064f2e094d8faca10d7c47bc5df636bdcc281d" + integrity sha512-/EXcDEr6MUcP+dJJHtcbKuc6LcYn8Rol4yuKNOhhDJMYJJTjgcAtQUACPupD8asNsgXPLV8v41389Y3IxWgOEg== dependencies: "@types/chroma-js" "^2.0.0" "@types/lodash" "^4.14.160" From 014d4eb9ca74d4e84d781fdfade4b3d37040c915 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Mon, 15 Aug 2022 14:36:18 -0500 Subject: [PATCH 05/20] euitoast selector updates --- test/functional/page_objects/common_page.ts | 8 ++++---- .../common/components/toasters/index.test.tsx | 18 ++++++++++++------ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/test/functional/page_objects/common_page.ts b/test/functional/page_objects/common_page.ts index b3c0f7deda9822..1bdcfe6e9177b8 100644 --- a/test/functional/page_objects/common_page.ts +++ b/test/functional/page_objects/common_page.ts @@ -414,9 +414,9 @@ export class CommonPageObject extends FtrService { async closeToast() { const toast = await this.find.byCssSelector('.euiToast', 6 * this.defaultFindTimeout); await toast.moveMouseTo(); - const title = await (await this.find.byCssSelector('.euiToastHeader__title')).getVisibleText(); + const title = await (await this.testSubjects.find('euiToastHeader__title')).getVisibleText(); - await this.find.clickByCssSelector('.euiToast__closeButton'); + await this.testSubjects.click('toastCloseButton'); return title; } @@ -424,7 +424,7 @@ export class CommonPageObject extends FtrService { const toastShown = await this.find.existsByCssSelector('.euiToast'); if (toastShown) { try { - await this.find.clickByCssSelector('.euiToast__closeButton'); + await this.testSubjects.click('toastCloseButton'); } catch (err) { // ignore errors, toast clear themselves after timeout } @@ -436,7 +436,7 @@ export class CommonPageObject extends FtrService { for (const toastElement of toasts) { try { await toastElement.moveMouseTo(); - const closeBtn = await toastElement.findByCssSelector('.euiToast__closeButton'); + const closeBtn = await toastElement.findByTestSubject('toastCloseButton'); await closeBtn.click(); } catch (err) { // ignore errors, toast clear themselves after timeout diff --git a/x-pack/plugins/security_solution/public/common/components/toasters/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/toasters/index.test.tsx index bb42e99d50518e..570bf8c1122100 100644 --- a/x-pack/plugins/security_solution/public/common/components/toasters/index.test.tsx +++ b/x-pack/plugins/security_solution/public/common/components/toasters/index.test.tsx @@ -121,7 +121,7 @@ describe('Toaster', () => { wrapper.find('[data-test-subj="add-toast"]').simulate('click'); expect(wrapper.find('.euiGlobalToastList').exists()).toBe(true); - expect(wrapper.find('.euiToastHeader__title').text()).toBe('Test & Test'); + expect(wrapper.find('[data-test-subj="euiToastHeader__title"]').text()).toBe('Test & Test'); }); test('Render an error toaster', () => { @@ -153,7 +153,9 @@ describe('Toaster', () => { wrapper.find('[data-test-subj="add-toast"]').simulate('click'); expect(wrapper.find('.euiGlobalToastList').exists()).toBe(true); - expect(wrapper.find('.euiToastHeader__title').text()).toBe('Test & Test ERROR'); + expect(wrapper.find('[data-test-subj="euiToastHeader__title"]').text()).toBe( + 'Test & Test ERROR' + ); expect(wrapper.find('button[data-test-subj="toaster-show-all-error-modal"]').exists()).toBe( true ); @@ -198,10 +200,12 @@ describe('Toaster', () => { wrapper.find('[data-test-subj="add-toast"]').simulate('click'); expect(wrapper.find('button[data-test-subj="toastCloseButton"]').length).toBe(1); - expect(wrapper.find('.euiToastHeader__title').text()).toBe('Test & Test'); + expect(wrapper.find('[data-test-subj="euiToastHeader__title"]').text()).toBe('Test & Test'); wrapper.find('button[data-test-subj="delete-toast"]').simulate('click'); expect(wrapper.find('.euiToast').length).toBe(1); - expect(wrapper.find('.euiToastHeader__title').text()).toBe('Test & Test II'); + expect(wrapper.find('[data-test-subj="euiToastHeader__title"]').text()).toBe( + 'Test & Test II' + ); }); test('Do not show anymore toaster when modal error is open', () => { @@ -270,14 +274,16 @@ describe('Toaster', () => { ); wrapper.find('[data-test-subj="add-toast"]').simulate('click'); - expect(wrapper.find('.euiToastHeader__title').text()).toBe('Test & Test II'); + expect(wrapper.find('[data-test-subj="euiToastHeader__title"]').text()).toBe( + 'Test & Test II' + ); wrapper.find('button[data-test-subj="toaster-show-all-error-modal"]').simulate('click'); expect(wrapper.find('.euiToast').length).toBe(0); wrapper.find('button[data-test-subj="modal-all-errors-close"]').simulate('click'); expect(wrapper.find('.euiToast').length).toBe(1); - expect(wrapper.find('.euiToastHeader__title').text()).toBe('Test & Test'); + expect(wrapper.find('[data-test-subj="euiToastHeader__title"]').text()).toBe('Test & Test'); }); }); From cc794f2c0aa4e4df310b573af7fa8e87c34fc481 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Mon, 15 Aug 2022 14:56:17 -0500 Subject: [PATCH 06/20] more EuiDescriptionListProps imports --- .../components/shared/service_icons/cloud_details.tsx | 7 +++++-- .../components/shared/service_icons/container_details.tsx | 3 +-- .../components/shared/service_icons/serverless_details.tsx | 7 +++++-- .../components/shared/service_icons/service_details.tsx | 3 +-- .../sections/epm/screens/detail/overview/details.tsx | 2 +- .../public/resolver/view/panels/node_detail.tsx | 2 +- 6 files changed, 14 insertions(+), 10 deletions(-) diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/cloud_details.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/cloud_details.tsx index b5e4013d08ecb6..f84c0c09cee3be 100644 --- a/x-pack/plugins/apm/public/components/shared/service_icons/cloud_details.tsx +++ b/x-pack/plugins/apm/public/components/shared/service_icons/cloud_details.tsx @@ -5,8 +5,11 @@ * 2.0. */ -import { EuiBadge, EuiDescriptionList } from '@elastic/eui'; -import { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list'; +import { + EuiBadge, + EuiDescriptionList, + EuiDescriptionListProps, +} from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import React from 'react'; import { APIReturnType } from '../../../services/rest/create_call_apm_api'; diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/container_details.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/container_details.tsx index 2bc3fddfb7590e..aff1a6d9c053f8 100644 --- a/x-pack/plugins/apm/public/components/shared/service_icons/container_details.tsx +++ b/x-pack/plugins/apm/public/components/shared/service_icons/container_details.tsx @@ -5,8 +5,7 @@ * 2.0. */ -import { EuiDescriptionList } from '@elastic/eui'; -import { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list'; +import { EuiDescriptionList, EuiDescriptionListProps } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import React from 'react'; import { asInteger } from '../../../../common/utils/formatters'; diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/serverless_details.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/serverless_details.tsx index d05abab6d674ab..5d6e3f5df0b66d 100644 --- a/x-pack/plugins/apm/public/components/shared/service_icons/serverless_details.tsx +++ b/x-pack/plugins/apm/public/components/shared/service_icons/serverless_details.tsx @@ -5,8 +5,11 @@ * 2.0. */ -import { EuiBadge, EuiDescriptionList } from '@elastic/eui'; -import { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list'; +import { + EuiBadge, + EuiDescriptionList, + EuiDescriptionListProps, +} from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import React from 'react'; import { APIReturnType } from '../../../services/rest/create_call_apm_api'; diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/service_details.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/service_details.tsx index 5ddb9a422c37c7..2c6e900822103a 100644 --- a/x-pack/plugins/apm/public/components/shared/service_icons/service_details.tsx +++ b/x-pack/plugins/apm/public/components/shared/service_icons/service_details.tsx @@ -5,8 +5,7 @@ * 2.0. */ -import { EuiDescriptionList } from '@elastic/eui'; -import { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list'; +import { EuiDescriptionList, EuiDescriptionListProps } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; import React from 'react'; import { APIReturnType } from '../../../services/rest/create_call_apm_api'; diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/details.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/details.tsx index 83631c674f7545..162c9cb0d9efea 100644 --- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/details.tsx +++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/details.tsx @@ -6,6 +6,7 @@ */ import React, { memo, useCallback, useMemo, useState } from 'react'; import { FormattedMessage } from '@kbn/i18n-react'; +import type { EuiDescriptionListProps } from '@elastic/eui'; import { EuiFlexGroup, EuiFlexItem, @@ -16,7 +17,6 @@ import { EuiLink, EuiPortal, } from '@elastic/eui'; -import type { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list'; import { euiStyled } from '@kbn/kibana-react-plugin/common'; diff --git a/x-pack/plugins/security_solution/public/resolver/view/panels/node_detail.tsx b/x-pack/plugins/security_solution/public/resolver/view/panels/node_detail.tsx index c2ebad459241bc..2c4181add11cbf 100644 --- a/x-pack/plugins/security_solution/public/resolver/view/panels/node_detail.tsx +++ b/x-pack/plugins/security_solution/public/resolver/view/panels/node_detail.tsx @@ -11,10 +11,10 @@ import type { HTMLAttributes } from 'react'; import React, { memo, useMemo } from 'react'; import { useSelector } from 'react-redux'; import { i18n } from '@kbn/i18n'; +import type { EuiDescriptionListProps } from '@elastic/eui'; import { htmlIdGenerator, EuiSpacer, EuiTitle, EuiText, EuiTextColor, EuiLink } from '@elastic/eui'; import { FormattedMessage } from '@kbn/i18n-react'; import styled from 'styled-components'; -import type { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list'; import { StyledDescriptionList, StyledTitle } from './styles'; import * as selectors from '../../store/selectors'; import * as eventModel from '../../../../common/endpoint/models/event'; From fb0e0493d4130571f6f047e2a7007f2af1df45b8 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Tue, 16 Aug 2022 13:23:45 -0500 Subject: [PATCH 07/20] eui to v62.2.2 --- 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 0548321a7a8f3d..d1d95e0c12999e 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "@elastic/datemath": "5.0.3", "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@8.3.0-canary.1", "@elastic/ems-client": "8.3.3", - "@elastic/eui": "62.2.1", + "@elastic/eui": "62.2.2", "@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 62bef2562585bf..d42dfdcf285b8b 100644 --- a/src/dev/license_checker/config.ts +++ b/src/dev/license_checker/config.ts @@ -83,6 +83,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@62.2.1': ['SSPL-1.0 OR Elastic License 2.0'], + '@elastic/eui@62.2.2': ['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 c83c15bc63d561..dd7aba0d667487 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1548,10 +1548,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@62.2.1": - version "62.2.1" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-62.2.1.tgz#8a064f2e094d8faca10d7c47bc5df636bdcc281d" - integrity sha512-/EXcDEr6MUcP+dJJHtcbKuc6LcYn8Rol4yuKNOhhDJMYJJTjgcAtQUACPupD8asNsgXPLV8v41389Y3IxWgOEg== +"@elastic/eui@62.2.2": + version "62.2.2" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-62.2.2.tgz#b94cf6e9016fc9e079f0ddc1718f31a42325b6fb" + integrity sha512-Nlu7QV/Dwp7AC8oFaZouxlzL1PItvKZU8IzXnqGWvCK7KfGHw5oMRC7mJYDtCyL6FOYVHLKm92rYM5od2Ih8/Q== dependencies: "@types/chroma-js" "^2.0.0" "@types/lodash" "^4.14.160" From 41f0733611a6a22add44789239f67071c3368c77 Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Tue, 16 Aug 2022 14:22:07 -0500 Subject: [PATCH 08/20] snapshot updates --- .../header/__snapshots__/header.test.tsx.snap | 8 +- .../header_breadcrumbs.test.tsx.snap | 156 +- .../ui/header/header_breadcrumbs.test.tsx | 6 +- .../__snapshots__/page_template.test.tsx.snap | 190 +- .../__snapshots__/solution_nav.test.tsx.snap | 291 ++- .../__snapshots__/palette.stories.storyshot | 303 ++- .../font_picker.stories.storyshot | 112 +- .../keyboard_shortcuts_doc.stories.storyshot | 176 +- .../palette_picker.stories.storyshot | 657 +++++- .../text_style_picker.stories.storyshot | 92 +- .../__snapshots__/edit_var.stories.storyshot | 356 +++- .../filter.component.stories.storyshot | 61 +- .../filters_group.component.stories.storyshot | 609 +++++- ...orkpad_filters.component.stories.storyshot | 1812 ++++++++++++++++- .../extended_template.stories.storyshot | 201 +- .../__snapshots__/checker_errors.test.js.snap | 11 +- .../create_descriptions_list.test.tsx.snap | 378 ++-- .../common/components/toasters/index.test.tsx | 18 +- .../__snapshots__/index.test.tsx.snap | 112 +- 19 files changed, 5101 insertions(+), 448 deletions(-) diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap index ac0743939d75af..d00e26bfcfe999 100644 --- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap +++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap @@ -145,18 +145,18 @@ exports[`Header renders 1`] = `