Merge pull request #1910 from bcgov/feat/clearer-diffs

Feat/clearer diffs

app/components/Attachment/AttachmentTableRow.tsx

@@ -13,6 +13,7 @@ interface Props {
   formChangeRowId: number;
   hideDelete?: boolean;
   isFirstRevision: boolean;
+  operation?: string;
 }
 
 const AttachmentTableRow: React.FC<Props> = ({
@@ -21,6 +22,7 @@ const AttachmentTableRow: React.FC<Props> = ({
   formChangeRowId,
   hideDelete,
   isFirstRevision,
+  operation,
 }) => {
   const [
     discardProjectAttachmentFormChange,
@@ -65,6 +67,12 @@ const AttachmentTableRow: React.FC<Props> = ({
   return (
     <>
       <tr>
+        {operation && (
+          <td>
+            {operation.charAt(0).toUpperCase() +
+              operation.slice(1).toLowerCase()}
+          </td>
+        )}
         <td>{fileName}</td>
         <td>{fileType}</td>
         <td>{fileSize}</td>

app/components/Form/Functions/getMilestoneFilteredSchema.ts

@@ -12,7 +12,8 @@ import { JSONSchema7 } from "json-schema";
  */
 export const getMilestoneFilteredSchema = (
   formSchema: JSONSchema7,
-  formChange
+  formChange,
+  latestCommittedFormChange
 ) => {
   const properties = formSchema.properties;
   // schema dependencies
@@ -37,7 +38,7 @@ export const getMilestoneFilteredSchema = (
   for (const key of Object.keys(filteredSchema.properties)) {
     const [updatedFormData, prevFormData] = [
       formChange?.newFormData?.[key],
-      formChange?.formChangeByPreviousFormChangeId?.newFormData?.[key],
+      latestCommittedFormChange?.newFormData?.[key],
     ];
     if (
       updatedFormData === prevFormData ||

app/components/Form/ProjectAnnualReportFormSummary.tsx

@@ -46,9 +46,6 @@ const ProjectAnnualReportFormSummary: React.FC<Props> = ({
               isPristine
               newFormData
               operation
-              formChangeByPreviousFormChangeId {
-                newFormData
-              }
               formByJsonSchemaName {
                 jsonSchema
               }
@@ -93,6 +90,21 @@ const ProjectAnnualReportFormSummary: React.FC<Props> = ({
     return [filteredReports];
   }, [annualReportFormChanges]);
 
+  let latestCommittedReports = latestCommittedAnnualReportFormChanges.edges;
+  const latestCommittedReportMap = useMemo(() => {
+    const filteredReports = latestCommittedReports.map(({ node }) => node);
+
+    const reportMap = filteredReports.reduce(
+      (reports, current) => (
+        (reports[current.newFormData.reportingRequirementIndex] = current),
+        reports
+      ),
+      {}
+    );
+
+    return reportMap;
+  }, [latestCommittedReports]);
+
   const allFormChangesPristine = useMemo(
     () =>
       !annualReportFormChanges.some(
@@ -103,6 +115,10 @@ 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
@@ -112,7 +128,8 @@ const ProjectAnnualReportFormSummary: React.FC<Props> = ({
           }
         : getFilteredSchema(
             annualReport.formByJsonSchemaName.jsonSchema.schema as JSONSchema7,
-            annualReport
+            annualReport,
+            latestCommittedData
           );
 
       if (
@@ -122,13 +139,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>
@@ -162,9 +172,7 @@ const ProjectAnnualReportFormSummary: React.FC<Props> = ({
               uiSchema={reportingRequirementUiSchema}
               formContext={{
                 operation: annualReport.operation,
-                oldData:
-                  annualReport.formChangeByPreviousFormChangeId?.newFormData,
-                latestCommittedData,
+                latestCommittedData: latestCommittedData?.newFormData,
                 isAmendmentsAndOtherRevisionsSpecific:
                   isOnAmendmentsAndOtherRevisionsPage,
               }}
@@ -183,6 +191,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

app/components/Form/ProjectAttachmentsFormSummary.tsx

@@ -7,6 +7,7 @@ import { FormNotAddedOrUpdated } from "./SummaryFormCommonComponents";
 import { useEffect, useMemo } from "react";
 
 const tableFilters = [
+  new TextFilter("Operation", "operation"),
   new TextFilter("File Name", "fileName"),
   new TextFilter("Type", "type"),
   new TextFilter("Size", "size"),
@@ -36,7 +37,6 @@ const ProjectAttachmentsFormSummary: React.FC<Props> = ({
         summaryProjectAttachmentFormChanges: formChangesFor(
           first: 500
           formDataTableName: "project_attachment"
-          filter: { operation: { notEqualTo: ARCHIVE } }
         ) @connection(key: "connection_summaryProjectAttachmentFormChanges") {
           __id
           totalCount
@@ -115,6 +115,7 @@ const ProjectAttachmentsFormSummary: React.FC<Props> = ({
             ({ node }) => (
               <AttachmentTableRow
                 key={node.id}
+                operation={node.operation}
                 attachment={node.asProjectAttachment.attachmentByAttachmentId}
                 formChangeRowId={node.rowId}
                 connectionId={revision.summaryProjectAttachmentFormChanges.__id}

app/components/Form/ProjectContactFormSummary.tsx

@@ -48,14 +48,6 @@ const ProjectContactFormSummary: React.FC<Props> = ({
                   ...ContactDetails_contact
                 }
               }
-              formChangeByPreviousFormChangeId {
-                newFormData
-                asProjectContact {
-                  contactByContactId {
-                    fullName
-                  }
-                }
-              }
               formByJsonSchemaName {
                 jsonSchema
               }
@@ -181,11 +173,6 @@ const ProjectContactFormSummary: React.FC<Props> = ({
             formData={node.newFormData}
             formContext={{
               operation: node.operation,
-              oldData: node.formChangeByPreviousFormChangeId?.newFormData,
-              oldUiSchema: createProjectContactUiSchema(
-                node?.formChangeByPreviousFormChangeId?.asProjectContact
-                  ?.contactByContactId?.fullName
-              ),
               latestCommittedData:
                 latestCommittedContactNode?.node?.newFormData,
               latestCommittedUiSchema,
@@ -205,7 +192,7 @@ const ProjectContactFormSummary: React.FC<Props> = ({
     secondaryContacts,
     renderDiff,
     isOnAmendmentsAndOtherRevisionsPage,
-    summaryContactFormChanges,
+    lastCommittedSecondaryContacts,
   ]);
 
   // Update the hasDiff state in the CollapsibleFormWidget to define if the form has diffs to show
@@ -260,13 +247,6 @@ const ProjectContactFormSummary: React.FC<Props> = ({
               formData={primaryContact ? primaryContact.node.newFormData : null}
               formContext={{
                 operation: primaryContact?.node.operation,
-                oldData:
-                  primaryContact?.node.formChangeByPreviousFormChangeId
-                    ?.newFormData,
-                oldUiSchema: createProjectContactUiSchema(
-                  primaryContact?.node?.formChangeByPreviousFormChangeId
-                    ?.asProjectContact?.contactByContactId?.fullName
-                ),
                 latestCommittedData:
                   lastCommittedPrimaryContact?.node?.newFormData,
                 latestCommittedUiSchema: createProjectContactUiSchema(

app/components/Form/ProjectEmissionIntensityReportFormSummary.tsx

@@ -51,18 +51,12 @@ const ProjectEmissionsIntensityReportFormSummary: React.FC<Props> = ({
               formByJsonSchemaName {
                 jsonSchema
               }
-              formChangeByPreviousFormChangeId {
-                newFormData
-                calculatedEiPerformance
-                paymentPercentage
-                maximumPerformanceMilestoneAmount
-                actualPerformanceMilestoneAmount
-              }
             }
           }
         }
         latestCommittedEmissionIntensityReportFormChange: latestCommittedFormChangesFor(
-          formDataTableName: "emission_intensity_report"
+          formDataTableName: "reporting_requirement"
+          reportType: "TEIMP"
         ) {
           edges {
             node {
@@ -97,24 +91,6 @@ const ProjectEmissionsIntensityReportFormSummary: React.FC<Props> = ({
       summaryReportingRequirement?.actualPerformanceMilestoneAmount,
   };
 
-  const oldData = {
-    ...summaryReportingRequirement?.formChangeByPreviousFormChangeId
-      ?.newFormData,
-    //calculated values
-    calculatedEiPerformance:
-      summaryReportingRequirement?.formChangeByPreviousFormChangeId
-        ?.calculatedEiPerformance,
-    paymentPercentage:
-      summaryReportingRequirement?.formChangeByPreviousFormChangeId
-        ?.paymentPercentage,
-    maximumPerformanceMilestoneAmount:
-      summaryReportingRequirement?.formChangeByPreviousFormChangeId
-        ?.maximumPerformanceMilestoneAmount,
-    actualPerformanceMilestoneAmount:
-      summaryReportingRequirement?.formChangeByPreviousFormChangeId
-        ?.actualPerformanceMilestoneAmount,
-  };
-
   const latestCommittedData = {
     ...latestCommittedEmissionIntensityReportFormChange?.edges[0]?.node
       ?.newFormData,
@@ -147,7 +123,7 @@ const ProjectEmissionsIntensityReportFormSummary: React.FC<Props> = ({
   const filteredSchema = getSchemaAndDataIncludingCalculatedValues(
     emissionIntensityFormBySlug.jsonSchema.schema as JSONSchema7,
     newData,
-    oldData,
+    latestCommittedData,
     {
       // This is only to add the (Adjusted) to the title of the field to differentiate it from the calculated field
       adjustedEmissionsIntensityPerformance: {
@@ -265,7 +241,6 @@ const ProjectEmissionsIntensityReportFormSummary: React.FC<Props> = ({
           actualPerformanceMilestoneAmount:
             summaryReportingRequirement?.actualPerformanceMilestoneAmount,
           operation: summaryReportingRequirement?.operation,
-          oldData,
           latestCommittedData,
           isAmendmentsAndOtherRevisionsSpecific:
             isOnAmendmentsAndOtherRevisionsPage,

app/components/Form/ProjectFormSummary.tsx

@@ -52,25 +52,6 @@ const ProjectFormSummary: React.FC<Props> = ({
               name
             }
           }
-          formChangeByPreviousFormChangeId {
-            rank
-            newFormData
-            asProject {
-              operatorByOperatorId {
-                legalName
-                bcRegistryId
-              }
-              fundingStreamRfpByFundingStreamRfpId {
-                year
-                fundingStreamByFundingStreamId {
-                  description
-                }
-              }
-              projectStatusByProjectStatusId {
-                name
-              }
-            }
-          }
         }
         latestCommittedProjectFormChanges: latestCommittedFormChangesFor(
           formDataTableName: "project"
@@ -110,30 +91,16 @@ const ProjectFormSummary: React.FC<Props> = ({
   // Show diff if it is not the first revision and not view only (rendered from the overview page)
   const renderDiff = !isFirstRevision && !viewOnly;
 
-  const oldData = {
-    ...projectFormChange.formChangeByPreviousFormChangeId?.newFormData,
-    rank: projectFormChange.formChangeByPreviousFormChangeId?.rank,
-  };
-
   const newDataAsProject = projectFormChange.asProject;
-  const previousDataAsProject =
-    projectFormChange.formChangeByPreviousFormChangeId?.asProject;
-
-  const oldUiSchema = previousDataAsProject
-    ? createProjectUiSchema(
-        previousDataAsProject.operatorByOperatorId.legalName,
-        `${previousDataAsProject?.fundingStreamRfpByFundingStreamRfpId?.fundingStreamByFundingStreamId.description} - ${previousDataAsProject?.fundingStreamRfpByFundingStreamRfpId?.year}`,
-        previousDataAsProject.operatorByOperatorId.bcRegistryId,
-        previousDataAsProject.projectStatusByProjectStatusId.name
-      )
-    : null;
 
-  const latestCommittedUiSchema = latestCommittedData?.asProject
+  const latestCommittedAsProject =
+    latestCommittedProjectFormChanges?.edges[0]?.node?.asProject;
+  const latestCommittedUiSchema = latestCommittedAsProject
     ? createProjectUiSchema(
-        latestCommittedData.asProject.operatorByOperatorId.legalName,
-        `${latestCommittedData.asProject?.fundingStreamRfpByFundingStreamRfpId?.fundingStreamByFundingStreamId.description} - ${latestCommittedData.asProject?.fundingStreamRfpByFundingStreamRfpId?.year}`,
-        latestCommittedData.asProject.operatorByOperatorId.bcRegistryId,
-        latestCommittedData.asProject.projectStatusByProjectStatusId.name
+        latestCommittedAsProject.operatorByOperatorId.legalName,
+        `${latestCommittedAsProject?.fundingStreamRfpByFundingStreamRfpId?.fundingStreamByFundingStreamId.description} - ${latestCommittedAsProject?.fundingStreamRfpByFundingStreamRfpId?.year}`,
+        latestCommittedAsProject.operatorByOperatorId.bcRegistryId,
+        latestCommittedAsProject.projectStatusByProjectStatusId.name
       )
     : null;
 
@@ -148,7 +115,7 @@ const ProjectFormSummary: React.FC<Props> = ({
           projectSchema as JSONSchema7,
 
           { ...projectFormChange?.newFormData, rank: projectFormChange.rank },
-          oldData,
+          latestCommittedData,
           {
             rank: {
               type: "number",
@@ -199,8 +166,6 @@ const ProjectFormSummary: React.FC<Props> = ({
           formData={formData}
           formContext={{
             calculatedRank: projectFormChange.rank,
-            oldData,
-            oldUiSchema,
             latestCommittedData,
             latestCommittedUiSchema,
             operation: projectFormChange.operation,