From 8e2e7b7b9255f042eebc55d70d40a1d3a6eb54db Mon Sep 17 00:00:00 2001 From: Cee Chen Date: Mon, 18 Mar 2024 09:56:54 -0700 Subject: [PATCH 01/12] Upgrade EUI to v93.4.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 a19ef297496c4..0894fa9c15689 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "@elastic/ecs": "^8.11.1", "@elastic/elasticsearch": "^8.12.2", "@elastic/ems-client": "8.5.1", - "@elastic/eui": "93.3.0", + "@elastic/eui": "93.4.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 3d4cb683a24f8..3a692ef7a5f7e 100644 --- a/src/dev/license_checker/config.ts +++ b/src/dev/license_checker/config.ts @@ -86,7 +86,7 @@ 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.5.1': ['Elastic License 2.0'], - '@elastic/eui@93.3.0': ['SSPL-1.0 OR Elastic License 2.0'], + '@elastic/eui@93.4.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 'buffers@0.1.1': ['MIT'], // license in importing module https://www.npmjs.com/package/binary '@bufbuild/protobuf@1.2.1': ['Apache-2.0'], // license (Apache-2.0 AND BSD-3-Clause) diff --git a/yarn.lock b/yarn.lock index 20249d3edb856..2c5005728a13a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1748,10 +1748,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@93.3.0": - version "93.3.0" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-93.3.0.tgz#3fc1052aa4b0192deadbee9c9ac48409d7df2cf4" - integrity sha512-0JNaioZISY8GGt3G+piER4U+e82jQ41cvE2Wz7WotuWiRYJEWVoJrtERWE/DCXubAj95XVCLSetWuQce3EGzmw== +"@elastic/eui@93.4.0": + version "93.4.0" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-93.4.0.tgz#14a7302125e13c1c324c5169fb320451f6b79e7a" + integrity sha512-fDUNvsPninaDdXWAQRFfoEzk4EgZL+OUoDbzDVH9PTcxkA/dr54sMoTV8KrvvXBVQ+X+VXndcXzmluQeWKj+5g== dependencies: "@hello-pangea/dnd" "^16.3.0" "@types/lodash" "^4.14.198" From e951c36f9af28f9ae0bbb09ea8212f6e581fcaf7 Mon Sep 17 00:00:00 2001 From: Cee Chen Date: Mon, 18 Mar 2024 09:57:51 -0700 Subject: [PATCH 02/12] Update deprecated EUI palettes to new culturally inclusive names --- .../charts/public/services/palettes/palettes.tsx | 8 ++++---- .../maps/public/classes/styles/color_palettes.ts | 12 ++++++------ .../scatterplot_matrix_vega_lite_spec.ts | 6 +++--- .../application/memory_usage/memory_item_colors.ts | 4 ++-- .../lens_attributes/heatmap_attributes.ts | 4 ++-- .../metrics/inventory_view/lib/get_color_palette.ts | 8 ++++---- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/plugins/charts/public/services/palettes/palettes.tsx b/src/plugins/charts/public/services/palettes/palettes.tsx index 4df7e2bea16a9..62aefd4a9765a 100644 --- a/src/plugins/charts/public/services/palettes/palettes.tsx +++ b/src/plugins/charts/public/services/palettes/palettes.tsx @@ -12,8 +12,8 @@ import { euiPaletteColorBlind, euiPaletteCool, euiPaletteGray, - euiPaletteNegative, - euiPalettePositive, + euiPaletteRed, + euiPaletteGreen, euiPaletteWarm, euiPaletteForStatus, euiPaletteForTemperature, @@ -281,11 +281,11 @@ export const buildPalettes: ( }, negative: { title: i18n.translate('charts.palettes.negativeLabel', { defaultMessage: 'Negative' }), - ...buildGradient('negative', euiPaletteNegative), + ...buildGradient('negative', euiPaletteRed), }, positive: { title: i18n.translate('charts.palettes.positiveLabel', { defaultMessage: 'Positive' }), - ...buildGradient('positive', euiPalettePositive), + ...buildGradient('positive', euiPaletteGreen), }, cool: { title: i18n.translate('charts.palettes.coolLabel', { defaultMessage: 'Cool' }), diff --git a/x-pack/plugins/maps/public/classes/styles/color_palettes.ts b/x-pack/plugins/maps/public/classes/styles/color_palettes.ts index a4fd893ea8c90..232728cc72f00 100644 --- a/x-pack/plugins/maps/public/classes/styles/color_palettes.ts +++ b/x-pack/plugins/maps/public/classes/styles/color_palettes.ts @@ -12,8 +12,8 @@ import { euiPaletteForTemperature, euiPaletteCool, euiPaletteWarm, - euiPaletteNegative, - euiPalettePositive, + euiPaletteRed, + euiPaletteGreen, euiPaletteGray, euiPaletteColorBlind, EuiColorPalettePickerPaletteProps, @@ -59,9 +59,9 @@ const COLOR_PALETTES: COLOR_PALETTE[] = [ { value: 'Greens', getPalette: (steps: number) => { - return euiPalettePositive(steps); + return euiPaletteGreen(steps); }, - palette: euiPalettePositive(8), + palette: euiPaletteGreen(8), type: 'gradient', }, { @@ -75,9 +75,9 @@ const COLOR_PALETTES: COLOR_PALETTE[] = [ { value: 'Reds', getPalette: (steps: number) => { - return euiPaletteNegative(steps); + return euiPaletteRed(steps); }, - palette: euiPaletteNegative(8), + palette: euiPaletteRed(8), type: 'gradient', }, { diff --git a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix_vega_lite_spec.ts b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix_vega_lite_spec.ts index 3b01eb7ed5366..96889679ed155 100644 --- a/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix_vega_lite_spec.ts +++ b/x-pack/plugins/ml/public/application/components/scatterplot_matrix/scatterplot_matrix_vega_lite_spec.ts @@ -11,7 +11,7 @@ import type { TopLevelSpec } from 'vega-lite/build/vega-lite'; import type { euiLightVars as euiThemeLight } from '@kbn/ui-theme'; -import { euiPaletteColorBlind, euiPaletteNegative, euiPalettePositive } from '@elastic/eui'; +import { euiPaletteColorBlind, euiPaletteRed, euiPaletteGreen } from '@elastic/eui'; import { i18n } from '@kbn/i18n'; @@ -25,11 +25,11 @@ export const USER_SELECTION = 'user_selection'; export const SINGLE_POINT_CLICK = 'single_point_click'; export const COLOR_BLUR = '#bbb'; -export const COLOR_OUTLIER = euiPaletteNegative(2)[1]; +export const COLOR_OUTLIER = euiPaletteRed(2)[1]; export const COLOR_SELECTION = euiPaletteColorBlind()[2]; export const COLOR_RANGE_OUTLIER = [euiPaletteColorBlind()[1], euiPaletteColorBlind()[2]]; export const COLOR_RANGE_NOMINAL = euiPaletteColorBlind({ rotations: 2 }); -export const COLOR_RANGE_QUANTITATIVE = euiPalettePositive(5); +export const COLOR_RANGE_QUANTITATIVE = euiPaletteGreen(5); const CUSTOM_VIS_FIELDS_PATH = 'fields'; export const getColorSpec = ( diff --git a/x-pack/plugins/ml/public/application/memory_usage/memory_item_colors.ts b/x-pack/plugins/ml/public/application/memory_usage/memory_item_colors.ts index ee6baaf33f740..05be88f45ed11 100644 --- a/x-pack/plugins/ml/public/application/memory_usage/memory_item_colors.ts +++ b/x-pack/plugins/ml/public/application/memory_usage/memory_item_colors.ts @@ -9,7 +9,7 @@ import { euiPaletteComplementary, euiPaletteForTemperature, euiPaletteGray, - euiPalettePositive, + euiPaletteGreen, euiPaletteWarm, } from '@elastic/eui'; import type { MlSavedObjectType } from '../../../common/types/saved_objects'; @@ -21,7 +21,7 @@ export function getMemoryItemColor(typeIn: MemoryItem) { case 'anomaly-detector': return euiPaletteWarm(5)[1]; case 'data-frame-analytics': - return euiPalettePositive(5)[2]; + return euiPaletteGreen(5)[2]; case 'trained-model': return euiPaletteForTemperature(5)[1]; case 'estimated-available-memory': diff --git a/x-pack/plugins/observability_solution/exploratory_view/public/components/shared/exploratory_view/configurations/lens_attributes/heatmap_attributes.ts b/x-pack/plugins/observability_solution/exploratory_view/public/components/shared/exploratory_view/configurations/lens_attributes/heatmap_attributes.ts index d62bd8684b48c..8835d02c3317f 100644 --- a/x-pack/plugins/observability_solution/exploratory_view/public/components/shared/exploratory_view/configurations/lens_attributes/heatmap_attributes.ts +++ b/x-pack/plugins/observability_solution/exploratory_view/public/components/shared/exploratory_view/configurations/lens_attributes/heatmap_attributes.ts @@ -7,7 +7,7 @@ import { FormulaPublicApi, HeatmapVisualizationState } from '@kbn/lens-plugin/public'; -import { euiPaletteNegative } from '@elastic/eui'; +import { euiPaletteRed } from '@elastic/eui'; import { ColorStop } from '@kbn/coloring'; import { LayerConfig } from '../lens_attributes'; import { SingleMetricLensAttributes } from './single_metric_attributes'; @@ -52,7 +52,7 @@ export class HeatMapLensAttributes extends SingleMetricLensAttributes { } getHeatmapState() { - const negativePalette = euiPaletteNegative(5); + const negativePalette = euiPaletteRed(5); const layerConfig = this.layerConfigs[0]; return { diff --git a/x-pack/plugins/observability_solution/infra/public/pages/metrics/inventory_view/lib/get_color_palette.ts b/x-pack/plugins/observability_solution/infra/public/pages/metrics/inventory_view/lib/get_color_palette.ts index 41b8ad2d2e2ed..2795e81c4d522 100644 --- a/x-pack/plugins/observability_solution/infra/public/pages/metrics/inventory_view/lib/get_color_palette.ts +++ b/x-pack/plugins/observability_solution/infra/public/pages/metrics/inventory_view/lib/get_color_palette.ts @@ -9,8 +9,8 @@ import { euiPaletteCool, euiPaletteForStatus, euiPaletteForTemperature, - euiPaletteNegative, - euiPalettePositive, + euiPaletteRed, + euiPaletteGreen, euiPaletteWarm, } from '@elastic/eui'; import { InventoryColorPalette } from '../../../../lib/lib'; @@ -24,9 +24,9 @@ const createColorPalette = (name: InventoryColorPalette = 'cool', steps: number case 'warm': return euiPaletteWarm(steps); case 'positive': - return euiPalettePositive(steps); + return euiPaletteGreen(steps); case 'negative': - return euiPaletteNegative(steps); + return euiPaletteRed(steps); default: return euiPaletteCool(steps); } From d6c0cf58d561bce3cb2597e16f7c3bcbf32b847b Mon Sep 17 00:00:00 2001 From: Cee Chen Date: Mon, 18 Mar 2024 10:08:17 -0700 Subject: [PATCH 03/12] [EuiBreadcrumb] Fix type import --- .../public/dashboard_top_nav/internal_dashboard_top_nav.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/dashboard/public/dashboard_top_nav/internal_dashboard_top_nav.tsx b/src/plugins/dashboard/public/dashboard_top_nav/internal_dashboard_top_nav.tsx index f184c3c23eb3c..d3e0ac3459049 100644 --- a/src/plugins/dashboard/public/dashboard_top_nav/internal_dashboard_top_nav.tsx +++ b/src/plugins/dashboard/public/dashboard_top_nav/internal_dashboard_top_nav.tsx @@ -19,7 +19,7 @@ import { ViewMode } from '@kbn/embeddable-plugin/public'; import type { DataView } from '@kbn/data-views-plugin/public'; import { TopNavMenuProps } from '@kbn/navigation-plugin/public'; import { EuiHorizontalRule, EuiIcon, EuiToolTipProps } from '@elastic/eui'; -import { EuiBreadcrumbProps } from '@elastic/eui/src/components/breadcrumbs/breadcrumb'; +import type { EuiBreadcrumb } from '@elastic/eui'; import { MountPoint } from '@kbn/core/public'; import { getDashboardTitle, @@ -40,7 +40,7 @@ import './_dashboard_top_nav.scss'; import { DashboardRedirect } from '../dashboard_container/types'; export interface InternalDashboardTopNavProps { - customLeadingBreadCrumbs?: EuiBreadcrumbProps[]; + customLeadingBreadCrumbs?: EuiBreadcrumb[]; embedSettings?: DashboardEmbedSettings; forceHideUnifiedSearch?: boolean; redirectTo: DashboardRedirect; From dda2012590c0e73bc302a8db7925ee6bee876aa5 Mon Sep 17 00:00:00 2001 From: Cee Chen Date: Mon, 18 Mar 2024 10:29:06 -0700 Subject: [PATCH 04/12] [EuiDataGrid] Update `useDataGridColumnSorting` usage --- .../common/components/header_actions/header_actions.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/x-pack/plugins/security_solution/public/common/components/header_actions/header_actions.tsx b/x-pack/plugins/security_solution/public/common/components/header_actions/header_actions.tsx index cbac23af41205..63a729f9b0463 100644 --- a/x-pack/plugins/security_solution/public/common/components/header_actions/header_actions.tsx +++ b/x-pack/plugins/security_solution/public/common/components/header_actions/header_actions.tsx @@ -193,7 +193,13 @@ const HeaderActionsComponent: React.FC = ({ [columnHeaders, dispatch, timelineId, defaultColumns] ); - const ColumnSorting = useDataGridColumnSorting(myColumns, sortedColumns, {}, [], displayValues); + const ColumnSorting = useDataGridColumnSorting({ + columns: myColumns, + sorting: sortedColumns, + schema: {}, + schemaDetectors: [], + displayValues, + }); return ( From 669d65c1f959803592e69f60a5247102333ecfe9 Mon Sep 17 00:00:00 2001 From: Cee Chen Date: Mon, 18 Mar 2024 10:35:58 -0700 Subject: [PATCH 05/12] [charts] Remove deprecated theme sass import --- src/core/public/styles/_base.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/src/core/public/styles/_base.scss b/src/core/public/styles/_base.scss index 22d461a8b4084..07dee5598edd3 100644 --- a/src/core/public/styles/_base.scss +++ b/src/core/public/styles/_base.scss @@ -1,6 +1,5 @@ // Charts themes available app-wide @import '@elastic/charts/dist/theme'; -@import '@elastic/eui/src/themes/charts/theme'; // We apply brute force focus states to anything not coming from Eui // which has focus states designed at the component level. From af723c9e84fa2bfd502740f8cb9f77e0aab203db Mon Sep 17 00:00:00 2001 From: Cee Chen Date: Mon, 18 Mar 2024 11:59:48 -0700 Subject: [PATCH 06/12] [EuiModal] Update snapshots from a11y changes --- .../src/modal/__snapshots__/modal_service.test.tsx.snap | 6 ++++++ .../src/list_header/__snapshots__/list_header.test.tsx.snap | 2 ++ .../edit_modal/__snapshots__/edit_modal.test.tsx.snap | 2 ++ .../import_data_modal/__snapshots__/index.test.tsx.snap | 6 ++++++ 4 files changed, 16 insertions(+) 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 c93fae64cf361..ce53f3fbae63c 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 @@ -129,7 +129,9 @@ exports[`ModalService openConfirm() renders a mountpoint confirm message 2`] = ` data-eui="EuiFocusTrap" >