Merge branch 'improvement/change-theme-usage' into q/127.0

scality · Jan 3, 2024 · 8fd8998 · 8fd8998
2 parents 641a6a2 + dae35db
commit 8fd8998
Show file tree

Hide file tree

Showing 37 changed files with 1,541 additions and 1,619 deletions.
diff --git a/salt/metalk8s/addons/ui/config/metalk8s-shell-ui-config.yaml.j2 b/salt/metalk8s/addons/ui/config/metalk8s-shell-ui-config.yaml.j2
@@ -37,4 +37,15 @@ spec:
     darkRebrand: /brand/assets/logo-darkRebrand.svg
   favicon: /brand/favicon-metalk8s.svg
   canChangeLanguage: false
-  canChangeTheme: false
+  canChangeTheme: true
+  themes: 
+    dark: 
+      type: "core-ui"
+      name: "darkRebrand"
+      logoPath: "/brand/assets/logo-dark.svg"
+
+    light: 
+      type: "core-ui"
+      name: "artescaLight"
+      logoPath: "/brand/assets/logo-light.svg"
+
diff --git a/shell-ui/package-lock.json b/shell-ui/package-lock.json
diff --git a/shell-ui/package.json b/shell-ui/package.json
@@ -23,6 +23,8 @@
     "@testing-library/react": "^11.2.5",
     "@testing-library/react-hooks": "^5.1.1",
     "@testing-library/user-event": "^13.0.10",
+    "@types/react": "^17.0.39",
+    "@types/react-dom": "^17.0.11",
     "@types/react-router": "^5.1.20",
     "@types/styled-components": "^5.1.26",
     "babel-jest": "^26.6.3",
@@ -55,8 +57,8 @@
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@js-temporal/polyfill": "^0.4.4",
-    "@scality/core-ui": "github:scality/core-ui#0.109.0",
-    "@scality/module-federation": "github:scality/module-federation.git#1.1.0",
+    "@scality/core-ui": "github:scality/core-ui#0.110.0",
+    "@scality/module-federation": "github:scality/module-federation.git#1.2.0",
     "canvas": "^2.9.3",
     "downshift": "^8.0.0",
     "oidc-client": "^1.11.3",

diff --git a/shell-ui/public/shell/config.json b/shell-ui/public/shell/config.json
@@ -13,5 +13,18 @@
     "subLogin": []
   },
   "discoveryUrl": "/shell/deployed-ui-apps.json",
-  "productName": "MetalK8s"
+  "productName": "MetalK8s",
+  "canChangeTheme": true,
+  "themes": {
+    "dark": {
+      "type": "core-ui",
+      "name": "darkRebrand",
+      "logoPath": "/brand/assets/logo-dark.svg"
+    },
+    "light": {
+      "type": "core-ui",
+      "name": "artescaLight",
+      "logoPath": "/brand/assets/logo-light.svg"
+    }
+  }
 }
diff --git a/shell-ui/src/FederatedApp.spec.tsx b/shell-ui/src/FederatedApp.spec.tsx
@@ -125,6 +125,14 @@ export const configurationHandlers = [
           subLogin: [],
         },
         discoveryUrl: '/shell/deployed-ui-apps.json',
+        canChangeTheme: true,
+        themes: {
+          dark: {
+            type: 'core-ui',
+            name: 'darkRebrand',
+            logoPath: '/brand/assets/logo-dark.svg',
+          },
+        },
       }),
     );
   }),