chore: fix incomplete reference in annual report form summary

bcgov · May 16, 2024 · 39bd3b8 · 39bd3b8
1 parent 497f213
commit 39bd3b8
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/app/components/Form/ProjectAnnualReportFormSummary.tsx b/app/components/Form/ProjectAnnualReportFormSummary.tsx
@@ -115,6 +115,7 @@ const ProjectAnnualReportFormSummary: React.FC<Props> = ({
 
   const annualReportsJSX = useMemo(() => {
     return sortedAnnualReports.map((annualReport, index) => {
+      const latestCommittedData = latestCommittedReportMap[annualReport.newFormData.reportingRequirementIndex]
       if (!annualReport) return;
       // Set the formSchema and formData based on showing the diff or not
       const { formSchema, formData } = !renderDiff
@@ -125,9 +126,7 @@ const ProjectAnnualReportFormSummary: React.FC<Props> = ({
         : getFilteredSchema(
             annualReport.formByJsonSchemaName.jsonSchema.schema as JSONSchema7,
             annualReport,
-            latestCommittedReportMap[
-              annualReport.newFormData.reportingRequirementIndex
-            ]
+            latestCommittedData
           );
 
       if (
@@ -137,13 +136,6 @@ const ProjectAnnualReportFormSummary: React.FC<Props> = ({
       )
         return null;
 
-      const latestCommittedData =
-        latestCommittedAnnualReportFormChanges?.edges?.find(
-          ({ node }) =>
-            node.newFormData.reportingRequirementIndex ===
-            annualReport.newFormData.reportingRequirementIndex
-        )?.node?.newFormData;
-
       return (
         <div key={index} className="reportContainer">
           <header>
@@ -177,7 +169,7 @@ const ProjectAnnualReportFormSummary: React.FC<Props> = ({
               uiSchema={reportingRequirementUiSchema}
               formContext={{
                 operation: annualReport.operation,
-                latestCommittedData,
+                latestCommittedData: latestCommittedData?.newFormData,
                 isAmendmentsAndOtherRevisionsSpecific:
                   isOnAmendmentsAndOtherRevisionsPage,
               }}
@@ -196,6 +188,7 @@ const ProjectAnnualReportFormSummary: React.FC<Props> = ({
     isOnAmendmentsAndOtherRevisionsPage,
     renderDiff,
     sortedAnnualReports,
+    latestCommittedReportMap
   ]);
 
   // Update the hasDiff state in the CollapsibleFormWidget to define if the form has diffs to show