Merge pull request #1293 from CybercentreCanada/update/borealis

Update/Borealis (master)
CybercentreCanada · Dec 9, 2024 · 483565f · 483565f
2 parents 73de7d7 + da78b21
commit 483565f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "@vitejs/plugin-react": "^4.2.1",
     "@vitejs/plugin-react-swc": "^3.5.0",
     "autosuggest-highlight": "^3.3.4",
-    "borealis-ui": "^0.1.13",
+    "borealis-ui": "^0.4.0",
     "browser-detect": "^0.2.28",
     "buffer": "^6.0.3",
     "chart.js": "^4.4.1",

diff --git a/src/components/app/app.tsx b/src/components/app/app.tsx
@@ -42,7 +42,7 @@ const MyAppMain = () => {
   const provider = getProvider();
   const { setUser, setConfiguration, user, configuration } = useALContext();
   const { setReady: setAppLayoutReady } = useAppLayout();
-  const { setReady: setBorealisReady } = useBorealis();
+  const { setReady: setBorealisReady, setCustomIconify } = useBorealis();
   const { setItems } = useAppSwitcher();
   const { bootstrap } = useMyAPI();
 
@@ -55,9 +55,10 @@ const MyAppMain = () => {
     }
   };
 
-  const setReady = (layout: boolean, borealis: boolean) => {
+  const setReady = (layout: boolean, borealis: boolean, iconifyUrl: string = null) => {
     setAppLayoutReady(layout);
     setBorealisReady(borealis);
+    setCustomIconify(iconifyUrl);
   };
 
   useEffect(() => {

diff --git a/src/components/hooks/useMyAPI.tsx b/src/components/hooks/useMyAPI.tsx
@@ -53,7 +53,7 @@ type BootstrapProps = {
   setConfiguration: (cfg: Configuration) => void;
   setLoginParams: (params: LoginParamsProps) => void;
   setUser: (user: WhoAmIProps) => void;
-  setReady: (layout: boolean, borealis: boolean) => void;
+  setReady: (layout: boolean, borealis: boolean, iconifyUrl: string) => void;
   retryAfter?: number;
 };
 
@@ -155,7 +155,11 @@ const useMyAPI = (): UseMyAPIReturn => {
           setUser(user);
 
           // Mark the interface ready
-          setReady(true, user.configuration.ui.api_proxies.includes('borealis'));
+          setReady(
+            true,
+            'borealis' in user.configuration.ui.api_proxies,
+            user.configuration?.ui?.api_proxies?.borealis?.custom_iconify || null
+          );
 
           // Render appropriate page
           if (!user.agrees_with_tos && user.configuration.ui.tos) {

diff --git a/src/components/models/base/config.ts b/src/components/models/base/config.ts
@@ -298,7 +298,7 @@ export type UI = {
   allow_zip_downloads: boolean;
 
   /** Proxy requests to the configured API target and add headers */
-  api_proxies: string[];
+  api_proxies: { [proxy: string]: any };
 
   /** Hogwarts App data */
   apps: AppSwitcherItem[];

diff --git a/src/components/visual/ActionMenu.tsx b/src/components/visual/ActionMenu.tsx
@@ -382,7 +382,7 @@ const WrappedActionMenu: React.FC<TagProps> = ({
           state.mouseY !== null && state.mouseX !== null ? { top: state.mouseY, left: state.mouseX } : undefined
         }
       >
-        {currentUserConfig.ui.api_proxies.includes('borealis') &&
+        {'borealis' in currentUserConfig.ui.api_proxies &&
           type in BOREALIS_TYPE_MAP &&
           value !== null &&
           setBorealisDetails && (

diff --git a/src/components/visual/ActionableCustomChip.tsx b/src/components/visual/ActionableCustomChip.tsx
@@ -61,7 +61,7 @@ const WrappedActionableCustomChip: React.FC<ActionableCustomChipProps> = ({
           classification={classification}
         />
       )}
-      {configuration.ui.api_proxies.includes('borealis') && data_type in BOREALIS_TYPE_MAP && label !== null ? (
+      {'borealis' in configuration.ui.api_proxies && data_type in BOREALIS_TYPE_MAP && label !== null ? (
         <EnrichmentCustomChip
           dataType={BOREALIS_TYPE_MAP[data_type]}
           dataValue={label}

diff --git a/src/components/visual/Tag.tsx b/src/components/visual/Tag.tsx
@@ -107,7 +107,7 @@ const WrappedTag: React.FC<TagProps> = ({
           setBorealisDetails={setShowBorealisDetails}
         />
       )}
-      {configuration.ui.api_proxies.includes('borealis') && type in BOREALIS_TYPE_MAP && value !== null ? (
+      {'borealis' in configuration.ui.api_proxies && type in BOREALIS_TYPE_MAP && value !== null ? (
         <EnrichmentCustomChip
           dataType={BOREALIS_TYPE_MAP[type]}
           dataValue={value}