Merge remote-tracking branch 'origin/staging'

dataesr · Oct 9, 2024 · 864f351 · 864f351
2 parents 2e21aba + 3a00afc
commit 864f351
Showing 1 changed file with 59 additions and 4 deletions.
diff --git a/client/src/components/contact-form/index.tsx b/client/src/components/contact-form/index.tsx
@@ -4,12 +4,14 @@ import {
   Notice,
   TextArea,
   TextInput,
+  Select,
+  SelectOption,
   useDSFRConfig,
 } from "@dataesr/dsfr-plus";
-import { useState } from "react";
+import { useState, useEffect } from "react";
 import useForm from "../../hooks/useForm";
 import { useMutation } from "@tanstack/react-query";
-import { useNavigate } from "react-router-dom";
+import { useNavigate, useLocation } from "react-router-dom";
 import { createIntl, RawIntlProvider } from "react-intl";
 import { postHeadersTicketOffice } from "../../config/api";
 
@@ -61,18 +63,31 @@ export default function ContactForm({ objectId, objectType }: Props) {
   const { locale } = useDSFRConfig();
   const intl = createIntl({ locale, messages: messages[locale] });
   const navigate = useNavigate();
-  const api = objectId && objectType ? "contribute" : "contacts";
+  const location = useLocation();
   const [thanks, setThanks] = useState(false);
+  const [api, setApi] = useState("contacts");
   const { isPending, isError, mutate } = useMutation({
     mutationFn: async (data: FormState) => {
-      let payload = { ...data };
+      let payload: any = { ...data };
+
+      if (data.organization || data.fonction) {
+        payload.extra = {
+          ...(data.organization && { organisation: data.organization }),
+          ...(data.fonction && { fonction: data.fonction }),
+        };
+
+        delete payload.organization;
+        delete payload.fonction;
+      }
 
       if (api === "contacts") {
         payload = { ...payload, fromApplication: "scanr" };
       }
+
       if (api === "contribute") {
         payload = { ...payload, objectId, objectType };
       }
+
       const resp = await fetch(`/ticket/api/${api}`, {
         method: "POST",
         body: JSON.stringify(payload),
@@ -93,11 +108,24 @@ export default function ContactForm({ objectId, objectType }: Props) {
       console.error("error", e);
     },
   });
+
   const { form, updateForm, errors } = useForm<FormState, FormState>(
     {},
     validate
   );
 
+  const handleApiChange = (key: any) => {
+    if (key === "contact") setApi("contacts");
+    else if (key === "remove") setApi("remove-user");
+    else if (key === "nameChange") setApi("update-user-data");
+  };
+
+  useEffect(() => {
+    if (location.pathname.includes("bugs")) {
+      setApi("contribute");
+    }
+  }, [location]);
+
   if (thanks) {
     return (
       <RawIntlProvider value={intl}>
@@ -142,6 +170,33 @@ export default function ContactForm({ objectId, objectType }: Props) {
           mutate(form);
         }}
       >
+        {!location.pathname.includes("bugs") && (
+          <Select
+            isRequired
+            onSelectionChange={(key) => handleApiChange(key)}
+            label="Sélectionner le type de requête"
+          >
+            <SelectOption
+              key="contact"
+              description="Envoyer un message via le formulaire de contact"
+            >
+              Formulaire de contact
+            </SelectOption>
+            <SelectOption
+              key="remove"
+              description="Supprimer un profil utilisateur"
+            >
+              Suppression de profil
+            </SelectOption>
+            <SelectOption
+              key="nameChange"
+              description="Demander un changement de nom"
+            >
+              Changement de nom
+            </SelectOption>
+          </Select>
+        )}
+
         <TextInput
           value={form.name}
           onChange={(e) => updateForm({ name: e.target.value })}