Merge pull request #143 from CybercentreCanada/hotfix/user_menu

Set Apps on configuration changes
CybercentreCanada · Sep 24, 2021 · 4021c60 · 4021c60
2 parents e353dec + fcb5c75
commit 4021c60
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/components/app/app.tsx b/src/components/app/app.tsx
@@ -36,7 +36,7 @@ const MyApp = () => {
 
   const provider = getProvider();
   const { t } = useTranslation();
-  const { setUser, setConfiguration, user } = useALContext();
+  const { setUser, setConfiguration, user, configuration } = useALContext();
   const { setReady, setApps } = useAppLayout();
   const { showErrorMessage } = useMySnackbar();
 
@@ -49,6 +49,12 @@ const MyApp = () => {
     }
   };
 
+  useEffect(() => {
+    if (configuration && configuration.ui.apps) {
+      setApps(configuration.ui.apps);
+    }
+  }, [configuration, setApps]);
+
   useEffect(() => {
     if (user || provider) {
       return;
@@ -88,11 +94,6 @@ const MyApp = () => {
           // Set the current user
           setUser(api_data.api_response);
 
-          //Set the app list?
-          if (api_data.api_response.configuration.ui.apps) {
-            setApps(api_data.api_response.configuration.ui.apps);
-          }
-
           // Mark the interface ready
           setReady(true);