Merge pull request #30 from bcgov/hot-fix

Fix Breadcrumb nav
bcgov · Aug 14, 2024 · c1d177f · c1d177f
2 parents fb913c2 + d55ca1e
commit c1d177f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/submit-web/src/components/Shared/layout/SideNav/BreadcrumbNav.tsx b/submit-web/src/components/Shared/layout/SideNav/BreadcrumbNav.tsx
@@ -5,15 +5,16 @@ import { theme } from "@/styles/theme";
 
 interface RouteSegment {
   title: string;
-  path: string;
+  path?: string;
 }
 
 const filterUniqueRoutes = (breadcrumbs: RouteSegment[]) => {
   const seenPaths = new Set();
   return breadcrumbs.filter((segment) => {
-    const isUnique = !seenPaths.has(segment.path);
+    if (!segment?.path || !segment?.title) return false;
+    const isUnique = !seenPaths.has(segment?.path);
     if (isUnique) {
-      seenPaths.add(segment.path);
+      seenPaths.add(segment?.path);
     }
     return isUnique;
   });
@@ -45,7 +46,7 @@ const BreadcrumbNav: React.FC = () => {
         >
           <Breadcrumbs aria-label="breadcrumb">
             {uniqueBreadcrumbs.map(
-              (segment: { title: string; path: string }, index: number) => {
+              (segment: { title: string; path?: string }, index: number) => {
                 const { title, path } = segment;
                 const isLast = index === uniqueBreadcrumbs.length - 1;
                 return isLast ? (

diff --git a/submit-web/src/routes/_authenticated/_dashboard.tsx b/submit-web/src/routes/_authenticated/_dashboard.tsx
@@ -1,6 +1,5 @@
 import BreadcrumbNav from "@/components/Shared/layout/SideNav/BreadcrumbNav";
 import SideNavBar from "@/components/Shared/layout/SideNav/SideNavBar";
-import { useIsMobile } from "@/hooks/common";
 import { Box } from "@mui/material";
 import { Outlet, createFileRoute } from "@tanstack/react-router";
 
@@ -10,17 +9,10 @@ export const Route = createFileRoute("/_authenticated/_dashboard")({
 });
 
 function DashboardLayout() {
-  const isMobile = useIsMobile();
-
   return (
     <div>
       <BreadcrumbNav />
-      <Box
-        height={"calc(100vh - 88px)"}
-        width={isMobile ? "100%" : `calc(100vw)`}
-        flexDirection={"row"}
-        display={"flex"}
-      >
+      <Box height={"calc(100vh - 88px)"} flexDirection={"row"} display={"flex"}>
         <SideNavBar />
         <Outlet />
       </Box>