Merge pull request #274 from jadmsaadaot/SUBMIT-task#310-B

Add All project before project breadcrumb
bcgov · Jan 31, 2025 · d5e5c57 · d5e5c57
2 parents 5b39619 + b760404
commit d5e5c57
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/submit-web/src/components/Shared/layout/SideNav/BreadcrumbNav.tsx b/submit-web/src/components/Shared/layout/SideNav/BreadcrumbNav.tsx
@@ -13,15 +13,14 @@ const BreadcrumbNav: React.FC = () => {
 
   const breadcrumbs = useMemo(() => {
     return matches
-      .map((match) => {
-        const { meta, pathname } = match;
-        if (meta && meta[0]?.title && pathname) {
-          return {
-            title: meta[0].title,
-            path: pathname,
-          };
-        }
-        return null;
+      .flatMap((match) => {
+        if (!match.meta) return [];
+
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        return match.meta.map((meta: any) => ({
+          title: meta.title,
+          path: meta.path || match.pathname,
+        }));
       })
       .filter(Boolean) as RouteSegment[];
   }, [matches]);

diff --git a/submit-web/src/routes/proponent/_proponentLayout/projects/$projectId/_projectLayout.tsx b/submit-web/src/routes/proponent/_proponentLayout/projects/$projectId/_projectLayout.tsx
@@ -17,7 +17,13 @@ export const Route = createFileRoute(
       getAccountProjectQueryOptions(Number(projectId)),
     ),
   component: ProjectLayout,
-  meta: ({ loaderData }) => [{ title: loaderData.project.name }],
+  meta: ({ loaderData, params }) => [
+    { title: "All Projects", path: "/proponent/projects/" },
+    {
+      title: loaderData.project.name,
+      path: `/proponent/projects/${params.projectId}`,
+    },
+  ],
   pendingComponent: () => (
     <PageGrid>
       <ProjectsSkeleton />

diff --git a/submit-web/src/routes/staff/_staffLayout/projects/$projectId/_projectLayout.tsx b/submit-web/src/routes/staff/_staffLayout/projects/$projectId/_projectLayout.tsx
@@ -17,7 +17,13 @@ export const Route = createFileRoute(
       getAccountProjectForStaffQueryOptions(Number(projectId)),
     ),
   component: ProjectLayout,
-  meta: ({ loaderData }) => [{ title: loaderData.project.name }],
+  meta: ({ loaderData, params }) => [
+    { title: "All Projects", path: "/staff/projects/" },
+    {
+      title: loaderData.project.name,
+      path: `/staff/projects/${params.projectId}`,
+    },
+  ],
   pendingComponent: () => (
     <PageGrid>
       <ProjectsSkeleton />