fix: admin referent list buttons and edit actions (#2210)

SocialGouv · Mar 18, 2024 · e7717d5 · e7717d5
1 parent 8e8d691
commit e7717d5
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 23 deletions.
diff --git a/packages/app/src/api/core-domain/useCases/referent/EditReferent.ts b/packages/app/src/api/core-domain/useCases/referent/EditReferent.ts
@@ -36,10 +36,12 @@ export class EditReferent implements UseCase<EditReferentDTO, ReferentDTO> {
             : found.value,
           county: dto.county ? new County(dto.county) : found.county,
           region: dto.region ? new Region(dto.region) : found.region,
-          substitute: {
-            email: dto.substitute?.email ? new Email(dto.substitute.email) : found.substitute?.email,
-            name: dto.substitute?.name ?? found.substitute?.name, // ?? because "" is allowed
-          },
+          substitute: Object.keys(dto.substitute || {}).length
+            ? {
+                email: dto.substitute?.email ? new Email(dto.substitute.email) : found.substitute?.email,
+                name: dto.substitute?.name ?? found.substitute?.name, // ?? because "" is allowed
+              }
+            : undefined,
         },
         new UniqueID(dto.id),
       );

diff --git a/packages/app/src/app/admin/liste-referents/ReferentModal.tsx b/packages/app/src/app/admin/liste-referents/ReferentModal.tsx
@@ -13,7 +13,7 @@ import { FormFieldset, FormLayout } from "@design-system";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { noop, sortBy } from "lodash";
 import { useRouter } from "next/navigation";
-import { useCallback, useEffect } from "react";
+import { useEffect } from "react";
 import { useForm } from "react-hook-form";
 
 import { createReferent, saveReferent } from "./actions";
@@ -42,14 +42,6 @@ export const ReferentModal = ({ mode = "edit", modal }: ReferentModalProps) => {
     mode: "onChange",
   });
 
-  const cleanForm = useCallback(() => {
-    reset({
-      type: "email",
-      principal: true,
-      region: void 0,
-    });
-  }, [reset]);
-
   useEffect(() => {
     if (mode === "edit") {
       reset({
@@ -60,8 +52,8 @@ export const ReferentModal = ({ mode = "edit", modal }: ReferentModalProps) => {
           name: currentEdited?.substitute?.name ?? "",
         },
       });
-    } else cleanForm();
-  }, [reset, currentEdited, mode, cleanForm]);
+    }
+  }, [reset, currentEdited, mode]);
 
   const writtenName = watch("name");
   const selectedRegion = watch("region");
@@ -71,11 +63,14 @@ export const ReferentModal = ({ mode = "edit", modal }: ReferentModalProps) => {
   const doSave = async () => {
     const go = await trigger();
     if (go) {
-      handleSubmit(async formData => {
+      await handleSubmit(async formData => {
         if (mode === "edit") {
-          saveReferent(formData);
+          if (formData.substitute?.name === "" && formData.substitute?.email === "") {
+            formData.substitute = void 0;
+          }
+          await saveReferent(formData);
         } else {
-          createReferent(formData);
+          await createReferent(formData);
         }
         modal.close();
         router.refresh();
@@ -93,9 +88,9 @@ export const ReferentModal = ({ mode = "edit", modal }: ReferentModalProps) => {
           children: "Sauvegarder",
           disabled: !isValid || !isDirty,
           doClosesModal: false,
-          onClick() {
-            doSave();
-            cleanForm();
+          async onClick() {
+            await doSave();
+            reset();
           },
         },
       ]}
@@ -180,12 +175,15 @@ export const ReferentModal = ({ mode = "edit", modal }: ReferentModalProps) => {
                 label: "Email",
                 nativeInputProps: {
                   value: "email",
-                  ...register("type", { deps: "value" }),
+                  ...register("type"),
                 },
               },
               {
                 label: "URL",
-                nativeInputProps: { value: "url", ...register("type", { deps: "value" }) },
+                nativeInputProps: {
+                  value: "url",
+                  ...register("type", { setValueAs: value => (value === "URL" ? "url" : "email") }),
+                },
               },
             ]}
           />

diff --git a/packages/app/src/app/admin/liste-referents/_actionButtons/ActionButtons.tsx b/packages/app/src/app/admin/liste-referents/_actionButtons/ActionButtons.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import ButtonsGroup from "@codegouvfr/react-dsfr/ButtonsGroup";
 
 import { CreateReferentModal, createReferentModalButtonProps } from "./CreateReferentModal";

diff --git a/packages/app/src/app/admin/liste-referents/_actionButtons/ExportReferentsModal.tsx b/packages/app/src/app/admin/liste-referents/_actionButtons/ExportReferentsModal.tsx
@@ -1,3 +1,5 @@
+"use client";
+
 import ButtonsGroup from "@codegouvfr/react-dsfr/ButtonsGroup";
 import { createModal } from "@codegouvfr/react-dsfr/Modal";
 import { config } from "@common/config";