Merge pull request #42 from CBIIT/CRDCDH-133

CRDCDH-133 Updating Program/Study
CBIIT · Jul 14, 2023 · 892940e · 892940e
2 parents 928eb68 + 3e2f4b6
commit 892940e
Show file tree

Hide file tree

Showing 9 changed files with 429 additions and 287 deletions.
diff --git a/src/components/Contexts/FormContext.tsx b/src/components/Contexts/FormContext.tsx
@@ -7,6 +7,7 @@ import React, {
   useState,
 } from "react";
 import { useLazyQuery, useMutation } from '@apollo/client';
+import { merge, cloneDeep } from "lodash";
 import { GET_APP, SAVE_APP, SUBMIT_APP } from './graphql';
 import initialValues from "../../config/InitialValues";
 import { FormatDate } from "../../utils";
@@ -124,15 +125,18 @@ export const FormProvider: FC<ProviderProps> = (props) => {
     // Update the state when the lazy query response changes
     if (data) {
       const applicationData = data?.getApplication;
+      const initialValuesData = cloneDeep(initialValues);
+
+      const newData: Application = {
+        ...merge(initialValuesData, applicationData),
+        // To avoid false positive form changes
+        targetedReleaseDate: FormatDate(applicationData?.targetedReleaseDate, "MM/DD/YYYY"),
+        targetedSubmissionDate: FormatDate(applicationData?.targetedSubmissionDate, "MM/DD/YYYY"),
+      };
+
       setState({
         status: Status.LOADED,
-        data: {
-          ...initialValues,
-          ...applicationData,
-          // To avoid false positive form changes
-          targetedReleaseDate: FormatDate(applicationData?.targetedReleaseDate, "MM/DD/YYYY"),
-          targetedSubmissionDate: FormatDate(applicationData?.targetedSubmissionDate, "MM/DD/YYYY"),
-        }
+        data: newData,
       });
     }