Merge pull request #105 from mission-apprentissage/suppression-demande

Suppression demande
mission-apprentissage · Oct 2, 2023 · 420dadb · 420dadb
2 parents 8769413 + 30017c1
commit 420dadb
Show file tree

Hide file tree

Showing 45 changed files with 601 additions and 322 deletions.
diff --git a/server/public/mails/activate_account.mjml.ejs b/server/public/mails/activate_account.mjml.ejs
@@ -22,24 +22,15 @@
             background-color="#0e4194"
             color="white"
           >
-            Lien d'activation
+            Activer votre compte
           </mj-button>
           <mj-text>
-            Concernant la saisie des demandes d’ouverture, fermeture… :<br />
-            - vous devez enregistrer la liste des demandes qui seront soumises
-            au vote du Conseil Régional et non pas toutes les demandes que vous
-            avez examinées.<br />
-            - vous pouvez enregistrer les demandes en mode brouillon ou
-            soumettre à la validation<br />
-            - lorsque la saisie de toutes les demandes pour la Région Académique
-            sera terminée, l’utilisateur “Pilote” (Recteur ou SGA) devra valider
-            la liste<br />
-            <br />
             Pour toute question, consultez la
             <a href="<%= utils.getPublicUrl(`/documentation`) %>">
               documentation dans Orion</a
             >
-            ou contactez-nous.<br />
+            ou contactez-nous à l'adresse suivante:
+            [email protected]<br />
           </mj-text>
           <%- include('./common/signature.ejs'); %>
         </mj-column>

diff --git a/server/public/mails/activate_account_pilote.mjml.ejs b/server/public/mails/activate_account_pilote.mjml.ejs
@@ -21,7 +21,7 @@
             background-color="#0e4194"
             color="white"
           >
-            Lien d'activation
+            Activer votre compte
           </mj-button>
           <mj-text>
             Pour toute question, consultez la

diff --git a/server/public/mails/activate_account_region.mjml.ejs b/server/public/mails/activate_account_region.mjml.ejs
@@ -0,0 +1,54 @@
+<mjml>
+  <%- include('./common/head.ejs'); %>
+  <mj-body background-color="#f9fafc">
+    <%- include('./common/header.ejs'); %>
+    <mj-wrapper padding="10px 20px">
+      <mj-section background-color="#ffffff" padding-top="0">
+        <mj-column>
+          <mj-text>
+            Bonjour <%= data.recipient.firstname %> <%= data.recipient.lastname
+            %>,<br />
+            <br />
+            Orion vous donne accès à différentes données et indicateurs qui
+            outillent les réflexions autour de la transformation de la carte des
+            formations professionnelles en voie initiale.<br />
+            <br />
+            À compter d’aujourd’hui, vous pouvez saisir les demandes
+            d’ouverture/fermeture de formations dans Orion, ce qui permettra
+            d’initier le dialogue de gestion avec la DGESCO.<br />
+            <br />
+            Pour y accéder, activez votre compte en cliquant sur le lien
+            ci-dessous :<br />
+          </mj-text>
+          <mj-button
+            href="<%= utils.getPublicUrl(`/auth/activer-compte?activationToken=${data.activationToken}`) %>"
+            background-color="#0e4194"
+            color="white"
+          >
+            Activer votre compte
+          </mj-button>
+          <mj-text>
+            À venir pour compléter ce module de saisie :
+            <br />
+            <ul>
+              <li>
+                Le 16/10, une console d’analyse des demandes enrichie par les
+                indicateurs InserJeunes ;
+              </li>
+              <li>
+                Le 23/10, une page de pilotage du taux de transformation de la
+                carte.
+              </li>
+            </ul>
+          </mj-text>
+          <mj-text>
+            Si vous rencontrez des problèmes lors de la connexion ou de la
+            saisie, vous pouvez contacter notre équipe à l’adresse suivante :
+            [email protected]
+          </mj-text>
+          <%- include('./common/signature.ejs'); %>
+        </mj-column>
+      </mj-section>
+    </mj-wrapper>
+  </mj-body>
+</mjml>
diff --git a/server/src/modules/core/services/mailer/mailer.ts b/server/src/modules/core/services/mailer/mailer.ts
@@ -37,6 +37,15 @@ export type TemplatePayloads = {
     };
     activationToken: string;
   };
+  activate_account_region: {
+    recipient: {
+      lastname?: string | undefined;
+      firstname?: string | undefined;
+      email: string;
+      role: string;
+    };
+    activationToken: string;
+  };
 };
 
 function createTransporter(smtp: SMTPTransport & { secure: boolean }) {

diff --git a/server/src/modules/core/usecases/createUser/createUser.usecase.ts b/server/src/modules/core/usecases/createUser/createUser.usecase.ts
@@ -49,8 +49,14 @@ export const [createUser, createUserFactory] = inject(
       );
 
       const template =
-        ({ pilote: "activate_account_pilote" } as const)[role] ??
-        ("activate_account" as const);
+        (
+          {
+            pilote: "activate_account_pilote",
+            pilote_region: "activate_account_region",
+            gestionnaire_region: "activate_account_region",
+            expert_region: "activate_account_region",
+          } as const
+        )[role] ?? ("activate_account" as const);
 
       deps.shootTemplate({
         to: email,

diff --git a/server/src/modules/intentions/routes/demande.routes.ts b/server/src/modules/intentions/routes/demande.routes.ts
@@ -13,6 +13,7 @@ import { hasPermissionHandler } from "../../core";
 import { countDemandes } from "../queries/countDemandes.query";
 import { findDemande } from "../queries/findDemande.query";
 import { findDemandes } from "../queries/findDemandes.query";
+import { deleteDemande } from "../usecases/deleteDemande/deleteDemande.usecase";
 import { submitDemande } from "../usecases/submitDemande/submitDemande.usecase";
 import { submitDraftDemande } from "../usecases/submitDraftDemande/submitDraftDemande.usecase";
 
@@ -21,7 +22,7 @@ export const demandeRoutes = ({ server }: { server: Server }) => {
     "/demande/submit",
     {
       schema: ROUTES_CONFIG.submitDemande,
-      preHandler: hasPermissionHandler("intentions/envoi"),
+      preHandler: hasPermissionHandler("intentions/ecriture"),
     },
     async (request, response) => {
       const { demande } = request.body;
@@ -39,7 +40,7 @@ export const demandeRoutes = ({ server }: { server: Server }) => {
     "/demande/draft",
     {
       schema: ROUTES_CONFIG.submitDraftDemande,
-      preHandler: hasPermissionHandler("intentions/envoi"),
+      preHandler: hasPermissionHandler("intentions/ecriture"),
     },
     async (request, response) => {
       const { demande } = request.body;
@@ -65,7 +66,7 @@ export const demandeRoutes = ({ server }: { server: Server }) => {
       const demande = await findDemande({ id: request.params.id, user });
       if (!demande) return response.status(404).send();
 
-      const scope = getPermissionScope(user.role, "intentions/envoi");
+      const scope = getPermissionScope(user.role, "intentions/ecriture");
       const canEdit = guardScope(scope?.default, {
         user: () => user.id === demande.createurId,
         region: () => user.codeRegion === demande.codeRegion,
@@ -76,6 +77,20 @@ export const demandeRoutes = ({ server }: { server: Server }) => {
     }
   );
 
+  server.delete(
+    "/demande/:id",
+    {
+      schema: ROUTES_CONFIG.deleteDemande,
+      preHandler: hasPermissionHandler("intentions/ecriture"),
+    },
+    async (request, response) => {
+      const user = request.user;
+      if (!user) throw Boom.forbidden();
+      await deleteDemande({ id: request.params.id, user });
+      response.status(200).send();
+    }
+  );
+
   server.get(
     "/demandes",
     {

diff --git a/server/src/modules/intentions/usecases/deleteDemande/deleteDemande.dep.ts b/server/src/modules/intentions/usecases/deleteDemande/deleteDemande.dep.ts
@@ -0,0 +1,5 @@
+import { kdb } from "../../../../db/db";
+
+export const deleteDemandeQuery = async (id: string) => {
+  await kdb.deleteFrom("demande").where("id", "=", id).execute();
+};
diff --git a/server/src/modules/intentions/usecases/deleteDemande/deleteDemande.usecase.ts b/server/src/modules/intentions/usecases/deleteDemande/deleteDemande.usecase.ts
@@ -0,0 +1,30 @@
+import Boom from "@hapi/boom";
+import { getPermissionScope, guardScope } from "shared";
+
+import { RequestUser } from "../../../core/model/User";
+import { findOneDemande } from "../../repositories/findOneDemande.query";
+import { deleteDemandeQuery } from "./deleteDemande.dep";
+
+export const deleteDemandeFactory =
+  (deps = { findOneDemande, deleteDemandeQuery }) =>
+  async ({
+    id,
+    user,
+  }: {
+    id: string;
+    user: Pick<RequestUser, "id" | "role" | "codeRegion">;
+  }) => {
+    const demande = await deps.findOneDemande(id);
+    if (!demande) throw Boom.notFound();
+
+    const scope = getPermissionScope(user.role, "intentions/ecriture");
+    const isAllowed = guardScope(scope?.default, {
+      user: () => user.id === demande.createurId,
+      region: () => user.codeRegion === demande.codeRegion,
+      national: () => true,
+    });
+    if (!isAllowed) throw Boom.forbidden();
+    await deps.deleteDemandeQuery(demande.id);
+  };
+
+export const deleteDemande = deleteDemandeFactory();
diff --git a/server/src/modules/intentions/usecases/submitDemande/submitDemande.usecase.ts b/server/src/modules/intentions/usecases/submitDemande/submitDemande.usecase.ts
@@ -74,7 +74,7 @@ export const [submitDemande, submitDemandeFactory] = inject(
       if (!dataEtablissement) throw Boom.badRequest("Code uai non valide");
       if (!dataEtablissement.codeRegion) throw Boom.badData();
 
-      const scope = getPermissionScope(user.role, "intentions/envoi");
+      const scope = getPermissionScope(user.role, "intentions/ecriture");
       const isAllowed = guardScope(scope?.default, {
         user: () =>
           user.codeRegion === dataEtablissement.codeRegion &&

diff --git a/server/src/modules/intentions/usecases/submitDraftDemande/submitDraftDemande.usecase.ts b/server/src/modules/intentions/usecases/submitDraftDemande/submitDraftDemande.usecase.ts
@@ -74,7 +74,7 @@ export const [submitDraftDemande] = inject(
       if (!dataEtablissement) throw Boom.badRequest("Code uai non valide");
       if (!dataEtablissement.codeRegion) throw Boom.badData();
 
-      const scope = getPermissionScope(user.role, "intentions/envoi");
+      const scope = getPermissionScope(user.role, "intentions/ecriture");
       const isAllowed = guardScope(scope?.default, {
         user: () =>
           user.codeRegion === dataEtablissement.codeRegion &&

diff --git a/shared/client/intentions/intentions.client.ts b/shared/client/intentions/intentions.client.ts
@@ -31,6 +31,11 @@ export const createIntentionsClient = (instance: AxiosInstance) => ({
     url: "/demande/draft",
     instance,
   }),
+  deleteDemande: createClientMethod<typeof ROUTES_CONFIG.deleteDemande>({
+    method: "DELETE",
+    url: ({ params: { id } }) => `/demande/${id}`,
+    instance,
+  }),
   getDemande: createClientMethod<typeof ROUTES_CONFIG.getDemande>({
     method: "GET",
     url: ({ params: { id } }) => `/demande/${id}`,

diff --git a/shared/client/intentions/intentions.schema.ts b/shared/client/intentions/intentions.schema.ts
@@ -175,6 +175,12 @@ export const intentionsSchemas = {
       }),
     },
   },
+  deleteDemande: {
+    params: Type.Object({ id: Type.String() }),
+    response: {
+      200: Type.Void(),
+    },
+  },
   getDemandes: {
     querystring: Type.Intersect([
       FiltersSchema,

diff --git a/shared/security/permissions.ts b/shared/security/permissions.ts
@@ -11,8 +11,7 @@ export const PERMISSIONS = {
   admin: {
     "pilotage_reforme/lecture": { default: "national" },
     "intentions/lecture": { default: "national", draft: "national" },
-    "intentions/suppression": { default: "national" },
-    "intentions/envoi": { default: "national" },
+    "intentions/ecriture": { default: "national" },
   },
   pilote: {
     // "intentions/lecture": { default: "national", draft: "national" },
@@ -23,13 +22,11 @@ export const PERMISSIONS = {
   },
   expert_region: {
     "intentions/lecture": { default: "region", draft: "region" },
-    "intentions/suppression": { default: "region" },
-    "intentions/envoi": { default: "region" },
+    "intentions/ecriture": { default: "region" },
   },
   gestionnaire_region: {
     "intentions/lecture": { draft: "user", default: "region" },
-    "intentions/suppression": { default: "user" },
-    "intentions/envoi": { default: "user" },
+    "intentions/ecriture": { default: "user" },
   },
 } satisfies {
   [R: string]: {

diff --git a/ui/app/(wrapped)/intentions/[intentionId]/page.client.tsx b/ui/app/(wrapped)/intentions/[intentionId]/page.client.tsx
@@ -24,7 +24,7 @@ export default ({
     <>
       {data && (
         <IntentionForm
-          canEdit={data.canEdit}
+          disabled={!data.canEdit}
           formId={intentionId}
           defaultValues={data}
           formMetadata={data.metadata}

diff --git a/ui/app/(wrapped)/intentions/components/ConfirmationDelete.tsx b/ui/app/(wrapped)/intentions/components/ConfirmationDelete.tsx
@@ -0,0 +1,65 @@
+import {
+  AlertDialog,
+  AlertDialogBody,
+  AlertDialogContent,
+  AlertDialogFooter,
+  AlertDialogOverlay,
+  Button,
+  Heading,
+  Text,
+  useDisclosure,
+} from "@chakra-ui/react";
+import { FC, MouseEventHandler, useRef } from "react";
+
+import { ArrowIcon } from "@/components/icons/arrowIcon";
+
+export const ConfirmationDelete = ({
+  Trigger,
+  onConfirm,
+}: {
+  Trigger: FC<{ onClick: MouseEventHandler<HTMLButtonElement> }>;
+  onConfirm: () => Promise<void>;
+}) => {
+  const { isOpen, onOpen, onClose } = useDisclosure();
+  const cancelRef = useRef(null);
+
+  return (
+    <>
+      <Trigger onClick={onOpen} />
+      <AlertDialog
+        isOpen={isOpen}
+        leastDestructiveRef={cancelRef}
+        onClose={onClose}
+        size="xl"
+        isCentered
+      >
+        <AlertDialogOverlay>
+          <AlertDialogContent borderRadius={0}>
+            <AlertDialogBody>
+              <Heading fontSize="3xl" mt="6">
+                <ArrowIcon mr="2" mb="1" />
+                Confirmation de suppression
+              </Heading>
+              <Text mt="4">
+                Êtes-vous sûr de vouloir supprimer la demande ?
+              </Text>
+              <Text mt="4">
+                Cette action est irréversible, vous perdrez l’ensemble des
+                données associées à votre demande.
+              </Text>
+            </AlertDialogBody>
+
+            <AlertDialogFooter>
+              <Button variant="secondary" ref={cancelRef} onClick={onClose}>
+                Annuler
+              </Button>
+              <Button variant="primary" onClick={onConfirm} ml={3}>
+                Confirmer la suppression
+              </Button>
+            </AlertDialogFooter>
+          </AlertDialogContent>
+        </AlertDialogOverlay>
+      </AlertDialog>
+    </>
+  );
+};
diff --git a/...ped)/intentions/intentionForm/InfoBox.tsx → ...rapped)/intentions/components/InfoBox.tsx b/...ped)/intentions/intentionForm/InfoBox.tsx → ...rapped)/intentions/components/InfoBox.tsx
diff --git a/...ntentions/menuIntention/MenuIntention.tsx → ...)/intentions/components/MenuIntention.tsx b/...ntentions/menuIntention/MenuIntention.tsx → ...)/intentions/components/MenuIntention.tsx