chore: Update oui to 1.15 and consume $ouiSideNavBackgroundColor (#8480)

* chore: Update oui to 1.15 and consume $ouiSideNavBackgroundColor Signed-off-by: Viraj Sanghvi <[email protected]> * Changeset file for PR #8480 created/updated * Add snapshot tests Signed-off-by: Viraj Sanghvi <[email protected]> --------- Signed-off-by: Viraj Sanghvi <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> (cherry picked from commit 8fa7ff4) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Oct 4, 2024 · fefc5b4 · fefc5b4
1 parent f82075a
commit fefc5b4
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 23 deletions.
diff --git a/changelogs/fragments/8480.yml 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))
diff --git 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/[email protected]",
     "@elastic/request-crypto": "2.0.0",

diff --git 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
@@ -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/[email protected]",
     "@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
@@ -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
diff --git a/...agement/public/components/data_source_table/__snapshots__/data_source_table.test.tsx.snap b/...agement/public/components/data_source_table/__snapshots__/data_source_table.test.tsx.snap
diff --git a/...ry_data_connection/__snapshots__/manage_direct_query_data_connections_table.test.tsx.snap b/...ry_data_connection/__snapshots__/manage_direct_query_data_connections_table.test.tsx.snap
diff --git a/src/plugins/workspace/public/components/workspace_selector/workspace_selector.scss b/src/plugins/workspace/public/components/workspace_selector/workspace_selector.scss
@@ -1,5 +1,3 @@
-@import "../../../../../core/public/chrome/ui/header/variables";
-
 .workspaceNameLabel {
-  background-color: $ouiSideNavBackgroundColorTemp;
+  background-color: $euiSideNavBackgroundColor;
 }
diff --git a/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json b/test/interpreter_functional/plugins/osd_tp_run_pipeline/package.json
@@ -12,7 +12,7 @@
     "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "npm:@opensearch-project/oui@1.14.0",
+    "@elastic/eui": "npm:@opensearch-project/oui@1.15.0",
     "@osd/plugin-helpers": "1.0.0",
     "react": "^16.14.0",
     "react-dom": "^16.12.0",

diff --git a/test/plugin_functional/plugins/osd_sample_panel_action/package.json b/test/plugin_functional/plugins/osd_sample_panel_action/package.json
@@ -12,7 +12,7 @@
     "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "npm:@opensearch-project/oui@1.14.0",
+    "@elastic/eui": "npm:@opensearch-project/oui@1.15.0",
     "react": "^16.14.0",
     "typescript": "4.0.2"
   }

diff --git a/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json b/test/plugin_functional/plugins/osd_tp_custom_visualizations/package.json
@@ -12,7 +12,7 @@
     "build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "npm:@opensearch-project/oui@1.14.0",
+    "@elastic/eui": "npm:@opensearch-project/oui@1.15.0",
     "@osd/plugin-helpers": "1.0.0",
     "react": "^16.14.0",
     "typescript": "4.0.2"

diff --git a/yarn.lock b/yarn.lock
@@ -1431,10 +1431,10 @@
   resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
   integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==
 
-"@elastic/eui@npm:@opensearch-project/oui@1.14.0":
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/@opensearch-project/oui/-/oui-1.14.0.tgz#137aca372fd4d83e33704cdefbf3245c6ba28164"
-  integrity sha512-vZr9nYWo6vb9+xE9ktgPL8c3ltfcMdPEBmATei1xTEWIKOfzvvLbLAVcf+UTQc+8+GOYayKB9bgENsuV006sAA==
+"@elastic/eui@npm:@opensearch-project/oui@1.15.0":
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/@opensearch-project/oui/-/oui-1.15.0.tgz#bec1bcb15cee9bcc31c71920b1b491d0cb60a8d9"
+  integrity sha512-xa/ygOlmNnQy+LcSgsbr9WCL8jt6HzWoJcV4tI0uPo1j7GNTyi6IccE30CXjmUEqh3Fce82ghKzBuWGreJXGeQ==
   dependencies:
     "@types/chroma-js" "^2.4.0"
     "@types/react-beautiful-dnd" "^13.1.3"