feat(api,admin): added visible boolean to certification, added Badge to certifcation based on status and visibility

fbonniec · fbonniec · commit b01856f40ce0 · 2024-12-02T17:56:49.000+01:00
diff --git a/packages/reva-admin-react/src/app/(admin)/certifications-v2/(list)/layout.tsx b/packages/reva-admin-react/src/app/(admin)/certifications-v2/(list)/layout.tsx
@@ -1,20 +1,25 @@
 "use client";
 import { Button } from "@codegouvfr/react-dsfr/Button";
-import SideMenu from "@codegouvfr/react-dsfr/SideMenu";
+import SideMenu, { SideMenuProps } from "@codegouvfr/react-dsfr/SideMenu";
 import { useSearchParams } from "next/navigation";
 import { ReactNode } from "react";
 
 const CertificationListLayout = ({ children }: { children: ReactNode }) => {
   const searchParams = useSearchParams();
-  const statusParam = searchParams.get("status");
+  const statusParam = searchParams.get("status") || undefined;
   const searchFilter = searchParams.get("search") || "";
+  const visibleParam = searchParams.get("visible") || undefined;
 
-  const hrefSideMenu = (status: string | null) => {
+  const hrefSideMenu = (status?: string, visible?: "true" | "false") => {
     const params = new URLSearchParams();
     if (status) {
       params.set("status", status);
     }
 
+    if (visible) {
+      params.set("visible", visible);
+    }
+
     params.set("page", "1");
 
     if (searchFilter) {
@@ -24,15 +29,32 @@ const CertificationListLayout = ({ children }: { children: ReactNode }) => {
     return `/certifications-v2/?${params.toString()}`;
   };
 
-  const menuItem = (text: string, status: string | null) => ({
-    isActive: status === statusParam,
+  const menuItem = (
+    text: string,
+    status?: string,
+    visible?: "true" | "false",
+  ): SideMenuProps.Item => ({
+    isActive: status === statusParam && visible === visibleParam,
     linkProps: {
-      href: hrefSideMenu(status),
+      href: hrefSideMenu(status, visible),
       target: "_self",
     },
     text,
   });
 
+  const items: SideMenuProps.Item[] = [
+    menuItem("Toutes les certifications"),
+    {
+      ...menuItem("Publiées", "VALIDE_PAR_CERTIFICATEUR"),
+      items: [
+        menuItem("Visibles", "VALIDE_PAR_CERTIFICATEUR", "true"),
+        menuItem("Invisibles", "VALIDE_PAR_CERTIFICATEUR", "false"),
+      ],
+    },
+    menuItem("Envoyées pour validation", "A_VALIDER_PAR_CERTIFICATEUR"),
+    menuItem("Brouillons", "BROUILLON"),
+  ];
+
   return (
     <div className="w-full flex flex-col md:flex-row gap-6">
       <SideMenu
@@ -42,9 +64,7 @@ const CertificationListLayout = ({ children }: { children: ReactNode }) => {
         sticky
         fullHeight
         items={[
-          menuItem("Toutes les certifications", null),
-          menuItem("Certifications disponibles", "AVAILABLE"),
-          menuItem("Certifications inactives", "INACTIVE"),
+          ...items,
           {
             isActive: false,
             linkProps: {
diff --git a/packages/reva-admin-react/src/app/(admin)/certifications-v2/(list)/page.tsx b/packages/reva-admin-react/src/app/(admin)/certifications-v2/(list)/page.tsx
@@ -3,30 +3,34 @@ import { WhiteCard } from "@/components/card/white-card/WhiteCard";
 import { useGraphQlClient } from "@/components/graphql/graphql-client/GraphqlClient";
 import { SearchList } from "@/components/search/search-list/SearchList";
 import { graphql } from "@/graphql/generated";
-import { CertificationStatus } from "@/graphql/generated/graphql";
+import { CertificationStatusV2 } from "@/graphql/generated/graphql";
 import { useQuery } from "@tanstack/react-query";
 import { useSearchParams } from "next/navigation";
-import { Tag } from "@codegouvfr/react-dsfr/Tag";
 import { Button } from "@codegouvfr/react-dsfr/Button";
 import { format } from "date-fns";
+import Badge from "@codegouvfr/react-dsfr/Badge";
 
 const getCertificationsQuery = graphql(`
-  query getCertificationsForListPage(
+  query getCertificationsV2ForListPage(
     $offset: Int
     $searchFilter: String
-    $status: CertificationStatus
+    $status: CertificationStatusV2
+    $visible: Boolean
   ) {
-    searchCertificationsForAdmin(
+    searchCertificationsV2ForAdmin(
       limit: 10
       offset: $offset
       searchText: $searchFilter
       status: $status
+      visible: $visible
     ) {
       rows {
         id
         label
         codeRncp
         status
+        statusV2
+        visible
         certificationAuthorityStructure {
           label
         }
@@ -50,22 +54,27 @@ const CertificationListPage = () => {
   const currentPage = page ? Number.parseInt(page) : 1;
   const searchFilter = searchParams.get("search") || "";
   const status = searchParams.get("status");
+  const stringParam = searchParams.get("visible");
+  const visible =
+    stringParam === "true" ? true : stringParam === "false" ? false : undefined;
 
   const {
     data: getCertificationsResponse,
     status: getCertificationsQueryStatus,
   } = useQuery({
-    queryKey: ["getCertifications", searchFilter, currentPage, status],
+    queryKey: ["getCertifications", searchFilter, currentPage, status, visible],
     queryFn: () =>
       graphqlClient.request(getCertificationsQuery, {
         offset: (currentPage - 1) * RECORDS_PER_PAGE,
         searchFilter,
-        status: status as CertificationStatus,
+        status: status as CertificationStatusV2,
+        visible,
       }),
   });
 
   const certificationPage =
-    getCertificationsResponse?.searchCertificationsForAdmin;
+    getCertificationsResponse?.searchCertificationsV2ForAdmin;
+
   return (
     certificationPage && (
       <div className="flex flex-col w-full">
@@ -84,18 +93,16 @@ const CertificationListPage = () => {
           >
             {(c) => (
               <WhiteCard key={c.id} className="gap-2">
-                <span className="text-gray-500 text-sm">{c.codeRncp}</span>
+                <div className="flex flex-row justify-between items-center">
+                  <span className="text-gray-500 text-sm">{c.codeRncp}</span>
+                  <BadgeCertificationStatus
+                    status={c.statusV2}
+                    visible={c.visible}
+                  />
+                </div>
                 <span className="text-lg font-bold">{c.label}</span>
                 <span>{c.certificationAuthorityStructure?.label}</span>
                 <span>Expire le: {format(c.expiresAt, "dd/MM/yyyy")}</span>
-                <Tag
-                  small
-                  className={`mt-2 text-black ${
-                    c.status === "AVAILABLE" ? "bg-green-300" : "bg-red-400"
-                  } `}
-                >
-                  {c.status === "AVAILABLE" ? "Disponible" : "Inactive"}
-                </Tag>
                 <Button
                   data-test="access-certification-button"
                   className="mt-2 ml-auto"
@@ -114,4 +121,55 @@ const CertificationListPage = () => {
   );
 };
 
+const BadgeCertificationStatus = ({
+  status,
+  visible,
+}: {
+  status: CertificationStatusV2;
+  visible: boolean;
+}) => (
+  <>
+    {status == "BROUILLON" && (
+      <Badge
+        noIcon
+        severity="new"
+        data-test="certification-timeline-element-brouillon-badge"
+      >
+        BROUILLON
+      </Badge>
+    )}
+
+    {status == "A_VALIDER_PAR_CERTIFICATEUR" && (
+      <Badge
+        noIcon
+        severity="info"
+        data-test="certification-timeline-element-envoye-pour-validation-badge"
+      >
+        ENVOYÉ POUR VALIDATION
+      </Badge>
+    )}
+
+    {((status == "VALIDE_PAR_CERTIFICATEUR" && !visible) ||
+      status == "INACTIVE") && (
+      <Badge
+        noIcon
+        severity="warning"
+        data-test="certification-timeline-element-invisible-badge"
+      >
+        INVISIBLE
+      </Badge>
+    )}
+
+    {status == "VALIDE_PAR_CERTIFICATEUR" && visible && (
+      <Badge
+        noIcon
+        severity="success"
+        data-test="certification-timeline-element-visible-badge"
+      >
+        VISIBLE
+      </Badge>
+    )}
+  </>
+);
+
 export default CertificationListPage;
diff --git a/packages/reva-api/modules/referential/features/searchCertificationsV2ForAdmin.ts b/packages/reva-api/modules/referential/features/searchCertificationsV2ForAdmin.ts
@@ -0,0 +1,79 @@
+import { $Enums, Prisma } from "@prisma/client";
+
+import { prismaClient } from "../../../prisma/client";
+import { processPaginationInfo } from "../../shared/list/pagination";
+import { Certification, CertificationStatusV2 } from "../referential.types";
+
+export const searchCertificationsV2ForAdmin = async ({
+  offset,
+  limit,
+  searchText,
+  status,
+  visible,
+}: {
+  offset?: number;
+  limit?: number;
+  searchText?: string;
+  status?: CertificationStatusV2;
+  visible?: boolean;
+}): Promise<PaginatedListResult<Certification>> => {
+  const realLimit = limit || 10;
+  const realOffset = offset || 0;
+
+  let whereClause: Prisma.CertificationWhereInput = {};
+
+  if (searchText) {
+    whereClause = {
+      ...whereClause,
+      OR: [
+        { label: { contains: searchText, mode: "insensitive" } },
+        { rncpId: { contains: searchText, mode: "insensitive" } },
+        {
+          certificationAuthorityStructure: {
+            label: {
+              contains: searchText,
+              mode: "insensitive",
+            },
+          },
+        },
+        {
+          rncpTypeDiplome: { contains: searchText, mode: "insensitive" },
+        },
+      ],
+    };
+  }
+
+  if (status) {
+    whereClause = {
+      ...whereClause,
+      statusV2: status as $Enums.CertificationStatusV2,
+    };
+  }
+
+  if (visible) {
+    whereClause = {
+      ...whereClause,
+      visible,
+    };
+  }
+
+  const certifications = await prismaClient.certification.findMany({
+    where: whereClause,
+    orderBy: [{ label: "asc" }],
+    take: limit,
+    skip: offset,
+  });
+
+  const count = await prismaClient.certification.count({
+    where: whereClause,
+  });
+
+  return {
+    rows: certifications.map((c) => ({ ...c, codeRncp: c.rncpId })),
+    info: processPaginationInfo({
+      totalRows: count,
+      limit: realLimit,
+      offset: realOffset,
+    }),
+  };
+};
diff --git a/packages/reva-api/modules/referential/referential.graphql b/packages/reva-api/modules/referential/referential.graphql
@@ -23,6 +23,7 @@ type Certification {
   codeRncp: String!
   status: CertificationStatus!
   statusV2: CertificationStatusV2!
+  visible: Boolean!
   typeDiplome: String
   degree: Degree!
   conventionsCollectives: [ConventionCollective!]!
@@ -268,6 +269,13 @@ type Query {
     searchText: String
     status: CertificationStatus
   ): CertificationPage!
+  searchCertificationsV2ForAdmin(
+    offset: Int
+    limit: Int
+    searchText: String
+    status: CertificationStatusV2
+    visible: Boolean
+  ): CertificationPage!
   getCertification(certificationId: ID!): Certification!
   getRegions: [Region!]!
   getDepartments: [Department!]!
diff --git a/packages/reva-api/modules/referential/referential.resolvers.ts b/packages/reva-api/modules/referential/referential.resolvers.ts
@@ -16,6 +16,7 @@ import { getReorientationReasons } from "./features/getReorientationReasons";
 import { getVulnerabilityIndicators } from "./features/getVulnerabilityIndicators";
 import { replaceCertification } from "./features/replaceCertification";
 import { searchCertificationsForAdmin } from "./features/searchCertificationsForAdmin";
+import { searchCertificationsV2ForAdmin } from "./features/searchCertificationsV2ForAdmin";
 import { updateCertification } from "./features/updateCertification";
 import { updateCompetenceBlocsByCertificationId } from "./features/updateCompetenceBlocsByCertificationId";
 import { referentialResolversSecurityMap } from "./referential.security";
@@ -133,6 +134,14 @@ const unsafeReferentialResolvers = {
         searchText: payload.searchText,
         status: payload.status,
       }),
+    searchCertificationsV2ForAdmin: (_: any, payload: any) =>
+      searchCertificationsV2ForAdmin({
+        offset: payload.offset,
+        limit: payload.limit,
+        searchText: payload.searchText,
+        status: payload.status,
+        visible: payload.visible,
+      }),
     getCertification: (
       _: unknown,
       { certificationId }: { certificationId: string },
diff --git a/packages/reva-api/modules/referential/referential.types.ts b/packages/reva-api/modules/referential/referential.types.ts
@@ -22,6 +22,16 @@ export const CertificationStatus = {
 export type CertificationStatus =
   (typeof CertificationStatus)[keyof typeof CertificationStatus];
 
+export const CertificationStatusV2 = {
+  BROUILLON: "BROUILLON",
+  A_VALIDER_PAR_CERTIFICATEUR: "A_VALIDER_PAR_CERTIFICATEUR",
+  VALIDE_PAR_CERTIFICATEUR: "VALIDE_PAR_CERTIFICATEUR",
+  INACTIVE: "INACTIVE",
+};
+
+export type CertificationStatusV2 =
+  (typeof CertificationStatusV2)[keyof typeof CertificationStatusV2];
+
 export interface Certification {
   id: string;
   label: string;
@@ -33,6 +43,8 @@ export interface Certification {
   abilities: string | null;
   codeRncp: string;
   status: CertificationStatus;
+  statusV2: CertificationStatusV2;
+  visible: boolean | null;
 }
 
 export interface Region {
diff --git a/packages/reva-api/prisma/migrations/20241202160010_add_property_visible_to_certification/migration.sql b/packages/reva-api/prisma/migrations/20241202160010_add_property_visible_to_certification/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "certification" ADD COLUMN     "visible" BOOLEAN NOT NULL DEFAULT false;
diff --git a/packages/reva-api/prisma/schema.prisma b/packages/reva-api/prisma/schema.prisma
@@ -46,6 +46,7 @@ model Certification {
   summary                                           String?
   status                                            CertificationStatus                                 @default(INACTIVE)
   statusV2                                          CertificationStatusV2                               @default(BROUILLON) @map("status_v2")
+  visible                                           Boolean                                             @default(false)
   rncpId                                            String                                              @map("rncp_id") @db.VarChar(255)
   organismsAndRegions                               OrganismsOnRegionsAndCertifications[]
   createdAt                                         DateTime                                            @default(now()) @map("created_at") @db.Timestamptz(6)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- AlterTable`
	`2`	`+ALTER TABLE "certification" ADD COLUMN "visible" BOOLEAN NOT NULL DEFAULT false;`