From c18076cb1dd70e9ba7b446ae5aa355fef306c2d3 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:05:17 +0800 Subject: [PATCH] chore: Update oui to 1.15 and consume $ouiSideNavBackgroundColor (#8480) (#8487) * chore: Update oui to 1.15 and consume $ouiSideNavBackgroundColor * Changeset file for PR #8480 created/updated * Add snapshot tests --------- (cherry picked from commit 8fa7ff496eadfcea6a8e1edf90b8279f84825840) Signed-off-by: Viraj Sanghvi Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> --- changelogs/fragments/8480.yml | 2 ++ package.json | 2 +- packages/osd-ui-framework/package.json | 2 +- packages/osd-ui-shared-deps/package.json | 2 +- .../chrome/ui/header/collapsible_nav_group_enabled.scss | 4 +--- src/core/public/chrome/ui/header/variables.scss | 1 - .../__snapshots__/data_source_table.test.tsx.snap | 4 ++-- ...nage_direct_query_data_connections_table.test.tsx.snap | 8 ++++---- .../components/workspace_selector/workspace_selector.scss | 4 +--- .../plugins/osd_tp_run_pipeline/package.json | 2 +- .../plugins/osd_sample_panel_action/package.json | 2 +- .../plugins/osd_tp_custom_visualizations/package.json | 2 +- yarn.lock | 8 ++++---- 13 files changed, 20 insertions(+), 23 deletions(-) create mode 100644 changelogs/fragments/8480.yml delete mode 100644 src/core/public/chrome/ui/header/variables.scss diff --git a/changelogs/fragments/8480.yml b/changelogs/fragments/8480.yml new file mode 100644 index 00000000000..2efb41870b2 --- /dev/null +++ b/changelogs/fragments/8480.yml @@ -0,0 +1,2 @@ +chore: +- Update oui to 1.15 and consume $ouiSideNavBackgroundColor ([#8480](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8480)) \ No newline at end of file diff --git a/package.json b/package.json index d48ce47f648..bd3bcc0a5fd 100644 --- a/package.json +++ b/package.json @@ -150,7 +150,7 @@ "dependencies": { "@aws-crypto/client-node": "^3.1.1", "@elastic/datemath": "5.0.3", - "@elastic/eui": "npm:@opensearch-project/oui@1.14.0", + "@elastic/eui": "npm:@opensearch-project/oui@1.15.0", "@elastic/good": "^9.0.1-kibana3", "@elastic/numeral": "npm:@amoo-miki/numeral@2.6.0", "@elastic/request-crypto": "2.0.0", diff --git a/packages/osd-ui-framework/package.json b/packages/osd-ui-framework/package.json index 96944fbb2f1..0a6c7586744 100644 --- a/packages/osd-ui-framework/package.json +++ b/packages/osd-ui-framework/package.json @@ -23,7 +23,7 @@ "enzyme-adapter-react-16": "^1.9.1" }, "devDependencies": { - "@elastic/eui": "npm:@opensearch-project/oui@1.14.0", + "@elastic/eui": "npm:@opensearch-project/oui@1.15.0", "@osd/babel-preset": "1.0.0", "@osd/optimizer": "1.0.0", "comment-stripper": "^0.0.4", diff --git a/packages/osd-ui-shared-deps/package.json b/packages/osd-ui-shared-deps/package.json index d3c493300e4..9e2a5646a87 100644 --- a/packages/osd-ui-shared-deps/package.json +++ b/packages/osd-ui-shared-deps/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@elastic/charts": "31.1.0", - "@elastic/eui": "npm:@opensearch-project/oui@1.14.0", + "@elastic/eui": "npm:@opensearch-project/oui@1.15.0", "@elastic/numeral": "npm:@amoo-miki/numeral@2.6.0", "@opensearch/datemath": "5.0.3", "@osd/i18n": "1.0.0", diff --git a/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.scss b/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.scss index 529f0f749eb..e410361bef8 100644 --- a/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.scss +++ b/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.scss @@ -1,10 +1,8 @@ -@import "./variables"; - .context-nav-wrapper { border: none !important; border-top-right-radius: $euiSizeL; border-bottom-right-radius: $euiSizeL; - background-color: $ouiSideNavBackgroundColorTemp; + background-color: $euiSideNavBackgroundColor; overflow: hidden; .nav-link-item { diff --git a/src/core/public/chrome/ui/header/variables.scss b/src/core/public/chrome/ui/header/variables.scss deleted file mode 100644 index ca276818b65..00000000000 --- a/src/core/public/chrome/ui/header/variables.scss +++ /dev/null @@ -1 +0,0 @@ -$ouiSideNavBackgroundColorTemp: lightOrDarkTheme(#ebe4df, #001c28); /* stylelint-disable-line */ diff --git a/src/plugins/data_source_management/public/components/data_source_table/__snapshots__/data_source_table.test.tsx.snap b/src/plugins/data_source_management/public/components/data_source_table/__snapshots__/data_source_table.test.tsx.snap index e437be94ff0..ea382b84aee 100644 --- a/src/plugins/data_source_management/public/components/data_source_table/__snapshots__/data_source_table.test.tsx.snap +++ b/src/plugins/data_source_management/public/components/data_source_table/__snapshots__/data_source_table.test.tsx.snap @@ -460,11 +460,11 @@ exports[`DataSourceTable should get datasources successful should render normall >