Merge branch 'feat/information' into carolineBda/list-modifications

# Conflicts: # targets/frontend/src/modules/documents/api/documents.controller.ts # targets/frontend/src/modules/documents/api/documents.query.ts # targets/frontend/src/modules/documents/api/documents.repository.ts # targets/frontend/src/modules/documents/api/documents.service.ts # targets/frontend/src/modules/documents/type.ts # targets/frontend/src/modules/informations/api/informations.query.ts # targets/frontend/src/modules/informations/components/informationsEdit/Informations.query.ts # targets/frontend/src/modules/informations/components/informationsEdit/InformationsBlock.tsx # targets/frontend/src/modules/informations/components/informationsEdit/editInformation.mapping.ts # targets/frontend/src/modules/informations/components/informationsEdit/editInformation.mutation.ts # targets/frontend/src/modules/informations/components/informationsList/InformationsList.query.ts # targets/frontend/src/modules/informations/type.ts # targets/hasura/metadata/databases/default/tables/information_informations.yaml
SocialGouv · Oct 12, 2023 · dc7d28c · dc7d28c
2 parents 6663044 + ca80213
commit dc7d28c
Show file tree

Hide file tree

Showing 49 changed files with 907 additions and 506 deletions.
diff --git a/targets/frontend/src/components/contributions/answers/Answer.tsx b/targets/frontend/src/components/contributions/answers/Answer.tsx
@@ -1,71 +1,36 @@
 import {
   AlertColor,
   Box,
-  Button,
-  FormControl,
   Stack,
+  Tooltip,
+  TooltipProps,
   Typography,
+  styled,
+  tooltipClasses,
 } from "@mui/material";
-import React, { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
+import React, { useState } from "react";
 import { useUser } from "src/hooks/useUser";
 
-import { FormEditionField, FormRadioGroup, FormTextField } from "../../forms";
 import { StatusContainer } from "../status";
 import { Answer, Status } from "../type";
 import { useContributionAnswerUpdateMutation } from "./answer.mutation";
 import { useContributionAnswerQuery } from "./answer.query";
 import { Comments } from "./Comments";
-import {
-  CdtnReferenceInput,
-  KaliReferenceInput,
-  LegiReferenceInput,
-  OtherReferenceInput,
-} from "./references";
 import { statusesMapping } from "../status/data";
-import { getNextStatus, getPrimaryButtonLabel } from "../status/utils";
 import { SnackBar } from "../../utils/SnackBar";
 import { Breadcrumb, BreadcrumbLink } from "src/components/utils";
-import { FicheSpDocumentInput } from "./references/FicheSpDocumentInput";
+import { AnswerForm } from "./AnswerForm";
+import { fr } from "@codegouvfr/react-dsfr";
 
 export type ContributionsAnswerProps = {
   id: string;
 };
 
-const isNotEditable = (answer: Answer | undefined) =>
-  answer?.status.status !== "REDACTING" &&
-  answer?.status.status !== "TODO" &&
-  answer?.status.status !== "VALIDATING";
-
-const isCodeDuTravail = (answer: Answer): boolean =>
-  answer.agreement.id === "0000";
-
 export const ContributionsAnswer = ({
   id,
 }: ContributionsAnswerProps): JSX.Element => {
   const answer = useContributionAnswerQuery({ id });
   const { user } = useUser() as any;
-  const [status, setStatus] = useState<Status>("TODO");
-  useEffect(() => {
-    if (answer?.status) {
-      setStatus(answer.status.status);
-    }
-  }, [answer]);
-  const { control, getValues, trigger } = useForm<Answer>({
-    values: answer,
-    defaultValues: {
-      content: "",
-      contentType: "ANSWER",
-      status: {
-        status: "TODO",
-      },
-      legiReferences: [],
-      kaliReferences: [],
-      otherReferences: [],
-      cdtnReferences: [],
-      contentFichesSpDocument: answer?.contentFichesSpDocument ? {} : undefined,
-    },
-  });
   const updateAnswer = useContributionAnswerUpdateMutation();
   const [snack, setSnack] = useState<{
     open: boolean;
@@ -75,19 +40,7 @@ export const ContributionsAnswer = ({
     open: false,
   });
 
-  const onSubmit = async (newStatus: Status) => {
-    const isValid = await trigger();
-    if (!isValid) {
-      return setSnack({
-        open: true,
-        severity: "error",
-        message: "Formulaire invalide",
-      });
-    }
-
-    setStatus(newStatus);
-    const data = getValues();
-
+  const onSubmit = async (newStatus: Status, data: Answer) => {
     try {
       if (!answer || !answer.id) {
         throw new Error("Id non définit");
@@ -114,38 +67,12 @@ export const ContributionsAnswer = ({
       setSnack({ open: true, severity: "error", message: e.message });
     }
   };
-
-  const agreementResponseOptions = [
-    {
-      label: "La convention collective ne prévoit rien",
-      value: "NOTHING",
-    },
-    {
-      label: "La convention collective renvoie au Code du Travail",
-      value: "CDT",
-    },
-    {
-      label:
-        "La convention collective intégralement moins favorable que le CDT",
-      value: "UNFAVOURABLE",
-    },
-    {
-      label: "Nous n'avons pas la réponse",
-      value: "UNKNOWN",
-    },
-  ];
-  const genericResponseOptions = [
-    {
-      label: "Utiliser la fiche service public",
-      value: "SP",
-    },
-  ];
   return (
     <>
       <Stack direction="row" justifyContent="space-between">
         <Breadcrumb>
           <BreadcrumbLink
-            href={`/contributions/questions/${answer?.question.id}`}
+            href={`/contributions/questions/${answer?.question?.id}`}
           >
             <>
               <Typography
@@ -160,136 +87,56 @@ export const ContributionsAnswer = ({
               {answer?.question?.content}
             </>
           </BreadcrumbLink>
-          <BreadcrumbLink>{answer?.agreement?.id}</BreadcrumbLink>
+          <BreadcrumbLink>
+            <HtmlTooltip
+              title={
+                <>
+                  <Typography color="inherit">
+                    {answer?.agreement?.name}
+                  </Typography>
+                </>
+              }
+            >
+              <Typography>{answer?.agreement?.id}</Typography>
+            </HtmlTooltip>
+          </BreadcrumbLink>
         </Breadcrumb>
         {answer?.status && (
-          <div style={{ color: statusesMapping[status].color }}>
+          <div style={{ color: statusesMapping[answer?.status.status].color }}>
             <StatusContainer status={answer.status} />
           </div>
         )}
       </Stack>
-      <Box sx={{ display: "flex", flexDirection: "row" }}>
+      <Stack direction="row">
         <Box sx={{ width: "70%" }}>
-          <form
-            onSubmit={(e) => {
-              // This is a hack to prevent the form from being submitted by the tiptap editor.
-              // The details extension is not working properly and submit the form when click on the arrow.
-              // See https://github.com/ueberdosis/tiptap/issues/4384
-              e.preventDefault();
-            }}
-          >
-            <Stack spacing={5}>
-              <FormControl>
-                <FormTextField
-                  name="updateDate"
-                  control={control}
-                  label="Date mise à jour"
-                  disabled
-                  labelFixed
-                />
-              </FormControl>
-              <FormControl>
-                <FormEditionField
-                  label="Réponse"
-                  name="content"
-                  disabled={isNotEditable(answer)}
-                  control={control}
-                />
-              </FormControl>
-              {answer && (
-                <FormRadioGroup
-                  name="contentType"
-                  label="Type de réponse"
-                  control={control}
-                  disabled={isNotEditable(answer)}
-                  options={[
-                    {
-                      label: "Afficher la réponse",
-                      value: "ANSWER",
-                    },
-                    ...(isCodeDuTravail(answer)
-                      ? genericResponseOptions
-                      : agreementResponseOptions),
-                  ]}
-                />
-              )}
-              {answer && isCodeDuTravail(answer) && (
-                <FicheSpDocumentInput
-                  name="contentFichesSpDocument"
-                  control={control}
-                  disabled={isNotEditable(answer)}
-                />
-              )}
-              {answer && !isCodeDuTravail(answer) && (
-                <KaliReferenceInput
-                  name="kaliReferences"
-                  agreement={answer.agreement}
-                  control={control}
-                  disabled={isNotEditable(answer)}
-                />
-              )}
-              <LegiReferenceInput
-                name="legiReferences"
-                control={control}
-                disabled={isNotEditable(answer)}
-              />
-              <OtherReferenceInput
-                name="otherReferences"
-                control={control}
-                disabled={isNotEditable(answer)}
-              />
-              <CdtnReferenceInput
-                name="cdtnReferences"
-                control={control}
-                disabled={isNotEditable(answer)}
-              />
-              <Stack
-                direction="row"
-                justifyContent="end"
-                spacing={2}
-                padding={2}
-              >
-                <Button
-                  variant="outlined"
-                  type="button"
-                  onClick={() => onSubmit("REDACTING")}
-                  disabled={status === "TODO" || status === "REDACTING"}
-                >
-                  Remettre en rédaction
-                </Button>
-                <Button
-                  variant="text"
-                  type="button"
-                  disabled={isNotEditable(answer)}
-                  onClick={() => onSubmit("REDACTING")}
-                >
-                  Sauvegarder
-                </Button>
-                <Button
-                  variant="contained"
-                  type="button"
-                  color="success"
-                  onClick={() => onSubmit(getNextStatus(status))}
-                  disabled={status === "PUBLISHED"}
-                >
-                  {getPrimaryButtonLabel(status)}
-                </Button>
-              </Stack>
-            </Stack>
-
-            <SnackBar snack={snack} setSnack={setSnack}></SnackBar>
-          </form>
+          {answer && (
+            <AnswerForm answer={answer} onSubmit={onSubmit}></AnswerForm>
+          )}
         </Box>
         <Box sx={{ width: "30%" }}>
-          {answer && (
+          {answer && answer.statuses && (
             <Comments
               answerId={answer.id}
               comments={answer.answerComments ?? []}
               statuses={answer.statuses}
             />
           )}
         </Box>
-      </Box>
+      </Stack>
+
+      <SnackBar snack={snack} setSnack={setSnack}></SnackBar>
     </>
   );
 };
+
+const HtmlTooltip = styled(({ className, ...props }: TooltipProps) => (
+  <Tooltip {...props} classes={{ popper: className }} />
+))(({ theme }) => ({
+  [`& .${tooltipClasses.tooltip}`]: {
+    backgroundColor: fr.colors.decisions.background.default.grey.hover,
+    color: fr.colors.decisions.text.default.grey.default,
+    maxWidth: 220,
+    fontSize: theme.typography.pxToRem(12),
+    border: `1px solid ${fr.colors.decisions.border.default.grey.default}`,
+  },
+}));