#2363 - Réutiliser le même composant d'affichage de détail d'une convention

front/package.json

@@ -54,7 +54,6 @@
     "date-fns": "2.28.0",
     "eslint": "^8.57.1",
     "eslint-config-prettier": "^8.10.0",
-    "eslint-plugin-jest": "^28.8.3",
     "html-templates": "workspace:*",
     "jest": "^29.5.0",
     "leaflet": "^1.9.4",

front/src/app/components/admin/conventions/ConventionValidation.tsx

@@ -1,38 +1,40 @@
+import { fr } from "@codegouvfr/react-dsfr";
+import { Badge } from "@codegouvfr/react-dsfr/Badge";
 import { formatDistance } from "date-fns";
-import { fr } from "date-fns/locale";
+import { fr as french } from "date-fns/locale";
 import React from "react";
-import type { ConventionReadDto, ConventionStatus } from "shared";
-import { ConventionValidationDetails } from "./ConventionValidationDetails";
+import {
+  ConventionRenewedInformations,
+  ConventionSummary,
+} from "react-design-system";
+import {
+  ConventionReadDto,
+  isConventionRenewed,
+  toDisplayedDate,
+} from "shared";
+import { labelAndSeverityByStatus } from "src/app/contents/convention/labelAndSeverityByStatus";
+import { useStyles } from "tss-react/dsfr";
+import { makeConventionSections } from "../../../contents/convention/conventionSummary.helpers";
 
 const beforeAfterString = (date: string) => {
   const eventDate = new Date(date);
   const currentDate = new Date();
 
   return formatDistance(eventDate, currentDate, {
     addSuffix: true,
-    locale: fr,
+    locale: french,
   });
 };
 
-const labelByStatus: Record<ConventionStatus, string> = {
-  ACCEPTED_BY_COUNSELLOR: "[📗 DEMANDE ÉLIGIBLE]",
-  ACCEPTED_BY_VALIDATOR: "[✅ DEMANDE VALIDÉE]",
-  CANCELLED: "[🗑️ CONVENTION ANNULÉE]",
-  DRAFT: "[📕 BROUILLON]",
-  IN_REVIEW: "[📙 DEMANDE À ETUDIER]",
-  PARTIALLY_SIGNED: "[✍️ Partiellement signée]",
-  READY_TO_SIGN: "[📄 En cours de signature]",
-  REJECTED: "[❌ DEMANDE REJETÉE]",
-  DEPRECATED: "[❌ DEMANDE OBSOLÈTE]",
-};
-
 export interface ConventionValidationProps {
   convention: ConventionReadDto;
 }
 
 export const ConventionValidation = ({
   convention,
 }: ConventionValidationProps) => {
+  const { cx } = useStyles();
+
   const {
     status,
     signatories: { beneficiary },
@@ -41,20 +43,34 @@ export const ConventionValidation = ({
     dateEnd: _,
   } = convention;
 
-  const title =
-    `${labelByStatus[status]} ` +
-    `${beneficiary.lastName.toUpperCase()} ${
-      beneficiary.firstName
-    } chez ${businessName} ` +
-    `${beforeAfterString(dateStart)}`;
+  const title = `${beneficiary.lastName.toUpperCase()} ${
+    beneficiary.firstName
+  } chez ${businessName} ${beforeAfterString(dateStart)}`;
 
   return (
     <>
+      <Badge
+        className={cx(
+          fr.cx("fr-mb-3w"),
+          labelAndSeverityByStatus[status].color,
+        )}
+      >
+        {labelAndSeverityByStatus[status].label}
+      </Badge>
       <h3>{title}</h3>
       {convention.statusJustification && (
         <p>Justification : {convention.statusJustification}</p>
       )}
-      <ConventionValidationDetails convention={convention} />
+      {isConventionRenewed(convention) && (
+        <ConventionRenewedInformations renewed={convention.renewed} />
+      )}
+      <ConventionSummary
+        submittedAt={toDisplayedDate({
+          date: new Date(convention.dateSubmission),
+        })}
+        summary={makeConventionSections(convention, cx)}
+        conventionId={convention.id}
+      />
     </>
   );
 };