chore: fix navigation buttons urls

bcgov · Dec 11, 2024 · 9949aa6 · 9949aa6
1 parent ba8615b
commit 9949aa6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/...pp/components/reportInformation/nonAttributableEmissions/NonAttributableEmissionsForm.tsx b/...pp/components/reportInformation/nonAttributableEmissions/NonAttributableEmissionsForm.tsx
@@ -11,9 +11,6 @@ import {
 } from "@reporting/src/data/jsonSchema/nonAttributableEmissions/nonAttributableEmissions";
 import { actionHandler } from "@bciers/actions";
 
-const BASE_URL = "/reporting/reports";
-const CANCEL_URL = "/reports";
-
 interface ActivityData {
   id: number;
   activity: string;
@@ -71,8 +68,8 @@ export default function NonAttributableEmissionsForm({
 
   const router = useRouter();
 
-  const SAVE_AND_CONTINUE_URL = `${BASE_URL}/${versionId}/facilities/${facilityId}/emission-summary`;
-  const BACK_URL = `activities?step=-1`;
+  const saveAndContinueUrl = `/reports/${versionId}/facilities/${facilityId}/emission-summary`;
+  const backUrl = `activities?step=-1`;
 
   const schema = generateUpdatedSchema(gasTypes, emissionCategories);
   const taskListElements: TaskListElement[] = [
@@ -103,9 +100,6 @@ export default function NonAttributableEmissionsForm({
     const response = await actionHandler(endpoint, "POST", endpoint, {
       body: JSON.stringify(formData),
     });
-    if (response) {
-      router.push(SAVE_AND_CONTINUE_URL);
-    }
   };
 
   return (
@@ -122,12 +116,11 @@ export default function NonAttributableEmissionsForm({
       schema={schema}
       uiSchema={nonAttributableEmissionUiSchema}
       formData={formData}
-      baseUrl={BASE_URL}
-      cancelUrl={CANCEL_URL}
+      cancelUrl="#"
       onChange={(data) => setFormData(data.formData)}
       onSubmit={() => handleSubmit()}
-      backUrl={BACK_URL}
-      continueUrl={SAVE_AND_CONTINUE_URL}
+      backUrl={backUrl}
+      continueUrl={saveAndContinueUrl}
     />
   );
 }
diff --git a/...s/apps/reporting/src/tests/components/reportInformation/NonAttributableEmissions.test.tsx b/...s/apps/reporting/src/tests/components/reportInformation/NonAttributableEmissions.test.tsx
@@ -100,7 +100,7 @@ describe("NonAttributableEmissionsForm Component", () => {
 
     await waitFor(() => expect(actionHandler).toHaveBeenCalled());
     expect(mockPush).toHaveBeenCalledWith(
-      `/reporting/reports/${versionId}/facilities/${facilityId}/emission-summary`,
+      `/reports/${versionId}/facilities/${facilityId}/emission-summary`,
     );
   });