refactor: simplify form step math in operation form

bcgov · Nov 22, 2023 · b8b0beb · b8b0beb
1 parent 2481c0f
commit b8b0beb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/client/app/components/form/MultiStepFormBase.tsx b/client/app/components/form/MultiStepFormBase.tsx
@@ -1,4 +1,3 @@
-import { useState } from "react";
 import { useParams } from "next/navigation";
 import { RJSFSchema } from "@rjsf/utils";
 import { Alert } from "@mui/material";
@@ -33,7 +32,6 @@ const MultiStepFormBase = ({
 }: MultiStepFormProps) => {
   const params = useParams();
   const formSection = parseInt(params?.formSection as string) - 1;
-  const [formState, setFormState] = useState(formData || {});
 
   const formSectionList = Object.keys(schema.properties as any);
   const mapSectionTitles = formSectionList.map(
@@ -53,13 +51,7 @@ const MultiStepFormBase = ({
         uiSchema={uiSchema}
         readonly={readonly}
         onSubmit={onSubmit}
-        formData={formState}
-        onChange={(e) => {
-          setFormState({
-            ...formState,
-            ...e.formData,
-          });
-        }}
+        formData={formData}
       >
         {error && <Alert severity="error">{error}</Alert>}
         <MultiStepButtons

diff --git a/client/app/components/form/OperationsForm.tsx b/client/app/components/form/OperationsForm.tsx
@@ -22,7 +22,7 @@ export default function OperationsForm({ formData, schema }: Props) {
   const [error, setError] = useState(undefined);
   const router = useRouter();
   const params = useParams();
-  const formSection = parseInt(params?.formSection as string) - 1;
+  const formSection = parseInt(params?.formSection as string);
   const operationId = params?.operation;
   const isCreate = params?.operation === "0";
 
@@ -48,8 +48,8 @@ export default function OperationsForm({ formData, schema }: Props) {
     reporting_activities: "",
   };
   const formSectionList = Object.keys(schema.properties as any);
-  const isNotFinalStep = formSection !== formSectionList.length - 1;
-  const isFinalStep = formSection === formSectionList.length - 1;
+  const isNotFinalStep = formSection !== formSectionList.length;
+  const isFinalStep = formSection === formSectionList.length;
 
   return (
     <>
@@ -110,12 +110,10 @@ export default function OperationsForm({ formData, schema }: Props) {
               return;
             }
 
-            router.replace(
-              `/dashboard/operations/${operation}/${formSection + 1}`,
-            );
+            router.replace(`/dashboard/operations/${operation}/${formSection}`);
             if (isNotFinalStep) {
               router.push(
-                `/dashboard/operations/${operation}/${formSection + 2}`,
+                `/dashboard/operations/${operation}/${formSection + 1}`,
               );
               return;
             }