From 4a07920c0cb6ac89182a86763b0705fa5c50382e Mon Sep 17 00:00:00 2001
From: clement-duport <clement.duport@beta.gouv.fr>
Date: Wed, 6 Nov 2024 10:57:21 +0100
Subject: [PATCH 1/4] keep the agency departments and kind field value when
 modifiying a convention

---
 .../forms/commons/AgencySelector.tsx          |   6 +
 .../forms/convention/ConventionForm.tsx       | 108 ++++++++++++------
 .../forms/convention/conventionHelpers.ts     |  35 ++++--
 .../src/app/routes/routeParams/convention.ts  |   3 +
 4 files changed, 111 insertions(+), 41 deletions(-)

diff --git a/front/src/app/components/forms/commons/AgencySelector.tsx b/front/src/app/components/forms/commons/AgencySelector.tsx
index ea904027cd..c784b9e1f9 100644
--- a/front/src/app/components/forms/commons/AgencySelector.tsx
+++ b/front/src/app/components/forms/commons/AgencySelector.tsx
@@ -98,6 +98,11 @@ export const AgencySelector = ({
     [agencyDepartmentField.name],
   );
 
+  const agencyKindFieldName = useMemo(
+    () => agencyKindField.name as keyof SupportedFormsDto,
+    [agencyKindField.name],
+  );
+
   const agencyDepartment = useWatch({
     name: agencyDepartmentFieldName,
     control,
@@ -187,6 +192,7 @@ export const AgencySelector = ({
           disabled={agencyKindOptions.length === 0 || shouldLockToPeAgencies}
           nativeSelectProps={{
             ...agencyKindField,
+            ...register(agencyKindFieldName),
             onChange: (event) =>
               setAllowedAgencyKinds(
                 event.currentTarget.value === "all"
diff --git a/front/src/app/components/forms/convention/ConventionForm.tsx b/front/src/app/components/forms/convention/ConventionForm.tsx
index 78cb3bf311..a60e01a4c4 100644
--- a/front/src/app/components/forms/convention/ConventionForm.tsx
+++ b/front/src/app/components/forms/convention/ConventionForm.tsx
@@ -23,12 +23,12 @@ import { useDispatch, useSelector } from "react-redux";
 import {
   AgencyKindFilter,
   Beneficiary,
+  ConventionInternshipKindSpecific,
   ConventionReadDto,
   DepartmentCode,
   FederatedIdentity,
   InternshipKind,
   addressDtoToString,
-  conventionSchema,
   domElementIds,
   hasBeneficiaryCurrentEmployer,
   isBeneficiaryMinor,
@@ -62,6 +62,7 @@ import {
 import { ConventionFeedbackNotification } from "src/app/components/forms/convention/ConventionFeedbackNotification";
 import {
   ConventionPresentation,
+  conventionPresentationSchema,
   undefinedIfEmptyString,
 } from "src/app/components/forms/convention/conventionHelpers";
 
@@ -163,9 +164,10 @@ export const ConventionForm = ({
     useWaitForReduxFormUiReadyBeforeInitialisation(initialValues);
   const defaultValues =
     mode === "create" ? initialValues : fetchedConvention || initialValues;
-  const methods = useForm<ConventionReadDto>({
+
+  const methods = useForm<Required<ConventionPresentation>>({
     defaultValues,
-    resolver: zodResolver(conventionSchema),
+    resolver: zodResolver(conventionPresentationSchema),
     mode: "onTouched",
   });
 
@@ -203,23 +205,71 @@ export const ConventionForm = ({
     conventionValues.internshipKind ?? "immersion",
   );
 
-  const onSubmit: SubmitHandler<ConventionReadDto> = (convention) => {
-    const conventionToSave: ConventionReadDto = {
-      ...convention,
-      workConditions: undefinedIfEmptyString(convention.workConditions),
-      establishmentNumberEmployeesRange:
-        establishmentNumberEmployeesRange === ""
-          ? undefined
-          : establishmentNumberEmployeesRange,
-    };
-    dispatch(
-      conventionSlice.actions.showSummaryChangeRequested({
-        showSummary: true,
-        convention: conventionToSave,
-      }),
+  const isImmersionConvention = (
+    convention: ConventionPresentation,
+  ): convention is Required<ConventionPresentation> & {
+    internshipKind: "immersion";
+  } => convention.internshipKind === "immersion";
+
+  const isMiniStage = (
+    convention: ConventionPresentation,
+  ): convention is Required<ConventionPresentation> & {
+    signatories: ConventionInternshipKindSpecific<"mini-stage-cci">["signatories"];
+    internshipKind: "mini-stage-cci";
+  } => {
+    return (
+      convention.internshipKind === "mini-stage-cci" &&
+      "levelOfEducation" in convention.signatories.beneficiary
     );
   };
 
+  const onSubmit: SubmitHandler<Required<ConventionPresentation>> = (
+    convention,
+  ) => {
+    if (isMiniStage(convention)) {
+      const conventionToSave: ConventionReadDto = {
+        ...convention,
+        internshipKind: convention.internshipKind,
+        workConditions: undefinedIfEmptyString(convention.workConditions),
+        establishmentNumberEmployeesRange:
+          establishmentNumberEmployeesRange === ""
+            ? undefined
+            : establishmentNumberEmployeesRange,
+        agencySiret: "",
+        agencyName: "",
+        agencyCounsellorEmails: [],
+        agencyValidatorEmails: [],
+      };
+
+      dispatch(
+        conventionSlice.actions.showSummaryChangeRequested({
+          showSummary: true,
+          convention: conventionToSave,
+        }),
+      );
+    } else if (isImmersionConvention(convention)) {
+      const conventionToSave: ConventionReadDto = {
+        ...convention,
+        workConditions: undefinedIfEmptyString(convention.workConditions),
+        establishmentNumberEmployeesRange:
+          establishmentNumberEmployeesRange === ""
+            ? undefined
+            : establishmentNumberEmployeesRange,
+        agencySiret: "",
+        agencyName: "",
+        agencyCounsellorEmails: [],
+        agencyValidatorEmails: [],
+      };
+
+      dispatch(
+        conventionSlice.actions.showSummaryChangeRequested({
+          showSummary: true,
+          convention: conventionToSave,
+        }),
+      );
+    }
+  };
+
   const accordionsRef = useRef<Array<ElementRef<"div">>>([]);
 
   const [stepsStatus, setStepsStatus] = useState<Record<
@@ -301,7 +351,7 @@ export const ConventionForm = ({
   ): Promise<Record<number, StepSeverity>> => {
     const stepFields = formUiSections[step - 1];
     const validatedFields = stepFields.map(async (field) => ({
-      [field]: await trigger(field as keyof ConventionReadDto),
+      [field]: await trigger(field as keyof ConventionPresentation),
     }));
     const validatedFieldsValue = await Promise.all(validatedFields);
     const getStepStatus = () => {
@@ -312,7 +362,7 @@ export const ConventionForm = ({
       ).length;
       const stepIsTouched = stepFields.filter(
         (stepField) =>
-          getFieldState(stepField as keyof ConventionReadDto).isTouched,
+          getFieldState(stepField as keyof ConventionPresentation).isTouched,
       ).length;
       if (validatedFieldsValue.every((field) => Object.values(field)[0])) {
         return "success";
@@ -384,6 +434,12 @@ export const ConventionForm = ({
               data-matomo-name={domElementIds.conventionImmersionRoute.form({
                 mode,
               })}
+              onSubmit={(e) =>
+                handleSubmit(onSubmit, (errors) => {
+                  validateSteps("doNotClear");
+                  console.error(conventionValues, errors);
+                })(e)
+              }
             >
               <>
                 <>
@@ -545,16 +601,10 @@ export const ConventionForm = ({
                   disabled={shouldSubmitButtonBeDisabled}
                   iconId="fr-icon-checkbox-circle-line"
                   iconPosition="left"
-                  type="button"
+                  type="submit"
                   nativeButtonProps={{
                     id: domElementIds.conventionImmersionRoute.submitFormButton,
                   }}
-                  onClick={(e) =>
-                    handleSubmit(onSubmit, (errors) => {
-                      validateSteps("doNotClear");
-                      console.error(conventionValues, errors);
-                    })(e)
-                  }
                 >
                   Vérifier la demande
                 </Button>
@@ -583,12 +633,6 @@ export const ConventionForm = ({
                 <ShareConventionLink />
                 <Button
                   type="submit"
-                  onClick={(e) =>
-                    handleSubmit(onSubmit, (errors) => {
-                      validateSteps("doNotClear");
-                      console.error(conventionValues, errors);
-                    })(e)
-                  }
                   id={
                     domElementIds.conventionImmersionRoute
                       .submitFormButtonMobile
diff --git a/front/src/app/components/forms/convention/conventionHelpers.ts b/front/src/app/components/forms/convention/conventionHelpers.ts
index 1848da90e7..0218d8472c 100644
--- a/front/src/app/components/forms/convention/conventionHelpers.ts
+++ b/front/src/app/components/forms/convention/conventionHelpers.ts
@@ -1,11 +1,15 @@
 import {
-  ConventionDto,
-  DepartmentCode,
+  ConventionReadDto,
   EstablishmentTutor,
   InternshipKind,
   OmitFromExistingKeys,
   Signatories,
+  agencyKindSchema,
+  conventionSchema,
+  refersToAgencyIdSchema,
+  zStringMinLength1,
 } from "shared";
+import { z } from "zod";
 
 export const undefinedIfEmptyString = (text?: string): string | undefined =>
   text || undefined;
@@ -20,10 +24,6 @@ type WithEstablishmentTutor = {
   establishmentTutor: EstablishmentTutor;
 };
 
-type WithAgencyDepartment = {
-  agencyDepartment: DepartmentCode;
-};
-
 type WithIntershipKind = {
   internshipKind: InternshipKind;
 };
@@ -33,11 +33,28 @@ type WithFromPeConnectedUser = {
 };
 
 export type ConventionPresentation = OmitFromExistingKeys<
-  Partial<ConventionDto>,
-  "statusJustification"
+  Partial<ConventionReadDto>,
+  | "agencyName"
+  | "agencyCounsellorEmails"
+  | "agencyValidatorEmails"
+  | "agencySiret"
 > &
   WithSignatures &
   WithEstablishmentTutor &
   WithIntershipKind &
-  WithAgencyDepartment &
   WithFromPeConnectedUser;
+
+export const conventionPresentationSchema: z.Schema<ConventionPresentation> =
+  conventionSchema.and(
+    z.object({
+      agencyDepartment: z.string(),
+      agencyKind: agencyKindSchema,
+      agencyRefersTo: z
+        .object({
+          id: refersToAgencyIdSchema,
+          name: zStringMinLength1,
+          kind: agencyKindSchema,
+        })
+        .optional(),
+    }),
+  );
diff --git a/front/src/app/routes/routeParams/convention.ts b/front/src/app/routes/routeParams/convention.ts
index 25aa558aa7..1a153fd150 100644
--- a/front/src/app/routes/routeParams/convention.ts
+++ b/front/src/app/routes/routeParams/convention.ts
@@ -1,5 +1,6 @@
 import { addDays, startOfToday } from "date-fns";
 import {
+  AgencyKind,
   AppellationAndRomeDto,
   AppellationCode,
   BeneficiaryCurrentEmployer,
@@ -287,6 +288,7 @@ export const conventionValuesFromUrl = {
   isRqth: param.query.optional.boolean,
   birthdate: param.query.optional.string,
   agencyDepartment: param.query.optional.string,
+  agencyKind: param.query.optional.string,
 
   brEmail: param.query.optional.string,
   brFirstName: param.query.optional.string,
@@ -409,6 +411,7 @@ const conventionPresentationFromParams = (
   // Agency
   agencyId: params.agencyId ?? undefined,
   agencyDepartment: params.agencyDepartment ?? "",
+  agencyKind: params.agencyKind as AgencyKind | undefined,
 
   //Actors
   establishmentTutor: {

From 0e981f645dbcecee7d8ed299e1ac1e7801ad1686 Mon Sep 17 00:00:00 2001
From: clement-duport <clement.duport@beta.gouv.fr>
Date: Wed, 6 Nov 2024 11:55:03 +0100
Subject: [PATCH 2/4] fix review

---
 .../forms/convention/ConventionForm.tsx       | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/front/src/app/components/forms/convention/ConventionForm.tsx b/front/src/app/components/forms/convention/ConventionForm.tsx
index a60e01a4c4..9a2aabe46c 100644
--- a/front/src/app/components/forms/convention/ConventionForm.tsx
+++ b/front/src/app/components/forms/convention/ConventionForm.tsx
@@ -23,7 +23,7 @@ import { useDispatch, useSelector } from "react-redux";
 import {
   AgencyKindFilter,
   Beneficiary,
-  ConventionInternshipKindSpecific,
+  ConventionDto,
   ConventionReadDto,
   DepartmentCode,
   FederatedIdentity,
@@ -207,21 +207,15 @@ export const ConventionForm = ({
 
   const isImmersionConvention = (
     convention: ConventionPresentation,
-  ): convention is Required<ConventionPresentation> & {
-    internshipKind: "immersion";
-  } => convention.internshipKind === "immersion";
+  ): convention is Extract<ConventionDto, { internshipKind: "immersion" }> =>
+    convention.internshipKind === "immersion";
 
   const isMiniStage = (
     convention: ConventionPresentation,
-  ): convention is Required<ConventionPresentation> & {
-    signatories: ConventionInternshipKindSpecific<"mini-stage-cci">["signatories"];
-    internshipKind: "mini-stage-cci";
-  } => {
-    return (
-      convention.internshipKind === "mini-stage-cci" &&
-      "levelOfEducation" in convention.signatories.beneficiary
-    );
-  };
+  ): convention is Extract<
+    ConventionDto,
+    { internshipKind: "mini-stage-cci" }
+  > => convention.internshipKind === "mini-stage-cci";
 
   const onSubmit: SubmitHandler<Required<ConventionPresentation>> = (
     convention,
@@ -434,12 +428,10 @@ export const ConventionForm = ({
               data-matomo-name={domElementIds.conventionImmersionRoute.form({
                 mode,
               })}
-              onSubmit={(e) =>
-                handleSubmit(onSubmit, (errors) => {
-                  validateSteps("doNotClear");
-                  console.error(conventionValues, errors);
-                })(e)
-              }
+              onSubmit={handleSubmit(onSubmit, (errors) => {
+                validateSteps("doNotClear");
+                console.error(conventionValues, errors);
+              })}
             >
               <>
                 <>

From dcd4a58e9aec31a8b4f8e27b9e310991be344369 Mon Sep 17 00:00:00 2001
From: clement-duport <clement.duport@beta.gouv.fr>
Date: Thu, 7 Nov 2024 15:41:41 +0100
Subject: [PATCH 3/4] refacto on submit

---
 .../forms/convention/ConventionForm.tsx       | 76 +++++--------------
 1 file changed, 21 insertions(+), 55 deletions(-)

diff --git a/front/src/app/components/forms/convention/ConventionForm.tsx b/front/src/app/components/forms/convention/ConventionForm.tsx
index 9a2aabe46c..1da45272e8 100644
--- a/front/src/app/components/forms/convention/ConventionForm.tsx
+++ b/front/src/app/components/forms/convention/ConventionForm.tsx
@@ -23,12 +23,12 @@ import { useDispatch, useSelector } from "react-redux";
 import {
   AgencyKindFilter,
   Beneficiary,
-  ConventionDto,
   ConventionReadDto,
   DepartmentCode,
   FederatedIdentity,
   InternshipKind,
   addressDtoToString,
+  conventionSchema,
   domElementIds,
   hasBeneficiaryCurrentEmployer,
   isBeneficiaryMinor,
@@ -205,63 +205,29 @@ export const ConventionForm = ({
     conventionValues.internshipKind ?? "immersion",
   );
 
-  const isImmersionConvention = (
-    convention: ConventionPresentation,
-  ): convention is Extract<ConventionDto, { internshipKind: "immersion" }> =>
-    convention.internshipKind === "immersion";
-
-  const isMiniStage = (
-    convention: ConventionPresentation,
-  ): convention is Extract<
-    ConventionDto,
-    { internshipKind: "mini-stage-cci" }
-  > => convention.internshipKind === "mini-stage-cci";
-
   const onSubmit: SubmitHandler<Required<ConventionPresentation>> = (
     convention,
   ) => {
-    if (isMiniStage(convention)) {
-      const conventionToSave: ConventionReadDto = {
-        ...convention,
-        internshipKind: convention.internshipKind,
-        workConditions: undefinedIfEmptyString(convention.workConditions),
-        establishmentNumberEmployeesRange:
-          establishmentNumberEmployeesRange === ""
-            ? undefined
-            : establishmentNumberEmployeesRange,
-        agencySiret: "",
-        agencyName: "",
-        agencyCounsellorEmails: [],
-        agencyValidatorEmails: [],
-      };
-
-      dispatch(
-        conventionSlice.actions.showSummaryChangeRequested({
-          showSummary: true,
-          convention: conventionToSave,
-        }),
-      );
-    } else if (isImmersionConvention(convention)) {
-      const conventionToSave: ConventionReadDto = {
-        ...convention,
-        workConditions: undefinedIfEmptyString(convention.workConditions),
-        establishmentNumberEmployeesRange:
-          establishmentNumberEmployeesRange === ""
-            ? undefined
-            : establishmentNumberEmployeesRange,
-        agencySiret: "",
-        agencyName: "",
-        agencyCounsellorEmails: [],
-        agencyValidatorEmails: [],
-      };
-
-      dispatch(
-        conventionSlice.actions.showSummaryChangeRequested({
-          showSummary: true,
-          convention: conventionToSave,
-        }),
-      );
-    }
+    const conventionToSave: ConventionReadDto = {
+      ...conventionSchema.parse(convention),
+      agencyKind: convention.agencyKind,
+      agencyDepartment: convention.agencyDepartment,
+      workConditions: undefinedIfEmptyString(convention.workConditions),
+      establishmentNumberEmployeesRange:
+        establishmentNumberEmployeesRange === ""
+          ? undefined
+          : establishmentNumberEmployeesRange,
+      agencySiret: "",
+      agencyName: "",
+      agencyCounsellorEmails: [],
+      agencyValidatorEmails: [],
+    };
+    dispatch(
+      conventionSlice.actions.showSummaryChangeRequested({
+        showSummary: true,
+        convention: conventionToSave,
+      }),
+    );
   };
 
   const accordionsRef = useRef<Array<ElementRef<"div">>>([]);

From 88bec795ccc0028caa7981a2559c177f68e4ebd5 Mon Sep 17 00:00:00 2001
From: clement-duport <clement.duport@beta.gouv.fr>
Date: Wed, 13 Nov 2024 11:43:16 +0100
Subject: [PATCH 4/4] fix review

---
 front/src/app/components/forms/convention/conventionHelpers.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/front/src/app/components/forms/convention/conventionHelpers.ts b/front/src/app/components/forms/convention/conventionHelpers.ts
index 0218d8472c..b3b4f16b39 100644
--- a/front/src/app/components/forms/convention/conventionHelpers.ts
+++ b/front/src/app/components/forms/convention/conventionHelpers.ts
@@ -48,7 +48,6 @@ export const conventionPresentationSchema: z.Schema<ConventionPresentation> =
   conventionSchema.and(
     z.object({
       agencyDepartment: z.string(),
-      agencyKind: agencyKindSchema,
       agencyRefersTo: z
         .object({
           id: refersToAgencyIdSchema,