Merge branch 'develop' (#1753)

* Rebase master (#1746) * fix: release (#1732) * fix: add CNPG prod cluster (#1729) * fix: add CNPG prod cluster * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * fix * Update values.yaml * fix * fix * fix * fix * chore: fix preprod workflow * fix: release * chore(release): version 1.135.1 * release ([#1732](#1732)) ([8393d46](8393d46)), closes [#1729](#1729) * chore(release): version 1.135.2 * add CNPG prod cluster ([#1729](#1729)) ([4b74272](4b74272)) * allow metabse ingress ([#1733](#1733)) ([1f841e1](1f841e1)) * release ([dffeb6c](dffeb6c)) * fix: 🐛 Corrige la navigation vers les articles depuis calendar * fix(ci): restore from cnpg (#1736) * fix: restore from CNPG * fix: reset dbs on dev/preprod deploys * fix * fix * fix * fix * fix * fix * Update values.yaml * Update values.yaml * Update values.yaml * fix(cnpg): use fixed name DB * fix(restore): use defaults recovery user (#1738) * fix(restore): use defaults recovery user * Update values.yaml * Update values.yaml * Update values.yaml * fix(cnpg): disable preprod backups for real * fix: Corrige les notifications articles et certaines redirections vers les articles * chore: change le numéro de version (v1.1.98) * chore(release): version 1.135.3 * Corrige les notifications articles et certaines redirections vers les articles ([5364e89](5364e89)) * **ci:** restore from cnpg ([#1736](#1736)) ([fb94763](fb94763)) * **cnpg:** disable preprod backups for real ([67ea71b](67ea71b)) * **cnpg:** use fixed name DB ([e5073fb](e5073fb)) * **restore:** use defaults recovery user ([#1738](#1738)) ([c230ef1](c230ef1)) * 🐛 Corrige la navigation vers les articles depuis calendar ([b0904c0](b0904c0)) * fix: yarn berry + fetch + docker opti (#1739) * fix: 🐛 Corrige la redirection vers les articles depuis les tnd * chore(release): version 1.135.4 * 🐛 Corrige la redirection vers les articles depuis les tnd ([2e1a2d7](2e1a2d7)) * yarn berry + fetch + docker opti ([#1739](#1739)) ([772e4ca](772e4ca)) * chore(release): version 1.135.5 * 🐛 Corrige la redirection vers les articles depuis les tnd ([ad155a0](ad155a0)) * Corrige les notifications articles et certaines redirections vers les articles ([e2ab03f](e2ab03f)) * yarn berry + fetch + docker opti ([#1739](#1739)) ([204a176](204a176)) * **ci:** restore from cnpg ([#1736](#1736)) ([8cb13d5](8cb13d5)) * **cnpg:** disable preprod backups for real ([0a313f0](0a313f0)) * **cnpg:** use fixed name DB ([8f8796c](8f8796c)) * **restore:** use defaults recovery user ([#1738](#1738)) ([3cefc73](3cefc73)) * 🐛 Corrige la navigation vers les articles depuis calendar ([5bcfd15](5bcfd15)) * feat: ajoute un champ dans la config pour activer zeroAccident * chore(release): version 1.136.0 * ajoute un champ dans la config pour activer zeroAccident ([bf2ce24](bf2ce24)) * feat: ajoute un flag zeroAccident sur les articles * chore(release): version 1.137.0 * ajoute un flag zeroAccident sur les articles ([a782dc6](a782dc6)) * chore(release): version 1.138.0 * ajoute un champ dans la config pour activer zeroAccident ([c31e085](c31e085)) * ajoute un flag zeroAccident sur les articles ([29ee0fd](29ee0fd)) * zeroaaccident ([438aab0](438aab0)) * chore(release): version 1.138.1 * Expo build iOS ([1b5b9ff](1b5b9ff)) * chore(release): version 1.138.2 * 🐛 Politique de confidentialité 2024 ([5661675](5661675)) * chore(release): version 1.139.0 * 🐛 Ajoute les liens de l'app ZéroAccident ([a75f778](a75f778)) * 🎸 Ajoute un champ 'note' pour l'annuaire 1000j blues ([c1e552c](c1e552c)) * chore(release): version 1.140.0 * **recosante:** add recosante widget on evaluation page ([#1742](#1742)) ([dafc7be](dafc7be)) * chore(release): version 1.140.1 * add info dev (expoUpdates enabled) ([00d337c](00d337c)) * feat: add contact type for widget epds --------- Co-authored-by: Julien Bouquillon <[email protected]> Co-authored-by: semantic-release-bot <[email protected]> Co-authored-by: Jo <[email protected]> * feat: #1749, #1751 - Ajout de la langue choisie (EPDS) + Ajout d'un champ message avant l'ouverture de whatsapp * fix: Corrige les tests et supprime les tests UI sur le centre de notifications * fix: nouveau lien accessibilité numerique * fix: Omitting --ignore-scripts can lead to the execution of shell scripts --------- Co-authored-by: Julien Bouquillon <[email protected]> Co-authored-by: semantic-release-bot <[email protected]> Co-authored-by: Jo <[email protected]>
SocialGouv · Jul 1, 2024 · 995a5d1 · 995a5d1
1 parent f33c933
commit 995a5d1
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 158 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,86 +1,75 @@
 # [1.141.0](https://github.com/SocialGouv/1000jours/compare/v1.140.1...v1.141.0) (2024-05-13)
 
-
 ### Features
 
-* add contact type for widget epds ([#1747](https://github.com/SocialGouv/1000jours/issues/1747)) ([205bdc7](https://github.com/SocialGouv/1000jours/commit/205bdc74a9db8184297100ec464f7df1cdbe8d73))
+- add contact type for widget epds ([#1747](https://github.com/SocialGouv/1000jours/issues/1747)) ([205bdc7](https://github.com/SocialGouv/1000jours/commit/205bdc74a9db8184297100ec464f7df1cdbe8d73))
 
 ## [1.140.1](https://github.com/SocialGouv/1000jours/compare/v1.140.0...v1.140.1) (2024-04-08)
 
-
 ### Bug Fixes
 
-* add info dev (expoUpdates enabled) ([00d337c](https://github.com/SocialGouv/1000jours/commit/00d337cbe6070c97e1a2b413c7362351cb3640e3))
+- add info dev (expoUpdates enabled) ([00d337c](https://github.com/SocialGouv/1000jours/commit/00d337cbe6070c97e1a2b413c7362351cb3640e3))
 
 # [1.140.0](https://github.com/SocialGouv/1000jours/compare/v1.139.0...v1.140.0) (2024-04-01)
 
-
 ### Features
 
-* **recosante:** add recosante widget on evaluation page ([#1742](https://github.com/SocialGouv/1000jours/issues/1742)) ([dafc7be](https://github.com/SocialGouv/1000jours/commit/dafc7bef7e5a43c2fe01452636baa1e856639dd6))
+- **recosante:** add recosante widget on evaluation page ([#1742](https://github.com/SocialGouv/1000jours/issues/1742)) ([dafc7be](https://github.com/SocialGouv/1000jours/commit/dafc7bef7e5a43c2fe01452636baa1e856639dd6))
 
 # [1.139.0](https://github.com/SocialGouv/1000jours/compare/v1.138.2...v1.139.0) (2024-03-25)
 
-
 ### Bug Fixes
 
-* 🐛 Ajoute les liens de l'app ZéroAccident ([a75f778](https://github.com/SocialGouv/1000jours/commit/a75f77888ca32dbcdc4adfdc429c2c034b873203))
-
+- 🐛 Ajoute les liens de l'app ZéroAccident ([a75f778](https://github.com/SocialGouv/1000jours/commit/a75f77888ca32dbcdc4adfdc429c2c034b873203))
 
 ### Features
 
-* 🎸 Ajoute un champ 'note' pour l'annuaire 1000j blues ([c1e552c](https://github.com/SocialGouv/1000jours/commit/c1e552ce0e4660e1bfec45f590114081fd192cce))
+- 🎸 Ajoute un champ 'note' pour l'annuaire 1000j blues ([c1e552c](https://github.com/SocialGouv/1000jours/commit/c1e552ce0e4660e1bfec45f590114081fd192cce))
 
 ## [1.138.2](https://github.com/SocialGouv/1000jours/compare/v1.138.1...v1.138.2) (2024-03-18)
 
-
 ### Bug Fixes
 
-* 🐛 Politique de confidentialité 2024 ([5661675](https://github.com/SocialGouv/1000jours/commit/5661675fb24f367ab51b595fc109998bb7c1ed4f))
+- 🐛 Politique de confidentialité 2024 ([5661675](https://github.com/SocialGouv/1000jours/commit/5661675fb24f367ab51b595fc109998bb7c1ed4f))
 
 ## [1.138.1](https://github.com/SocialGouv/1000jours/compare/v1.138.0...v1.138.1) (2024-03-04)
 
-
 ### Bug Fixes
 
-* Expo build iOS ([1b5b9ff](https://github.com/SocialGouv/1000jours/commit/1b5b9ffad7ff804dda503188beb293ca62ca68fa))
+- Expo build iOS ([1b5b9ff](https://github.com/SocialGouv/1000jours/commit/1b5b9ffad7ff804dda503188beb293ca62ca68fa))
 
 # [1.138.0](https://github.com/SocialGouv/1000jours/compare/v1.137.0...v1.138.0) (2024-03-04)
 
-
 ### Features
 
-* ajoute un champ dans la config pour activer zeroAccident ([c31e085](https://github.com/SocialGouv/1000jours/commit/c31e0853c852b559982e642851a9d14d9d3a52f4))
-* ajoute un flag zeroAccident sur les articles ([29ee0fd](https://github.com/SocialGouv/1000jours/commit/29ee0fdc549103b7a68fca62b12c5db1a4b22e6c))
-* zeroaaccident ([438aab0](https://github.com/SocialGouv/1000jours/commit/438aab05081a50bd0bdd80d5e93d5f16b6f0755d))
+- ajoute un champ dans la config pour activer zeroAccident ([c31e085](https://github.com/SocialGouv/1000jours/commit/c31e0853c852b559982e642851a9d14d9d3a52f4))
+- ajoute un flag zeroAccident sur les articles ([29ee0fd](https://github.com/SocialGouv/1000jours/commit/29ee0fdc549103b7a68fca62b12c5db1a4b22e6c))
+- zeroaaccident ([438aab0](https://github.com/SocialGouv/1000jours/commit/438aab05081a50bd0bdd80d5e93d5f16b6f0755d))
 
 # [1.137.0](https://github.com/SocialGouv/1000jours/compare/v1.136.0...v1.137.0) (2024-01-29)
 
-
 ### Features
 
-* ajoute un flag zeroAccident sur les articles ([a782dc6](https://github.com/SocialGouv/1000jours/commit/a782dc618641ede29c43cf4f468d1adea67b13d5))
+- ajoute un flag zeroAccident sur les articles ([a782dc6](https://github.com/SocialGouv/1000jours/commit/a782dc618641ede29c43cf4f468d1adea67b13d5))
 
 # [1.136.0](https://github.com/SocialGouv/1000jours/compare/v1.135.5...v1.136.0) (2024-01-29)
 
-
 ### Features
 
-* ajoute un champ dans la config pour activer zeroAccident ([bf2ce24](https://github.com/SocialGouv/1000jours/commit/bf2ce2443c03cda78f8826b5f6a66a2571beffd3))
+- ajoute un champ dans la config pour activer zeroAccident ([bf2ce24](https://github.com/SocialGouv/1000jours/commit/bf2ce2443c03cda78f8826b5f6a66a2571beffd3))
 
 ## [1.135.5](https://github.com/SocialGouv/1000jours/compare/v1.135.4...v1.135.5) (2024-01-15)
 
-
 ### Bug Fixes
 
-* 🐛 Corrige la redirection vers les articles depuis les tnd ([ad155a0](https://github.com/SocialGouv/1000jours/commit/ad155a00a61404e1fb291ad5f7df6e271da59aaa))
-* Corrige les notifications articles et certaines redirections vers les articles ([e2ab03f](https://github.com/SocialGouv/1000jours/commit/e2ab03f01d8deeb992483018264480b5ba08608d))
-* yarn berry + fetch + docker opti ([#1739](https://github.com/SocialGouv/1000jours/issues/1739)) ([204a176](https://github.com/SocialGouv/1000jours/commit/204a1768b78a743d666def2aa715e46299efc0cc))
-* **ci:** restore from cnpg ([#1736](https://github.com/SocialGouv/1000jours/issues/1736)) ([8cb13d5](https://github.com/SocialGouv/1000jours/commit/8cb13d53d5a375f357b7ed165922621f1a32eb66))
-* **cnpg:** disable preprod backups for real ([0a313f0](https://github.com/SocialGouv/1000jours/commit/0a313f028d3d80395b4d6bd5d78824eba7503d03))
-* **cnpg:** use fixed name DB ([8f8796c](https://github.com/SocialGouv/1000jours/commit/8f8796cd82205d403b12636e4a0995941cff3df1))
-* **restore:** use defaults recovery user ([#1738](https://github.com/SocialGouv/1000jours/issues/1738)) ([3cefc73](https://github.com/SocialGouv/1000jours/commit/3cefc73649ee5d292c29875bd638bfebd233fd79))
-* 🐛 Corrige la navigation vers les articles depuis calendar ([5bcfd15](https://github.com/SocialGouv/1000jours/commit/5bcfd15e745a2e89ba06a44b8eb7eb19ee9df4fc))
+- 🐛 Corrige la redirection vers les articles depuis les tnd ([ad155a0](https://github.com/SocialGouv/1000jours/commit/ad155a00a61404e1fb291ad5f7df6e271da59aaa))
+- Corrige les notifications articles et certaines redirections vers les articles ([e2ab03f](https://github.com/SocialGouv/1000jours/commit/e2ab03f01d8deeb992483018264480b5ba08608d))
+- yarn berry + fetch + docker opti ([#1739](https://github.com/SocialGouv/1000jours/issues/1739)) ([204a176](https://github.com/SocialGouv/1000jours/commit/204a1768b78a743d666def2aa715e46299efc0cc))
+- **ci:** restore from cnpg ([#1736](https://github.com/SocialGouv/1000jours/issues/1736)) ([8cb13d5](https://github.com/SocialGouv/1000jours/commit/8cb13d53d5a375f357b7ed165922621f1a32eb66))
+- **cnpg:** disable preprod backups for real ([0a313f0](https://github.com/SocialGouv/1000jours/commit/0a313f028d3d80395b4d6bd5d78824eba7503d03))
+- **cnpg:** use fixed name DB ([8f8796c](https://github.com/SocialGouv/1000jours/commit/8f8796cd82205d403b12636e4a0995941cff3df1))
+- **restore:** use defaults recovery user ([#1738](https://github.com/SocialGouv/1000jours/issues/1738)) ([3cefc73](https://github.com/SocialGouv/1000jours/commit/3cefc73649ee5d292c29875bd638bfebd233fd79))
+- 🐛 Corrige la navigation vers les articles depuis calendar ([5bcfd15](https://github.com/SocialGouv/1000jours/commit/5bcfd15e745a2e89ba06a44b8eb7eb19ee9df4fc))
 
 ## [1.135.4](https://github.com/SocialGouv/1000jours/compare/v1.135.3...v1.135.4) (2024-01-15)
 

diff --git a/back/strapi/Dockerfile b/back/strapi/Dockerfile
@@ -13,7 +13,7 @@ ARG NODE_HOME=/opt/$NODE_PACKAGE
 ENV NODE_PATH $NODE_HOME/lib/node_modules
 ENV PATH $NODE_HOME/bin:$PATH
 RUN curl https://nodejs.org/dist/v$NODE_VERSION/$NODE_PACKAGE.tar.gz | tar -xzC /opt/
-RUN npm i -g yarn
+RUN npm i -g --ignore-scripts yarn
 
 RUN apt-get update && \
   apt-get install --no-install-recommends -y \

diff --git a/back/strapi/api/activation-tile/models/activation-tile.settings.json b/back/strapi/api/activation-tile/models/activation-tile.settings.json
@@ -23,6 +23,9 @@
     },
     "whatsapp": {
       "type": "boolean"
+    },
+    "whatsapp_redirect_message": {
+      "type": "string"
     }
   }
 }
diff --git a/back/strapi/api/reponses-epds/config/schema.graphql.js b/back/strapi/api/reponses-epds/config/schema.graphql.js
@@ -62,6 +62,7 @@ module.exports = {
       prenom: String
       score_question_dix: String
       telephone: String
+      langue: String
     ): Boolean
 
     epdsContactConfirmed (

diff --git a/back/strapi/api/reponses-epds/services/contact.js b/back/strapi/api/reponses-epds/services/contact.js
@@ -11,35 +11,22 @@ const emailTemplate = (info) => ({
     <ul>
     ${
       info.email
-        ? `
-        <li>à l'adresse suivante : <a href="mailto:<%- email %>"><%- email %></a>`
+        ? ` <li>à l'adresse suivante : <a href="mailto:<%- email %>"><%- email %></a></li>`
         : ""
     }
     ${
       info.telephone
-        ? ` </li>
-      <li>au numéro suivant : <a href="tel:<%- telephone %>"><%- telephone %></a>`
-        : ""
-    }
-    ${
-      info.moyen
-        ? ` </li>
-      <li>préférence : <%- moyen %>`
-        : ""
-    }
-    ${
-      info.horaires
-        ? ` </li>
-      <li>horaires : <%- horaires %>`
+        ? ` <li>au numéro suivant : <a href="tel:<%- telephone %>"><%- telephone %></a></li>`
         : ""
     }
+    ${info.moyen ? ` <li>préférence : <%- moyen %></li>` : ""}
+    ${info.horaires ? ` <li>horaires : <%- horaires %></li>` : ""}
     ${
       info.score_question_dix
-        ? `
-        <li>score à la question 10 "Il m’est arrivé de penser à me faire du mal" : <%- score_question_dix %> / 3`
+        ? ` <li>score à la question 10 "Il m’est arrivé de penser à me faire du mal" : <%- score_question_dix %> / 3</li>`
         : ""
     }
-    </li>
+    ${info.langue ? ` <li>langue: <%- langue %></li>` : ""}
     </ul>
     </p>
 
@@ -80,6 +67,12 @@ const emailTemplate = (info) => ({
     - score à la question 10 "Il m’est arrivé de penser à me faire du mal" : <%- score_question_dix %> / 3`
         : ``
     }
+    ${
+      info.langue
+        ? `
+    - langue : <%- langue %>`
+        : ``
+    }
 
     L'équipe 1000 premiers jours.`,
 });
@@ -93,6 +86,7 @@ const contact = async ({
   nombre_enfants = "ND",
   score_question_dix = "ND",
   telephone = "ND",
+  langue = "ND",
 }) => {
   if (!process.env["MAIL_SEND_TO"])
     throw new Error("Le service mail n'est pas configuré");
@@ -106,6 +100,7 @@ const contact = async ({
     prenom,
     score_question_dix,
     telephone,
+    langue,
   };
 
   try {

diff --git a/front/src/components/menu/accessibility.component.tsx b/front/src/components/menu/accessibility.component.tsx
@@ -92,7 +92,7 @@ const Accessibility: FC = () => {
         Pour en savoir plus sur la politique d’accessibilité numérique de l’État
         :
       </P>
-      <A url="http://references.modernisation.gouv.fr/accessibilite-numerique">
+      <A url="https://accessibilite.numerique.gouv.fr/">
         Référentiel général d'amélioration de l'accessibilité
       </A>
     </ScrollView>

diff --git a/front/src/components/menu/legalNotice.component.tsx b/front/src/components/menu/legalNotice.component.tsx
@@ -56,7 +56,7 @@ const LegalNotice: FC = () => {
         Pour en savoir plus sur la politique d’accessibilité numérique de l’État
         :
       </P>
-      <A url="http://references.modernisation.gouv.fr/accessibilite-numerique">
+      <A url="https://accessibilite.numerique.gouv.fr/">
         Référentiel général d'amélioration de l'accessibilité
       </A>
 

diff --git a/front/src/components/notification/notificationToggle.component.test.tsx b/front/src/components/notification/notificationToggle.component.test.tsx
diff --git a/front/src/utils/notifications/notification.util.test.ts b/front/src/utils/notifications/notification.util.test.ts
@@ -11,16 +11,16 @@ import { NotificationUtils, StorageUtils } from "..";
 import { NotificationType } from "./notification.util";
 
 describe("Notification utils", () => {
-  describe("Build Articles Notification Content", () => {
-    const CURRENT_STEP = {
-      debut: 0,
-      description: null,
-      fin: 90,
-      id: "6",
-      nom: "De 0 à 3 mois",
-      ordre: 6,
-    };
+  const CURRENT_STEP = {
+    debut: 0,
+    description: null,
+    fin: 90,
+    id: "6",
+    nom: "De 0 à 3 mois",
+    ordre: 6,
+  };
 
+  describe("Build Articles Notification Content", () => {
     afterEach(() => {
       void AsyncStorage.clear();
     });
@@ -52,9 +52,14 @@ describe("Notification utils", () => {
 
     it("buildArticlesNotificationContent is called with no articles to read (NB_ARTICLE_TO_READ = 0)", async () => {
       const NB_ARTICLE_TO_READ = 0;
+      await StorageUtils.storeObjectValue(
+        StorageKeysConstants.currentStep,
+        CURRENT_STEP
+      );
       const content = await NotificationUtils.buildArticlesNotificationContent(
         NB_ARTICLE_TO_READ
       );
+
       const expected = {
         body: Labels.article.notification.congrats.body,
         data: {