fix: on remet la politique de confidentialité pour le dashlord (#3411)

mission-apprentissage · Dec 4, 2023 · 7d27118 · 7d27118
1 parent cec88db
commit 7d27118
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 12 deletions.
diff --git a/.talismanrc b/.talismanrc
@@ -119,6 +119,8 @@ fileignoreconfig:
   checksum: 32225fd2335732e86cceb6b3bb90e5e4a93c976090cf9445c7243f555638fd86
 - filename: ui/pages/mentions-legales.tsx
   checksum: a2f835244846eceb8330f07846c128d318de81c5e46741be536b554726b4372c
+- filename: ui/pages/politique-de-confidentialite.tsx
+  checksum: ecb4075e29596bc69091cf6a3a3836622cc0ccfa91359e6d96eaa026881886c6
 scopeconfig:
 - scope: node
 custom_patterns:

diff --git a/server/static/emails/reminder_missing_configuration_and_data.mjml.ejs b/server/static/emails/reminder_missing_configuration_and_data.mjml.ejs
@@ -22,7 +22,7 @@
           </mj-text>
           <mj-text>
             Le tableau de bord collecte les données sur l’apprentissage selon le principe de minimisation des
-            <a target="_blank" href="<%= utils.getPublicUrl(`/mention-information`) %>" class="link-nostyle">
+            <a target="_blank" href="<%= utils.getPublicUrl(`/politique-de-confidentialite`) %>" class="link-nostyle">
               <u>données personnelles</u>
             </a>
           </mj-text>

diff --git a/server/static/emails/reminder_missing_data.mjml.ejs b/server/static/emails/reminder_missing_data.mjml.ejs
@@ -26,7 +26,7 @@
           </mj-text>
           <mj-text>
             Le tableau de bord collecte les données sur l’apprentissage selon le principe de minimisation des
-            <a target="_blank" href="<%= utils.getPublicUrl(`/mention-information`) %>" class="link-nostyle">
+            <a target="_blank" href="<%= utils.getPublicUrl(`/politique-de-confidentialite`) %>" class="link-nostyle">
               <u>données personnelles</u>
             </a>
           </mj-text>

diff --git a/ui/components/Page/components/Footer.tsx b/ui/components/Page/components/Footer.tsx
@@ -113,10 +113,7 @@ const Footer = () => {
                 </Link>
               </ListItem>
               <ListItem _after={{ content: "'|'", marginLeft: "0.5rem", marginRight: "0.5rem" }}>
-                <Link href={"/mention-information"} isExternal>
-                  Mention d’information
-                  <ExternalLinkLine w={"0.55rem"} h={"0.55rem"} mb={"0.125rem"} ml={1} />
-                </Link>
+                <Link href={"/politique-de-confidentialite"}>Politique de confidentialité</Link>
               </ListItem>
               <ListItem _after={{ content: "'|'", marginLeft: "0.5rem", marginRight: "0.5rem" }}>
                 <Link href="https://beta.gouv.fr/startups/tdb-apprentissage.html" isExternal>

diff --git a/ui/modules/dashboard/DashboardOrganisme.tsx b/ui/modules/dashboard/DashboardOrganisme.tsx
@@ -810,7 +810,7 @@ const DashboardOrganisme = ({ organisme, modePublique }: Props) => {
                       données peuvent être consultées <strong>exclusivement</strong> par votre organisme et les
                       administrations publiques dans le cadre de la{" "}
                       <Link
-                        href="/mention-information"
+                        href="/politique-de-confidentialite"
                         borderBottom="1px"
                         _hover={{ textDecoration: "none" }}
                         display="inline-flex"

diff --git a/ui/next.config.js b/ui/next.config.js
@@ -67,18 +67,17 @@ const nextConfig = {
       },
       {
         source: "/politique-confidentialite",
-        destination: "/mention-information",
+        destination: "/politique-de-confidentialite",
         permanent: true,
       },
       {
         source: "/protection-des-donnees",
-        destination: "/mention-information",
+        destination: "/politique-de-confidentialite",
         permanent: true,
       },
       {
         source: "/mention-information",
-        destination:
-          "https://mission-apprentissage.notion.site/Mention-d-information-7b1c32f4c2214e0c9523686b18ada6fa?pvs=4",
+        destination: "/politique-de-confidentialite",
         permanent: true,
       },
     ];

diff --git a/ui/pages/mentions-legales.tsx b/ui/pages/mentions-legales.tsx
@@ -20,7 +20,7 @@ export const getStaticProps = (async () => {
 export default function MentionsLegales({ data }: InferGetStaticPropsType<typeof getStaticProps>) {
   return (
     <SimplePage title="Mentions légales">
-      <NotionRenderer pageTitle={false} disableHeader={true} recordMap={data} fullPage={true} darkMode={false} />
+      <NotionRenderer disableHeader={true} recordMap={data} fullPage={true} darkMode={false} />
     </SimplePage>
   );
 }
diff --git a/ui/pages/politique-de-confidentialite.tsx b/ui/pages/politique-de-confidentialite.tsx
@@ -0,0 +1,26 @@
+import { GetStaticProps, InferGetStaticPropsType } from "next";
+import { NotionAPI } from "notion-client";
+import { ExtendedRecordMap } from "notion-types";
+import { NotionRenderer } from "react-notion-x";
+
+import { _get } from "@/common/httpClient";
+import SimplePage from "@/components/Page/SimplePage";
+
+import "react-notion-x/src/styles.css";
+
+export const getStaticProps = (async () => {
+  const notion = new NotionAPI();
+  const recordMap = await notion.getPage("Politique-de-confidentialit-7b1c32f4c2214e0c9523686b18ada6fa");
+  // const data = await _get("/api/mentions-legales");
+  return { props: { data: recordMap }, revalidate: 60 * 30 };
+}) satisfies GetStaticProps<{
+  data: ExtendedRecordMap;
+}>;
+
+export default function PolitiqueDeConfidentialité({ data }: InferGetStaticPropsType<typeof getStaticProps>) {
+  return (
+    <SimplePage title="Politique de confidentialité">
+      <NotionRenderer disableHeader={true} recordMap={data} fullPage={true} darkMode={false} />
+    </SimplePage>
+  );
+}