Merge commit 'refs/pull/499/head' of github.com:alchemy-fr/phraseanet…

…-services into w2448
alchemy-fr · Dec 3, 2024 · 94adae4 · 94adae4
2 parents 8f01701 + a895b92
commit 94adae4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/dashboard/client/config-compiler.js b/dashboard/client/config-compiler.js
@@ -71,6 +71,7 @@ window.config.muiTheme = ${stackConfig.theme.replace(/^export\s+const\s+themeOpt
 
     return {
         customHTML,
+        logo: stackConfig.logo,
         locales: config.available_locales,
         autoConnectIdP: env.AUTO_CONNECT_IDP,
         baseUrl: env.DASHBOARD_CLIENT_URL,

diff --git a/dashboard/client/src/Dashboard.tsx b/dashboard/client/src/Dashboard.tsx
@@ -65,7 +65,11 @@ export default function Dashboard({}: Props) {
                             },
                         }}
                     >
-                        {STACK_NAME}
+                        { 
+                            config.logo ? <img src={config.logo} alt={STACK_NAME}  style={{ maxHeight:48, maxWidth:150 }}/>
+                            : STACK_NAME
+                        }
+
                         {user ? (
                             <Chip
                                 icon={<SellIcon />}

diff --git a/databox/client/config-compiler.js b/databox/client/config-compiler.js
@@ -61,6 +61,7 @@ window.config.muiTheme = ${stackConfig.theme.replace(/^export\s+const\s+themeOpt
 
     return {
         customHTML,
+        logo: stackConfig.logo,
         autoConnectIdP: env.AUTO_CONNECT_IDP,
         baseUrl: env.DATABOX_API_URL,
         uploaderApiBaseUrl: env.UPLOADER_API_URL,

diff --git a/databox/client/src/components/Layout/MainAppBar.tsx b/databox/client/src/components/Layout/MainAppBar.tsx
@@ -78,7 +78,11 @@ export default function MainAppBar({onToggleLeftPanel}: Props) {
                                 cursor: 'pointer',
                             }}
                         >
-                            {t('common.databox', `Databox`)}
+                            { 
+                                config.logo ? <img src={config.logo} alt={t('common.databox', `Databox`)}  style={{ maxHeight:32, maxWidth:150 }}/>
+                                : t('common.databox', `Databox`)
+                            }
+
                         </Typography>
 
                         <Box

diff --git a/lib/js/core/src/types.ts b/lib/js/core/src/types.ts
@@ -23,6 +23,7 @@ export type WindowConfig = {
     analytics?: AnalyticsConfig;
     pusherHost?: Readonly<string>;
     pusherKey?: Readonly<string>;
+    logo: Readonly<string>;
 }
 
 export type SentryConfig = Pick<WindowConfig,