Merge branch 'dev' into simulateur-brut-net-dsfr

SocialGouv · Oct 15, 2024 · 0748928 · 0748928
2 parents cd15bc7 + 9a05003
commit 0748928
Show file tree

Hide file tree

Showing 38 changed files with 754 additions and 129 deletions.
diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml
@@ -12,6 +12,16 @@ app:
   imagePackage: app
   imageProject: cdtn
   probesPath: /api/health
+  livenessProbe:
+    failureThreshold: 15
+    httpGet:
+      path: /api/health/
+      port: http
+      scheme: HTTP
+    initialDelaySeconds: 30  # Délai avant la première vérification après le démarrage du pod
+    periodSeconds: 10         # Fréquence des vérifications
+    successThreshold: 1
+    timeoutSeconds: 10         # Temps maximum pour que l'endpoint réponde
   containerSecurityContext:
     readOnlyRootFilesystem: true
   envFrom:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.156.1](https://github.com/SocialGouv/code-du-travail-numerique/compare/v4.156.0...v4.156.1) (2024-10-14)
+
+### Bug Fixes
+
+- **indemnité de licenciement:** ajout de l'avenant pour la CC 275 ([#6174](https://github.com/SocialGouv/code-du-travail-numerique/issues/6174)) ([bf843e5](https://github.com/SocialGouv/code-du-travail-numerique/commit/bf843e54f6778bb7be2d937a412b578e02667997))
+- preavis demission ref manquante 3239 ([#6168](https://github.com/SocialGouv/code-du-travail-numerique/issues/6168)) ([1a85a22](https://github.com/SocialGouv/code-du-travail-numerique/commit/1a85a2279a74bd8d05d93865433da07d03e8aabc))
+
+# [4.156.0](https://github.com/SocialGouv/code-du-travail-numerique/compare/v4.155.2...v4.156.0) (2024-10-10)
+
+### Bug Fixes
+
+- **bouton questionnaire:** ne pas ouvrir avec l'animation si on est en mobile ([#6200](https://github.com/SocialGouv/code-du-travail-numerique/issues/6200)) ([c284244](https://github.com/SocialGouv/code-du-travail-numerique/commit/c2842445d5ed2804617dd02ec219fceba1b842d3))
+- **deps:** update dependency next to v14.2.11 [security] ([9d8bcb7](https://github.com/SocialGouv/code-du-travail-numerique/commit/9d8bcb7d7306afede239256cb56710f8551794b8))
+- **error logs:** retrait du log dans sentry des erreurs d'accès au localStorage ([#6181](https://github.com/SocialGouv/code-du-travail-numerique/issues/6181)) ([8e20206](https://github.com/SocialGouv/code-du-travail-numerique/commit/8e20206358baca515c75727f3a4af6ab487d4e52))
+- **idcc:** ajout des redirections pour les CC qui ont été supprimé ([#6187](https://github.com/SocialGouv/code-du-travail-numerique/issues/6187)) ([2a1752a](https://github.com/SocialGouv/code-du-travail-numerique/commit/2a1752acc9bd6f5eb0c7c3c4bb859ce7e7589070))
+- **idcc:** ne pas afficher le lien vers la CC si pas de slug ([#6193](https://github.com/SocialGouv/code-du-travail-numerique/issues/6193)) ([221338c](https://github.com/SocialGouv/code-du-travail-numerique/commit/221338c9670e69538e93ec2c2f15e16e1a9539bb))
+- **indemnité de licenciement:** simplification de la CC 275 ([#6173](https://github.com/SocialGouv/code-du-travail-numerique/issues/6173)) ([10cc1bd](https://github.com/SocialGouv/code-du-travail-numerique/commit/10cc1bd0e156243dd33da88c7915e89a0637c63e))
+- liveness probe ([#6184](https://github.com/SocialGouv/code-du-travail-numerique/issues/6184)) ([0237f23](https://github.com/SocialGouv/code-du-travail-numerique/commit/0237f23fbe412288a6c8e07073a6561002b55fdb))
+- **trouver sa cc:** update url canonique ([#6175](https://github.com/SocialGouv/code-du-travail-numerique/issues/6175)) ([eb77564](https://github.com/SocialGouv/code-du-travail-numerique/commit/eb77564180242664082a9e3bc6f374e6de53d7f7))
+
+### Features
+
+- **modèles de documents:** track des utilisateurs qui type CTRL + C sur la page ([#6186](https://github.com/SocialGouv/code-du-travail-numerique/issues/6186)) ([da37349](https://github.com/SocialGouv/code-du-travail-numerique/commit/da37349065200e3c5da9c2d0ab03b9ee3e83c4de))
+
 ## [4.155.2](https://github.com/SocialGouv/code-du-travail-numerique/compare/v4.155.1...v4.155.2) (2024-09-25)
 
 ### Bug Fixes

diff --git a/lerna.json b/lerna.json
@@ -8,5 +8,5 @@
   },
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "4.155.2"
+  "version": "4.156.1"
 }
diff --git a/packages/code-du-travail-frontend/CHANGELOG.md b/packages/code-du-travail-frontend/CHANGELOG.md
@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.156.1](https://github.com/SocialGouv/code-du-travail-numerique/compare/v4.156.0...v4.156.1) (2024-10-14)
+
+**Note:** Version bump only for package @cdt/frontend
+
+# [4.156.0](https://github.com/SocialGouv/code-du-travail-numerique/compare/v4.155.2...v4.156.0) (2024-10-10)
+
+### Bug Fixes
+
+- **bouton questionnaire:** ne pas ouvrir avec l'animation si on est en mobile ([#6200](https://github.com/SocialGouv/code-du-travail-numerique/issues/6200)) ([c284244](https://github.com/SocialGouv/code-du-travail-numerique/commit/c2842445d5ed2804617dd02ec219fceba1b842d3))
+- **deps:** update dependency next to v14.2.11 [security] ([9d8bcb7](https://github.com/SocialGouv/code-du-travail-numerique/commit/9d8bcb7d7306afede239256cb56710f8551794b8))
+- **error logs:** retrait du log dans sentry des erreurs d'accès au localStorage ([#6181](https://github.com/SocialGouv/code-du-travail-numerique/issues/6181)) ([8e20206](https://github.com/SocialGouv/code-du-travail-numerique/commit/8e20206358baca515c75727f3a4af6ab487d4e52))
+- **idcc:** ajout des redirections pour les CC qui ont été supprimé ([#6187](https://github.com/SocialGouv/code-du-travail-numerique/issues/6187)) ([2a1752a](https://github.com/SocialGouv/code-du-travail-numerique/commit/2a1752acc9bd6f5eb0c7c3c4bb859ce7e7589070))
+- **idcc:** ne pas afficher le lien vers la CC si pas de slug ([#6193](https://github.com/SocialGouv/code-du-travail-numerique/issues/6193)) ([221338c](https://github.com/SocialGouv/code-du-travail-numerique/commit/221338c9670e69538e93ec2c2f15e16e1a9539bb))
+- **trouver sa cc:** update url canonique ([#6175](https://github.com/SocialGouv/code-du-travail-numerique/issues/6175)) ([eb77564](https://github.com/SocialGouv/code-du-travail-numerique/commit/eb77564180242664082a9e3bc6f374e6de53d7f7))
+
+### Features
+
+- **modèles de documents:** track des utilisateurs qui type CTRL + C sur la page ([#6186](https://github.com/SocialGouv/code-du-travail-numerique/issues/6186)) ([da37349](https://github.com/SocialGouv/code-du-travail-numerique/commit/da37349065200e3c5da9c2d0ab03b9ee3e83c4de))
+
 ## [4.155.2](https://github.com/SocialGouv/code-du-travail-numerique/compare/v4.155.1...v4.155.2) (2024-09-25)
 
 ### Bug Fixes

diff --git a/packages/code-du-travail-frontend/__tests__/__snapshots__/a-propos.test.tsx.snap b/packages/code-du-travail-frontend/__tests__/__snapshots__/a-propos.test.tsx.snap
@@ -171,15 +171,15 @@ exports[`<About /> should render 1`] = `
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Donner votre avis"
-      class="sc-f4078397-0 hFwgVG"
+      class="sc-1a079d5a-0 dPrVcb"
       data-tally-open="3jLRW1"
       data-tally-overlay="1"
       data-tally-width="500"
     >
       <img
         alt="Suggestion"
         aria-hidden="true"
-        class="sc-f4078397-1 gbqaNR"
+        class="sc-1a079d5a-1 dcOJGP"
         src="/static/assets/img/emoj-wave.png"
       />
       <span>

diff --git a/packages/code-du-travail-frontend/__tests__/__snapshots__/droit-du-travail.test.js.snap b/packages/code-du-travail-frontend/__tests__/__snapshots__/droit-du-travail.test.js.snap
@@ -171,15 +171,15 @@ exports[`<DroitDuTravail /> should render 1`] = `
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Donner votre avis"
-      class="sc-f4078397-0 hFwgVG"
+      class="sc-1a079d5a-0 dPrVcb"
       data-tally-open="3jLRW1"
       data-tally-overlay="1"
       data-tally-width="500"
     >
       <img
         alt="Suggestion"
         aria-hidden="true"
-        class="sc-f4078397-1 gbqaNR"
+        class="sc-1a079d5a-1 dcOJGP"
         src="/static/assets/img/emoj-wave.png"
       />
       <span>

diff --git a/...es/code-du-travail-frontend/__tests__/__snapshots__/fiche-ministere-travail.test.tsx.snap b/...es/code-du-travail-frontend/__tests__/__snapshots__/fiche-ministere-travail.test.tsx.snap
@@ -171,15 +171,15 @@ exports[`<FicheMT /> should render 1`] = `
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Donner votre avis"
-      class="sc-f4078397-0 hFwgVG"
+      class="sc-1a079d5a-0 dPrVcb"
       data-tally-open="3jLRW1"
       data-tally-overlay="1"
       data-tally-width="500"
     >
       <img
         alt="Suggestion"
         aria-hidden="true"
-        class="sc-f4078397-1 gbqaNR"
+        class="sc-1a079d5a-1 dcOJGP"
         src="/static/assets/img/emoj-wave.png"
       />
       <span>

diff --git a/packages/code-du-travail-frontend/__tests__/__snapshots__/glossaire-[slug].test.tsx.snap b/packages/code-du-travail-frontend/__tests__/__snapshots__/glossaire-[slug].test.tsx.snap
@@ -171,15 +171,15 @@ exports[`<Term /> should render 1`] = `
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Donner votre avis"
-      class="sc-f4078397-0 hFwgVG"
+      class="sc-1a079d5a-0 dPrVcb"
       data-tally-open="3jLRW1"
       data-tally-overlay="1"
       data-tally-width="500"
     >
       <img
         alt="Suggestion"
         aria-hidden="true"
-        class="sc-f4078397-1 gbqaNR"
+        class="sc-1a079d5a-1 dcOJGP"
         src="/static/assets/img/emoj-wave.png"
       />
       <span>

diff --git a/packages/code-du-travail-frontend/__tests__/__snapshots__/glossaire.test.tsx.snap b/packages/code-du-travail-frontend/__tests__/__snapshots__/glossaire.test.tsx.snap
@@ -171,15 +171,15 @@ exports[`<Glossaire /> should render 1`] = `
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Donner votre avis"
-      class="sc-f4078397-0 hFwgVG"
+      class="sc-1a079d5a-0 dPrVcb"
       data-tally-open="3jLRW1"
       data-tally-overlay="1"
       data-tally-width="500"
     >
       <img
         alt="Suggestion"
         aria-hidden="true"
-        class="sc-f4078397-1 gbqaNR"
+        class="sc-1a079d5a-1 dcOJGP"
         src="/static/assets/img/emoj-wave.png"
       />
       <span>

diff --git a/...ode-du-travail-frontend/__tests__/__snapshots__/modeles-de-courriers-[slug].test.tsx.snap b/...ode-du-travail-frontend/__tests__/__snapshots__/modeles-de-courriers-[slug].test.tsx.snap
@@ -171,15 +171,15 @@ exports[`<ModelesDeCourrier /> should render 1`] = `
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Donner votre avis"
-      class="sc-f4078397-0 hFwgVG"
+      class="sc-1a079d5a-0 dPrVcb"
       data-tally-open="3jLRW1"
       data-tally-overlay="1"
       data-tally-width="500"
     >
       <img
         alt="Suggestion"
         aria-hidden="true"
-        class="sc-f4078397-1 gbqaNR"
+        class="sc-1a079d5a-1 dcOJGP"
         src="/static/assets/img/emoj-wave.png"
       />
       <span>

diff --git a/packages/code-du-travail-frontend/__tests__/__snapshots__/modeles-de-courriers.test.tsx.snap b/packages/code-du-travail-frontend/__tests__/__snapshots__/modeles-de-courriers.test.tsx.snap
@@ -171,15 +171,15 @@ exports[`<ModelesDeCourriers /> should render 1`] = `
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Donner votre avis"
-      class="sc-f4078397-0 hFwgVG"
+      class="sc-1a079d5a-0 dPrVcb"
       data-tally-open="3jLRW1"
       data-tally-overlay="1"
       data-tally-width="500"
     >
       <img
         alt="Suggestion"
         aria-hidden="true"
-        class="sc-f4078397-1 gbqaNR"
+        class="sc-1a079d5a-1 dcOJGP"
         src="/static/assets/img/emoj-wave.png"
       />
       <span>

diff --git a/packages/code-du-travail-frontend/__tests__/__snapshots__/recherche.test.js.snap b/packages/code-du-travail-frontend/__tests__/__snapshots__/recherche.test.js.snap
@@ -91,15 +91,15 @@ exports[`<Recherche /> should render 1`] = `
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Donner votre avis"
-      class="sc-f4078397-0 hFwgVG"
+      class="sc-1a079d5a-0 dPrVcb"
       data-tally-open="3jLRW1"
       data-tally-overlay="1"
       data-tally-width="500"
     >
       <img
         alt="Suggestion"
         aria-hidden="true"
-        class="sc-f4078397-1 gbqaNR"
+        class="sc-1a079d5a-1 dcOJGP"
         src="/static/assets/img/emoj-wave.png"
       />
       <span>

diff --git a/packages/code-du-travail-frontend/__tests__/__snapshots__/themes.test.tsx.snap b/packages/code-du-travail-frontend/__tests__/__snapshots__/themes.test.tsx.snap
@@ -171,15 +171,15 @@ exports[`<Theme /> should render 1`] = `
       aria-expanded="false"
       aria-haspopup="dialog"
       aria-label="Donner votre avis"
-      class="sc-f4078397-0 hFwgVG"
+      class="sc-1a079d5a-0 dPrVcb"
       data-tally-open="3jLRW1"
       data-tally-overlay="1"
       data-tally-width="500"
     >
       <img
         alt="Suggestion"
         aria-hidden="true"
-        class="sc-f4078397-1 gbqaNR"
+        class="sc-1a079d5a-1 dcOJGP"
         src="/static/assets/img/emoj-wave.png"
       />
       <span>

diff --git a/packages/code-du-travail-frontend/package.json b/packages/code-du-travail-frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cdt/frontend",
-  "version": "4.155.2",
+  "version": "4.156.1",
   "description": "Code du travail frontend",
   "private": true,
   "homepage": "https://code-du-travail.beta.gouv.fr/",

diff --git a/packages/code-du-travail-frontend/redirects.json b/packages/code-du-travail-frontend/redirects.json
@@ -1065,47 +1065,47 @@
     "permanent": true
   },
   {
-    "source": "/convention-collective/(2075|2075(?:-[a-z0-9-]+)?)",
+    "source": "/convention-collective/2075(-[a-z0-9-]+)?",
     "destination": "/convention-collective/1747-activites-industrielles-de-boulangerie-et-patisserie",
     "permanent": true
   },
   {
-    "source": "/convention-collective/(7012|7012(?:-[a-z0-9-]+)?)",
+    "source": "/convention-collective/7012(-[a-z0-9-]+)?",
     "destination": "/convention-collective/7026-personnels-des-activites-hippiques",
     "permanent": true
   },
   {
-    "source": "/convention-collective/(7013|7013(?:-[a-z0-9-]+)?)",
+    "source": "/convention-collective/7013(-[a-z0-9-]+)?",
     "destination": "/convention-collective/7026-personnels-des-activites-hippiques",
     "permanent": true
   },
   {
-    "source": "/convention-collective/(7014|7014(?:-[a-z0-9-]+)?)",
+    "source": "/convention-collective/7014(-[a-z0-9-]+)?",
     "destination": "/convention-collective/7026-personnels-des-activites-hippiques",
     "permanent": true
   },
   {
-    "source": "/convention-collective/(1194|1194(?:-[a-z0-9-]+)?)",
+    "source": "/convention-collective/1194(-[a-z0-9-]+)?",
     "destination": "/convention-collective/2121-edition",
     "permanent": true
   },
   {
-    "source": "/convention-collective/(1016|1016(?:-[a-z0-9-]+)?)",
+    "source": "/convention-collective/1016(-[a-z0-9-]+)?",
     "destination": "/convention-collective/2121-edition",
     "permanent": true
   },
   {
-    "source": "/convention-collective/(2770|2770(?:-[a-z0-9-]+)?)",
+    "source": "/convention-collective/2770(-[a-z0-9-]+)?",
     "destination": "/convention-collective/2121-edition",
     "permanent": true
   },
   {
-    "source": "/convention-collective/(635|635(?:-[a-z0-9-]+)?)",
+    "source": "/convention-collective/(0635|635(?:-[a-z0-9-]+)?)",
     "destination": "/convention-collective/573-commerces-de-gros",
     "permanent": true
   },
   {
-    "source": "/convention-collective/(1734|1734(?:-[a-z0-9-]+)?)",
+    "source": "/convention-collective/1734(-[a-z0-9-]+)?",
     "destination": "/convention-collective/2642-production-audiovisuelle",
     "permanent": true
   },
@@ -1115,7 +1115,7 @@
     "permanent": true
   },
   {
-    "source": "/convention-collective/(2564|2564(?:-[a-z0-9-]+)?)",
+    "source": "/convention-collective/2564(-[a-z0-9-]+)?",
     "destination": "/convention-collective/1875-veterinaires-personnel-salarie-des-cabinets-et-cliniques-veterinaires",
     "permanent": true
   },
@@ -1125,8 +1125,38 @@
     "permanent": true
   },
   {
-    "source": "/convention-collective/(1383|1383(?:-[a-z0-9-]+)?)",
+    "source": "/convention-collective/1383(-[a-z0-9-]+)?",
     "destination": "/convention-collective/3243-quincaillerie-fournitures-industrielles-fers-metaux-et-equipement-de-la",
     "permanent": true
+  },
+  {
+    "source": "/convention-collective/bijouterie-joaillerie-orfevrerie-horlogerie-bjoh",
+    "destination": "/convention-collective/3251-bijouterie-joaillerie-orfevrerie-horlogerie-bjoh",
+    "permanent": true
+  },
+  {
+    "source": "/convention-collective/1044(-[a-z0-9-]+)?",
+    "destination": "/convention-collective/3251-bijouterie-joaillerie-orfevrerie-horlogerie-bjoh",
+    "permanent": true
+  },
+  {
+    "source": "/convention-collective/(0567|567(?:-[a-z0-9-]+)?)",
+    "destination": "/convention-collective/3251-bijouterie-joaillerie-orfevrerie-horlogerie-bjoh",
+    "permanent": true
+  },
+  {
+    "source": "/convention-collective/2785(-[a-z0-9-]+)?",
+    "destination": "/convention-collective/3250-commissaires-de-justice-et-societes-de-ventes-volontaires",
+    "permanent": true
+  },
+  {
+    "source": "/convention-collective/batiment-etam-ile-de-france-hors-seine-et-marne",
+    "destination": "/convention-collective/2707-batiment-etam-ile-de-france-hors-seine-et-marne",
+    "permanent": true
+  },
+  {
+    "source": "/convention-collective/bijouterie-joaillerie-orfevrerie-horlogerie-bjoh",
+    "destination": "/convention-collective/3251-bijouterie-joaillerie-orfevrerie-horlogerie-bjoh",
+    "permanent": true
   }
 ]
diff --git a/packages/code-du-travail-frontend/src/api/config.ts b/packages/code-du-travail-frontend/src/api/config.ts
@@ -35,4 +35,6 @@ export const IDCC_MERGE = {
   2642: [1734],
   1875: [2564],
   3243: [731, 1383],
+  3251: [1044, 567],
+  3250: [2785],
 };
diff --git a/packages/code-du-travail-frontend/src/conventions/Search/ConventionLink.tsx b/packages/code-du-travail-frontend/src/conventions/Search/ConventionLink.tsx
@@ -90,7 +90,6 @@ export const ConventionLink = ({
   onClick,
   small = false,
 }: Props): JSX.Element => {
-  const { num } = convention;
   const router = useRouter();
 
   const clickHandler = () => {
@@ -106,7 +105,7 @@ export const ConventionLink = ({
 
   return (
     <>
-      {num === 9999 ? (
+      {!convention.slug ? (
         <DisabledConvention convention={convention} commonProps={commonProps} />
       ) : (
         <EnabledConvention