[TM-1723] fix breadcrumb on site report (#904)

* [TM-1723] fix breadcrumb on site report * fix breadcrumbs for nursery reports
wri · Feb 7, 2025 · e56e87a · e56e87a
1 parent 8056d95
commit e56e87a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/pages/reports/nursery-report/[uuid].page.tsx b/src/pages/reports/nursery-report/[uuid].page.tsx
@@ -20,6 +20,7 @@ import LoadingContainer from "@/components/generic/Loading/LoadingContainer";
 import FrameworkProvider from "@/context/framework.provider";
 import { useGetV2ENTITYUUID, useGetV2TasksUUIDReports } from "@/generated/apiComponents";
 import { useDate } from "@/hooks/useDate";
+import { useReportingWindow } from "@/hooks/useReportingWindow";
 import StatusBar from "@/pages/project/[uuid]/components/StatusBar";
 import NurseryReportHeader from "@/pages/reports/nursery-report/components/NurseryReportHeader";
 import { getFullName } from "@/utils/user";
@@ -44,10 +45,12 @@ const NurseryReportDetailPage = () => {
   );
 
   const { data: taskReportsData } = useGetV2TasksUUIDReports({ pathParams: { uuid: nurseryReport.task_uuid } });
-  const projectReport = taskReportsData?.data?.filter(report => report.type === "project-report")?.[0] ?? {};
 
   const reportTitle = nurseryReport.report_title ?? nurseryReport.title ?? t("Nursery Report");
 
+  const window = useReportingWindow((taskReportsData?.data?.[0] as any)?.due_at);
+  const taskTitle = t("Reporting Task {window}", { window });
+
   return (
     <FrameworkProvider frameworkKey={nurseryReport.framework_key}>
       <LoadingContainer loading={isLoading}>
@@ -58,7 +61,10 @@ const NurseryReportDetailPage = () => {
           links={[
             { title: t("My Projects"), path: "/my-projects" },
             { title: nurseryReport.project?.name ?? t("Project"), path: `/project/${nurseryReport.project?.uuid}` },
-            { title: nurseryReport.project_report_title, path: `/reports/project-report/${projectReport.uuid}` },
+            {
+              title: taskTitle,
+              path: `/project/${nurseryReport.project?.uuid}/reporting-task/${nurseryReport.task_uuid}`
+            },
             { title: reportTitle }
           ]}
         />

diff --git a/src/pages/reports/site-report/[uuid].page.tsx b/src/pages/reports/site-report/[uuid].page.tsx
@@ -30,6 +30,7 @@ import FrameworkProvider, { ALL_TF, Framework } from "@/context/framework.provid
 import { useGetV2ENTITYUUID, useGetV2TasksUUIDReports } from "@/generated/apiComponents";
 import { useDate } from "@/hooks/useDate";
 import useDemographicData from "@/hooks/useDemographicData";
+import { useReportingWindow } from "@/hooks/useReportingWindow";
 import StatusBar from "@/pages/project/[uuid]/components/StatusBar";
 import SiteReportHeader from "@/pages/reports/site-report/components/SiteReportHeader";
 import { getFullName } from "@/utils/user";
@@ -55,7 +56,7 @@ const SiteReportDetailPage = () => {
   );
 
   const { data: taskReportsData } = useGetV2TasksUUIDReports({ pathParams: { uuid: siteReport.task_uuid } });
-  const projectReport = taskReportsData?.data?.filter(report => report.type === "project-report")?.[0] ?? {};
+
   const reportTitle = siteReport.report_title ?? siteReport.title ?? t("Site Report");
 
   const { grids: workdayGrids, title: workdaysTitle } = useDemographicData(
@@ -66,6 +67,9 @@ const SiteReportDetailPage = () => {
     "Site Workdays"
   );
 
+  const window = useReportingWindow((taskReportsData?.data?.[0] as any)?.due_at);
+  const taskTitle = t("Reporting Task {window}", { window });
+
   return (
     <FrameworkProvider frameworkKey={siteReport.framework_key}>
       <LoadingContainer loading={isLoading}>
@@ -76,7 +80,7 @@ const SiteReportDetailPage = () => {
           links={[
             { title: t("My Projects"), path: "/my-projects" },
             { title: siteReport.project?.name ?? t("Project"), path: `/project/${siteReport.project?.uuid}` },
-            { title: siteReport.project_report_title, path: `/reports/project-report/${projectReport.uuid}` },
+            { title: taskTitle, path: `/project/${siteReport.project?.uuid}/reporting-task/${siteReport.task_uuid}` },
             { title: reportTitle }
           ]}
         />