fix: fix fetching commissions (#616)

Author: YoannNumericite

prisma/migrations/20240425140149_add_archived_on_commission/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "Commission" ADD COLUMN     "archived" BOOLEAN;

prisma/schema.prisma

@@ -1,7 +1,7 @@
 generator client {
   provider        = "prisma-client-js"
   previewFeatures = ["fullTextSearch", "referentialActions"]
-  engineType = "binary"
+  engineType      = "binary"
 }
 
 datasource db {
@@ -17,6 +17,7 @@ model Commission {
   dossiers        Dossier[]
   lastSent        DateTime?
   SendList        SendList[]
+  archived        Boolean?
 }
 
 model SocieteProduction {

src/pages/api/commissions/index.ts

@@ -188,7 +188,7 @@ const getPastCommissions = async () => {
       },
     },
     orderBy: { date: "desc" },
-    where: { date: { lt: new Date() }, dossiers: { some: {} } },
+    where: { date: { lt: new Date() }, dossiers: { some: {} }, archived: false },
   });
 };
 

src/pages/dossiers/index.tsx

@@ -70,32 +70,38 @@ const Page: React.FC = () => {
   const [showTable, setShowTable] = React.useState<boolean>(true);
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const [status, setStatus] = React.useState<statusGroup>("futur");
-  const [loadingPdf, setLoadingPdf] = React.useState<string>('')
+  const [loadingPdf, setLoadingPdf] = React.useState<string>("");
 
   // eslint-disable-next-line @typescript-eslint/no-shadow
   const handleStatus = (status: statusGroup) => {
     setStatus(status);
   };
 
-  const { commissions, ...swrCommissions } = useCommissions(
-    "upcoming",
-    //@ts-expect-error
-    session.data.dbUser.role !== "MEMBRE"
-      ? "all"
-      : //@ts-expect-error
-        session.data.dbUser.departements
-  );
+  const { commissions, ...swrCommissions } =
+    status === "futur"
+      ? useCommissions(
+          "upcoming",
+          //@ts-expect-error
+          session.data.dbUser.role !== "MEMBRE"
+            ? "all"
+            : //@ts-expect-error
+              session.data.dbUser.departements
+        )
+      : { commissions: [] };
 
   console.log("commissions : ", commissions);
 
-  const { ...commissionsPast } = useCommissions(
-    "past",
-    //@ts-expect-error
-    session.data.dbUser.role !== "MEMBRE"
-      ? "all"
-      : //@ts-expect-error
-        session.data.dbUser.departements
-  );
+  const { ...commissionsPast } =
+    status === "past"
+      ? useCommissions(
+          "past",
+          //@ts-expect-error
+          session.data.dbUser.role !== "MEMBRE"
+            ? "all"
+            : //@ts-expect-error
+              session.data.dbUser.departements
+        )
+      : { commissions: [] };
 
   const [searchValueInput, setSearchValueInput] = useState<string | undefined>(
     undefined
@@ -471,36 +477,36 @@ const Page: React.FC = () => {
                                     <ButtonLink
                                       light={true}
                                       onClick={async () => {
-                                        setLoadingPdf('ODJ_' + commission.id);
+                                        setLoadingPdf("ODJ_" + commission.id);
                                         await generateOdj(commission);
-                                        setLoadingPdf('');
+                                        setLoadingPdf("");
                                       }}
                                     >
                                       <RiDownloadLine
                                         style={{ marginRight: "10px" }}
                                       />
-                                      {loadingPdf === 'ODJ_' + commission.id ? 
-                                        (<IconLoader></IconLoader>)
-                                        :
-                                        (<span>Ordre du jour</span>)
-                                      }
+                                      {loadingPdf === "ODJ_" + commission.id ? (
+                                        <IconLoader></IconLoader>
+                                      ) : (
+                                        <span>Ordre du jour</span>
+                                      )}
                                     </ButtonLink>
                                     <ButtonLink
                                       light={true}
                                       onClick={async () => {
-                                        setLoadingPdf('PV_' + commission.id);
+                                        setLoadingPdf("PV_" + commission.id);
                                         await generatePV(commission);
-                                        setLoadingPdf('');
+                                        setLoadingPdf("");
                                       }}
                                     >
                                       <RiDownloadLine
                                         style={{ marginRight: "10px" }}
                                       />
-                                      {loadingPdf === 'PV_' + commission.id ? 
-                                        (<IconLoader></IconLoader>)
-                                        :
-                                        (<span>Procès Verbal</span>)
-                                      }
+                                      {loadingPdf === "PV_" + commission.id ? (
+                                        <IconLoader></IconLoader>
+                                      ) : (
+                                        <span>Procès Verbal</span>
+                                      )}
                                     </ButtonLink>
                                   </div>
                                 )}