From a29a005acde439f3cc4befa6e6026ac452231979 Mon Sep 17 00:00:00 2001 From: Lene Gadewoll Date: Mon, 27 Oct 2025 19:51:56 +0100 Subject: [PATCH 01/14] chore: update eui packages --- package.json | 4 ++-- src/dev/license_checker/config.ts | 4 ++-- yarn.lock | 26 +++++++++++++------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index eeda3211323bc..676bd15c6937b 100644 --- a/package.json +++ b/package.json @@ -127,8 +127,8 @@ "@elastic/ecs": "^9.0.0", "@elastic/elasticsearch": "9.1.1", "@elastic/ems-client": "8.6.3", - "@elastic/eui": "107.0.1", - "@elastic/eui-theme-borealis": "3.6.0", + "@elastic/eui": "108.0.0", + "@elastic/eui-theme-borealis": "4.0.0", "@elastic/filesaver": "1.1.2", "@elastic/kibana-d3-color": "npm:@elastic/kibana-d3-color@2.0.1", "@elastic/monaco-esql": "^3.1.11", diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts index 7db8dbd5ebc98..b8519e1b477f0 100644 --- a/src/dev/license_checker/config.ts +++ b/src/dev/license_checker/config.ts @@ -89,8 +89,8 @@ 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.6.3': ['Elastic License 2.0'], - '@elastic/eui@107.0.1': ['Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.0'], - '@elastic/eui-theme-borealis@3.6.0': ['Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.0'], + '@elastic/eui@108.0.0': ['Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.0'], + '@elastic/eui-theme-borealis@4.0.0': ['Elastic License 2.0 OR AGPL-3.0-only OR SSPL-1.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@2.5.2': ['Apache-2.0'], // license (Apache-2.0 AND BSD-3-Clause) diff --git a/yarn.lock b/yarn.lock index 84376eadb4120..04d26d9702373 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2650,26 +2650,26 @@ resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-2.5.0.tgz#99ca807edeb157baf38fef9e39fd031f19b702a5" integrity sha512-dW6U7N4HAdSst+Iqhaw1In8zxT8rE4AMnIJIN6C/vNM8XDKmFyzkw/AddpvW5oZHdV0D7+3w/VI9petN4RnWBQ== -"@elastic/eui-theme-borealis@3.6.0": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@elastic/eui-theme-borealis/-/eui-theme-borealis-3.6.0.tgz#95a8106981112eff010d691590ca758ab2950462" - integrity sha512-mQMtVfBB50Cnq0myytWTec4vwxxg1sgSoTpMK/i4lsr+xcfUbkjGQRIpPWfJaiWGnrUYhJeL1GyG8dHxEPeyYg== +"@elastic/eui-theme-borealis@4.0.0": + version "4.0.0" + resolved "https://registry.yarnpkg.com/@elastic/eui-theme-borealis/-/eui-theme-borealis-4.0.0.tgz#9fc6463f8e358f9b3b2f6387e5935d66be481122" + integrity sha512-NV+g4vaoPfAV1mAI2oORMY7WD2YdLqx1zMGSH/HKjM9j49U/OK8Jl3DvHGTTAloWe2TvjlWnq6QJgm0xNwxjiA== -"@elastic/eui-theme-common@5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@elastic/eui-theme-common/-/eui-theme-common-5.0.0.tgz#896da358c1fd0ce16681c7bca1793840a2bb8f33" - integrity sha512-NcTKneakMdf2dIsQ9ZOqcRMsttCDQGos/RK51C9V+9QTA8roMDoDVg1zqGZY8ELOttzov1JUuPkfmN6Ga1jlkA== +"@elastic/eui-theme-common@6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@elastic/eui-theme-common/-/eui-theme-common-6.0.0.tgz#0227f2a1d2b023024fe5777afd57257c53048f69" + integrity sha512-Qi52Jfby/W5huw8Tj5mTjSxwn4qoXPqidscukPEgUe8IVdgaIJ3CLTR1gOplsPKf/CDfX8Tb7l4dLoL2FWSaMA== dependencies: "@types/lodash" "^4.14.202" chroma-js "^2.4.2" lodash "^4.17.21" -"@elastic/eui@107.0.1": - version "107.0.1" - resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-107.0.1.tgz#7d7bcae7115b5e6c92a1994971170190149f817b" - integrity sha512-Uk8W3yI4DOdWRHHJiAZ+Q3tr8COeU6MiC+AitZLDbBGNiQ7a3lr/C8pNc8yFhpOVCPQpjofALEZiENg2AzFrGA== +"@elastic/eui@108.0.0": + version "108.0.0" + resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-108.0.0.tgz#409fc6c49f19651832c411072482cd79bcdbd17c" + integrity sha512-W9l/jGlhxYYT0pN9vpaGmeR7nWYwTpmiLCkX8HnYOORQLUY6eXz5+9ng6WY68XzHWTcWUOMQB15OSyisj4VLVw== dependencies: - "@elastic/eui-theme-common" "5.0.0" + "@elastic/eui-theme-common" "6.0.0" "@elastic/prismjs-esql" "^1.1.2" "@hello-pangea/dnd" "^16.6.0" "@types/lodash" "^4.14.202" From 89f3f2a7213333e2ec6a5f16019d2d3ec4676375 Mon Sep 17 00:00:00 2001 From: Lene Gadewoll Date: Fri, 10 Oct 2025 14:30:18 +0200 Subject: [PATCH 02/14] refactor: update Amsterdam related imports --- .../private/kbn-ui-shared-deps-npm/webpack.config.js | 6 ++---- .../src/exit_full_screen_button.component.tsx | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/platform/packages/private/kbn-ui-shared-deps-npm/webpack.config.js b/src/platform/packages/private/kbn-ui-shared-deps-npm/webpack.config.js index f688da51dae39..ebf822d6a4955 100644 --- a/src/platform/packages/private/kbn-ui-shared-deps-npm/webpack.config.js +++ b/src/platform/packages/private/kbn-ui-shared-deps-npm/webpack.config.js @@ -63,10 +63,8 @@ module.exports = (_, argv) => { '@elastic/eui', '@elastic/eui/optimize/es/components/provider/nested', '@elastic/eui/optimize/es/services/theme/warning', - '@elastic/eui/dist/eui_theme_amsterdam_light.json', - '@elastic/eui/dist/eui_theme_amsterdam_dark.json', - '@elastic/eui/dist/eui_theme_borealis_light.json', - '@elastic/eui/dist/eui_theme_borealis_dark.json', + '@elastic/eui-theme-borealis/lib/eui_theme_borealis_light.json', + '@elastic/eui-theme-borealis/lib/eui_theme_borealis_dark.json', '@elastic/eui-theme-borealis', '@elastic/numeral', '@emotion/cache', diff --git a/src/platform/packages/shared/shared-ux/button/exit_full_screen/src/exit_full_screen_button.component.tsx b/src/platform/packages/shared/shared-ux/button/exit_full_screen/src/exit_full_screen_button.component.tsx index 7f1d0627c85d8..61ab6ffd1f2ba 100644 --- a/src/platform/packages/shared/shared-ux/button/exit_full_screen/src/exit_full_screen_button.component.tsx +++ b/src/platform/packages/shared/shared-ux/button/exit_full_screen/src/exit_full_screen_button.component.tsx @@ -20,7 +20,7 @@ import { } from '@elastic/eui'; // EUI allows reaching into internal folders for component-specific exports, but they aren't typed in Kibana // @ts-ignore -import { useEuiButtonFocusCSS } from '@elastic/eui/lib/themes/amsterdam/global_styling/mixins/button'; +import { useEuiButtonFocusCSS } from '@elastic/eui/lib/global_styling/mixins/_button'; // @ts-ignore import { euiButtonDisplayStyles } from '@elastic/eui/lib/components/button/button_display/_button_display.styles'; import { i18n } from '@kbn/i18n'; From 421ba8736340678bc2573cdac3d490fb3a96987f Mon Sep 17 00:00:00 2001 From: Lene Gadewoll Date: Sat, 11 Oct 2025 00:11:52 +0200 Subject: [PATCH 03/14] refactor: remove v8/amsterdam theme switching support --- packages/kbn-optimizer/README.mdx | 6 +-- .../src/injected_metadata_service.mock.ts | 2 +- .../render_template.test.ts.snap | 2 +- .../src/bootstrap/bootstrap_renderer.test.ts | 4 +- .../src/bootstrap/bootstrap_renderer.ts | 4 +- .../src/bootstrap/render_template.test.ts | 2 +- .../server-internal/src/render_utils.ts | 6 +-- .../src/rendering_service.test.ts | 10 ++--- .../server-internal/src/theme.test.ts | 24 +---------- .../rendering/server-internal/src/theme.ts | 6 --- .../server-internal/src/views/fonts.tsx | 2 +- .../src/theme_service.test.ts | 34 +++++++-------- .../browser-internal/src/theme_service.ts | 4 +- .../packages/ui-settings/common/src/theme.ts | 9 +--- .../src/settings/theme.test.ts | 13 +++--- .../server-internal/src/settings/theme.ts | 3 -- .../server-internal/src/ui_settings_config.ts | 3 -- .../styles/core_app/_globals_v8dark.scss | 8 ---- .../styles/core_app/_globals_v8light.scss | 8 ---- .../generate_packages_optimized_assets.ts | 4 +- .../packages/shared/kbn-ui-theme/src/theme.ts | 23 +++------- .../__mocks__/services.ts | 2 +- .../kibana_context/common/color_mode.test.ts | 4 +- .../react/kibana_context/common/index.ts | 2 +- .../react/kibana_context/common/theme.ts | 6 +-- .../kibana_context/root/eui_provider.test.tsx | 8 ++-- .../root/root_provider.test.tsx | 6 +-- .../theme/theme_provider.test.tsx | 6 +-- .../kibana_mount/to_mount_point.test.tsx | 6 +-- .../alerts_query_inspector_modal.test.tsx | 2 +- .../vis_types/vega/public/data_model/utils.ts | 43 +------------------ .../public/__mocks__/theme.ts | 2 +- .../discover/public/__mocks__/services.ts | 2 +- .../theme/kibana_theme_provider.test.tsx | 6 +-- .../shared/fleet/.storybook/context/index.tsx | 2 +- .../user_profile/user_profile.test.tsx | 4 +- 36 files changed, 76 insertions(+), 202 deletions(-) delete mode 100644 src/core/public/styles/core_app/_globals_v8dark.scss delete mode 100644 src/core/public/styles/core_app/_globals_v8light.scss diff --git a/packages/kbn-optimizer/README.mdx b/packages/kbn-optimizer/README.mdx index d95b1b735ea55..d03f02e5416fe 100644 --- a/packages/kbn-optimizer/README.mdx +++ b/packages/kbn-optimizer/README.mdx @@ -51,16 +51,16 @@ Any import in a bundle which resolves into another bundles "context" directory, ## Themes -SASS imports in bundles are automatically converted to CSS for one or more themes. In development we build the `v8light` and `v8dark` themes by default to improve build performance. When producing distributable bundles the default shifts to `*` so that the distributable bundles will include all themes, preventing the bundles from needing to be rebuilt when users change the active theme in Kibana's advanced settings. +SASS imports in bundles are automatically converted to CSS for one or more themes. In development we build the `borealislight` and `borealisdark` themes by default to improve build performance. When producing distributable bundles the default shifts to `*` so that the distributable bundles will include all themes, preventing the bundles from needing to be rebuilt when users change the active theme in Kibana's advanced settings. To customize the themes that are built for development you can specify the `KBN_OPTIMIZER_THEMES` environment variable to one or more theme tags, or use `*` to build styles for all themes. Unfortunately building more than one theme significantly impacts build performance, so try to be strategic about which themes you build. -Currently supported theme tags: `v8light`, `v8dark` +Currently supported theme tags: `borealislight`, `borealisdark` Examples: ```sh # start Kibana with only a single theme -KBN_OPTIMIZER_THEMES=v8light yarn start +KBN_OPTIMIZER_THEMES=borealislight yarn start # start Kibana with all the themes KBN_OPTIMIZER_THEMES=* yarn start diff --git a/src/core/packages/injected-metadata/browser-mocks/src/injected_metadata_service.mock.ts b/src/core/packages/injected-metadata/browser-mocks/src/injected_metadata_service.mock.ts index 437bc7c15042e..032b3819ee7bd 100644 --- a/src/core/packages/injected-metadata/browser-mocks/src/injected_metadata_service.mock.ts +++ b/src/core/packages/injected-metadata/browser-mocks/src/injected_metadata_service.mock.ts @@ -43,7 +43,7 @@ const createSetupContractMock = () => { } as any), getTheme: jest.fn().mockReturnValue({ darkMode: false, - name: 'amsterdam', + name: 'borealis', version: 'v8', stylesheetPaths: { default: ['light-1.css'], diff --git a/src/core/packages/rendering/server-internal/src/bootstrap/__snapshots__/render_template.test.ts.snap b/src/core/packages/rendering/server-internal/src/bootstrap/__snapshots__/render_template.test.ts.snap index 7d03a25563705..5279d90abee23 100644 --- a/src/core/packages/rendering/server-internal/src/bootstrap/__snapshots__/render_template.test.ts.snap +++ b/src/core/packages/rendering/server-internal/src/bootstrap/__snapshots__/render_template.test.ts.snap @@ -180,7 +180,7 @@ var kbnCsp = JSON.parse(document.querySelector('kbn-csp').getAttribute('data')); var kbnHardenPrototypes = JSON.parse(document.querySelector('kbn-prototype-hardening').getAttribute('data')); window.__kbnHardenPrototypes__ = kbnHardenPrototypes.hardenPrototypes; window.__kbnStrictCsp__ = kbnCsp.strictCsp; -window.__kbnThemeTag__ = 'v8light'; +window.__kbnThemeTag__ = 'borealislight'; window.__kbnPublicPath__ = {\\"foo\\": \\"bar\\"}; window.__kbnBundles__ = kbnBundlesLoader(); diff --git a/src/core/packages/rendering/server-internal/src/bootstrap/bootstrap_renderer.test.ts b/src/core/packages/rendering/server-internal/src/bootstrap/bootstrap_renderer.test.ts index 40d031cc9cd75..02c2b75b76b83 100644 --- a/src/core/packages/rendering/server-internal/src/bootstrap/bootstrap_renderer.test.ts +++ b/src/core/packages/rendering/server-internal/src/bootstrap/bootstrap_renderer.test.ts @@ -395,7 +395,7 @@ describe('bootstrapRenderer', () => { }) ); - themeName$.next('amsterdam'); + themeName$.next('borealis'); await renderer({ request, uiSettingsClient, @@ -403,7 +403,7 @@ describe('bootstrapRenderer', () => { expect(renderTemplateMock).toHaveBeenCalledWith( expect.objectContaining({ - themeTagName: 'v8', + themeTagName: 'borealis', }) ); }); diff --git a/src/core/packages/rendering/server-internal/src/bootstrap/bootstrap_renderer.ts b/src/core/packages/rendering/server-internal/src/bootstrap/bootstrap_renderer.ts index cf20a3709ed2c..7d717858a23ba 100644 --- a/src/core/packages/rendering/server-internal/src/bootstrap/bootstrap_renderer.ts +++ b/src/core/packages/rendering/server-internal/src/bootstrap/bootstrap_renderer.ts @@ -83,9 +83,7 @@ export const bootstrapRendererFactory: BootstrapRendererFactory = ({ } const colorMode = darkMode === false ? 'light' : darkMode === true ? 'dark' : 'system'; - // Amsterdam theme is called `v8` internally - // and should be kept this way for compatibility reasons. - const themeTagName = themeName === 'amsterdam' ? 'v8' : themeName; + const themeTagName = themeName; const bundlesHref = getBundlesHref(baseHref); const bundlePaths = getPluginsBundlePaths({ diff --git a/src/core/packages/rendering/server-internal/src/bootstrap/render_template.test.ts b/src/core/packages/rendering/server-internal/src/bootstrap/render_template.test.ts index 926e15c912bc9..a4894a4c246e4 100644 --- a/src/core/packages/rendering/server-internal/src/bootstrap/render_template.test.ts +++ b/src/core/packages/rendering/server-internal/src/bootstrap/render_template.test.ts @@ -11,7 +11,7 @@ import { renderTemplate } from './render_template'; function mockParams() { return { - themeTagName: 'v8', + themeTagName: 'borealis', colorMode: 'light', jsDependencyPaths: ['/js-1', '/js-2'], styleSheetPaths: ['/style-1', '/style-2'], diff --git a/src/core/packages/rendering/server-internal/src/render_utils.ts b/src/core/packages/rendering/server-internal/src/render_utils.ts index 876baaea315b0..f0baab119ab43 100644 --- a/src/core/packages/rendering/server-internal/src/render_utils.ts +++ b/src/core/packages/rendering/server-internal/src/render_utils.ts @@ -42,11 +42,7 @@ export const getScriptPaths = ({ themeName: ThemeName; }) => { if (darkMode === 'system') { - return [ - `${baseHref}/ui/bootstrap_system_theme_${ - themeName === 'borealis' ? 'borealis' : 'amsterdam' - }.js`, - ]; + return [`${baseHref}/ui/bootstrap_system_theme_borealis.js`]; } else { return []; } diff --git a/src/core/packages/rendering/server-internal/src/rendering_service.test.ts b/src/core/packages/rendering/server-internal/src/rendering_service.test.ts index 71356e29bd6ec..dd195757daa80 100644 --- a/src/core/packages/rendering/server-internal/src/rendering_service.test.ts +++ b/src/core/packages/rendering/server-internal/src/rendering_service.test.ts @@ -605,7 +605,7 @@ describe('RenderingService', () => { }); describe('start()', () => { - it('subscribes to the featureFlags.setStringValue$ observable and updates theme name accordingly', async () => { + it('subscribes to the featureFlags.setStringValue$', async () => { // setup and render added to assert the current theme name const { render } = await service.setup(mockRenderingSetupDeps); const themeName$ = new BehaviorSubject(DEFAULT_THEME_NAME); @@ -631,15 +631,11 @@ describe('RenderingService', () => { globalClient: uiSettingsServiceMock.createClient(), }; - getIsThemeBundledMock.mockImplementation((name) => ['borealis', 'amsterdam'].includes(name)); + getIsThemeBundledMock.mockImplementation((name) => name === 'borealis'); - let renderResult = await render(createKibanaRequest(), uiSettings); + const renderResult = await render(createKibanaRequest(), uiSettings); expect(getIsThemeBundledMock).toHaveBeenCalledWith('borealis'); expect(renderResult).toContain(',"name":"borealis"'); - - themeName$.next('amsterdam'); - renderResult = await render(createKibanaRequest(), uiSettings); - expect(renderResult).toContain(',"name":"amsterdam"'); }); it('falls back to the default theme if theme is not bundled', async () => { diff --git a/src/core/packages/rendering/server-internal/src/theme.test.ts b/src/core/packages/rendering/server-internal/src/theme.test.ts index e7a95548d84b4..c17205dfac860 100644 --- a/src/core/packages/rendering/server-internal/src/theme.test.ts +++ b/src/core/packages/rendering/server-internal/src/theme.test.ts @@ -10,24 +10,6 @@ import { getThemeTag, isThemeBundled } from './theme'; describe('getThemeTag', () => { - it('returns the correct value for name:amsterdam and darkMode:false', () => { - expect( - getThemeTag({ - name: 'v8', - darkMode: false, - }) - ).toEqual('v8light'); - }); - - it('returns the correct value for name:amsterdam and darkMode:true', () => { - expect( - getThemeTag({ - name: 'v8', - darkMode: true, - }) - ).toEqual('v8dark'); - }); - it('returns the correct value for other other theme names and darkMode:false', () => { expect( getThemeTag({ @@ -59,14 +41,12 @@ describe('isThemeBundled', () => { }); it('returns true when both light and dark mode theme tags are included in KBN_OPTIMIZER_THEMES', () => { - process.env.KBN_OPTIMIZER_THEMES = 'v8light,v8dark,borealislight,borealisdark'; - expect(isThemeBundled('amsterdam')).toEqual(true); + process.env.KBN_OPTIMIZER_THEMES = 'borealislight,borealisdark'; expect(isThemeBundled('borealis')).toEqual(true); }); it('returns false when either theme tag is missing in KBN_OPTIMIZER_THEMES for given theme name', () => { - process.env.KBN_OPTIMIZER_THEMES = 'v8light,borealisdark,borealisdark'; - expect(isThemeBundled('amsterdam')).toEqual(false); + process.env.KBN_OPTIMIZER_THEMES = 'borealisdark,borealisdark'; expect(isThemeBundled('borealis')).toEqual(false); }); diff --git a/src/core/packages/rendering/server-internal/src/theme.ts b/src/core/packages/rendering/server-internal/src/theme.ts index 7577944780cb1..22acd7a24d6c1 100644 --- a/src/core/packages/rendering/server-internal/src/theme.ts +++ b/src/core/packages/rendering/server-internal/src/theme.ts @@ -11,12 +11,6 @@ import type { ThemeName, ThemeTag } from '@kbn/core-ui-settings-common'; import { parseThemeTags } from '@kbn/core-ui-settings-common'; export const getThemeTag = ({ name, darkMode }: { name: string; darkMode: boolean }) => { - // Amsterdam theme is called `v8` internally - // and should be kept this way for compatibility reasons. - if (name === 'amsterdam') { - name = 'v8'; - } - return `${name}${darkMode ? 'dark' : 'light'}`; }; diff --git a/src/core/packages/rendering/server-internal/src/views/fonts.tsx b/src/core/packages/rendering/server-internal/src/views/fonts.tsx index 7eca4cfbd2a72..943d2d3e1ea3f 100644 --- a/src/core/packages/rendering/server-internal/src/views/fonts.tsx +++ b/src/core/packages/rendering/server-internal/src/views/fonts.tsx @@ -28,7 +28,7 @@ interface FontFace { } /** - * `Inter` is the latest version of `Inter UI` and used specifically in v8 of Kibana from EUI Amsterdam + * `Inter` is the latest version of `Inter UI` */ const getInter = (url: string): FontFace => { return { diff --git a/src/core/packages/theme/browser-internal/src/theme_service.test.ts b/src/core/packages/theme/browser-internal/src/theme_service.test.ts index 575d98fe40c8d..ab3a81dc9017c 100644 --- a/src/core/packages/theme/browser-internal/src/theme_service.test.ts +++ b/src/core/packages/theme/browser-internal/src/theme_service.test.ts @@ -45,7 +45,7 @@ describe('ThemeService', () => { beforeEach(() => { injectedMetadata.getTheme.mockReturnValue({ version: 'v8', - name: 'amsterdam', + name: 'borealis', darkMode: false, stylesheetPaths: { dark: ['dark-1.css'], @@ -59,13 +59,13 @@ describe('ThemeService', () => { const theme = await firstValueFrom(theme$); expect(theme).toEqual({ darkMode: false, - name: 'amsterdam', + name: 'borealis', }); }); it('sets __kbnThemeTag__ to the correct value', async () => { themeService.setup({ injectedMetadata }); - expect(window.__kbnThemeTag__).toEqual('v8light'); + expect(window.__kbnThemeTag__).toEqual('borealislight'); }); it('calls createStyleSheet with the correct parameters', async () => { @@ -90,7 +90,7 @@ describe('ThemeService', () => { beforeEach(() => { injectedMetadata.getTheme.mockReturnValue({ version: 'v8', - name: 'amsterdam', + name: 'borealis', darkMode: true, stylesheetPaths: { dark: ['dark-1.css'], @@ -104,13 +104,13 @@ describe('ThemeService', () => { const theme = await firstValueFrom(theme$); expect(theme).toEqual({ darkMode: true, - name: 'amsterdam', + name: 'borealis', }); }); it('sets __kbnThemeTag__ to the correct value', async () => { themeService.setup({ injectedMetadata }); - expect(window.__kbnThemeTag__).toEqual('v8dark'); + expect(window.__kbnThemeTag__).toEqual('borealisdark'); }); it('calls createStyleSheet with the correct parameters', async () => { @@ -135,7 +135,7 @@ describe('ThemeService', () => { beforeEach(() => { injectedMetadata.getTheme.mockReturnValue({ version: 'v8', - name: 'amsterdam', + name: 'borealis', darkMode: 'system', stylesheetPaths: { dark: ['dark-1.css'], @@ -155,10 +155,10 @@ describe('ThemeService', () => { expect(theme).toEqual({ darkMode: false, - name: 'amsterdam', + name: 'borealis', }); - expect(window.__kbnThemeTag__).toEqual('v8light'); + expect(window.__kbnThemeTag__).toEqual('borealislight'); expect(setDarkModeMock).toHaveBeenCalledTimes(1); expect(setDarkModeMock).toHaveBeenCalledWith(false); @@ -183,10 +183,10 @@ describe('ThemeService', () => { expect(theme).toEqual({ darkMode: false, - name: 'amsterdam', + name: 'borealis', }); - expect(window.__kbnThemeTag__).toEqual('v8light'); + expect(window.__kbnThemeTag__).toEqual('borealislight'); expect(setDarkModeMock).toHaveBeenCalledTimes(1); expect(setDarkModeMock).toHaveBeenCalledWith(false); @@ -203,10 +203,10 @@ describe('ThemeService', () => { expect(theme).toEqual({ darkMode: true, - name: 'amsterdam', + name: 'borealis', }); - expect(window.__kbnThemeTag__).toEqual('v8dark'); + expect(window.__kbnThemeTag__).toEqual('borealisdark'); expect(setDarkModeMock).toHaveBeenCalledTimes(1); expect(setDarkModeMock).toHaveBeenCalledWith(true); @@ -229,14 +229,14 @@ describe('ThemeService', () => { expect(await firstValueFrom(theme$)).toEqual({ darkMode: false, }); - expect(window.__kbnThemeTag__).toEqual('v8light'); + expect(window.__kbnThemeTag__).toEqual('borealislight'); handler!(true); expect(await firstValueFrom(theme$)).toEqual({ darkMode: true, }); - expect(window.__kbnThemeTag__).toEqual('v8dark'); + expect(window.__kbnThemeTag__).toEqual('borealisdark'); }); }); }); @@ -252,7 +252,7 @@ describe('ThemeService', () => { it('exposes a `theme$` observable with the values provided by the injected metadata', async () => { injectedMetadata.getTheme.mockReturnValue({ version: 'v8', - name: 'amsterdam', + name: 'borealis', darkMode: true, stylesheetPaths: { dark: [], @@ -264,7 +264,7 @@ describe('ThemeService', () => { const theme = await firstValueFrom(theme$); expect(theme).toEqual({ darkMode: true, - name: 'amsterdam', + name: 'borealis', }); }); }); diff --git a/src/core/packages/theme/browser-internal/src/theme_service.ts b/src/core/packages/theme/browser-internal/src/theme_service.ts index e79a19550bb8d..edbccebcc36ed 100644 --- a/src/core/packages/theme/browser-internal/src/theme_service.ts +++ b/src/core/packages/theme/browser-internal/src/theme_service.ts @@ -83,8 +83,6 @@ export class ThemeService { } const updateKbnThemeTag = (theme: CoreTheme) => { - const name = theme.name === 'amsterdam' ? 'v8' : theme.name; - const globals: any = typeof window === 'undefined' ? {} : window; - globals.__kbnThemeTag__ = `${name}${theme.darkMode ? 'dark' : 'light'}`; + globals.__kbnThemeTag__ = `${theme.name}${theme.darkMode ? 'dark' : 'light'}`; }; diff --git a/src/core/packages/ui-settings/common/src/theme.ts b/src/core/packages/ui-settings/common/src/theme.ts index d51d415b4b85b..99882275149e6 100644 --- a/src/core/packages/ui-settings/common/src/theme.ts +++ b/src/core/packages/ui-settings/common/src/theme.ts @@ -8,15 +8,10 @@ */ export const DEFAULT_THEME_NAME = 'borealis'; -export const SUPPORTED_THEME_NAMES = ['amsterdam', 'borealis'] as const; +export const SUPPORTED_THEME_NAMES = ['borealis'] as const; export type ThemeName = (typeof SUPPORTED_THEME_NAMES)[number]; -/** - * Theme tags of the Amsterdam theme - */ -export const ThemeAmsterdamTags = ['v8light', 'v8dark'] as const; - /** * Theme tags of the experimental Borealis theme */ @@ -26,7 +21,7 @@ export const ThemeBorealisTags = ['borealislight', 'borealisdark'] as const; * An array of all theme tags supported by Kibana. Note that this list doesn't * reflect what theme tags are available in a Kibana build. */ -export const SUPPORTED_THEME_TAGS = [...ThemeAmsterdamTags, ...ThemeBorealisTags] as const; +export const SUPPORTED_THEME_TAGS = [...ThemeBorealisTags] as const; export type ThemeTag = (typeof SUPPORTED_THEME_TAGS)[number]; export type ThemeTags = readonly ThemeTag[]; diff --git a/src/core/packages/ui-settings/server-internal/src/settings/theme.test.ts b/src/core/packages/ui-settings/server-internal/src/settings/theme.test.ts index c18a11fda10db..5dabca4b8a5c4 100644 --- a/src/core/packages/ui-settings/server-internal/src/settings/theme.test.ts +++ b/src/core/packages/ui-settings/server-internal/src/settings/theme.test.ts @@ -41,9 +41,6 @@ describe('theme settings', () => { const validate = getValidationFn(themeSettings['theme:name']); it('should only accept expected values', () => { - // TODO: Remove amsterdam theme - // https://github.com/elastic/eui-private/issues/170 - expect(() => validate('amsterdam')).not.toThrow(); expect(() => validate('borealis')).not.toThrow(); expect(() => validate(true)).toThrow(); @@ -84,9 +81,9 @@ describe('theme settings', () => { expect( getThemeSettings({ ...defaultOptions, - defaultTheme: 'amsterdam', + defaultTheme: 'borealis', })['theme:name'].value - ).toBe('amsterdam'); + ).toBe('borealis'); }); }); }); @@ -94,17 +91,17 @@ describe('theme settings', () => { describe('process.env.KBN_OPTIMIZER_THEMES handling', () => { it('defaults to properties of first tag', () => { - process.env.KBN_OPTIMIZER_THEMES = 'v8dark,v8light'; + process.env.KBN_OPTIMIZER_THEMES = 'borealisdark,borealislight'; let settings = getThemeSettings({ ...defaultOptions, isDist: false }); expect(settings['theme:darkMode'].value).toBe('enabled'); - process.env.KBN_OPTIMIZER_THEMES = 'v8light,v8dark'; + process.env.KBN_OPTIMIZER_THEMES = 'borealislight,borealisdark'; settings = getThemeSettings({ ...defaultOptions, isDist: false }); expect(settings['theme:darkMode'].value).toBe('disabled'); }); it('ignores the value when isDist is true', () => { - process.env.KBN_OPTIMIZER_THEMES = 'v8dark'; + process.env.KBN_OPTIMIZER_THEMES = 'borealisdark'; const settings = getThemeSettings({ ...defaultOptions, isDist: true }); expect(settings['theme:darkMode'].value).toBe('disabled'); }); diff --git a/src/core/packages/ui-settings/server-internal/src/settings/theme.ts b/src/core/packages/ui-settings/server-internal/src/settings/theme.ts index 87551111bf91c..44ebf09a4a1d9 100644 --- a/src/core/packages/ui-settings/server-internal/src/settings/theme.ts +++ b/src/core/packages/ui-settings/server-internal/src/settings/theme.ts @@ -115,9 +115,6 @@ export const getThemeSettings = ( // Cast to a mutable array to satisfy the `UiSettingsParams.options` type options: SUPPORTED_THEME_NAMES as Writable, optionLabels: { - amsterdam: i18n.translate('core.ui_settings.params.themeName.options.amsterdam', { - defaultMessage: 'Amsterdam', - }), borealis: i18n.translate('core.ui_settings.params.themeName.options.borealis', { defaultMessage: 'Borealis', }), diff --git a/src/core/packages/ui-settings/server-internal/src/ui_settings_config.ts b/src/core/packages/ui-settings/server-internal/src/ui_settings_config.ts index b3c125ec5e174..59be3bc7c1165 100644 --- a/src/core/packages/ui-settings/server-internal/src/ui_settings_config.ts +++ b/src/core/packages/ui-settings/server-internal/src/ui_settings_config.ts @@ -19,9 +19,6 @@ const deprecations: ConfigDeprecationProvider = ({ unused, renameFromRoot }) => ]; export const defaultThemeSchema = schema.oneOf([ - // TODO: Remove amsterdam theme - // https://github.com/elastic/eui-private/issues/170 - schema.literal('amsterdam'), schema.literal('borealis'), // Allow experimental themes schema.string(), diff --git a/src/core/public/styles/core_app/_globals_v8dark.scss b/src/core/public/styles/core_app/_globals_v8dark.scss deleted file mode 100644 index 9a2fca26223f4..0000000000000 --- a/src/core/public/styles/core_app/_globals_v8dark.scss +++ /dev/null @@ -1,8 +0,0 @@ -// v8dark global scope -// -// prepended to all .scss imports (from JS, when v8dark theme selected) - -@import '@elastic/eui/src/themes/amsterdam/colors_dark'; -@import '@elastic/eui/src/themes/amsterdam/globals'; - -$kbnThemeVersion: 'v8dark'; diff --git a/src/core/public/styles/core_app/_globals_v8light.scss b/src/core/public/styles/core_app/_globals_v8light.scss deleted file mode 100644 index 9ce3638096246..0000000000000 --- a/src/core/public/styles/core_app/_globals_v8light.scss +++ /dev/null @@ -1,8 +0,0 @@ -// v8light global scope -// -// prepended to all .scss imports (from JS, when v8light theme selected) - -@import '@elastic/eui/src/themes/amsterdam/colors_light'; -@import '@elastic/eui/src/themes/amsterdam/globals'; - -$kbnThemeVersion: 'v8light'; diff --git a/src/dev/build/tasks/generate_packages_optimized_assets.ts b/src/dev/build/tasks/generate_packages_optimized_assets.ts index 9a0c292f39697..64b8747185e5e 100644 --- a/src/dev/build/tasks/generate_packages_optimized_assets.ts +++ b/src/dev/build/tasks/generate_packages_optimized_assets.ts @@ -123,8 +123,8 @@ function categorizeAssets(assetDirs: string[]) { for (const { path, category } of assets) { if (category === 'euiTheme') { - // only track v8.light theme - if (path.includes('v8.light')) { + // only track borealis.light theme + if (path.includes('borealis.light')) { add('css', path); } continue; diff --git a/src/platform/packages/shared/kbn-ui-theme/src/theme.ts b/src/platform/packages/shared/kbn-ui-theme/src/theme.ts index 7455cca9ab82c..a3aea84ffe223 100644 --- a/src/platform/packages/shared/kbn-ui-theme/src/theme.ts +++ b/src/platform/packages/shared/kbn-ui-theme/src/theme.ts @@ -7,20 +7,17 @@ * License v3.0 only", or the "Server Side Public License, v 1". */ -import { default as v8Light } from '@elastic/eui/dist/eui_theme_amsterdam_light.json'; -import { default as v8Dark } from '@elastic/eui/dist/eui_theme_amsterdam_dark.json'; - import { default as borealisLight } from '@elastic/eui-theme-borealis/lib/eui_theme_borealis_light.json'; import { default as borealisDark } from '@elastic/eui-theme-borealis/lib/eui_theme_borealis_dark.json'; const globals: any = typeof window === 'undefined' ? {} : window; -export type Theme = typeof v8Light; +export type Theme = typeof borealisLight; // in the Kibana app we can rely on this global being defined, but in // some cases (like jest) the global is undefined /** @deprecated theme can be dynamic now, access is discouraged */ -export const tag: string = globals.__kbnThemeTag__ || 'v8light'; +export const tag: string = globals.__kbnThemeTag__ || 'borealislight'; /** @deprecated theme can be dynamic now, access is discouraged */ export const version = 8; /** @deprecated theme can be dynamic now, access is discouraged */ @@ -32,16 +29,9 @@ export const _setDarkMode = (mode: boolean) => { }; const getThemeVars = (): { light: Theme; dark: Theme } => { - if (globals?.__kbnThemeTag__?.includes('borealis')) { - return { - light: borealisLight, - dark: borealisDark, - }; - } - return { - light: v8Light, - dark: v8Dark, + light: borealisLight, + dark: borealisDark, }; }; @@ -65,8 +55,5 @@ export const euiThemeVars: Theme = new Proxy( ); export function getEuiThemeVars(theme: { name: string; darkMode: boolean }) { - if (theme.name === `borealis`) { - return theme.darkMode ? borealisDark : borealisLight; - } - return theme.darkMode ? v8Dark : v8Light; + return theme.darkMode ? borealisDark : borealisLight; } diff --git a/src/platform/packages/shared/kbn-unified-data-table/__mocks__/services.ts b/src/platform/packages/shared/kbn-unified-data-table/__mocks__/services.ts index 9f90912fae0df..3cef8eb996e08 100644 --- a/src/platform/packages/shared/kbn-unified-data-table/__mocks__/services.ts +++ b/src/platform/packages/shared/kbn-unified-data-table/__mocks__/services.ts @@ -42,7 +42,7 @@ export function createServicesMock() { ...uiSettingsMock, }; - const theme = themeServiceMock.createSetupContract({ darkMode: false, name: 'amsterdam' }); + const theme = themeServiceMock.createSetupContract({ darkMode: false, name: 'borealis' }); corePluginMock.theme = theme; const dataPlugin = dataPluginMock.createStartContract(); diff --git a/src/platform/packages/shared/react/kibana_context/common/color_mode.test.ts b/src/platform/packages/shared/react/kibana_context/common/color_mode.test.ts index 8fcd75f49d45a..5ffc231dd406d 100644 --- a/src/platform/packages/shared/react/kibana_context/common/color_mode.test.ts +++ b/src/platform/packages/shared/react/kibana_context/common/color_mode.test.ts @@ -11,10 +11,10 @@ import { getColorMode } from './color_mode'; describe('getColorMode', () => { it('returns the correct `colorMode` when `darkMode` is enabled', () => { - expect(getColorMode({ name: 'amsterdam', darkMode: true })).toEqual('DARK'); + expect(getColorMode({ name: 'borealis', darkMode: true })).toEqual('DARK'); }); it('returns the correct `colorMode` when `darkMode` is disabled', () => { - expect(getColorMode({ name: 'amsterdam', darkMode: false })).toEqual('LIGHT'); + expect(getColorMode({ name: 'borealis', darkMode: false })).toEqual('LIGHT'); }); }); diff --git a/src/platform/packages/shared/react/kibana_context/common/index.ts b/src/platform/packages/shared/react/kibana_context/common/index.ts index 541e804b788c7..11cc48299ea2e 100644 --- a/src/platform/packages/shared/react/kibana_context/common/index.ts +++ b/src/platform/packages/shared/react/kibana_context/common/index.ts @@ -19,5 +19,5 @@ import type { KibanaTheme } from './types'; */ export const defaultTheme: KibanaTheme = { darkMode: false, - name: 'amsterdam', + name: 'borealis', }; diff --git a/src/platform/packages/shared/react/kibana_context/common/theme.ts b/src/platform/packages/shared/react/kibana_context/common/theme.ts index 7a1576ea26435..4d4c9143e379b 100644 --- a/src/platform/packages/shared/react/kibana_context/common/theme.ts +++ b/src/platform/packages/shared/react/kibana_context/common/theme.ts @@ -8,7 +8,6 @@ */ import type { EuiThemeSystem } from '@elastic/eui'; -import { EuiThemeAmsterdam } from '@elastic/eui'; import { EuiThemeBorealis } from '@elastic/eui-theme-borealis'; export interface ThemeConfig { @@ -16,9 +15,6 @@ export interface ThemeConfig { } const THEMES: Record = { - amsterdam: { - euiTheme: EuiThemeAmsterdam, - }, borealis: { euiTheme: EuiThemeBorealis, }, @@ -28,4 +24,4 @@ export const getThemeConfigByName = (name: string): ThemeConfig | null => { return THEMES[name as keyof typeof THEMES] || null; }; -export const DEFAULT_THEME_CONFIG = THEMES.amsterdam; +export const DEFAULT_THEME_CONFIG = THEMES.borealis; diff --git a/src/platform/packages/shared/react/kibana_context/root/eui_provider.test.tsx b/src/platform/packages/shared/react/kibana_context/root/eui_provider.test.tsx index 774f86d8ed9bf..1f68150beda4c 100644 --- a/src/platform/packages/shared/react/kibana_context/root/eui_provider.test.tsx +++ b/src/platform/packages/shared/react/kibana_context/root/eui_provider.test.tsx @@ -51,7 +51,7 @@ describe('KibanaEuiProvider', () => { }; it('exposes the EUI theme provider', async () => { - const coreTheme: KibanaTheme = { darkMode: true, name: 'amsterdam' }; + const coreTheme: KibanaTheme = { darkMode: true, name: 'borealis' }; render( { }); it('propagates changes of the coreTheme observable', async () => { - const coreTheme$ = new BehaviorSubject({ darkMode: true, name: 'amsterdam' }); + const coreTheme$ = new BehaviorSubject({ darkMode: true, name: 'borealis' }); render( @@ -91,7 +91,7 @@ describe('KibanaEuiProvider', () => { // Update the theme act(() => { - coreTheme$.next({ darkMode: false, name: 'amsterdam' }); + coreTheme$.next({ darkMode: false, name: 'borealis' }); }); // Wait for the component to update with new theme @@ -103,7 +103,7 @@ describe('KibanaEuiProvider', () => { }); it('passes component defaults to EuiProvider', async () => { - const coreTheme: KibanaTheme = { darkMode: true, name: 'amsterdam' }; + const coreTheme: KibanaTheme = { darkMode: true, name: 'borealis' }; render( diff --git a/src/platform/packages/shared/react/kibana_context/root/root_provider.test.tsx b/src/platform/packages/shared/react/kibana_context/root/root_provider.test.tsx index 2a826a364996d..57fd0883472ae 100644 --- a/src/platform/packages/shared/react/kibana_context/root/root_provider.test.tsx +++ b/src/platform/packages/shared/react/kibana_context/root/root_provider.test.tsx @@ -45,7 +45,7 @@ describe('KibanaRootContextProvider', () => { }; it('exposes the EUI theme provider', async () => { - const coreTheme: KibanaTheme = { darkMode: true, name: 'amsterdam' }; + const coreTheme: KibanaTheme = { darkMode: true, name: 'borealis' }; render( { }); it('propagates changes of the coreTheme observable', async () => { - const coreTheme$ = new BehaviorSubject({ darkMode: true, name: 'amsterdam' }); + const coreTheme$ = new BehaviorSubject({ darkMode: true, name: 'borealis' }); render( { // Update theme to light mode act(() => { - coreTheme$.next({ darkMode: false, name: 'amsterdam' }); + coreTheme$.next({ darkMode: false, name: 'borealis' }); }); // Wait for the theme to update diff --git a/src/platform/packages/shared/react/kibana_context/theme/theme_provider.test.tsx b/src/platform/packages/shared/react/kibana_context/theme/theme_provider.test.tsx index 8023c0cbf7e5f..587f4fd007bb0 100644 --- a/src/platform/packages/shared/react/kibana_context/theme/theme_provider.test.tsx +++ b/src/platform/packages/shared/react/kibana_context/theme/theme_provider.test.tsx @@ -57,7 +57,7 @@ describe('KibanaThemeProvider', () => { }; it('exposes the EUI theme provider', async () => { - const coreTheme$ = new BehaviorSubject({ darkMode: true, name: 'amsterdam' }); + const coreTheme$ = new BehaviorSubject({ darkMode: true, name: 'borealis' }); const wrapper = mountWithIntl( @@ -73,7 +73,7 @@ describe('KibanaThemeProvider', () => { it('propagates changes of the coreTheme observable', async () => { const coreTheme$ = new BehaviorSubject({ darkMode: true, - name: 'amsterdam', + name: 'borealis', }); const wrapper = mountWithIntl( @@ -87,7 +87,7 @@ describe('KibanaThemeProvider', () => { expect(euiTheme!.colorMode).toEqual('DARK'); await act(async () => { - coreTheme$.next({ darkMode: false, name: 'amsterdam' }); + coreTheme$.next({ darkMode: false, name: 'borealis' }); }); await refresh(wrapper); diff --git a/src/platform/packages/shared/react/kibana_mount/to_mount_point.test.tsx b/src/platform/packages/shared/react/kibana_mount/to_mount_point.test.tsx index 734742e120811..e467bc75b2520 100644 --- a/src/platform/packages/shared/react/kibana_mount/to_mount_point.test.tsx +++ b/src/platform/packages/shared/react/kibana_mount/to_mount_point.test.tsx @@ -44,7 +44,7 @@ describe('toMountPoint', () => { }; it('exposes the euiTheme when `theme$` is provided', async () => { - const theme = { theme$: of({ darkMode: true, name: 'amsterdam' }) }; + const theme = { theme$: of({ darkMode: true, name: 'borealis' }) }; const mount = toMountPoint(, { theme, i18n, analytics, userProfile }); const targetEl = document.createElement('div'); @@ -56,7 +56,7 @@ describe('toMountPoint', () => { }); it('propagates changes of the theme$ observable', async () => { - const theme$ = new BehaviorSubject({ darkMode: true, name: 'amsterdam' }); + const theme$ = new BehaviorSubject({ darkMode: true, name: 'borealis' }); const mount = toMountPoint(, { theme: { theme$ }, @@ -73,7 +73,7 @@ describe('toMountPoint', () => { expect(euiTheme!.colorMode).toEqual('DARK'); await act(async () => { - theme$.next({ darkMode: false, name: 'amsterdam' }); + theme$.next({ darkMode: false, name: 'borealis' }); }); await flushPromises(); diff --git a/src/platform/packages/shared/response-ops/alerts-table/components/alerts_query_inspector_modal.test.tsx b/src/platform/packages/shared/response-ops/alerts-table/components/alerts_query_inspector_modal.test.tsx index eb09539c188d0..59cfaa28d793f 100644 --- a/src/platform/packages/shared/response-ops/alerts-table/components/alerts_query_inspector_modal.test.tsx +++ b/src/platform/packages/shared/response-ops/alerts-table/components/alerts_query_inspector_modal.test.tsx @@ -46,7 +46,7 @@ describe('AlertsQueryInspectorModal', () => { }; const renderModalInspectQuery = () => { - const theme = { theme$: of({ darkMode: false, name: 'amsterdam' }) }; + const theme = { theme$: of({ darkMode: false, name: 'borealis' }) }; const userProfile = userProfileServiceMock.createStart(); return render(, { wrapper: ({ children }) => ( diff --git a/src/platform/plugins/private/vis_types/vega/public/data_model/utils.ts b/src/platform/plugins/private/vis_types/vega/public/data_model/utils.ts index fa3800d92418a..c138f5a966e54 100644 --- a/src/platform/plugins/private/vis_types/vega/public/data_model/utils.ts +++ b/src/platform/plugins/private/vis_types/vega/public/data_model/utils.ts @@ -43,8 +43,6 @@ export class Utils { const borealisDark = getEuiThemeVars({ name: 'borealis', darkMode: true }); const borealisLight = getEuiThemeVars({ name: 'borealis', darkMode: false }); -const amsterdamDark = getEuiThemeVars({ name: 'amsterdam', darkMode: true }); -const amsterdamLight = getEuiThemeVars({ name: 'amsterdam', darkMode: false }); // These colors should be replaced with the respective tokens whenever available from EUI export const VegaThemeColors = { @@ -86,44 +84,6 @@ export const VegaThemeColors = { ], }, }, - amsterdam: { - dark: { - grid: '#343741', // euiColorChartLines euiColorLightShade - title: '#D4DAE5', // euiColorDarkestShade - label: '#98A2B3', // euiColorDarkShade - default: amsterdamDark.euiColorVis0, // visColors.euiColorVis0 - visColors: [ - amsterdamDark.euiColorVis0, - amsterdamDark.euiColorVis1, - amsterdamDark.euiColorVis2, - amsterdamDark.euiColorVis3, - amsterdamDark.euiColorVis4, - amsterdamDark.euiColorVis5, - amsterdamDark.euiColorVis6, - amsterdamDark.euiColorVis7, - amsterdamDark.euiColorVis8, - amsterdamDark.euiColorVis9, - ], - }, - light: { - grid: '#eef0f3', // euiColorChartLines shade($euiColorLightestShade, 3%) - title: '#343741', // euiColorDarkestShade - label: '#69707D', // euiColorDarkShade - default: amsterdamLight.euiColorVis0, // visColors.euiColorVis0 - visColors: [ - amsterdamLight.euiColorVis0, - amsterdamLight.euiColorVis1, - amsterdamLight.euiColorVis2, - amsterdamLight.euiColorVis3, - amsterdamLight.euiColorVis4, - amsterdamLight.euiColorVis5, - amsterdamLight.euiColorVis6, - amsterdamLight.euiColorVis7, - amsterdamLight.euiColorVis8, - amsterdamLight.euiColorVis9, - ], - }, - }, }; export function getVegaThemeColors( @@ -131,6 +91,5 @@ export function getVegaThemeColors( colorToken: 'grid' | 'title' | 'label' | 'default' | 'visColors' ) { const colorMode = theme.darkMode ? 'dark' : 'light'; - const themeName = theme.name === 'amsterdam' ? 'amsterdam' : 'borealis'; - return VegaThemeColors[themeName][colorMode][colorToken]; + return VegaThemeColors[theme.name as keyof typeof VegaThemeColors]?.[colorMode][colorToken]; } diff --git a/src/platform/plugins/shared/chart_expressions/expression_partition_vis/public/__mocks__/theme.ts b/src/platform/plugins/shared/chart_expressions/expression_partition_vis/public/__mocks__/theme.ts index 01c40ecc53d2d..90deef57d7c19 100644 --- a/src/platform/plugins/shared/chart_expressions/expression_partition_vis/public/__mocks__/theme.ts +++ b/src/platform/plugins/shared/chart_expressions/expression_partition_vis/public/__mocks__/theme.ts @@ -11,6 +11,6 @@ import { themeServiceMock } from '@kbn/core/public/mocks'; import { ThemeService } from '@kbn/charts-plugin/public/services'; const theme = new ThemeService(); -theme.init(themeServiceMock.createSetupContract({ darkMode: false, name: 'amsterdam' })); +theme.init(themeServiceMock.createSetupContract({ darkMode: false, name: 'borealis' })); export { theme }; diff --git a/src/platform/plugins/shared/discover/public/__mocks__/services.ts b/src/platform/plugins/shared/discover/public/__mocks__/services.ts index 4af5bc7010f19..2ac0e8d45bf30 100644 --- a/src/platform/plugins/shared/discover/public/__mocks__/services.ts +++ b/src/platform/plugins/shared/discover/public/__mocks__/services.ts @@ -150,7 +150,7 @@ export function createDiscoverServicesMock(): DiscoverServices { }; const { profilesManagerMock } = createContextAwarenessMocks(); - const theme = themeServiceMock.createSetupContract({ darkMode: false, name: 'amsterdam' }); + const theme = themeServiceMock.createSetupContract({ darkMode: false, name: 'borealis' }); corePluginMock.theme = theme; corePluginMock.chrome.getActiveSolutionNavId$.mockReturnValue(new BehaviorSubject(null)); diff --git a/src/platform/plugins/shared/kibana_utils/public/theme/kibana_theme_provider.test.tsx b/src/platform/plugins/shared/kibana_utils/public/theme/kibana_theme_provider.test.tsx index c3c2be931d411..867525172d04b 100644 --- a/src/platform/plugins/shared/kibana_utils/public/theme/kibana_theme_provider.test.tsx +++ b/src/platform/plugins/shared/kibana_utils/public/theme/kibana_theme_provider.test.tsx @@ -54,7 +54,7 @@ describe('KibanaThemeProvider', () => { }; it('exposes the EUI theme provider', async () => { - const coreTheme: CoreTheme = { darkMode: true, name: 'amsterdam' }; + const coreTheme: CoreTheme = { darkMode: true, name: 'borealis' }; const wrapper = mountWithIntl( @@ -68,7 +68,7 @@ describe('KibanaThemeProvider', () => { }); it('propagates changes of the coreTheme observable', async () => { - const coreTheme$ = new BehaviorSubject({ darkMode: true, name: 'amsterdam' }); + const coreTheme$ = new BehaviorSubject({ darkMode: true, name: 'borealis' }); const wrapper = mountWithIntl( @@ -81,7 +81,7 @@ describe('KibanaThemeProvider', () => { expect(euiTheme!.colorMode).toEqual('DARK'); await act(async () => { - coreTheme$.next({ darkMode: false, name: 'amsterdam' }); + coreTheme$.next({ darkMode: false, name: 'borealis' }); }); await refresh(wrapper); diff --git a/x-pack/platform/plugins/shared/fleet/.storybook/context/index.tsx b/x-pack/platform/plugins/shared/fleet/.storybook/context/index.tsx index 177ca3eac724e..0b549c3ac4a17 100644 --- a/x-pack/platform/plugins/shared/fleet/.storybook/context/index.tsx +++ b/x-pack/platform/plugins/shared/fleet/.storybook/context/index.tsx @@ -108,7 +108,7 @@ export const StorybookContext: React.FC<{ settings: getSettings(), theme: { theme$: EMPTY, - getTheme: () => ({ darkMode: false, name: 'amsterdam' }), + getTheme: () => ({ darkMode: false, name: 'borealis' }), }, pricing: {} as unknown as PricingServiceStart, security: {} as unknown as SecurityServiceStart, diff --git a/x-pack/platform/plugins/shared/security/public/account_management/user_profile/user_profile.test.tsx b/x-pack/platform/plugins/shared/security/public/account_management/user_profile/user_profile.test.tsx index feb805088b8de..2627af7fdea0b 100644 --- a/x-pack/platform/plugins/shared/security/public/account_management/user_profile/user_profile.test.tsx +++ b/x-pack/platform/plugins/shared/security/public/account_management/user_profile/user_profile.test.tsx @@ -331,7 +331,7 @@ describe('useUserProfileForm', () => { const data: UserProfileData = {}; const nonCloudUser = mockAuthenticatedUser({ elastic_cloud_user: false }); - coreStart.theme.getTheme.mockReturnValue({ darkMode: true, name: 'amsterdam' }); + coreStart.theme.getTheme.mockReturnValue({ darkMode: true, name: 'borealis' }); coreStart.settings.client.isOverridden.mockReturnValue(true); const testWrapper = mount( @@ -369,7 +369,7 @@ describe('useUserProfileForm', () => { const data: UserProfileData = {}; const nonCloudUser = mockAuthenticatedUser({ elastic_cloud_user: false }); - coreStart.theme.getTheme.mockReturnValue({ darkMode: false, name: 'amsterdam' }); + coreStart.theme.getTheme.mockReturnValue({ darkMode: false, name: 'borealis' }); coreStart.settings.client.isOverridden.mockReturnValue(true); const testWrapper = mount( From 2c77e7b4ccc65ead2692d2ac5c6875611f79b34d Mon Sep 17 00:00:00 2001 From: Lene Gadewoll Date: Sat, 11 Oct 2025 00:12:41 +0200 Subject: [PATCH 04/14] refactor: udpate storybook theme usages --- .../shared/kbn-storybook/src/lib/preview.ts | 19 +------------------ .../shared/kbn-storybook/src/lib/themes.ts | 11 ++--------- .../react/kibana_context/root/README.mdx | 5 ++--- .../kibana_context/styled/styled_provider.tsx | 2 +- .../replacement_card.stories.tsx | 3 +-- .../storybook/decorator.tsx | 2 +- .../expression_input.stories.tsx | 3 +-- .../integration_preference.stories.tsx | 3 +-- .../test_utils/use_global_storybook_theme.tsx | 6 +++--- .../.storybook/decorator.tsx | 2 +- .../test_utils/use_global_storybook_theme.tsx | 6 +++--- .../test_utils/use_global_storybook_theme.tsx | 6 +++--- .../test_utils/use_global_storybook_theme.tsx | 6 +++--- 13 files changed, 23 insertions(+), 51 deletions(-) diff --git a/src/platform/packages/shared/kbn-storybook/src/lib/preview.ts b/src/platform/packages/shared/kbn-storybook/src/lib/preview.ts index 319d42a27e6f0..537298aa9374a 100644 --- a/src/platform/packages/shared/kbn-storybook/src/lib/preview.ts +++ b/src/platform/packages/shared/kbn-storybook/src/lib/preview.ts @@ -10,14 +10,7 @@ import type { Preview } from '@storybook/react'; import * as jest from 'jest-mock'; import { decorators } from './decorators'; -import { - AMSTERDAM_DARK, - AMSTERDAM_LIGHT, - BOREALIS_DARK, - BOREALIS_LIGHT, - DEFAULT_THEME, - THEME_TITLES, -} from './themes'; +import { BOREALIS_DARK, BOREALIS_LIGHT, DEFAULT_THEME, THEME_TITLES } from './themes'; // @ts-expect-error window.jest = jest; @@ -43,16 +36,6 @@ const preview: Preview = { icon: 'heart', title: THEME_TITLES[BOREALIS_DARK], }, - { - value: AMSTERDAM_LIGHT, - icon: 'hearthollow', - title: THEME_TITLES[AMSTERDAM_LIGHT], - }, - { - value: AMSTERDAM_DARK, - icon: 'heart', - title: THEME_TITLES[AMSTERDAM_DARK], - }, ], }, }, diff --git a/src/platform/packages/shared/kbn-storybook/src/lib/themes.ts b/src/platform/packages/shared/kbn-storybook/src/lib/themes.ts index aad7dee7b147e..361c4c5e4cefa 100644 --- a/src/platform/packages/shared/kbn-storybook/src/lib/themes.ts +++ b/src/platform/packages/shared/kbn-storybook/src/lib/themes.ts @@ -9,10 +9,8 @@ export const BOREALIS_LIGHT = 'borealis.light'; export const BOREALIS_DARK = 'borealis.dark'; -export const AMSTERDAM_LIGHT = 'amsterdam.light'; -export const AMSTERDAM_DARK = 'amsterdam.dark'; -export const THEMES = [BOREALIS_LIGHT, BOREALIS_DARK, AMSTERDAM_LIGHT, AMSTERDAM_DARK] as const; +export const THEMES = [BOREALIS_LIGHT, BOREALIS_DARK] as const; export type Theme = (typeof THEMES)[number]; @@ -21,12 +19,10 @@ export const DEFAULT_THEME: Theme = 'borealis.light'; export const THEME_TITLES: Record = { [BOREALIS_LIGHT]: 'Borealis Light', [BOREALIS_DARK]: 'Borealis Dark', - [AMSTERDAM_LIGHT]: 'Amsterdam Light', - [AMSTERDAM_DARK]: 'Amsterdam Dark', }; export const getColorMode = (theme: Theme) => { - if (theme === BOREALIS_DARK || theme === AMSTERDAM_DARK) { + if (theme === BOREALIS_DARK) { return 'dark'; } @@ -34,9 +30,6 @@ export const getColorMode = (theme: Theme) => { }; export const getEuiThemeName = (theme: Theme) => { - if (theme === AMSTERDAM_LIGHT || theme === AMSTERDAM_DARK) { - return 'amsterdam'; - } return 'borealis'; }; diff --git a/src/platform/packages/shared/react/kibana_context/root/README.mdx b/src/platform/packages/shared/react/kibana_context/root/README.mdx index 5ad6707e8ff45..c5bd6172cbae6 100644 --- a/src/platform/packages/shared/react/kibana_context/root/README.mdx +++ b/src/platform/packages/shared/react/kibana_context/root/README.mdx @@ -9,7 +9,7 @@ date: 2023-07-25 ## Description -This package contains a root context provider for Kibana rendering. It handles operations that should only happen _once_ when the browser loads a page. +This package contains a root context provider for Kibana rendering. It handles operations that should only happen _once_ when the browser loads a page. While it would be safer to isolate this in a `core` package, we need to use it in other contexts-- like Storybook and Jest. @@ -36,7 +36,7 @@ const i18n: I18nStart = { }; export const KibanaContextDecorator: Decorator (storyFn, { globals }) => { - const colorMode = globals.euiTheme === 'v8.dark' ? 'dark' : 'light'; + const colorMode = globals.euiTheme === 'borealis.dark' ? 'dark' : 'light'; useEffect(() => { theme$.next({ darkMode: colorMode === 'dark' }); @@ -49,4 +49,3 @@ export const KibanaContextDecorator: Decorator (storyFn, { globals }) => { ); }; ``` - diff --git a/src/platform/packages/shared/react/kibana_context/styled/styled_provider.tsx b/src/platform/packages/shared/react/kibana_context/styled/styled_provider.tsx index f7ea79a7629c4..4268b7bcc3744 100644 --- a/src/platform/packages/shared/react/kibana_context/styled/styled_provider.tsx +++ b/src/platform/packages/shared/react/kibana_context/styled/styled_provider.tsx @@ -55,7 +55,7 @@ const KibanaStyledComponentsThemeProvider = < * @deprecated All Kibana components need to migrate to Emotion. */ export const KibanaStyledComponentsThemeProviderDecorator: Decorator = (storyFn, { globals }) => { - const darkMode = globals.euiTheme === 'v8.dark' || globals.euiTheme === 'v7.dark'; + const darkMode = globals.euiTheme === 'borealis.dark'; return ( diff --git a/src/platform/plugins/shared/custom_integrations/public/components/replacement_card/replacement_card.stories.tsx b/src/platform/plugins/shared/custom_integrations/public/components/replacement_card/replacement_card.stories.tsx index ec8c7dccb14dc..268cce4d1050a 100644 --- a/src/platform/plugins/shared/custom_integrations/public/components/replacement_card/replacement_card.stories.tsx +++ b/src/platform/plugins/shared/custom_integrations/public/components/replacement_card/replacement_card.stories.tsx @@ -22,8 +22,7 @@ export default {
diff --git a/src/platform/plugins/shared/custom_integrations/storybook/decorator.tsx b/src/platform/plugins/shared/custom_integrations/storybook/decorator.tsx index 502f02121a4cb..1777a722e31fe 100644 --- a/src/platform/plugins/shared/custom_integrations/storybook/decorator.tsx +++ b/src/platform/plugins/shared/custom_integrations/storybook/decorator.tsx @@ -22,7 +22,7 @@ import { CustomIntegrationsServicesProvider } from '../public/services'; */ export const getCustomIntegrationsContextDecorator: Decorator = (story, { globals }) => { const ContextProvider = getCustomIntegrationsContextProvider(); - const darkMode = globals.euiTheme === 'v8.dark' || globals.euiTheme === 'v7.dark'; + const darkMode = globals.euiTheme === 'borealis.dark'; return ( diff --git a/src/platform/plugins/shared/presentation_util/public/components/expression_input/expression_input.stories.tsx b/src/platform/plugins/shared/presentation_util/public/components/expression_input/expression_input.stories.tsx index 6b480628a08e5..14e3013a7fb93 100644 --- a/src/platform/plugins/shared/presentation_util/public/components/expression_input/expression_input.stories.tsx +++ b/src/platform/plugins/shared/presentation_util/public/components/expression_input/expression_input.stories.tsx @@ -80,8 +80,7 @@ export default {
{storyFn()} diff --git a/x-pack/platform/plugins/shared/fleet/public/applications/integrations/sections/epm/components/integration_preference.stories.tsx b/x-pack/platform/plugins/shared/fleet/public/applications/integrations/sections/epm/components/integration_preference.stories.tsx index a104de73a42df..d3585e8247a75 100644 --- a/x-pack/platform/plugins/shared/fleet/public/applications/integrations/sections/epm/components/integration_preference.stories.tsx +++ b/x-pack/platform/plugins/shared/fleet/public/applications/integrations/sections/epm/components/integration_preference.stories.tsx @@ -20,8 +20,7 @@ export default {
diff --git a/x-pack/platform/plugins/shared/logs_shared/public/test_utils/use_global_storybook_theme.tsx b/x-pack/platform/plugins/shared/logs_shared/public/test_utils/use_global_storybook_theme.tsx index 023b74e360d97..35f3ceae15203 100644 --- a/x-pack/platform/plugins/shared/logs_shared/public/test_utils/use_global_storybook_theme.tsx +++ b/x-pack/platform/plugins/shared/logs_shared/public/test_utils/use_global_storybook_theme.tsx @@ -51,9 +51,9 @@ export const decorateWithGlobalStorybookThemeProviders: Decorator = ( const euiThemeFromId = (themeId: string): CoreTheme => { switch (themeId) { - case 'v8.dark': - return { darkMode: true, name: 'amsterdam' }; + case 'borealis.dark': + return { darkMode: true, name: 'borealis' }; default: - return { darkMode: false, name: 'amsterdam' }; + return { darkMode: false, name: 'borealis' }; } }; diff --git a/x-pack/platform/plugins/shared/triggers_actions_ui/.storybook/decorator.tsx b/x-pack/platform/plugins/shared/triggers_actions_ui/.storybook/decorator.tsx index f7e7daacb4597..9e2cafbfd2a2f 100644 --- a/x-pack/platform/plugins/shared/triggers_actions_ui/.storybook/decorator.tsx +++ b/x-pack/platform/plugins/shared/triggers_actions_ui/.storybook/decorator.tsx @@ -61,7 +61,7 @@ export const StorybookContextDecorator: FC { switch (themeId) { - case 'v8.dark': - return { darkMode: true, name: 'amsterdam' }; + case 'borealis.dark': + return { darkMode: true, name: 'borealis' }; default: - return { darkMode: false, name: 'amsterdam' }; + return { darkMode: false, name: 'borealis' }; } }; diff --git a/x-pack/solutions/observability/plugins/metrics_data_access/public/test_utils/use_global_storybook_theme.tsx b/x-pack/solutions/observability/plugins/metrics_data_access/public/test_utils/use_global_storybook_theme.tsx index ec469eccf1980..7eb48be85c7a8 100644 --- a/x-pack/solutions/observability/plugins/metrics_data_access/public/test_utils/use_global_storybook_theme.tsx +++ b/x-pack/solutions/observability/plugins/metrics_data_access/public/test_utils/use_global_storybook_theme.tsx @@ -49,9 +49,9 @@ export const decorateWithGlobalStorybookThemeProviders: Decorator = ( const euiThemeFromId = (themeId: string): CoreTheme => { switch (themeId) { - case 'v8.dark': - return { darkMode: true, name: 'amsterdam' }; + case 'borealis.dark': + return { darkMode: true, name: 'borealis' }; default: - return { darkMode: false, name: 'amsterdam' }; + return { darkMode: false, name: 'borealis' }; } }; diff --git a/x-pack/solutions/observability/plugins/observability/public/test_utils/use_global_storybook_theme.tsx b/x-pack/solutions/observability/plugins/observability/public/test_utils/use_global_storybook_theme.tsx index 460ca35bdba3d..b3bc42db8fc91 100644 --- a/x-pack/solutions/observability/plugins/observability/public/test_utils/use_global_storybook_theme.tsx +++ b/x-pack/solutions/observability/plugins/observability/public/test_utils/use_global_storybook_theme.tsx @@ -52,9 +52,9 @@ export const decorateWithGlobalStorybookThemeProviders: Decorator = ( const euiThemeFromId = (themeId: string): CoreTheme => { switch (themeId) { - case 'v8.dark': - return { darkMode: true, name: 'amsterdam' }; + case 'borealis.dark': + return { darkMode: true, name: 'borealis' }; default: - return { darkMode: false, name: 'amsterdam' }; + return { darkMode: false, name: 'borealis' }; } }; From ca205136d8e4a42c1e1eaa98039ea69cbd67779b Mon Sep 17 00:00:00 2001 From: Lene Gadewoll Date: Sat, 11 Oct 2025 17:41:49 +0200 Subject: [PATCH 05/14] refactor: remove theme conditions based on themeName --- .../src/get_highlight_colors.ts | 24 ++++------------- .../toolbar_button/toolbar_button.styles.ts | 18 +++---------- .../private/maps_ems/common/ems_defaults.ts | 8 +++--- .../components/phase_icon/phase_icon.tsx | 15 +++-------- .../components/timeline/timeline.styles.ts | 7 +++-- .../policy_flyout/phase_indicator.tsx | 8 +++--- .../components/index_lifecycle_summary.tsx | 7 +++-- .../sections/agents/services/agent_status.tsx | 18 +++---------- .../question_answering_output.tsx | 9 +------ .../general_data/modal/ilm.tsx | 7 +++-- .../apm/common/service_health_status.ts | 22 +++++---------- .../hooks/use_status_by_location.tsx | 9 ++----- .../monitor/ping_list/columns/ping_status.tsx | 5 +--- .../monitor_list/columns/status_badge.tsx | 5 +--- .../common/utils/__mocks__/severity_colors.ts | 5 ---- .../common/utils/risk_color_palette.test.tsx | 14 +--------- .../common/utils/risk_color_palette.tsx | 22 +-------------- .../alerts_progress_bar_row.tsx | 8 +----- .../severity_level_panel/helpers.test.tsx | 8 ++---- .../utils/translation_results/index.test.ts | 27 +------------------ .../common/utils/translation_results/index.ts | 15 +---------- .../tty_player_controls_markers/styles.ts | 10 +------ 22 files changed, 51 insertions(+), 220 deletions(-) diff --git a/src/platform/packages/shared/kbn-data-grid-in-table-search/src/get_highlight_colors.ts b/src/platform/packages/shared/kbn-data-grid-in-table-search/src/get_highlight_colors.ts index 2bb3a2f6cdd23..2b9f3f46c3670 100644 --- a/src/platform/packages/shared/kbn-data-grid-in-table-search/src/get_highlight_colors.ts +++ b/src/platform/packages/shared/kbn-data-grid-in-table-search/src/get_highlight_colors.ts @@ -9,26 +9,12 @@ import type { EuiThemeComputed } from '@elastic/eui'; -const AMSTERDAM_HIGHLIGHT_COLOR = '#e5ffc0'; -const AMSTERDAM_ACTIVE_HIGHLIGHT_COLOR = '#ffc30e'; - export const getHighlightColors = (euiTheme: EuiThemeComputed<{}>) => { - // FIXME: remove once Amsterdam theme is removed - const isAmsterdamTheme = euiTheme.themeName.toLowerCase().includes('amsterdam'); - return { - highlightColor: isAmsterdamTheme ? euiTheme.colors.plainDark : euiTheme.colors.textAccent, - highlightBackgroundColor: isAmsterdamTheme - ? AMSTERDAM_HIGHLIGHT_COLOR - : euiTheme.colors.backgroundLightAccent, - activeHighlightColor: isAmsterdamTheme - ? euiTheme.colors.plainDark - : euiTheme.colors.textInverse, - activeHighlightBackgroundColor: isAmsterdamTheme - ? AMSTERDAM_ACTIVE_HIGHLIGHT_COLOR - : euiTheme.colors.backgroundFilledAccent, - activeHighlightBorderColor: isAmsterdamTheme - ? AMSTERDAM_ACTIVE_HIGHLIGHT_COLOR - : euiTheme.colors.borderStrongAccent, + highlightColor: euiTheme.colors.textAccent, + highlightBackgroundColor: euiTheme.colors.backgroundLightAccent, + activeHighlightColor: euiTheme.colors.textInverse, + activeHighlightBackgroundColor: euiTheme.colors.backgroundFilledAccent, + activeHighlightBorderColor: euiTheme.colors.borderStrongAccent, }; }; diff --git a/src/platform/packages/shared/shared-ux/button_toolbar/src/buttons/toolbar_button/toolbar_button.styles.ts b/src/platform/packages/shared/shared-ux/button_toolbar/src/buttons/toolbar_button/toolbar_button.styles.ts index 571d5e1e3d1f7..499410519f773 100644 --- a/src/platform/packages/shared/shared-ux/button_toolbar/src/buttons/toolbar_button/toolbar_button.styles.ts +++ b/src/platform/packages/shared/shared-ux/button_toolbar/src/buttons/toolbar_button/toolbar_button.styles.ts @@ -15,21 +15,11 @@ export const fontWeightDefinitions = (euiTheme: UseEuiTheme['euiTheme']) => ({ }); export const ToolbarButtonStyles = ({ euiTheme }: UseEuiTheme) => { - const isAmsterdam = euiTheme.themeName === 'EUI_THEME_AMSTERDAM'; - return { - default: isAmsterdam - ? { - // style declaration carried over from https://github.com/elastic/kibana/blob/v8.10.4/src/plugins/kibana_react/public/toolbar_button/toolbar_button.scss - // informed by issue https://github.com/elastic/eui/issues/4730 - borderStyle: 'solid', - border: euiTheme.border.thin, - borderColor: euiTheme.border.color, - } - : { - // manual border override to ensure disabled buttons have a border to align with EuiButtonGroup styles - border: `${euiTheme.border.width.thin} solid ${euiTheme.colors.borderBasePlain}`, - }, + default: { + // manual border override to ensure disabled buttons have a border to align with EuiButtonGroup styles + border: `${euiTheme.border.width.thin} solid ${euiTheme.colors.borderBasePlain}`, + }, emptyButton: { backgroundColor: euiTheme.colors.backgroundBasePlain, border: `${euiTheme.border.width.thin} solid ${euiTheme.colors.borderBasePlain}`, diff --git a/src/platform/plugins/private/maps_ems/common/ems_defaults.ts b/src/platform/plugins/private/maps_ems/common/ems_defaults.ts index d0f18caf9f007..3f520b6216462 100644 --- a/src/platform/plugins/private/maps_ems/common/ems_defaults.ts +++ b/src/platform/plugins/private/maps_ems/common/ems_defaults.ts @@ -16,15 +16,13 @@ export const DEFAULT_EMS_FONT_LIBRARY_URL = // Theme-bound style identifiers export const EMS_ROADMAP_BOREALIS_DESATURATED_ID = 'road_map_desaturated_v9'; export const EMS_DARKMAP_BOREALIS_ID = 'dark_map_v9'; -export const EMS_ROADMAP_AMSTERDAM_DESATURATED_ID = 'road_map_desaturated'; -export const EMS_DARKMAP_AMSTERDAM_ID = 'dark_map'; // Default identifiers export const DEFAULT_EMS_ROADMAP_ID = 'road_map'; -// To be updated when Kibana only ships the Borealis tehem -export const DEFAULT_EMS_ROADMAP_DESATURATED_ID = EMS_ROADMAP_AMSTERDAM_DESATURATED_ID; -export const DEFAULT_EMS_DARKMAP_ID = EMS_DARKMAP_AMSTERDAM_ID; +// To be updated when Kibana only ships the Borealis theme +export const DEFAULT_EMS_ROADMAP_DESATURATED_ID = EMS_ROADMAP_BOREALIS_DESATURATED_ID; +export const DEFAULT_EMS_DARKMAP_ID = EMS_DARKMAP_BOREALIS_ID; export const EMS_APP_NAME = 'kibana'; // app-name submitted as the `app`-param to EMS diff --git a/x-pack/platform/plugins/private/index_lifecycle_management/public/application/sections/edit_policy/components/phase_icon/phase_icon.tsx b/x-pack/platform/plugins/private/index_lifecycle_management/public/application/sections/edit_policy/components/phase_icon/phase_icon.tsx index afb34c75f671c..1b62ecdd726cc 100644 --- a/x-pack/platform/plugins/private/index_lifecycle_management/public/application/sections/edit_policy/components/phase_icon/phase_icon.tsx +++ b/x-pack/platform/plugins/private/index_lifecycle_management/public/application/sections/edit_policy/components/phase_icon/phase_icon.tsx @@ -13,19 +13,12 @@ import type { Phases } from '../../../../../../common/types'; const useStyles = ({ enabled, phase }: { enabled: boolean; phase: string }) => { const { euiTheme } = useEuiTheme(); - const isBorealis = euiTheme.themeName === 'EUI_THEME_BOREALIS'; const phaseIconColors = { - hot: isBorealis ? euiTheme.colors.vis.euiColorVis6 : euiTheme.colors.vis.euiColorVisBehindText9, - warm: isBorealis - ? euiTheme.colors.vis.euiColorVis9 - : euiTheme.colors.vis.euiColorVisBehindText5, - cold: isBorealis - ? euiTheme.colors.vis.euiColorVis2 - : euiTheme.colors.vis.euiColorVisBehindText1, - frozen: isBorealis - ? euiTheme.colors.vis.euiColorVis4 - : euiTheme.colors.vis.euiColorVisBehindText4, + hot: euiTheme.colors.vis.euiColorVis6, + warm: euiTheme.colors.vis.euiColorVis9, + cold: euiTheme.colors.vis.euiColorVis2, + frozen: euiTheme.colors.vis.euiColorVis4, delete: euiTheme.colors.darkShade, }; diff --git a/x-pack/platform/plugins/private/index_lifecycle_management/public/application/sections/edit_policy/components/timeline/timeline.styles.ts b/x-pack/platform/plugins/private/index_lifecycle_management/public/application/sections/edit_policy/components/timeline/timeline.styles.ts index d0a4a600a1ff0..ae2f2acc179d4 100644 --- a/x-pack/platform/plugins/private/index_lifecycle_management/public/application/sections/edit_policy/components/timeline/timeline.styles.ts +++ b/x-pack/platform/plugins/private/index_lifecycle_management/public/application/sections/edit_policy/components/timeline/timeline.styles.ts @@ -11,12 +11,11 @@ import { useEuiTheme } from '@elastic/eui'; export const useStyles = () => { const { euiTheme } = useEuiTheme(); const ilmTimelineBarHeight = euiTheme.size.s; - const isBorealis = euiTheme.themeName === 'EUI_THEME_BOREALIS'; const timelineIconColors = { - hot: isBorealis ? euiTheme.colors.vis.euiColorVis6 : euiTheme.colors.vis.euiColorVis9, - warm: isBorealis ? euiTheme.colors.vis.euiColorVis9 : euiTheme.colors.vis.euiColorVis5, - cold: isBorealis ? euiTheme.colors.vis.euiColorVis2 : euiTheme.colors.vis.euiColorVis1, + hot: euiTheme.colors.vis.euiColorVis6, + warm: euiTheme.colors.vis.euiColorVis9, + cold: euiTheme.colors.vis.euiColorVis2, frozen: euiTheme.colors.vis.euiColorVis4, }; diff --git a/x-pack/platform/plugins/private/index_lifecycle_management/public/application/sections/policy_list/policy_flyout/phase_indicator.tsx b/x-pack/platform/plugins/private/index_lifecycle_management/public/application/sections/policy_list/policy_flyout/phase_indicator.tsx index 0a586f1abc5d6..56f7c2307c4fa 100644 --- a/x-pack/platform/plugins/private/index_lifecycle_management/public/application/sections/policy_list/policy_flyout/phase_indicator.tsx +++ b/x-pack/platform/plugins/private/index_lifecycle_management/public/application/sections/policy_list/policy_flyout/phase_indicator.tsx @@ -13,13 +13,11 @@ import type { Phase } from '../../../../../common/types'; export const PhaseIndicator = ({ phase }: { phase: Phase }) => { const { euiTheme } = useEuiTheme(); - const isBorealis = euiTheme.themeName === 'EUI_THEME_BOREALIS'; - // Changing the mappings for the phases in Borealis as a mid-term solution. See https://github.com/elastic/kibana/issues/203664#issuecomment-2536593361. const phaseToIndicatorColors = { - hot: isBorealis ? euiTheme.colors.vis.euiColorVis6 : euiTheme.colors.vis.euiColorVis9, - warm: isBorealis ? euiTheme.colors.vis.euiColorVis9 : euiTheme.colors.vis.euiColorVis5, - cold: isBorealis ? euiTheme.colors.vis.euiColorVis2 : euiTheme.colors.vis.euiColorVis1, + hot: euiTheme.colors.vis.euiColorVis6, + warm: euiTheme.colors.vis.euiColorVis9, + cold: euiTheme.colors.vis.euiColorVis2, frozen: euiTheme.colors.vis.euiColorVis4, delete: euiTheme.colors.lightShade, }; diff --git a/x-pack/platform/plugins/private/index_lifecycle_management/public/extend_index_management/components/index_lifecycle_summary.tsx b/x-pack/platform/plugins/private/index_lifecycle_management/public/extend_index_management/components/index_lifecycle_summary.tsx index 63ed9d77e486e..27e451f757453 100644 --- a/x-pack/platform/plugins/private/index_lifecycle_management/public/extend_index_management/components/index_lifecycle_summary.tsx +++ b/x-pack/platform/plugins/private/index_lifecycle_management/public/extend_index_management/components/index_lifecycle_summary.tsx @@ -44,20 +44,19 @@ export const IndexLifecycleSummary: FunctionComponent = ({ const { ilm: ilmData } = index; // only ILM managed indices render the ILM tab const ilm = ilmData as IlmExplainLifecycleLifecycleExplainManaged; - const isBorealis = euiTheme.themeName === 'EUI_THEME_BOREALIS'; // Changing the mappings for the phases in Borealis as a mid-term solution. See https://github.com/elastic/kibana/issues/203664#issuecomment-2536593361. const phaseToBadgeMapping: Record = { hot: { - color: isBorealis ? euiTheme.colors.vis.euiColorVis6 : euiTheme.colors.vis.euiColorVis9, + color: euiTheme.colors.vis.euiColorVis6, label: 'Hot', }, warm: { - color: isBorealis ? euiTheme.colors.vis.euiColorVis9 : euiTheme.colors.vis.euiColorVis5, + color: euiTheme.colors.vis.euiColorVis9, label: 'Warm', }, cold: { - color: isBorealis ? euiTheme.colors.vis.euiColorVis2 : euiTheme.colors.vis.euiColorVis1, + color: euiTheme.colors.vis.euiColorVis2, label: 'Cold', }, frozen: { diff --git a/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agents/services/agent_status.tsx b/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agents/services/agent_status.tsx index 6e2986735d6be..2c61ab10ca78f 100644 --- a/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agents/services/agent_status.tsx +++ b/x-pack/platform/plugins/shared/fleet/public/applications/fleet/sections/agents/services/agent_status.tsx @@ -26,29 +26,19 @@ export function getColorForAgentStatus( agentStatus: SimplifiedAgentStatus, euiTheme: EuiThemeComputed<{}> ): string { - const isAmsterdam = euiTheme.themeName === 'EUI_THEME_AMSTERDAM'; - switch (agentStatus) { case 'healthy': - return isAmsterdam - ? euiTheme.colors.vis.euiColorVisBehindText0 - : euiTheme.colors.backgroundFilledSuccess; + return euiTheme.colors.backgroundFilledSuccess; case 'offline': return euiTheme.colors.lightShade; case 'inactive': return euiTheme.colors.darkShade; case 'unhealthy': - return isAmsterdam - ? euiTheme.colors.vis.euiColorVisBehindText5 - : euiTheme.colors.backgroundFilledWarning; + return euiTheme.colors.backgroundFilledWarning; case 'orphaned': - return isAmsterdam - ? euiTheme.colors.vis.euiColorVisBehindText5 - : euiTheme.colors.backgroundFilledWarning; + return euiTheme.colors.backgroundFilledWarning; case 'updating': - return isAmsterdam - ? euiTheme.colors.vis.euiColorVisBehindText1 - : euiTheme.colors.backgroundFilledPrimary; + return euiTheme.colors.backgroundFilledPrimary; case 'unenrolled': return euiTheme.colors.backgroundBaseDisabled; case 'uninstalled': diff --git a/x-pack/platform/plugins/shared/ml/public/application/model_management/test_models/models/question_answering/question_answering_output.tsx b/x-pack/platform/plugins/shared/ml/public/application/model_management/test_models/models/question_answering/question_answering_output.tsx index 96e36e9550e42..d3b500c6dc44c 100644 --- a/x-pack/platform/plugins/shared/ml/public/application/model_management/test_models/models/question_answering/question_answering_output.tsx +++ b/x-pack/platform/plugins/shared/ml/public/application/model_management/test_models/models/question_answering/question_answering_output.tsx @@ -60,12 +60,7 @@ function insertHighlighting(result: FormattedQuestionAnsweringResult, inputText: const ResultBadge: FC> = ({ children }) => { const { euiTheme } = useEuiTheme(); const euiFontSizeXS = useEuiFontSize('xs').fontSize; - const isAmsterdam = euiTheme.themeName === 'EUI_THEME_AMSTERDAM'; - - // For Amsterdam, use a `behindText` variant. Borealis doesn't need it because of updated contrasts. - const badgeColor = isAmsterdam - ? euiTheme.colors.vis.euiColorVisBehindText5 - : euiTheme.colors.vis.euiColorVis9; + const badgeColor = euiTheme.colors.vis.euiColorVis9; return ( > = ({ children }) => { style={{ marginRight: ICON_PADDING, marginTop: `-${ICON_PADDING}`, - // For Amsterdam, add a border to the badge to improve contrast with the background. - ...(isAmsterdam ? { border: `1px solid ${euiTheme.colors.vis.euiColorVis5}` } : {}), fontSize: euiFontSizeXS, padding: '0px 6px', pointerEvents: 'none', diff --git a/x-pack/platform/plugins/shared/streams_app/public/components/data_management/stream_detail_lifecycle/general_data/modal/ilm.tsx b/x-pack/platform/plugins/shared/streams_app/public/components/data_management/stream_detail_lifecycle/general_data/modal/ilm.tsx index 8d36fe7f806dd..e480e0ad9549e 100644 --- a/x-pack/platform/plugins/shared/streams_app/public/components/data_management/stream_detail_lifecycle/general_data/modal/ilm.tsx +++ b/x-pack/platform/plugins/shared/streams_app/public/components/data_management/stream_detail_lifecycle/general_data/modal/ilm.tsx @@ -116,11 +116,10 @@ export function IlmField({ setSelectedPolicy(isIlmLifecycle(initialValue) ? initialValue.ilm.policy : undefined); }, [initialValue]); - const isBorealis = euiTheme.themeName === 'EUI_THEME_BOREALIS'; const phaseToIndicatorColors = { - hot: isBorealis ? euiTheme.colors.vis.euiColorVis6 : euiTheme.colors.vis.euiColorVis9, - warm: isBorealis ? euiTheme.colors.vis.euiColorVis9 : euiTheme.colors.vis.euiColorVis5, - cold: isBorealis ? euiTheme.colors.vis.euiColorVis2 : euiTheme.colors.vis.euiColorVis1, + hot: euiTheme.colors.vis.euiColorVis6, + warm: euiTheme.colors.vis.euiColorVis9, + cold: euiTheme.colors.vis.euiColorVis2, frozen: euiTheme.colors.vis.euiColorVis4, }; diff --git a/x-pack/solutions/observability/plugins/apm/common/service_health_status.ts b/x-pack/solutions/observability/plugins/apm/common/service_health_status.ts index d90090b5697fa..6bdbed59f0d2b 100644 --- a/x-pack/solutions/observability/plugins/apm/common/service_health_status.ts +++ b/x-pack/solutions/observability/plugins/apm/common/service_health_status.ts @@ -38,15 +38,13 @@ export function getServiceHealthStatusColor( euiTheme: EuiThemeComputed, status: ServiceHealthStatus ) { - const isAmsterdam = euiTheme.themeName === 'EUI_THEME_AMSTERDAM'; - switch (status) { case ServiceHealthStatus.healthy: - return isAmsterdam ? euiTheme.colors.vis.euiColorVis0 : euiTheme.colors.severity.success; + return euiTheme.colors.severity.success; case ServiceHealthStatus.warning: - return isAmsterdam ? euiTheme.colors.vis.euiColorVis5 : euiTheme.colors.severity.warning; + return euiTheme.colors.severity.warning; case ServiceHealthStatus.critical: - return isAmsterdam ? euiTheme.colors.vis.euiColorVis9 : euiTheme.colors.severity.danger; + return euiTheme.colors.severity.danger; case ServiceHealthStatus.unknown: return euiTheme.colors.mediumShade; } @@ -56,21 +54,13 @@ export function getServiceHealthStatusBadgeColor( euiTheme: EuiThemeComputed, status: ServiceHealthStatus ) { - const isAmsterdam = euiTheme.themeName === 'EUI_THEME_AMSTERDAM'; - switch (status) { case ServiceHealthStatus.healthy: - return isAmsterdam - ? euiTheme.colors.vis.euiColorVisBehindText0 - : euiTheme.colors.severity.success; + return euiTheme.colors.severity.success; case ServiceHealthStatus.warning: - return isAmsterdam - ? euiTheme.colors.vis.euiColorVisBehindText5 - : euiTheme.colors.severity.warning; + return euiTheme.colors.severity.warning; case ServiceHealthStatus.critical: - return isAmsterdam - ? euiTheme.colors.vis.euiColorVisBehindText9 - : euiTheme.colors.severity.risk; + return euiTheme.colors.severity.risk; case ServiceHealthStatus.unknown: return euiTheme.colors.mediumShade; } diff --git a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/hooks/use_status_by_location.tsx b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/hooks/use_status_by_location.tsx index 12a8fd4d2fee3..5eb05cdce5188 100644 --- a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/hooks/use_status_by_location.tsx +++ b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/hooks/use_status_by_location.tsx @@ -73,13 +73,11 @@ export function useStatusByLocation({ return useMemo(() => { const getColor = (status: string) => { - const isAmsterdam = euiTheme.themeName === 'EUI_THEME_AMSTERDAM'; - switch (status) { case 'up': - return isAmsterdam ? euiTheme.colors.vis.euiColorVis0 : euiTheme.colors.success; + return euiTheme.colors.success; case 'down': - return isAmsterdam ? euiTheme.colors.vis.euiColorVis9 : euiTheme.colors.vis.euiColorVis6; + return euiTheme.colors.vis.euiColorVis6; default: return euiTheme.colors.backgroundBaseSubdued; } @@ -113,11 +111,8 @@ export function useStatusByLocation({ data?.aggregations?.locations.buckets, loading, monitorLocations, - euiTheme.themeName, euiTheme.colors.success, - euiTheme.colors.vis.euiColorVis0, euiTheme.colors.vis.euiColorVis6, - euiTheme.colors.vis.euiColorVis9, euiTheme.colors.backgroundBaseSubdued, ]); } diff --git a/x-pack/solutions/observability/plugins/uptime/public/legacy_uptime/components/monitor/ping_list/columns/ping_status.tsx b/x-pack/solutions/observability/plugins/uptime/public/legacy_uptime/components/monitor/ping_list/columns/ping_status.tsx index a293a2103165d..587c46144b469 100644 --- a/x-pack/solutions/observability/plugins/uptime/public/legacy_uptime/components/monitor/ping_list/columns/ping_status.tsx +++ b/x-pack/solutions/observability/plugins/uptime/public/legacy_uptime/components/monitor/ping_list/columns/ping_status.tsx @@ -32,11 +32,8 @@ const getPingStatusLabel = (status: string, ping: Ping) => { export const PingStatusColumn = ({ pingStatus, item }: Props) => { const theme = useEuiTheme(); - const isAmsterdam = theme.euiTheme.themeName === 'EUI_THEME_AMSTERDAM'; - const dangerBehindText = isAmsterdam - ? theme.euiTheme.colors.vis.euiColorVisBehindText9 - : theme.euiTheme.colors.vis.euiColorVis6; + const dangerBehindText = theme.euiTheme.colors.vis.euiColorVis6; const timeStamp = moment(item.timestamp); diff --git a/x-pack/solutions/observability/plugins/uptime/public/legacy_uptime/components/overview/monitor_list/columns/status_badge.tsx b/x-pack/solutions/observability/plugins/uptime/public/legacy_uptime/components/overview/monitor_list/columns/status_badge.tsx index e218c21594052..fbf0ec8b2b977 100644 --- a/x-pack/solutions/observability/plugins/uptime/public/legacy_uptime/components/overview/monitor_list/columns/status_badge.tsx +++ b/x-pack/solutions/observability/plugins/uptime/public/legacy_uptime/components/overview/monitor_list/columns/status_badge.tsx @@ -19,11 +19,8 @@ export const StatusBadge = ({ summaryError?: PingError; }) => { const theme = useEuiTheme(); - const isAmsterdam = theme.euiTheme.themeName === 'EUI_THEME_AMSTERDAM'; - const dangerBehindText = isAmsterdam - ? theme.euiTheme.colors.vis.euiColorVisBehindText9 - : theme.euiTheme.colors.vis.euiColorVis6; + const dangerBehindText = theme.euiTheme.colors.vis.euiColorVis6; if (status === STATUS.UP) { return ( diff --git a/x-pack/solutions/security/plugins/security_solution/public/common/utils/__mocks__/severity_colors.ts b/x-pack/solutions/security/plugins/security_solution/public/common/utils/__mocks__/severity_colors.ts index 027827b314ebd..3bf2bfbf37524 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/common/utils/__mocks__/severity_colors.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/common/utils/__mocks__/severity_colors.ts @@ -7,11 +7,6 @@ import type { EuiThemeComputed } from '@elastic/eui'; -export const getMockEuiAmsterdamTheme = () => - ({ - themeName: 'EUI_THEME_AMSTERDAM', - } as EuiThemeComputed); - export const getMockEuiBorealisTheme = () => ({ themeName: 'EUI_THEME_BOREALIS', diff --git a/x-pack/solutions/security/plugins/security_solution/public/common/utils/risk_color_palette.test.tsx b/x-pack/solutions/security/plugins/security_solution/public/common/utils/risk_color_palette.test.tsx index 6bf67174ed70f..bc903a4149d7a 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/common/utils/risk_color_palette.test.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/common/utils/risk_color_palette.test.tsx @@ -7,19 +7,12 @@ import { renderHook } from '@testing-library/react'; import { getRiskSeverityColors, useRiskSeverityColors } from './risk_color_palette'; import { useEuiTheme } from '@elastic/eui'; -import { getMockEuiAmsterdamTheme, getMockEuiBorealisTheme } from './__mocks__/severity_colors'; +import { getMockEuiBorealisTheme } from './__mocks__/severity_colors'; jest.mock('@elastic/eui', () => ({ useEuiTheme: jest.fn(), })); -const EXPECTED_SEVERITY_COLOR_AMSTERDAM = { - low: '#54B399', - medium: '#F1D86F', - high: '#FF7E62', - critical: '#bd271e', -}; - const EXPECTED_SEVERITY_COLOR_BOREALIS = { low: '#54B399', medium: '#D6BF57', @@ -29,11 +22,6 @@ const EXPECTED_SEVERITY_COLOR_BOREALIS = { describe('risk_color_palette', () => { const scenarios = [ - { - mockEuiTheme: getMockEuiAmsterdamTheme(), - themeName: 'Amsterdam', - expected: EXPECTED_SEVERITY_COLOR_AMSTERDAM, - }, { mockEuiTheme: getMockEuiBorealisTheme(), themeName: 'Borealis', diff --git a/x-pack/solutions/security/plugins/security_solution/public/common/utils/risk_color_palette.tsx b/x-pack/solutions/security/plugins/security_solution/public/common/utils/risk_color_palette.tsx index e0eac26c7fe04..f16cf9b0ae010 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/common/utils/risk_color_palette.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/common/utils/risk_color_palette.tsx @@ -9,12 +9,6 @@ import type { EuiThemeComputed } from '@elastic/eui'; import { useEuiTheme } from '@elastic/eui'; import type { Severity } from '@kbn/securitysolution-io-ts-alerting-types'; import { useMemo } from 'react'; -import { - RISK_COLOR_CRITICAL, - RISK_COLOR_HIGH, - RISK_COLOR_LOW, - RISK_COLOR_MEDIUM, -} from '../constants'; // Temporary solution until we have a decision for color palette https://github.com/elastic/kibana/issues/203387 export const SEVERITY_COLOR = { @@ -24,21 +18,7 @@ export const SEVERITY_COLOR = { critical: '#E7664C', } as const; -const isAmsterdam = (euiThemeName: string) => { - return euiThemeName?.toLowerCase().includes('amsterdam'); -}; - -export const getRiskSeverityColors = (euiTheme: EuiThemeComputed) => { - if (euiTheme && isAmsterdam(euiTheme.themeName)) { - return { - low: RISK_COLOR_LOW, - medium: RISK_COLOR_MEDIUM, - high: RISK_COLOR_HIGH, - critical: RISK_COLOR_CRITICAL, - }; - } - return SEVERITY_COLOR; -}; +export const getRiskSeverityColors = (euiTheme: EuiThemeComputed) => SEVERITY_COLOR; export const useRiskSeverityColors = (): Record => { const { euiTheme } = useEuiTheme(); diff --git a/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_kpis/alerts_progress_bar_panel/alerts_progress_bar_row.tsx b/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_kpis/alerts_progress_bar_panel/alerts_progress_bar_row.tsx index 5e58e0b97d0ef..4979455d28b1f 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_kpis/alerts_progress_bar_panel/alerts_progress_bar_row.tsx +++ b/x-pack/solutions/security/plugins/security_solution/public/detections/components/alerts_kpis/alerts_progress_bar_panel/alerts_progress_bar_row.tsx @@ -14,13 +14,7 @@ import type { AlertsProgressBarData } from './types'; */ export const ProgressBarRow: React.FC<{ item: AlertsProgressBarData }> = ({ item }) => { const { euiTheme } = useEuiTheme(); - const color = useMemo( - () => - euiTheme.themeName === 'EUI_THEME_BOREALIS' - ? euiTheme.colors.vis.euiColorVis6 - : euiTheme.colors.vis.euiColorVis9, - [euiTheme] - ); + const color = useMemo(() => euiTheme.colors.vis.euiColorVis6, [euiTheme]); return ( { test('parse alerts with data', () => { @@ -39,8 +36,7 @@ describe.each([ { severity: 'medium', colorToken: '#D6BF57', themeName: 'Borealis' }, { severity: 'low', colorToken: '#54B399', themeName: 'Borealis' }, ])('$themeName: getSeverityColor', ({ severity, colorToken, themeName }) => { - const mockEuiTheme = - themeName === 'Amsterdam' ? getMockEuiAmsterdamTheme() : getMockEuiBorealisTheme(); + const mockEuiTheme = getMockEuiBorealisTheme(); test(`returns color for given severity: ${severity}`, () => { expect(getSeverityColor(severity, mockEuiTheme)).toEqual(colorToken); diff --git a/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/common/utils/translation_results/index.test.ts b/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/common/utils/translation_results/index.test.ts index d9d02561cfaf7..9120ce26dcb79 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/common/utils/translation_results/index.test.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/common/utils/translation_results/index.test.ts @@ -21,32 +21,7 @@ jest.mock('@elastic/eui', () => ({ describe('translation_results index', () => { describe('useResultVisColors', () => { - it('returns correct colors for Amsterdam theme', () => { - (useEuiTheme as jest.Mock).mockReturnValue({ - euiTheme: { - themeName: 'EUI_THEME_AMSTERDAM', - colors: { - vis: { - euiColorVis0: '#00A69B', - euiColorVis5: '#BD9536', - euiColorVis7: '#BD6F36', - euiColorVis9: '#C15129', - }, - }, - }, - }); - - const { result } = renderHook(() => useResultVisColors()); - - expect(result.current).toEqual({ - [MigrationTranslationResult.FULL]: '#00A69B', - [MigrationTranslationResult.PARTIAL]: '#BD9536', - [MigrationTranslationResult.UNTRANSLATABLE]: '#BD6F36', - error: '#C15129', - }); - }); - - it('returns default colors for other themes (Borealis)', () => { + it('returns default colors for Borealis theme', () => { (useEuiTheme as jest.Mock).mockReturnValue({ euiTheme: { themeName: 'EUI_THEME_BOREALIS', diff --git a/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/common/utils/translation_results/index.ts b/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/common/utils/translation_results/index.ts index fc05fbc33a464..f213f16c2fd3e 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/common/utils/translation_results/index.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/siem_migrations/common/utils/translation_results/index.ts @@ -5,7 +5,6 @@ * 2.0. */ -import { useEuiTheme } from '@elastic/eui'; import { MigrationTranslationResult } from '../../../../../common/siem_migrations/constants'; import type { MigrationTranslationResult as MigrationTranslationResultType } from '../../../../../common/siem_migrations/model/common.gen'; import * as i18n from './translations'; @@ -17,19 +16,7 @@ const COLORS = { error: '#E7664C', } as const; -export const useResultVisColors = () => { - const { euiTheme } = useEuiTheme(); - if (euiTheme.themeName === 'EUI_THEME_AMSTERDAM') { - return { - [MigrationTranslationResult.FULL]: euiTheme.colors.vis.euiColorVis0, - [MigrationTranslationResult.PARTIAL]: euiTheme.colors.vis.euiColorVis5, - [MigrationTranslationResult.UNTRANSLATABLE]: euiTheme.colors.vis.euiColorVis7, - error: euiTheme.colors.vis.euiColorVis9, - }; - } - // Borealis - return COLORS; -}; +export const useResultVisColors = () => COLORS; export const convertTranslationResultIntoColor = (status?: MigrationTranslationResultType) => { switch (status) { diff --git a/x-pack/solutions/security/plugins/session_view/public/components/tty_player_controls/tty_player_controls_markers/styles.ts b/x-pack/solutions/security/plugins/session_view/public/components/tty_player_controls/tty_player_controls_markers/styles.ts index 3bca74c25e09f..cdc806540ea0e 100644 --- a/x-pack/solutions/security/plugins/session_view/public/components/tty_player_controls/tty_player_controls_markers/styles.ts +++ b/x-pack/solutions/security/plugins/session_view/public/components/tty_player_controls/tty_player_controls_markers/styles.ts @@ -11,13 +11,8 @@ import { useEuiTheme } from '../../../hooks'; import { TTYPlayerLineMarkerType } from '.'; -const isAmsterdam = (euiThemeName: string) => { - return euiThemeName?.toLowerCase().includes('amsterdam'); -}; - export const useStyles = (progress: number) => { const { euiTheme, euiVars } = useEuiTheme(); - const themeName = euiTheme.themeName; const cached = useMemo(() => { const { border } = euiTheme; @@ -41,9 +36,7 @@ export const useStyles = (progress: number) => { if (selected) { return euiVars.terminalOutputMarkerAccent; } - return isAmsterdam(themeName) - ? euiTheme.colors.vis.euiColorVis1 - : euiTheme.colors.vis.euiColorVis2; + return euiTheme.colors.vis.euiColorVis2; }; const marker = (type: TTYPlayerLineMarkerType, selected: boolean): CSSObject => ({ @@ -133,7 +126,6 @@ export const useStyles = (progress: number) => { euiVars.terminalOutputMarkerWarning, euiVars.terminalOutputSliderBackground, progress, - themeName, ]); return cached; From 90e35714050443b8cd3754c905875a55657c957d Mon Sep 17 00:00:00 2001 From: Lene Gadewoll Date: Sat, 11 Oct 2025 17:42:22 +0200 Subject: [PATCH 06/14] refactor: remove theme conditions based on flags.hasVisColorAdjustment --- .../ml/aiops_log_rate_analysis/constants.ts | 8 +-- .../field_data_expanded_row/use_bar_color.ts | 8 +-- .../stats_table/hooks/use_color_range.ts | 10 +--- .../data_drift/use_data_drift_colors.ts | 12 +---- .../public/components/severity/config.tsx | 9 ++-- .../color_range_legend/use_color_range.ts | 8 +-- .../job_map/components/cytoscape_options.tsx | 25 ++------- .../pages/job_map/components/legend.tsx | 27 ++-------- .../datafeed_chart_flyout.tsx | 6 +-- .../models/ner/ner_output.test.tsx | 10 ++-- .../test_models/models/ner/ner_output.tsx | 53 +++---------------- .../cases_webhook/severity_filter.tsx | 9 ++-- .../monitor_status_cell_tooltip.tsx | 10 ++-- .../monitor_status/monitor_status_data.ts | 9 ++-- .../monitor_status/monitor_status_legend.tsx | 16 ++---- .../monitor_summary/monitor_alerts.tsx | 9 +--- .../monitor_error_sparklines.tsx | 7 +-- .../monitor_summary/monitor_errors_count.tsx | 3 +- .../monitor_list_table/monitor_locations.tsx | 5 +- .../overview/metric_item/metric_item.tsx | 13 ++--- .../overview/overview/overview_alerts.tsx | 10 +--- .../overview_errors/overview_errors_count.tsx | 4 +- .../overview_errors_sparklines.tsx | 7 +-- .../common/utils/unique_ips_palette.ts | 5 +- 24 files changed, 62 insertions(+), 221 deletions(-) diff --git a/x-pack/platform/packages/shared/ml/aiops_log_rate_analysis/constants.ts b/x-pack/platform/packages/shared/ml/aiops_log_rate_analysis/constants.ts index 6ae763ef40967..93c68b855705d 100644 --- a/x-pack/platform/packages/shared/ml/aiops_log_rate_analysis/constants.ts +++ b/x-pack/platform/packages/shared/ml/aiops_log_rate_analysis/constants.ts @@ -37,12 +37,8 @@ export const RANDOM_SAMPLER_SEED = 3867412; export const useLogRateAnalysisBarColors = () => { const { euiTheme } = useEuiTheme(); return { - barColor: euiTheme.flags.hasVisColorAdjustment - ? euiTheme.colors.vis.euiColorVis0 - : euiTheme.colors.vis.euiColorVis0, - barHighlightColor: euiTheme.flags.hasVisColorAdjustment - ? 'orange' - : euiTheme.colors.vis.euiColorVis8, + barColor: euiTheme.colors.vis.euiColorVis0, + barHighlightColor: euiTheme.colors.vis.euiColorVis8, }; }; diff --git a/x-pack/platform/plugins/private/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/use_bar_color.ts b/x-pack/platform/plugins/private/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/use_bar_color.ts index 682bbc7da8daf..ba58dea60f23a 100644 --- a/x-pack/platform/plugins/private/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/use_bar_color.ts +++ b/x-pack/platform/plugins/private/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/use_bar_color.ts @@ -5,10 +5,4 @@ * 2.0. */ -import { useEuiTheme } from '@elastic/eui'; - -export const useBarColor = () => { - const { euiTheme } = useEuiTheme(); - - return euiTheme.flags.hasVisColorAdjustment ? 'success' : 'vis0'; -}; +export const useBarColor = () => 'vis0'; diff --git a/x-pack/platform/plugins/private/data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts b/x-pack/platform/plugins/private/data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts index b929ec9a557db..615df1bbcf2d7 100644 --- a/x-pack/platform/plugins/private/data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts +++ b/x-pack/platform/plugins/private/data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts @@ -159,15 +159,7 @@ export const useColorRange = ( const colorRanges: Record = { [COLOR_RANGE.BLUE]: [ d3.rgb(euiTheme.colors.emptyShade).toString(), - d3 - .rgb( - // Amsterdam: euiTheme.colors.vis.euiColorVis1 - // Borealis: euiTheme.colors.vis.euiColorVis2 - euiTheme.flags.hasVisColorAdjustment - ? euiTheme.colors.vis.euiColorVis1 - : euiTheme.colors.vis.euiColorVis2 - ) - .toString(), + d3.rgb(euiTheme.colors.vis.euiColorVis2).toString(), ], [COLOR_RANGE.RED]: [ d3.rgb(euiTheme.colors.emptyShade).toString(), diff --git a/x-pack/platform/plugins/private/data_visualizer/public/application/data_drift/use_data_drift_colors.ts b/x-pack/platform/plugins/private/data_visualizer/public/application/data_drift/use_data_drift_colors.ts index 7d63ee4c7c259..443d1c01cc795 100644 --- a/x-pack/platform/plugins/private/data_visualizer/public/application/data_drift/use_data_drift_colors.ts +++ b/x-pack/platform/plugins/private/data_visualizer/public/application/data_drift/use_data_drift_colors.ts @@ -14,16 +14,8 @@ export const useDataDriftColors = () => { return useMemo( () => ({ - // Amsterdam: euiTheme.colors.vis.euiColorVis2 - // Borealis: euiTheme.colors.vis.euiColorVis4 - referenceColor: euiTheme.flags.hasVisColorAdjustment - ? euiTheme.colors.vis.euiColorVis2 - : euiTheme.colors.vis.euiColorVis4, - // Amsterdam: euiTheme.colors.vis.euiColorVis1 - // Borealis: euiTheme.colors.vis.euiColorVis2 - comparisonColor: euiTheme.flags.hasVisColorAdjustment - ? euiTheme.colors.vis.euiColorVis1 - : euiTheme.colors.vis.euiColorVis2, + referenceColor: euiTheme.colors.vis.euiColorVis4, + comparisonColor: euiTheme.colors.vis.euiColorVis2, overlapColor: '#490771', }), [euiTheme] diff --git a/x-pack/platform/plugins/shared/cases/public/components/severity/config.tsx b/x-pack/platform/plugins/shared/cases/public/components/severity/config.tsx index 8216625f6110c..ec47d96b1bac4 100644 --- a/x-pack/platform/plugins/shared/cases/public/components/severity/config.tsx +++ b/x-pack/platform/plugins/shared/cases/public/components/severity/config.tsx @@ -32,23 +32,22 @@ export const severities = { export const SeverityHealth: React.FC = ({ severity }) => { const { euiTheme } = useEuiTheme(); - const isAmsterdam = euiTheme.flags.hasVisColorAdjustment; const severityData = { low: { - color: isAmsterdam ? euiTheme.colors.vis.euiColorVis0 : euiTheme.colors.severity.neutral, + color: euiTheme.colors.severity.neutral, label: LOW, }, medium: { - color: isAmsterdam ? euiTheme.colors.vis.euiColorVis5 : euiTheme.colors.severity.warning, + color: euiTheme.colors.severity.warning, label: MEDIUM, }, high: { - color: isAmsterdam ? euiTheme.colors.vis.euiColorVis7 : euiTheme.colors.severity.risk, + color: euiTheme.colors.severity.risk, label: HIGH, }, critical: { - color: isAmsterdam ? euiTheme.colors.vis.euiColorVis9 : euiTheme.colors.severity.danger, + color: euiTheme.colors.severity.danger, label: CRITICAL, }, }; diff --git a/x-pack/platform/plugins/shared/ml/public/application/components/color_range_legend/use_color_range.ts b/x-pack/platform/plugins/shared/ml/public/application/components/color_range_legend/use_color_range.ts index d4f7bf3cf659c..72685b41bb2f9 100644 --- a/x-pack/platform/plugins/shared/ml/public/application/components/color_range_legend/use_color_range.ts +++ b/x-pack/platform/plugins/shared/ml/public/application/components/color_range_legend/use_color_range.ts @@ -156,13 +156,7 @@ export const useColorRange = ( const colorRanges: Record = { [COLOR_RANGE.BLUE]: [ rgb(euiTheme.colors.emptyShade).toString(), - rgb( - // Amsterdam: euiTheme.colors.vis.euiColorVis1 - // Borealis: euiTheme.colors.vis.euiColorVis2 - euiTheme.flags.hasVisColorAdjustment - ? euiTheme.colors.vis.euiColorVis1 - : euiTheme.colors.vis.euiColorVis2 - ).toString(), + rgb(euiTheme.colors.vis.euiColorVis2).toString(), ], [COLOR_RANGE.RED]: [ rgb(euiTheme.colors.emptyShade).toString(), diff --git a/x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/job_map/components/cytoscape_options.tsx b/x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/job_map/components/cytoscape_options.tsx index 9eca6585ac2b3..67a5bca1ef131 100644 --- a/x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/job_map/components/cytoscape_options.tsx +++ b/x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/job_map/components/cytoscape_options.tsx @@ -72,32 +72,15 @@ function borderColorForNode(el: cytoscape.NodeSingular, euiTheme: EuiThemeComput case JOB_MAP_NODE_TYPES.ANALYTICS_JOB_MISSING: return euiTheme.colors.fullShade; case JOB_MAP_NODE_TYPES.ANALYTICS: - // Amsterdam + Borealis return euiTheme.colors.vis.euiColorVis0; case JOB_MAP_NODE_TYPES.TRANSFORM: - // Amsterdam: euiTheme.colors.vis.euiColorVis1 - // Borealis: euiTheme.colors.vis.euiColorVis2 - return euiTheme.flags.hasVisColorAdjustment - ? euiTheme.colors.vis.euiColorVis1 - : euiTheme.colors.vis.euiColorVis2; + return euiTheme.colors.vis.euiColorVis2; case JOB_MAP_NODE_TYPES.INDEX: - // Amsterdam: euiTheme.colors.vis.euiColorVis2 - // Borealis: euiTheme.colors.vis.euiColorVis4 - return euiTheme.flags.hasVisColorAdjustment - ? euiTheme.colors.vis.euiColorVis2 - : euiTheme.colors.vis.euiColorVis4; + return euiTheme.colors.vis.euiColorVis4; case JOB_MAP_NODE_TYPES.TRAINED_MODEL: - // Amsterdam: euiTheme.colors.vis.euiColorVis3 - // Borealis: euiTheme.colors.vis.euiColorVis5 - return euiTheme.flags.hasVisColorAdjustment - ? euiTheme.colors.vis.euiColorVis3 - : euiTheme.colors.vis.euiColorVis5; + return euiTheme.colors.vis.euiColorVis5; case JOB_MAP_NODE_TYPES.INGEST_PIPELINE: - // Amsterdam: euiTheme.colors.vis.euiColorVis7 - // Borealis: euiTheme.colors.vis.euiColorVis8 - return euiTheme.flags.hasVisColorAdjustment - ? euiTheme.colors.vis.euiColorVis7 - : euiTheme.colors.vis.euiColorVis8; + return euiTheme.colors.vis.euiColorVis8; default: return euiTheme.colors.mediumShade; diff --git a/x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/job_map/components/legend.tsx b/x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/job_map/components/legend.tsx index 0a706aa7a82b2..bac68571dccb0 100644 --- a/x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/job_map/components/legend.tsx +++ b/x-pack/platform/plugins/shared/ml/public/application/data_frame_analytics/pages/job_map/components/legend.tsx @@ -49,29 +49,10 @@ export const JobMapLegend: FC<{ hasMissingJobNode: boolean }> = ({ hasMissingJob const euiBorderWidthThick = euiTheme.border.width.thick; const euiPageBackgroundColor = euiTheme.colors.backgroundBasePlain; - // Amsterdam: euiTheme.colors.vis.euiColorVis2 - // Borealis: euiTheme.colors.vis.euiColorVis4 - const borderColorIndexPattern = euiTheme.flags.hasVisColorAdjustment - ? euiTheme.colors.vis.euiColorVis2 - : euiTheme.colors.vis.euiColorVis4; - - // Amsterdam: euiTheme.colors.vis.euiColorVis7 - // Borealis: euiTheme.colors.vis.euiColorVis8 - const borderColorIngestPipeline = euiTheme.flags.hasVisColorAdjustment - ? euiTheme.colors.vis.euiColorVis7 - : euiTheme.colors.vis.euiColorVis8; - - // Amsterdam: euiTheme.colors.vis.euiColorVis1 - // Borealis: euiTheme.colors.vis.euiColorVis2 - const borderColorTransform = euiTheme.flags.hasVisColorAdjustment - ? euiTheme.colors.vis.euiColorVis1 - : euiTheme.colors.vis.euiColorVis2; - - // Amsterdam: euiTheme.colors.vis.euiColorVis3 - // Borealis: euiTheme.colors.vis.euiColorVis5 - const borderBottomColorTrainedModel = euiTheme.flags.hasVisColorAdjustment - ? euiTheme.colors.vis.euiColorVis3 - : euiTheme.colors.vis.euiColorVis5; + const borderColorIndexPattern = euiTheme.colors.vis.euiColorVis4; + const borderColorIngestPipeline = euiTheme.colors.vis.euiColorVis8; + const borderColorTransform = euiTheme.colors.vis.euiColorVis2; + const borderBottomColorTrainedModel = euiTheme.colors.vis.euiColorVis5; // Amsterdam + Borealis const borderColorAnalytics = euiTheme.colors.vis.euiColorVis0; diff --git a/x-pack/platform/plugins/shared/ml/public/application/jobs/jobs_list/components/datafeed_chart_flyout/datafeed_chart_flyout.tsx b/x-pack/platform/plugins/shared/ml/public/application/jobs/jobs_list/components/datafeed_chart_flyout/datafeed_chart_flyout.tsx index 58afeeb50eef4..a6831d66a5fb7 100644 --- a/x-pack/platform/plugins/shared/ml/public/application/jobs/jobs_list/components/datafeed_chart_flyout/datafeed_chart_flyout.tsx +++ b/x-pack/platform/plugins/shared/ml/public/application/jobs/jobs_list/components/datafeed_chart_flyout/datafeed_chart_flyout.tsx @@ -536,11 +536,7 @@ export const DatafeedChartFlyout: FC = ({ style={{ line: { strokeWidth: 3, - // Amsterdam: euiTheme.colors.vis.euiColorVis1 - // Borealis: euiTheme.colors.vis.euiColorVis2 - stroke: euiTheme.flags.hasVisColorAdjustment - ? euiTheme.colors.vis.euiColorVis1 - : euiTheme.colors.vis.euiColorVis2, + stroke: euiTheme.colors.vis.euiColorVis2, opacity: 0.5, }, }} diff --git a/x-pack/platform/plugins/shared/ml/public/application/model_management/test_models/models/ner/ner_output.test.tsx b/x-pack/platform/plugins/shared/ml/public/application/model_management/test_models/models/ner/ner_output.test.tsx index c47d086ea20d9..52ac235bd87fd 100644 --- a/x-pack/platform/plugins/shared/ml/public/application/model_management/test_models/models/ner/ner_output.test.tsx +++ b/x-pack/platform/plugins/shared/ml/public/application/model_management/test_models/models/ner/ner_output.test.tsx @@ -54,23 +54,23 @@ describe('NER output', () => { describe('getClassColor', () => { test('returns the correct color for class PER', () => { - expect(getClassColor('PER', true)).toBe('#FFC7DB'); + expect(getClassColor('PER')).toBe('#FCD883'); }); test('returns the correct color for class LOC', () => { - expect(getClassColor('LOC', true)).toBe('#A6EDEA'); + expect(getClassColor('LOC')).toBe('#61A2FF'); }); test('returns the correct color for class ORG', () => { - expect(getClassColor('ORG', true)).toBe('#16C5C0'); + expect(getClassColor('ORG')).toBe('#16C5C0'); }); test('returns the correct color for class MISC', () => { - expect(getClassColor('MISC', true)).toBe('#FFC9C2'); + expect(getClassColor('MISC')).toBe('#EAAE01'); }); test('returns the default color for an unknown class', () => { - expect(getClassColor('UNKNOWN', true)).toBe('#FFC7DB'); + expect(getClassColor('UNKNOWN')).toBe('#FCD883'); }); }); }); diff --git a/x-pack/platform/plugins/shared/ml/public/application/model_management/test_models/models/ner/ner_output.tsx b/x-pack/platform/plugins/shared/ml/public/application/model_management/test_models/models/ner/ner_output.tsx index 3e0d3fbfbe737..3b58b60316bf5 100644 --- a/x-pack/platform/plugins/shared/ml/public/application/model_management/test_models/models/ner/ner_output.tsx +++ b/x-pack/platform/plugins/shared/ml/public/application/model_management/test_models/models/ner/ner_output.tsx @@ -14,7 +14,6 @@ import { euiPaletteColorBlind, euiPaletteColorBlindBehindText, useEuiFontSize, - useEuiTheme, EuiBadge, EuiFlexGroup, EuiFlexItem, @@ -46,47 +45,31 @@ const ENTITY_TYPES: Record = { PER: { label: 'Person', icon: 'user', - // Amsterdam color - colorIndex: 5, + colorIndex: 9, }, LOC: { label: 'Location', icon: 'visMapCoordinate', - // Amsterdam color - colorIndex: 1, + colorIndex: 2, }, ORG: { label: 'Organization', icon: 'home', - // Amsterdam color colorIndex: 0, }, MISC: { label: 'Miscellaneous', icon: 'question', - // Amsterdam color - colorIndex: 7, + colorIndex: 8, }, }; const UNKNOWN_ENTITY_TYPE: EntityType = { label: '', icon: 'question', - // Amsterdam color - colorIndex: 5, + colorIndex: 9, }; -// Amsterdam -// ['#6dccb1', '#79aad9', '#ee789d', '#a987d1', '#e4a6c7', '#f1d86f', '#d2c0a0', '#f5a35c', '#c47c6c', '#ff7e62'] -// Borealis -// ['#00BEB8', '#98E6E2', '#599DFF', '#B4D5FF', '#ED6BA2', '#FFBED5', '#F66D64', '#FFC0B8', '#E6AB01', '#FCD279'] -const amsterdam2BorealisColorMap = new Map([ - [0, 0], - [1, 2], - [5, 9], - [7, 8], -]); - export const getNerOutputComponent = (inferrer: NerInference) => ; const NerOutput: FC<{ inferrer: NerInference }> = ({ inferrer }) => { @@ -170,25 +153,14 @@ const EntityBadge = ({ }: PropsWithChildren<{ entity: estypes.MlTrainedModelEntities; }>) => { - const { euiTheme } = useEuiTheme(); const euiFontSizeXS = useEuiFontSize('xs').fontSize; return ( = ({ selectedSeverity, onSeverityChange }) => { const { euiTheme } = useEuiTheme(); - const isAmsterdam = euiTheme.flags.hasVisColorAdjustment; const severities = { [CaseSeverity.LOW]: { - color: isAmsterdam ? euiTheme.colors.vis.euiColorVis0 : euiTheme.colors.severity.neutral, + color: euiTheme.colors.severity.neutral, label: i18n.SEVERITY_LOW_LABEL, }, [CaseSeverity.MEDIUM]: { - color: isAmsterdam ? euiTheme.colors.vis.euiColorVis5 : euiTheme.colors.severity.warning, + color: euiTheme.colors.severity.warning, label: i18n.SEVERITY_MEDIUM_LABEL, }, [CaseSeverity.HIGH]: { - color: isAmsterdam ? euiTheme.colors.vis.euiColorVis7 : euiTheme.colors.severity.risk, + color: euiTheme.colors.severity.risk, label: i18n.SEVERITY_HIGH_LABEL, }, [CaseSeverity.CRITICAL]: { - color: isAmsterdam ? euiTheme.colors.vis.euiColorVis9 : euiTheme.colors.severity.danger, + color: euiTheme.colors.severity.danger, label: i18n.SEVERITY_CRITICAL_LABEL, }, }; diff --git a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_cell_tooltip.tsx b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_cell_tooltip.tsx index 0568a128624d1..5922f39ed26a8 100644 --- a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_cell_tooltip.tsx +++ b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_cell_tooltip.tsx @@ -7,7 +7,7 @@ import React from 'react'; import moment from 'moment'; -import { EuiProgress, useEuiTheme, VISUALIZATION_COLORS } from '@elastic/eui'; +import { EuiProgress, useEuiTheme } from '@elastic/eui'; import type { TooltipValue } from '@elastic/charts'; import { TooltipTable, TooltipHeader, TooltipContainer } from '@elastic/charts'; @@ -24,12 +24,8 @@ export const MonitorStatusCellTooltip = ({ }) => { const { euiTheme } = useEuiTheme(); - const isAmsterdam = euiTheme.flags.hasVisColorAdjustment; - - const SUCCESS_COLOR = isAmsterdam ? VISUALIZATION_COLORS[0] : euiTheme.colors.success; - const DANGER_COLOR = isAmsterdam - ? VISUALIZATION_COLORS[VISUALIZATION_COLORS.length - 1] - : euiTheme.colors.danger; + const SUCCESS_COLOR = euiTheme.colors.success; + const DANGER_COLOR = euiTheme.colors.danger; if (!timeBin) { return <>{''}; } diff --git a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_data.ts b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_data.ts index bbe60e5c3c2a8..0d602f8615c21 100644 --- a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_data.ts +++ b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_data.ts @@ -8,7 +8,7 @@ import datemath from '@elastic/datemath'; import moment from 'moment'; import type { EuiThemeComputed, EuiThemeColorModeStandard } from '@elastic/eui'; -import { tint, transparentize, VISUALIZATION_COLORS, COLOR_MODES_STANDARD } from '@elastic/eui'; +import { tint, transparentize, COLOR_MODES_STANDARD } from '@elastic/eui'; import type { BrushEvent } from '@elastic/charts'; import type { MonitorStatusHeatmapBucket } from '../../../../../../common/runtime_types'; @@ -50,12 +50,9 @@ export interface MonitorStatusPanelProps { export function getColorBands(euiTheme: EuiThemeComputed, colorMode: EuiThemeColorModeStandard) { const colorTransitionFn = colorMode === COLOR_MODES_STANDARD.dark ? transparentize : tint; - const isAmsterdam = euiTheme.flags.hasVisColorAdjustment; - const SUCCESS_COLOR = isAmsterdam ? VISUALIZATION_COLORS[0] : euiTheme.colors.success; - const DANGER_COLOR = isAmsterdam - ? VISUALIZATION_COLORS[VISUALIZATION_COLORS.length - 1] - : euiTheme.colors.danger; + const SUCCESS_COLOR = euiTheme.colors.success; + const DANGER_COLOR = euiTheme.colors.danger; return [ { color: DANGER_COLOR, start: -Infinity, end: -1 }, diff --git a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_legend.tsx b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_legend.tsx index 0841ba1316244..83908db3b1bd6 100644 --- a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_legend.tsx +++ b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_status/monitor_status_legend.tsx @@ -6,25 +6,15 @@ */ import React, { useMemo } from 'react'; -import { - EuiFlexGroup, - EuiFlexItem, - EuiIcon, - EuiText, - useEuiTheme, - VISUALIZATION_COLORS, -} from '@elastic/eui'; +import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText, useEuiTheme } from '@elastic/eui'; import * as labels from './labels'; import { getSkippedVizColor } from './monitor_status_data'; export const MonitorStatusLegend = ({ brushable }: { brushable: boolean }) => { const { euiTheme } = useEuiTheme(); - const isAmsterdam = euiTheme.flags.hasVisColorAdjustment; - const SUCCESS_COLOR = isAmsterdam ? VISUALIZATION_COLORS[0] : euiTheme.colors.success; - const DANGER_COLOR = isAmsterdam - ? VISUALIZATION_COLORS[VISUALIZATION_COLORS.length - 1] - : euiTheme.colors.danger; + const SUCCESS_COLOR = euiTheme.colors.success; + const DANGER_COLOR = euiTheme.colors.danger; const LegendItem = useMemo(() => { return ({ diff --git a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_summary/monitor_alerts.tsx b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_summary/monitor_alerts.tsx index eee06e90d1586..9aeab1d2e05c7 100644 --- a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_summary/monitor_alerts.tsx +++ b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_summary/monitor_alerts.tsx @@ -41,7 +41,6 @@ export const MonitorAlerts = ({ } = useKibana().services; const { euiTheme } = useEuiTheme(); - const isAmsterdam = euiTheme.flags.hasVisColorAdjustment; const { queryIdFilter, locationFilter } = useMonitorQueryFilters(); const selectedLocation = useSelectedLocation(); @@ -146,9 +145,7 @@ export const MonitorAlerts = ({ { field: 'kibana.alert.status', values: ['active'] }, ...(locationFilter ?? []), ], - color: isAmsterdam - ? euiTheme.colors.vis.euiColorVisBehindText7 - : euiTheme.colors.vis.euiColorVis7, + color: euiTheme.colors.vis.euiColorVis7, }, ]} /> @@ -201,9 +198,7 @@ export const MonitorAlerts = ({ { field: 'kibana.alert.status', values: ['recovered'] }, ...(locationFilter ?? []), ], - color: isAmsterdam - ? euiTheme.colors.vis.euiColorVisBehindText0 - : euiTheme.colors.vis.euiColorVis0, + color: euiTheme.colors.vis.euiColorVis0, }, ]} /> diff --git a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_summary/monitor_error_sparklines.tsx b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_summary/monitor_error_sparklines.tsx index 5113de6b33f7b..9240651c29ed7 100644 --- a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_summary/monitor_error_sparklines.tsx +++ b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_summary/monitor_error_sparklines.tsx @@ -7,7 +7,7 @@ import { useKibana } from '@kbn/kibana-react-plugin/public'; import React, { useMemo } from 'react'; -import { euiPaletteColorBlindBehindText, useEuiTheme } from '@elastic/eui'; +import { useEuiTheme } from '@elastic/eui'; import { useMonitorQueryFilters } from '../hooks/use_monitor_query_filters'; import { ERRORS_LABEL } from './monitor_errors_count'; import type { ClientPluginsStart } from '../../../../../plugin'; @@ -23,7 +23,6 @@ export const MonitorErrorSparklines = ({ from, to, id }: Props) => { } = useKibana().services; const { euiTheme } = useEuiTheme(); - const isAmsterdam = euiTheme.flags.hasVisColorAdjustment; const { queryIdFilter, locationFilter } = useMonitorQueryFilters(); const time = useMemo(() => ({ from, to }), [from, to]); @@ -49,9 +48,7 @@ export const MonitorErrorSparklines = ({ from, to, id }: Props) => { selectedMetricField: 'monitor_errors', name: ERRORS_LABEL, operationType: 'unique_count', - color: isAmsterdam - ? euiPaletteColorBlindBehindText()[1] - : euiTheme.colors.vis.euiColorVis6, + color: euiTheme.colors.vis.euiColorVis6, }, ]} /> diff --git a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_summary/monitor_errors_count.tsx b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_summary/monitor_errors_count.tsx index f6dff5fcc26b7..537df790eb742 100644 --- a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_summary/monitor_errors_count.tsx +++ b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitor_details/monitor_summary/monitor_errors_count.tsx @@ -24,7 +24,6 @@ export const MonitorErrorsCount = ({ from, to, id }: MonitorErrorsCountProps) => exploratoryView: { ExploratoryViewEmbeddable }, } = useKibana().services; const { euiTheme } = useEuiTheme(); - const isAmsterdam = euiTheme.flags.hasVisColorAdjustment; const { queryIdFilter, locationFilter } = useMonitorQueryFilters(); const time = useMemo(() => ({ from, to }), [from, to]); @@ -47,7 +46,7 @@ export const MonitorErrorsCount = ({ from, to, id }: MonitorErrorsCountProps) => selectedMetricField: 'monitor_errors', name: ERRORS_LABEL, filters: locationFilter, - color: isAmsterdam ? euiTheme.colors.vis.euiColorVis1 : euiTheme.colors.vis.euiColorVis6, + color: euiTheme.colors.vis.euiColorVis6, }, ]} /> diff --git a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/monitor_locations.tsx b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/monitor_locations.tsx index a78d799f4f66c..e6bc5d0fc93d2 100644 --- a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/monitor_locations.tsx +++ b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/management/monitor_list_table/monitor_locations.tsx @@ -21,7 +21,6 @@ interface Props { export const MonitorLocations = ({ locations, monitorId, overviewStatus }: Props) => { const { euiTheme } = useEuiTheme(); - const isAmsterdam = euiTheme.flags.hasVisColorAdjustment; const locationsToDisplay = locations.map((loc) => { const locById = `${monitorId}-${loc.id}`; @@ -31,10 +30,10 @@ export const MonitorLocations = ({ locations, monitorId, overviewStatus }: Props if (overviewStatus?.downConfigs[locById]) { status = 'down'; - color = isAmsterdam ? euiTheme.colors.vis.euiColorVis9 : euiTheme.colors.danger; + color = euiTheme.colors.danger; } else if (overviewStatus?.upConfigs[locById]) { status = 'up'; - color = isAmsterdam ? euiTheme.colors.vis.euiColorVis0 : euiTheme.colors.success; + color = euiTheme.colors.success; } return { diff --git a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/metric_item/metric_item.tsx b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/metric_item/metric_item.tsx index 43769760e4271..1975987de0504 100644 --- a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/metric_item/metric_item.tsx +++ b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/metric_item/metric_item.tsx @@ -40,25 +40,18 @@ export const getColor = (euiTheme: EuiThemeComputed, isEnabled: boolean, status? if (!isEnabled) { return euiTheme.colors.backgroundBaseDisabled; } - const isAmsterdam = euiTheme.flags.hasVisColorAdjustment; // make sure these are synced with slo card colors while making changes switch (status) { case 'down': - return isAmsterdam - ? euiTheme.colors.vis.euiColorVisBehindText9 - : euiTheme.colors.backgroundBaseDanger; + return euiTheme.colors.backgroundBaseDanger; case 'up': - return isAmsterdam - ? euiTheme.colors.vis.euiColorVisBehindText0 - : euiTheme.colors.backgroundBaseSuccess; + return euiTheme.colors.backgroundBaseSuccess; case 'unknown': return euiTheme.colors.backgroundBasePlain; default: - return isAmsterdam - ? euiTheme.colors.vis.euiColorVisBehindText0 - : euiTheme.colors.backgroundBaseSuccess; + return euiTheme.colors.backgroundBaseSuccess; } }; diff --git a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/overview_alerts.tsx b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/overview_alerts.tsx index cd5e38606c4c4..56cfe711a0dc9 100644 --- a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/overview_alerts.tsx +++ b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/overview_alerts.tsx @@ -11,7 +11,6 @@ import { EuiPanel, EuiSpacer, EuiTitle, - euiPaletteColorBlindBehindText, useEuiTheme, } from '@elastic/eui'; import { RECORDS_FIELD } from '@kbn/exploratory-view-plugin/public'; @@ -70,7 +69,6 @@ export const OverviewAlerts = () => { } = useKibana().services; const { euiTheme } = useEuiTheme(); - const isAmsterdam = euiTheme.flags.hasVisColorAdjustment; const filters = useMonitorFilters({ forAlerts: true }); const { locations } = useGetUrlParams(); @@ -107,9 +105,7 @@ export const OverviewAlerts = () => { { field: 'kibana.alert.status', values: ['active', 'recovered'] }, ...filters, ], - color: isAmsterdam - ? euiTheme.colors.vis.euiColorVis1 - : euiTheme.colors.vis.euiColorVis6, + color: euiTheme.colors.vis.euiColorVis6, }, ]} /> @@ -139,9 +135,7 @@ export const OverviewAlerts = () => { { field: 'kibana.alert.status', values: ['active', 'recovered'] }, ...filters, ], - color: isAmsterdam - ? euiPaletteColorBlindBehindText()[1] - : euiTheme.colors.vis.euiColorVis6, + color: euiTheme.colors.vis.euiColorVis6, }, ]} /> diff --git a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/overview_errors/overview_errors_count.tsx b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/overview_errors/overview_errors_count.tsx index 427ae956ab6ae..1b8b03c0bd9da 100644 --- a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/overview_errors/overview_errors_count.tsx +++ b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/overview_errors/overview_errors_count.tsx @@ -24,10 +24,8 @@ export const OverviewErrorsCount = ({ from, to }: MonitorErrorsCountProps) => { exploratoryView: { ExploratoryViewEmbeddable }, } = useKibana().services; const { euiTheme } = useEuiTheme(); - const isAmsterdam = euiTheme.flags.hasVisColorAdjustment; const filters = useMonitorFilters({}); - const time = useMemo(() => ({ from, to }), [from, to]); return ( @@ -47,7 +45,7 @@ export const OverviewErrorsCount = ({ from, to }: MonitorErrorsCountProps) => { selectedMetricField: 'monitor_errors', name: ERRORS_LABEL, filters, - color: isAmsterdam ? euiTheme.colors.vis.euiColorVis1 : euiTheme.colors.vis.euiColorVis6, + color: euiTheme.colors.vis.euiColorVis6, }, ]} /> diff --git a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/overview_errors/overview_errors_sparklines.tsx b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/overview_errors/overview_errors_sparklines.tsx index 7529dd7cdb71f..2a156e68df21e 100644 --- a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/overview_errors/overview_errors_sparklines.tsx +++ b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/monitors_page/overview/overview/overview_errors/overview_errors_sparklines.tsx @@ -7,7 +7,7 @@ import { useKibana } from '@kbn/kibana-react-plugin/public'; import React, { useMemo } from 'react'; -import { euiPaletteColorBlindBehindText, useEuiTheme } from '@elastic/eui'; +import { useEuiTheme } from '@elastic/eui'; import { ERRORS_LABEL } from '../../../../monitor_details/monitor_summary/monitor_errors_count'; import type { ClientPluginsStart } from '../../../../../../../plugin'; import { useMonitorFilters } from '../../../hooks/use_monitor_filters'; @@ -24,7 +24,6 @@ export const OverviewErrorsSparklines = ({ from, to }: Props) => { const filters = useMonitorFilters({}); const { euiTheme } = useEuiTheme(); - const isAmsterdam = euiTheme.flags.hasVisColorAdjustment; const time = useMemo(() => ({ from, to }), [from, to]); @@ -47,9 +46,7 @@ export const OverviewErrorsSparklines = ({ from, to }: Props) => { dataType: 'synthetics', selectedMetricField: 'monitor_errors', name: ERRORS_LABEL, - color: isAmsterdam - ? euiPaletteColorBlindBehindText()[1] - : euiTheme.colors.vis.euiColorVis6, + color: euiTheme.colors.vis.euiColorVis6, operationType: 'unique_count', filters, }, diff --git a/x-pack/solutions/security/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/utils/unique_ips_palette.ts b/x-pack/solutions/security/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/utils/unique_ips_palette.ts index a2cbe731fa6c4..3547967099d19 100644 --- a/x-pack/solutions/security/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/utils/unique_ips_palette.ts +++ b/x-pack/solutions/security/plugins/security_solution/public/common/components/visualization_actions/lens_attributes/common/utils/unique_ips_palette.ts @@ -7,7 +7,6 @@ import type { EuiThemeComputed } from '@elastic/eui'; export const getDestinationIpColor = (euiTheme: EuiThemeComputed) => - euiTheme.flags.hasVisColorAdjustment ? '#9170b8' : euiTheme.colors.vis.euiColorVis2; + euiTheme.colors.vis.euiColorVis2; -export const getSourceIpColor = (euiTheme: EuiThemeComputed) => - euiTheme.flags.hasVisColorAdjustment ? '#d36186' : euiTheme.colors.vis.euiColorVis4; +export const getSourceIpColor = (euiTheme: EuiThemeComputed) => euiTheme.colors.vis.euiColorVis4; From 8e1d8536b2ecdf382977586c66310a68a38a9aa9 Mon Sep 17 00:00:00 2001 From: Lene Gadewoll Date: Mon, 13 Oct 2025 09:12:59 +0200 Subject: [PATCH 07/14] refactor: add type - addresses TS2742 inferred type error --- .../response-ops/rule_form/src/utils/get_default_params.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/packages/shared/response-ops/rule_form/src/utils/get_default_params.ts b/src/platform/packages/shared/response-ops/rule_form/src/utils/get_default_params.ts index 7076b5374a4e2..cc91320fd2d8b 100644 --- a/src/platform/packages/shared/response-ops/rule_form/src/utils/get_default_params.ts +++ b/src/platform/packages/shared/response-ops/rule_form/src/utils/get_default_params.ts @@ -17,7 +17,7 @@ export const getDefaultParams = ({ group: string; actionTypeModel: ActionTypeModel; ruleType: RuleTypeWithDescription; -}) => { +}): ActionTypeModel['defaultActionParams'] => { if (group === ruleType.recoveryActionGroup.id) { return actionTypeModel.defaultRecoveredActionParams; } else { From f3d4c1bf91b15d303f778e7a47d4b3d20b17aa8b Mon Sep 17 00:00:00 2001 From: Lene Gadewoll Date: Mon, 27 Oct 2025 12:01:18 +0100 Subject: [PATCH 08/14] refactor: update types --- .../components/confirmation_modal/confirmation_modal.tsx | 6 +++++- .../components/confirmation_modal/confirmation_modal.tsx | 6 +++++- .../impl/assistant/settings/assistant_settings.tsx | 6 +++++- .../common/screenshot/journey_screenshot_dialog.tsx | 5 ++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/confirmation_modal/confirmation_modal.tsx b/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/confirmation_modal/confirmation_modal.tsx index 2b9fdecee74cc..be66da375f5c1 100644 --- a/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/confirmation_modal/confirmation_modal.tsx +++ b/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/scripted_fields_table/components/confirmation_modal/confirmation_modal.tsx @@ -16,7 +16,11 @@ import type { ScriptedFieldItem } from '../../types'; interface DeleteScritpedFieldConfirmationModalProps { field: ScriptedFieldItem; hideDeleteConfirmationModal: ( - event?: React.KeyboardEvent | React.MouseEvent + event?: + | React.KeyboardEvent + | React.MouseEvent + | MouseEvent + | TouchEvent ) => void; deleteField: (event: React.MouseEvent) => void; } diff --git a/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/source_filters_table/components/confirmation_modal/confirmation_modal.tsx b/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/source_filters_table/components/confirmation_modal/confirmation_modal.tsx index ab9c5214c5515..aee52c9994ed6 100644 --- a/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/source_filters_table/components/confirmation_modal/confirmation_modal.tsx +++ b/src/platform/plugins/shared/data_view_management/public/components/edit_index_pattern/source_filters_table/components/confirmation_modal/confirmation_modal.tsx @@ -16,7 +16,11 @@ import { EuiConfirmModal, EUI_MODAL_CONFIRM_BUTTON, useGeneratedHtmlId } from '@ interface DeleteFilterConfirmationModalProps { filterToDeleteValue: string; onCancelConfirmationModal: ( - event?: React.KeyboardEvent | React.MouseEvent + event?: + | React.KeyboardEvent + | React.MouseEvent + | MouseEvent + | TouchEvent ) => void; onDeleteFilter: (event: React.MouseEvent) => void; } diff --git a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/settings/assistant_settings.tsx b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/settings/assistant_settings.tsx index bd46b34a10254..26b914289b108 100644 --- a/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/settings/assistant_settings.tsx +++ b/x-pack/platform/packages/shared/kbn-elastic-assistant/impl/assistant/settings/assistant_settings.tsx @@ -39,7 +39,11 @@ const StyledEuiModal = styled(EuiModal)` interface Props { defaultConnector?: AIConnector; onClose: ( - event?: React.KeyboardEvent | React.MouseEvent + event?: + | React.KeyboardEvent + | React.MouseEvent + | MouseEvent + | TouchEvent ) => void; onSave: (success: boolean) => Promise; selectedConversationId?: string; diff --git a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/common/screenshot/journey_screenshot_dialog.tsx b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/common/screenshot/journey_screenshot_dialog.tsx index 98fb47ebb7cad..a2af21c149cb1 100644 --- a/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/common/screenshot/journey_screenshot_dialog.tsx +++ b/x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/common/screenshot/journey_screenshot_dialog.tsx @@ -97,7 +97,10 @@ export const JourneyScreenshotDialog = ({ return isOpen ? ( | MouseEvent) => { + aria-label={i18n.translate('xpack.synthetics.monitor.screenshotDialog.ariaLabel', { + defaultMessage: 'Journey screenshot dialog', + })} + onClose={(evt) => { // for table row click to work evt?.stopPropagation?.(); onClose(); From 1b7faa35e6a210e193f5834d6780196528626b70 Mon Sep 17 00:00:00 2001 From: Lene Gadewoll Date: Sat, 11 Oct 2025 00:12:25 +0200 Subject: [PATCH 09/14] test: update snapshots - due to removed euiTheme.flags --- .../__snapshots__/login_form.test.tsx.snap | 20 ------------------- .../collapsible_panel.test.tsx.snap | 20 ------------------- .../simple_privilege_section.test.tsx.snap | 20 ------------------- 3 files changed, 60 deletions(-) diff --git a/x-pack/platform/plugins/shared/security/public/authentication/login/components/login_form/__snapshots__/login_form.test.tsx.snap b/x-pack/platform/plugins/shared/security/public/authentication/login/components/login_form/__snapshots__/login_form.test.tsx.snap index 088eaef23d4a3..7e6cb5432d90a 100644 --- a/x-pack/platform/plugins/shared/security/public/authentication/login/components/login_form/__snapshots__/login_form.test.tsx.snap +++ b/x-pack/platform/plugins/shared/security/public/authentication/login/components/login_form/__snapshots__/login_form.test.tsx.snap @@ -737,12 +737,6 @@ exports[`LoginForm renders as expected 1`] = ` "headerDarkBackground": "#0B1628", "headerDarkSearchBorderColor": "#485975", "headerDarkSectionItemBackgroundFocus": "#0A2342", - "keyPadMenuItemBackgroundDisabledSelect": Computed { - "computer": [Function], - "dependencies": Array [ - "colors.backgroundBaseDisabled", - ], - }, "listGroupItemBackgroundHover": Computed { "computer": [Function], "dependencies": Array [ @@ -1173,12 +1167,6 @@ exports[`LoginForm renders as expected 1`] = ` "headerDarkBackground": "#0B1628", "headerDarkSearchBorderColor": "#485975", "headerDarkSectionItemBackgroundFocus": "#0A2342", - "keyPadMenuItemBackgroundDisabledSelect": Computed { - "computer": [Function], - "dependencies": Array [ - "colors.backgroundBaseDisabled", - ], - }, "listGroupItemBackgroundHover": Computed { "computer": [Function], "dependencies": Array [ @@ -1541,9 +1529,7 @@ exports[`LoginForm renders as expected 1`] = ` "backgroundText": Computed { "computer": [Function], "dependencies": Array [ - "flags.buttonVariant", "colors.backgroundBasePlain", - "colors.backgroundLightText", ], }, "backgroundTextActive": "rgba(255,255,255, 0.16)", @@ -1834,9 +1820,7 @@ exports[`LoginForm renders as expected 1`] = ` "backgroundText": Computed { "computer": [Function], "dependencies": Array [ - "flags.buttonVariant", "colors.backgroundBasePlain", - "colors.backgroundLightText", ], }, "backgroundTextActive": "rgba(23,80,186, 0.12)", @@ -2238,10 +2222,6 @@ exports[`LoginForm renders as expected 1`] = ` }, }, "flags": Object { - "buttonVariant": "refresh", - "formVariant": "refresh", - "hasGlobalFocusColor": true, - "hasVisColorAdjustment": false, "shadowVariant": "refresh", }, "focus": Object { diff --git a/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/collapsible_panel/__snapshots__/collapsible_panel.test.tsx.snap b/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/collapsible_panel/__snapshots__/collapsible_panel.test.tsx.snap index 2fdb967c3e5a7..942e2638d30cf 100644 --- a/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/collapsible_panel/__snapshots__/collapsible_panel.test.tsx.snap +++ b/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/collapsible_panel/__snapshots__/collapsible_panel.test.tsx.snap @@ -689,12 +689,6 @@ exports[`it renders without blowing up 1`] = ` "headerDarkBackground": "#0B1628", "headerDarkSearchBorderColor": "#485975", "headerDarkSectionItemBackgroundFocus": "#0A2342", - "keyPadMenuItemBackgroundDisabledSelect": Computed { - "computer": [Function], - "dependencies": Array [ - "colors.backgroundBaseDisabled", - ], - }, "listGroupItemBackgroundHover": Computed { "computer": [Function], "dependencies": Array [ @@ -1125,12 +1119,6 @@ exports[`it renders without blowing up 1`] = ` "headerDarkBackground": "#0B1628", "headerDarkSearchBorderColor": "#485975", "headerDarkSectionItemBackgroundFocus": "#0A2342", - "keyPadMenuItemBackgroundDisabledSelect": Computed { - "computer": [Function], - "dependencies": Array [ - "colors.backgroundBaseDisabled", - ], - }, "listGroupItemBackgroundHover": Computed { "computer": [Function], "dependencies": Array [ @@ -1493,9 +1481,7 @@ exports[`it renders without blowing up 1`] = ` "backgroundText": Computed { "computer": [Function], "dependencies": Array [ - "flags.buttonVariant", "colors.backgroundBasePlain", - "colors.backgroundLightText", ], }, "backgroundTextActive": "rgba(255,255,255, 0.16)", @@ -1786,9 +1772,7 @@ exports[`it renders without blowing up 1`] = ` "backgroundText": Computed { "computer": [Function], "dependencies": Array [ - "flags.buttonVariant", "colors.backgroundBasePlain", - "colors.backgroundLightText", ], }, "backgroundTextActive": "rgba(23,80,186, 0.12)", @@ -2190,10 +2174,6 @@ exports[`it renders without blowing up 1`] = ` }, }, "flags": Object { - "buttonVariant": "refresh", - "formVariant": "refresh", - "hasGlobalFocusColor": true, - "hasVisColorAdjustment": false, "shadowVariant": "refresh", }, "focus": Object { diff --git a/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/__snapshots__/simple_privilege_section.test.tsx.snap b/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/__snapshots__/simple_privilege_section.test.tsx.snap index 7d1efa6ac6aa7..39ccd5836a902 100644 --- a/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/__snapshots__/simple_privilege_section.test.tsx.snap +++ b/x-pack/platform/plugins/shared/security/public/management/roles/edit_role/privileges/kibana/simple_privilege_section/__snapshots__/simple_privilege_section.test.tsx.snap @@ -689,12 +689,6 @@ exports[` renders without crashing 1`] = ` "headerDarkBackground": "#0B1628", "headerDarkSearchBorderColor": "#485975", "headerDarkSectionItemBackgroundFocus": "#0A2342", - "keyPadMenuItemBackgroundDisabledSelect": Computed { - "computer": [Function], - "dependencies": Array [ - "colors.backgroundBaseDisabled", - ], - }, "listGroupItemBackgroundHover": Computed { "computer": [Function], "dependencies": Array [ @@ -1125,12 +1119,6 @@ exports[` renders without crashing 1`] = ` "headerDarkBackground": "#0B1628", "headerDarkSearchBorderColor": "#485975", "headerDarkSectionItemBackgroundFocus": "#0A2342", - "keyPadMenuItemBackgroundDisabledSelect": Computed { - "computer": [Function], - "dependencies": Array [ - "colors.backgroundBaseDisabled", - ], - }, "listGroupItemBackgroundHover": Computed { "computer": [Function], "dependencies": Array [ @@ -1493,9 +1481,7 @@ exports[` renders without crashing 1`] = ` "backgroundText": Computed { "computer": [Function], "dependencies": Array [ - "flags.buttonVariant", "colors.backgroundBasePlain", - "colors.backgroundLightText", ], }, "backgroundTextActive": "rgba(255,255,255, 0.16)", @@ -1786,9 +1772,7 @@ exports[` renders without crashing 1`] = ` "backgroundText": Computed { "computer": [Function], "dependencies": Array [ - "flags.buttonVariant", "colors.backgroundBasePlain", - "colors.backgroundLightText", ], }, "backgroundTextActive": "rgba(23,80,186, 0.12)", @@ -2190,10 +2174,6 @@ exports[` renders without crashing 1`] = ` }, }, "flags": Object { - "buttonVariant": "refresh", - "formVariant": "refresh", - "hasGlobalFocusColor": true, - "hasVisColorAdjustment": false, "shadowVariant": "refresh", }, "focus": Object { From 05e513861a943d368d1a7b3c525a0e12553239f9 Mon Sep 17 00:00:00 2001 From: Lene Gadewoll Date: Mon, 13 Oct 2025 09:12:15 +0200 Subject: [PATCH 10/14] test: update snapshots - due to changes from amsterdam to borealis --- .../__snapshots__/error_toast.test.tsx.snap | 2 +- .../src/utils/get_render_cell_value.test.tsx | 4 ++-- .../event_annotation_service/service.test.ts | 10 +++++----- .../legend/__snapshots__/legend.test.tsx.snap | 2 +- .../__snapshots__/xy_chart.test.tsx.snap | 16 +++++++-------- .../shared_components/coloring/utils.test.ts | 14 ++++++------- .../legacy_metric/visualization.test.ts | 4 ++-- .../metric/visualization.test.ts | 4 ++-- .../visualizations/xy/visualization.test.tsx | 2 +- .../__snapshots__/login_page.test.tsx.snap | 4 ++-- .../unauthenticated_page.test.tsx.snap | 4 ++-- .../reset_session_page.test.tsx.snap | 4 ++-- .../filter_status_button.test.tsx.snap | 2 +- .../__snapshots__/status_filter.test.tsx.snap | 6 +++--- .../__snapshots__/index.test.tsx.snap | 2 +- .../__snapshots__/index.test.tsx.snap | 2 +- .../__snapshots__/index.test.tsx.snap | 2 +- .../severity_level_panel/helpers.test.tsx | 4 ---- .../risk_score_summary.test.ts.snap | 20 +++++++++---------- .../authentications_host_table.test.tsx.snap | 2 +- .../authentications_user_table.test.tsx.snap | 2 +- .../__snapshots__/index.test.tsx.snap | 6 +++--- .../flow_direction_select.test.tsx.snap | 4 ++-- .../__snapshots__/index.test.tsx.snap | 4 ++-- .../__snapshots__/index.test.tsx.snap | 4 ++-- .../__snapshots__/index.test.tsx.snap | 8 ++++---- .../__snapshots__/index.test.tsx.snap | 8 ++++---- .../__snapshots__/index.test.tsx.snap | 4 ++-- .../__snapshots__/index.test.tsx.snap | 6 +++--- .../netflow_row_renderer.test.tsx.snap | 4 ++-- ...stom_timeline_data_grid_body.test.tsx.snap | 4 ++-- 31 files changed, 80 insertions(+), 84 deletions(-) diff --git a/src/core/packages/notifications/browser-internal/src/toasts/__snapshots__/error_toast.test.tsx.snap b/src/core/packages/notifications/browser-internal/src/toasts/__snapshots__/error_toast.test.tsx.snap index e24dff447febf..8a3f032f3d298 100644 --- a/src/core/packages/notifications/browser-internal/src/toasts/__snapshots__/error_toast.test.tsx.snap +++ b/src/core/packages/notifications/browser-internal/src/toasts/__snapshots__/error_toast.test.tsx.snap @@ -1,3 +1,3 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`renders matching snapshot 1`] = `"

This is the toast message

"`; +exports[`renders matching snapshot 1`] = `"

This is the toast message

"`; diff --git a/src/platform/packages/shared/kbn-unified-data-table/src/utils/get_render_cell_value.test.tsx b/src/platform/packages/shared/kbn-unified-data-table/src/utils/get_render_cell_value.test.tsx index b97800dc39a86..9271ddf38cdc8 100644 --- a/src/platform/packages/shared/kbn-unified-data-table/src/utils/get_render_cell_value.test.tsx +++ b/src/platform/packages/shared/kbn-unified-data-table/src/utils/get_render_cell_value.test.tsx @@ -153,7 +153,7 @@ describe('Unified data table cell rendering', function () { /> ); expect(component.html()).toMatchInlineSnapshot( - `"
100
"` + `"
100
"` ); }); @@ -180,7 +180,7 @@ describe('Unified data table cell rendering', function () { /> ); expect(component.html()).toMatchInlineSnapshot( - `"
100
"` + `"
100
"` ); findTestSubject(component, 'docTableClosePopover').simulate('click'); expect(closePopoverMockFn).toHaveBeenCalledTimes(1); diff --git a/src/platform/plugins/private/event_annotation/public/event_annotation_service/service.test.ts b/src/platform/plugins/private/event_annotation/public/event_annotation_service/service.test.ts index b943d8e5e3b1a..9d4bef03f0ad2 100644 --- a/src/platform/plugins/private/event_annotation/public/event_annotation_service/service.test.ts +++ b/src/platform/plugins/private/event_annotation/public/event_annotation_service/service.test.ts @@ -173,7 +173,7 @@ describe('Event Annotation Service', () => { isHidden: [false], time: ['2022'], label: ['Hello'], - color: ['#f04e98'], + color: ['#BC1E70'], lineWidth: [1], lineStyle: ['solid'], icon: ['triangle'], @@ -245,7 +245,7 @@ describe('Event Annotation Service', () => { isHidden: [false], timeField: ['@timestamp'], label: ['Hello'], - color: ['#f04e98'], + color: ['#BC1E70'], lineWidth: [1], lineStyle: ['solid'], icon: ['triangle'], @@ -317,7 +317,7 @@ describe('Event Annotation Service', () => { isHidden: [false], time: ['2022'], label: ['Hello'], - color: ['#f04e98'], + color: ['#BC1E70'], lineWidth: [1], lineStyle: ['solid'], icon: ['triangle'], @@ -355,7 +355,7 @@ describe('Event Annotation Service', () => { isHidden: [false], timeField: ['@timestamp'], label: ['Hello'], - color: ['#f04e98'], + color: ['#BC1E70'], lineWidth: [1], lineStyle: ['solid'], icon: ['triangle'], @@ -418,7 +418,7 @@ describe('Event Annotation Service', () => { isHidden: [false], timeField: ['@timestamp'], label: ['Hello'], - color: ['#f04e98'], + color: ['#BC1E70'], lineWidth: [1], lineStyle: ['solid'], icon: ['triangle'], diff --git a/src/platform/plugins/private/vis_types/vislib/public/vislib/components/legend/__snapshots__/legend.test.tsx.snap b/src/platform/plugins/private/vis_types/vislib/public/vislib/components/legend/__snapshots__/legend.test.tsx.snap index a8961c9a01516..eed2ae27efe2d 100644 --- a/src/platform/plugins/private/vis_types/vislib/public/vislib/components/legend/__snapshots__/legend.test.tsx.snap +++ b/src/platform/plugins/private/vis_types/vislib/public/vislib/components/legend/__snapshots__/legend.test.tsx.snap @@ -2,4 +2,4 @@ exports[`VisLegend Component Legend closed should match the snapshot 1`] = `"
"`; -exports[`VisLegend Component Legend open should match the snapshot 1`] = `"
"`; +exports[`VisLegend Component Legend open should match the snapshot 1`] = `"
"`; diff --git a/src/platform/plugins/shared/chart_expressions/expression_xy/public/components/__snapshots__/xy_chart.test.tsx.snap b/src/platform/plugins/shared/chart_expressions/expression_xy/public/components/__snapshots__/xy_chart.test.tsx.snap index 5ed829d78d489..dabd26b950ad2 100644 --- a/src/platform/plugins/shared/chart_expressions/expression_xy/public/components/__snapshots__/xy_chart.test.tsx.snap +++ b/src/platform/plugins/shared/chart_expressions/expression_xy/public/components/__snapshots__/xy_chart.test.tsx.snap @@ -41,7 +41,7 @@ exports[`XYChart component annotations should render basic line annotation 1`] = "line": Object { "dash": undefined, "opacity": 1, - "stroke": "#f04e98", + "stroke": "#BC1E70", "strokeWidth": 1, }, } @@ -58,9 +58,9 @@ Array [ id="__endzones__" style={ Object { - "fill": "#69707d", + "fill": "#5A6D8C", "opacity": 0.2, - "stroke": "#69707d", + "stroke": "#5A6D8C", "strokeWidth": 0, } } @@ -166,7 +166,7 @@ exports[`XYChart component annotations should render grouped line annotations wi { it('should pick the light color when the passed one is dark', () => { - expect(getContrastColor('#000', true)).toBe('#ffffff'); - expect(getContrastColor('#000', false)).toBe('#ffffff'); + expect(getContrastColor('#000', true)).toBe('#FFFFFF'); + expect(getContrastColor('#000', false)).toBe('#FFFFFF'); }); it('should pick the dark color when the passed one is light', () => { @@ -19,13 +19,13 @@ describe('getContrastColor', () => { }); it('should take into account background color if the primary color is opaque', () => { - expect(getContrastColor('rgba(0,0,0,0)', true)).toBe('#ffffff'); + expect(getContrastColor('rgba(0,0,0,0)', true)).toBe('#FFFFFF'); expect(getContrastColor('rgba(0,0,0,0)', false)).toBe('#000000'); - expect(getContrastColor('#00000000', true)).toBe('#ffffff'); + expect(getContrastColor('#00000000', true)).toBe('#FFFFFF'); expect(getContrastColor('#00000000', false)).toBe('#000000'); - expect(getContrastColor('#ffffff00', true)).toBe('#ffffff'); - expect(getContrastColor('#ffffff00', false)).toBe('#000000'); - expect(getContrastColor('rgba(255,255,255,0)', true)).toBe('#ffffff'); + expect(getContrastColor('#FFFFFF00', true)).toBe('#FFFFFF'); + expect(getContrastColor('#FFFFFF00', false)).toBe('#000000'); + expect(getContrastColor('rgba(255,255,255,0)', true)).toBe('#FFFFFF'); expect(getContrastColor('rgba(255,255,255,0)', false)).toBe('#000000'); }); }); diff --git a/x-pack/platform/plugins/shared/lens/public/visualizations/legacy_metric/visualization.test.ts b/x-pack/platform/plugins/shared/lens/public/visualizations/legacy_metric/visualization.test.ts index 002cbc564e871..9e21c97b59e1c 100644 --- a/x-pack/platform/plugins/shared/lens/public/visualizations/legacy_metric/visualization.test.ts +++ b/x-pack/platform/plugins/shared/lens/public/visualizations/legacy_metric/visualization.test.ts @@ -309,10 +309,10 @@ describe('metric_visualization', () => { "left", ], "lHeight": Array [ - 82.5, + 75, ], "size": Array [ - 55, + 50, ], "sizeUnit": Array [ "px", diff --git a/x-pack/platform/plugins/shared/lens/public/visualizations/metric/visualization.test.ts b/x-pack/platform/plugins/shared/lens/public/visualizations/metric/visualization.test.ts index 19d3f58e426ec..e0a7c6a01f541 100644 --- a/x-pack/platform/plugins/shared/lens/public/visualizations/metric/visualization.test.ts +++ b/x-pack/platform/plugins/shared/lens/public/visualizations/metric/visualization.test.ts @@ -287,7 +287,7 @@ describe('metric visualization', () => { ).toMatchInlineSnapshot(` Array [ Object { - "color": "#ffffff", + "color": "#FFFFFF", "columnId": "metric-col-id", "triggerIconType": "color", }, @@ -311,7 +311,7 @@ describe('metric visualization', () => { .toMatchInlineSnapshot(` Array [ Object { - "color": "#ffffff", + "color": "#FFFFFF", "columnId": "metric-col-id", "triggerIconType": "color", }, diff --git a/x-pack/platform/plugins/shared/lens/public/visualizations/xy/visualization.test.tsx b/x-pack/platform/plugins/shared/lens/public/visualizations/xy/visualization.test.tsx index 87ba2ae9344d1..16245b5834004 100644 --- a/x-pack/platform/plugins/shared/lens/public/visualizations/xy/visualization.test.tsx +++ b/x-pack/platform/plugins/shared/lens/public/visualizations/xy/visualization.test.tsx @@ -2465,7 +2465,7 @@ describe('xy_visualization', () => { }); expect(config.groups[0].accessors).toEqual([ { - color: '#f04e98', + color: '#BC1E70', columnId: 'an1', customIcon: IconCircle, triggerIconType: 'custom', diff --git a/x-pack/platform/plugins/shared/security/public/authentication/login/__snapshots__/login_page.test.tsx.snap b/x-pack/platform/plugins/shared/security/public/authentication/login/__snapshots__/login_page.test.tsx.snap index 4ee98ed11a674..1f8791771d0cb 100644 --- a/x-pack/platform/plugins/shared/security/public/authentication/login/__snapshots__/login_page.test.tsx.snap +++ b/x-pack/platform/plugins/shared/security/public/authentication/login/__snapshots__/login_page.test.tsx.snap @@ -342,7 +342,7 @@ exports[`LoginPage page renders as expected 1`] = ` >
"`; +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
"`; -exports[`ResetSessionPage renders as expected with custom page title 1`] = `"My Company NameMockedFonts

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
"`; +exports[`ResetSessionPage renders as expected with custom page title 1`] = `"My Company NameMockedFonts

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
"`; From ec82a43941709d62486a054b3589c657d0dd7484 Mon Sep 17 00:00:00 2001 From: Lene Gadewoll Date: Mon, 27 Oct 2025 14:26:41 +0100 Subject: [PATCH 13/14] test: update snapshot --- .../application/__snapshots__/query_input.test.tsx.snap | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/packages/shared/kbn-management/settings/application/__snapshots__/query_input.test.tsx.snap b/src/platform/packages/shared/kbn-management/settings/application/__snapshots__/query_input.test.tsx.snap index 86e6a754bf394..96fee0d79aee1 100644 --- a/src/platform/packages/shared/kbn-management/settings/application/__snapshots__/query_input.test.tsx.snap +++ b/src/platform/packages/shared/kbn-management/settings/application/__snapshots__/query_input.test.tsx.snap @@ -49,7 +49,7 @@ exports[`Search should render normally 1`] = ` class="euiPopover emotion-euiPopover-inline-block" >