fix: Fix landing page route

informatici · Dec 5, 2023 · f4f4bc4 · f4f4bc4
1 parent 3728755
commit f4f4bc4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/libraries/hooks/useLandingPageRoute.ts b/src/libraries/hooks/useLandingPageRoute.ts
@@ -15,16 +15,14 @@ export const useLandingPageRoute = () => {
 
   // Calculate the landing page route based on the user's permissions.
   const landingPageRoute = useMemo(() => {
-    const route =
-      settings.find((e) => e.configName === "landing")?.configValue ?? "/";
-    const matched = landingPagePriority
-      .filter((e) => permissions.includes(e.permission))
-      .map((e) => e.route);
-    return matched.length > 0
-      ? matched.includes(route ?? "")
-        ? route
-        : matched[0]
-      : defaultRoute;
+    const route = settings.find((e) => e.configName === "landing")?.configValue;
+    return (
+      landingPagePriority.find((e) =>
+        route
+          ? e.route === route && permissions.includes(e.permission)
+          : permissions.includes(e.permission)
+      )?.route ?? defaultRoute
+    );
   }, [permissions, settings]);
 
   // Return the landing page route.

diff --git a/src/mockServer/routes/users.js b/src/mockServer/routes/users.js
@@ -13,7 +13,7 @@ export const userRoutes = (server) => {
     server.get("/settings").intercept((req, res) => {
       res
         .status(200)
-        .json([{ id: 1, configName: "landing", configValue: "/dashboard" }]);
+        .json([{ id: 1, configName: "landing", configValue: "/laboratory" }]);
     });
   });
 };