fix: correct budgets diffs

bcgov · Sep 11, 2023 · d338d91 · d338d91
1 parent 205ea51
commit d338d91
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/app/components/Form/ProjectFormSummary.tsx b/app/components/Form/ProjectFormSummary.tsx
@@ -168,6 +168,7 @@ const ProjectFormSummary: React.FC<Props> = ({
         Object.keys(formData).length === 0),
     [projectFormChange, formData]
   );
+  console.log("projectFormNotUpdated", projectFormNotUpdated);
   // Update the hasDiff state in the CollapsibleFormWidget to define if the form has diffs to show
   useEffect(
     () => setHasDiff && setHasDiff(!projectFormNotUpdated),

diff --git a/app/components/Form/ProjectFundingAgreementForm.tsx b/app/components/Form/ProjectFundingAgreementForm.tsx
@@ -144,6 +144,7 @@ const ProjectFundingAgreementForm: React.FC<Props> = (props) => {
     : "funding_parameter_IA";
 
   const addFundingAgreement = () => {
+    console.log("in add funding agreement");
     createFundingParameterFormChange({
       variables: {
         input: {

diff --git a/app/components/Form/ProjectFundingAgreementFormSummary.tsx b/app/components/Form/ProjectFundingAgreementFormSummary.tsx
@@ -127,7 +127,9 @@ const ProjectFundingAgreementFormSummary: React.FC<Props> = ({
     revision;
 
   const fundingAgreementSummary =
-    summaryProjectFundingAgreementFormChanges.edges[0]?.node;
+    summaryProjectFundingAgreementFormChanges.edges.filter(
+      ({ node }) => node.operation !== "ARCHIVE"
+    )[0]?.node;
 
   const newData = {
     ...fundingAgreementSummary?.newFormData,
@@ -266,11 +268,7 @@ const ProjectFundingAgreementFormSummary: React.FC<Props> = ({
     [fundingAgreementFormNotUpdated, setHasDiff]
   );
 
-  // This condition handles the case where the form is archived
-  if (
-    !fundingAgreementFormNotUpdated &&
-    fundingAgreementSummary?.operation === "ARCHIVE"
-  ) {
+  if (!fundingAgreementSummary) {
     return (
       <div>
         {!isOnAmendmentsAndOtherRevisionsPage && (

diff --git a/app/components/ProjectRevision/CollapsibleFormWidget.tsx b/app/components/ProjectRevision/CollapsibleFormWidget.tsx
@@ -37,6 +37,7 @@ const CollapsibleFormWidget: React.FC<CollapsibleFormWidgetProps> = ({
   const [hasDiff, setHasDiff] = useState(false);
   const [isOpen, setIsOpen] = useState(true); //This has to be true to start with, otherwise it will prevent the children from rendering
   const cursorStyle = hasDiff ? "pointer" : "default";
+
   const widgetQuery = useFragment(
     collapsibleFormWidgetFragment,
     projectRevision