Task/change reg purpose frontend/2169

.github/workflows/test-code.yaml

@@ -27,8 +27,7 @@ jobs:
         uses: ./.github/actions/dev-env-setup
       - name: Run Nx Affected Tests with Remote Caching
         id: nx-tests
-        run: |
-          yarn nx affected --base=origin/develop --target=test --parallel
+        run: yarn nx run components:test
         shell: bash
 
   yarn-audit:

bciers/apps/administration/app/components/operations/OperationInformationForm.tsx

@@ -1,11 +1,12 @@
 "use client";
 
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { useRouter, useSearchParams } from "next/navigation";
 
 import { UUID } from "crypto";
 import SingleStepTaskListForm from "@bciers/components/form/SingleStepTaskListForm";
 import { RJSFSchema } from "@rjsf/utils";
+import { IChangeEvent } from "@rjsf/core";
 import { administrationOperationInformationUiSchema } from "../../data/jsonSchema/operationInformation/administrationOperationInformation";
 import {
   OperationInformationFormData,
@@ -20,6 +21,7 @@ import { FormMode, FrontEndRoles } from "@bciers/utils/src/enums";
 import { useSessionRole } from "@bciers/utils/src/sessionUtils";
 import Note from "@bciers/components/layout/Note";
 import Link from "next/link";
+import ConfirmChangeOfRegistrationPurposeModal from "apps/registration/app/components/operations/registration/ConfirmChangeOfRegistrationPurposeModal";
 
 const OperationInformationForm = ({
   formData,
@@ -31,12 +33,25 @@ const OperationInformationForm = ({
   schema: RJSFSchema;
 }) => {
   const [error, setError] = useState(undefined);
+  const [selectedPurpose, setSelectedPurpose] = useState(
+    formData.registration_purpose || "",
+  );
+  const [
+    pendingChangeRegistrationPurpose,
+    setPendingChangeRegistrationPurpose,
+  ] = useState("");
   const router = useRouter();
   // To get the user's role from the session
   const role = useSessionRole();
   const searchParams = useSearchParams();
   const isRedirectedFromContacts = searchParams.get("from_contacts") as string;
 
+  useEffect(() => {
+    if (selectedPurpose) {
+      formData.registration_purpose = selectedPurpose;
+    }
+  }, [selectedPurpose]);
+
   const handleSubmit = async (data: {
     formData?: OperationInformationFormData;
   }) => {
@@ -80,6 +95,25 @@ const OperationInformationForm = ({
       return { error: response2.error };
     }
   };
+
+  const cancelRegistrationPurposeChange = () => {
+    setPendingChangeRegistrationPurpose("");
+  };
+
+  const confirmRegistrationPurposeChange = () => {
+    if (pendingChangeRegistrationPurpose !== "") {
+      setSelectedPurpose(pendingChangeRegistrationPurpose);
+    }
+    formData.registration_purpose = pendingChangeRegistrationPurpose;
+    setPendingChangeRegistrationPurpose("");
+  };
+
+  const handleSelectedPurposeChange = (newSelectedPurpose: string) => {
+    if (newSelectedPurpose && selectedPurpose) {
+      setPendingChangeRegistrationPurpose(newSelectedPurpose);
+    }
+  };
+
   return (
     <>
       {isRedirectedFromContacts && !role.includes("cas_") && (
@@ -88,6 +122,11 @@ const OperationInformationForm = ({
           contact to replace them.
         </Note>
       )}
+      <ConfirmChangeOfRegistrationPurposeModal
+        open={pendingChangeRegistrationPurpose !== ""}
+        cancelRegistrationPurposeChange={cancelRegistrationPurposeChange}
+        confirmRegistrationPurposeChange={confirmRegistrationPurposeChange}
+      />
       <SingleStepTaskListForm
         allowEdit={!role.includes("cas_")}
         mode={FormMode.READ_ONLY}
@@ -96,6 +135,12 @@ const OperationInformationForm = ({
         uiSchema={administrationOperationInformationUiSchema}
         formData={formData ?? {}}
         onSubmit={handleSubmit}
+        onChange={(e: IChangeEvent) => {
+          let newSelectedPurpose = e.formData?.section3?.registration_purpose;
+          if (newSelectedPurpose !== selectedPurpose) {
+            handleSelectedPurposeChange(newSelectedPurpose);
+          }
+        }}
         onCancel={() => router.push("/operations")}
         formContext={{
           operationId,

bciers/apps/administration/app/data/jsonSchema/operationInformation/administrationOperationInformation.ts

@@ -29,9 +29,7 @@ export const createAdministrationOperationInformationSchema = async (
       ),
       section2: await createMultipleOperatorsInformationSchema(),
       ...(status === OperationStatus.REGISTERED && {
-        section3: await createAdministrationRegistrationInformationSchema(
-          registrationPurposeValue,
-        ),
+        section3: await createAdministrationRegistrationInformationSchema(),
       }),
     },
   };
@@ -52,16 +50,16 @@ export const administrationOperationInformationUiSchema: UiSchema = {
       "operation_representatives",
       "registration_purpose",
       "regulated_operation_preface",
-      "regulated_products",
+      "reporting_operation_preface",
       "opted_in_preface",
-      "opted_in_operation",
       "new_entrant_preface",
+      "potential_reporting_preface",
+      "activities",
+      "regulated_products",
+      "opted_in_operation",
       "date_of_first_shipment",
       "new_entrant_application",
     ],
-    registration_purpose: {
-      "ui:widget": "ReadOnlyWidget",
-    },
     ...optedInOperationDetailsUiSchema,
   },
 };