#2366 - Les valeurs des champs département et type de l'agence ne disparaissent plus lorsque l'on clique su modifier la convention

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"

front/src/app/components/forms/convention/ConventionForm.tsx

@@ -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,14 +205,22 @@ export const ConventionForm = ({
     conventionValues.internshipKind ?? "immersion",
   );
 
-  const onSubmit: SubmitHandler<ConventionReadDto> = (convention) => {
+  const onSubmit: SubmitHandler<Required<ConventionPresentation>> = (
+    convention,
+  ) => {
     const conventionToSave: ConventionReadDto = {
-      ...convention,
+      ...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({
@@ -301,7 +311,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 +322,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 +394,10 @@ export const ConventionForm = ({
               data-matomo-name={domElementIds.conventionImmersionRoute.form({
                 mode,
               })}
+              onSubmit={handleSubmit(onSubmit, (errors) => {
+                validateSteps("doNotClear");
+                console.error(conventionValues, errors);
+              })}
             >
               <>
                 <>
@@ -545,16 +559,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 +591,6 @@ export const ConventionForm = ({
                 <ShareConventionLink />
                 <Button
                   type="submit"
-                  onClick={(e) =>
-                    handleSubmit(onSubmit, (errors) => {
-                      validateSteps("doNotClear");
-                      console.error(conventionValues, errors);
-                    })(e)
-                  }
                   id={
                     domElementIds.conventionImmersionRoute
                       .submitFormButtonMobile

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,27 @@ 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(),
+      agencyRefersTo: z
+        .object({
+          id: refersToAgencyIdSchema,
+          name: zStringMinLength1,
+          kind: agencyKindSchema,
+        })
+        .optional(),
+    }),
+  );

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: {