fix infinite loop in producer anonymous page

benjaminpochat · Dec 2, 2024 · 6f3510e · 6f3510e
1 parent 25e7fdd
commit 6f3510e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/frontend/app/src/layouts/producer/AnonymousLayout.tsx b/frontend/app/src/layouts/producer/AnonymousLayout.tsx
@@ -20,7 +20,7 @@ export default function AnonymousLayout() {
         }
         console.log('loadEnvironmentType')
         loadEnvironmentType()
-    }, [environmentTypeService])
+    }, [])
 
     const Item = styled(Paper)(({ theme }) => ({
         backgroundColor: theme.palette.mode === 'dark' ? '#1A2027' : '#fff',

diff --git a/frontend/app/src/layouts/producer/AuthenticatedLayout.tsx b/frontend/app/src/layouts/producer/AuthenticatedLayout.tsx
@@ -19,7 +19,9 @@ export default function AuthenticatedLayout() {
   const authenticationService = new AuthenticationService(keycloak)
   const urlService = new UrlService()
 
-  const {authenticatedAsCustomer, environmentType}: {isAuthenticatedAsCustomer: boolean, environmentType: {label: String, color: String} | undefined} = useLoaderData()
+  const data = useLoaderData()
+  const authenticatedAsCustomer: boolean = data.isAuthenticatedAsCustomer
+  const environmentType = data.environmentType
 
   const sideMenuWidth = 240;
 
@@ -100,11 +102,11 @@ export default function AuthenticatedLayout() {
 
   if (!authenticationService.isAuthenticated()) {
     return <Navigate to='/authentication' />
-  } else if (authenticatedAsCustomer) {
+  } 
+  if (authenticatedAsCustomer) {
     return <Navigate to='/unauthorized' />
-  } else {
-    return getAuthenticatedLayout()
   }
+  return getAuthenticatedLayout()
 }
 
 export async function loadAuthenticatedLayoutData(keycloak): Promise<{isAuthenticatedAsCustomer: boolean, environmentType: {label: String, color: String} | undefined}> {