[MDS-6265] Project Summary: Change from Change Requested -> Under Rev…

…iew on final submit only (#3353) MDS-6265 Project Summary: Change from Change Requested -> Under Review on final submit only
bcgov · Dec 19, 2024 · 0c89126 · 0c89126
1 parent 9ec204a
commit 0c89126
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/services/common/src/components/forms/SteppedForm.tsx b/services/common/src/components/forms/SteppedForm.tsx
@@ -12,7 +12,7 @@ interface SteppedFormProps extends Omit<FormWrapperProps, "onSubmit"> {
   children: Array<ReactElement<StepProps>>;
   handleTabChange: (newTab: string) => void | Promise<void>;
   handleSaveDraft?: (formValues) => Promise<void>;
-  handleSaveData?: (values, newActiveTab?: string) => Promise<void>;
+  handleSaveData?: (values, newActiveTab?: string, currentTab?: string) => Promise<void>;
   handleCancel?: () => void | Promise<void>;
   transformPayload?: (values: any) => any;
   activeTab: string;
@@ -108,7 +108,7 @@ const SteppedForm: FC<SteppedFormProps> = ({
     setIsSubmitting(true);
     try {
       if (handleSaveData && (await saveCheck())) {
-        await handleSaveData(getValues(formValues), tab);
+        await handleSaveData(getValues(formValues), tab, `${tabs[tabIndex]}`);
       }
       if (errors.length > 0) return;
       setTabIndex(indexOf(tabs, tab));

diff --git a/services/common/src/components/projectSummary/ProjectSummaryForm.tsx b/services/common/src/components/projectSummary/ProjectSummaryForm.tsx
@@ -29,7 +29,7 @@ import { areAuthFieldsDisabled, areDocumentFieldsDisabled, areFieldsDisabled, is
 interface ProjectSummaryFormProps {
   initialValues: IProjectSummary;
   handleTabChange: (newTab: string) => void;
-  handleSaveData: (formValues, newActiveTab?) => Promise<void>;
+  handleSaveData: (formValues, newActiveTab?, currentTab?) => Promise<void>;
   activeTab: string;
   isEditMode?: boolean;
 }

diff --git a/services/minespace-web/src/components/pages/Project/ProjectSummaryPage.tsx b/services/minespace-web/src/components/pages/Project/ProjectSummaryPage.tsx
@@ -183,14 +183,20 @@ export const ProjectSummaryPage = () => {
     history.push(url);
   };
 
-  const handleSaveData = async (formValues, newActiveTab?: string) => {
+  const handleSaveData = async (formValues, newActiveTab?: string, currentTab?: string) => {
     let message = newActiveTab
       ? "Successfully updated the project description."
       : "Successfully submitted a project description to the Province of British Columbia.";
     let status_code = projectSummary.status_code;
     let is_historic = projectSummary.is_historic;
 
-    if (status_code === "CHR" && formValues.confirmation_of_submission) {
+    if (
+      status_code === "CHR" &&
+      formValues.confirmation_of_submission &&
+      currentTab === "declaration"
+    ) {
+      // If a proponent re-submits the declaration, when changes are made to the project description,
+      // change it back to under review.
       status_code = "UNR";
     } else if ((!status_code || !isEditMode) && status_code !== "UNR") {
       status_code = "DFT";