feat: enhance state report handling by adding validation status and attachment_id management

Author: ledouxm

packages/backend/src/features/mail.ts

@@ -116,8 +116,7 @@ export const sendValidationRequestMail = ({
 <p>${creatorName} vous soumet un constat d'état${title} pour validation.</p>
 <p>Veuillez consulter le document et l'accepter ou le refuser en cliquant sur le lien ci-dessous :</p>
 <p><a href="${link}">${link}</a></p>
-<p>Ce lien est valable 7 jours.</p>
-<p>Cordialement</p>`,
+<p>Ce lien est valable 7 jours.</p>`,
   });
 
   return transporter.sendMail({
@@ -149,8 +148,7 @@ export const sendValidationResultMail = ({
     title: `Constat d'état${title} — ${accepted ? "Accepté" : "Refusé"}`,
     content: `<p>Bonjour,</p>
 <p>Votre constat d'état${title} a été <strong>${decision}</strong> par ${validatorEmail}.</p>
-${comment ? `<p>Commentaire : ${comment}</p>` : ""}
-<p>Cordialement</p>`,
+${comment ? `<p>Commentaire : ${comment}</p>` : ""}`,
   });
 
   return transporter.sendMail({

packages/backend/src/routes/validationRoutes.ts

@@ -122,7 +122,7 @@ export const validationPlugin: FastifyPluginAsyncTypebox = async (fastify, _) =>
 
         await trx
           .updateTable("state_report")
-          .set({ validation_status: "accepted" })
+          .set({ validation_status: "accepted", attachment_id: validation.pdf_path })
           .where("id", "=", validation.state_report_id!)
           .execute();
       });

packages/frontend/src/features/state-report/StateReportListItem.tsx

@@ -17,12 +17,10 @@ import { StateReportActions } from "./StateReportActions";
 export const StateReportListItem = ({
   report,
   isLast,
-  isPendingValidation,
   onClick,
 }: {
   report: StateReportWithUser;
   isLast?: boolean;
-  isPendingValidation?: boolean;
   onClick?: () => void;
 }) => {
   const ref = useRef<HTMLButtonElement>(null);
@@ -34,6 +32,8 @@ export const StateReportListItem = ({
   const byText = report.redacted_by ? `par ${report.redacted_by}` : null;
   const isDraft = !report.attachment_id;
 
+  const status = (report.validation_status as "pending" | "accepted" | "declined") || (isDraft ? "draft" : "published");
+
   return (
     <Flex className="report-list-item" position="relative" flexDirection="column" width="100%">
       <Link
@@ -77,7 +77,7 @@ export const StateReportListItem = ({
             {byText}
           </Box>
           <Box mt="8px" mb={whereText ? "0" : "24px"}>
-            <ReportBadge status={isPendingValidation ? "pending_validation" : isDraft ? "draft" : "published"} />
+            <ReportBadge status={status} />
           </Box>
         </Box>
       </Link>
@@ -168,16 +168,27 @@ const MenuMobileModalContent = ({ onClose, report }: MenuProps) => {
 
 type MenuProps = { onClose: (e: Event) => void; report: StateReportWithUser };
 
-type ReportStatus = "draft" | "pending_validation" | "published";
+type ReportStatus = "draft" | "pending" | "accepted" | "declined" | "published";
 const ReportBadge = ({ status }: { status: ReportStatus }) => {
   const labels: Record<ReportStatus, string> = {
     draft: "Brouillon",
-    pending_validation: "En attente de validation",
+    pending: "En attente de validation",
+    accepted: "Envoyé",
+    declined: "Refusé",
     published: "Envoyé",
   };
+
+  const severities: Record<ReportStatus, "info" | "success" | "error"> = {
+    draft: "info",
+    pending: "info",
+    accepted: "success",
+    declined: "info",
+    published: "success",
+  };
+
   return (
     <Badge
-      severity={status === "draft" ? "info" : "success"}
+      severity={severities[status]}
       noIcon
       small
       style={{
@@ -205,12 +216,16 @@ const ReportBadge = ({ status }: { status: ReportStatus }) => {
 
 const icons: Record<ReportStatus, string> = {
   draft: "ri-timer-fill",
-  pending_validation: "ri-time-line",
+  pending: "ri-time-line",
+  accepted: "ri-send-plane-fill",
+  declined: "ri-close-line",
   published: "ri-send-plane-fill",
 };
 
 const colors: Record<ReportStatus, [string, string]> = {
   draft: ["#716043", "#FEECC2"] as const,
-  pending_validation: ["#695240", "#FFE9E6"] as const,
+  pending: ["#695240", "#FFE9E6"] as const,
+  accepted: ["#18753C", "#D1F1D9"] as const,
+  declined: ["#B00020", "#FFCDD2"] as const,
   published: ["#18753C", "#D1F1D9"] as const,
 };

packages/frontend/src/features/state-report/utils.ts

@@ -21,10 +21,16 @@ export type StateReportStep = z.infer<typeof stateReportStepSchema>;
 
 export const useIsStateReportDisabled = () => {
   const form = useStateReportFormContext();
-  const hasAttachment = useWatch({ control: form.control, name: "attachment_id" });
-  return getIsStateReportDisabled({ attachment_id: hasAttachment });
+  const [hasAttachment, validationStatus] = useWatch({
+    control: form.control,
+    name: ["attachment_id", "validation_status"],
+  });
+  return getIsStateReportDisabled({ attachment_id: hasAttachment, validation_status: validationStatus });
 };
 
-export const getIsStateReportDisabled = (stateReport: { attachment_id: string | null }) => {
-  return !!stateReport.attachment_id;
+export const getIsStateReportDisabled = (stateReport: {
+  attachment_id: string | null;
+  validation_status: string | null;
+}) => {
+  return !!stateReport.attachment_id && stateReport.validation_status !== "declined";
 };

packages/frontend/src/routes/constat_.$constatId.pdf.tsx

@@ -157,7 +157,7 @@ const ConstatPdf = () => {
   // propagate isDisabled to children
   useEffect(() => {
     if (!stateReport) return;
-    const isStateReportDisabled = getIsStateReportDisabled({ attachment_id: stateReport.attachment_id });
+    const isStateReportDisabled = getIsStateReportDisabled({ ...stateReport });
     form.setValue("isStateReportDisabled", isStateReportDisabled);
   }, [stateReport]);