Merge branch 'dev' into maxgfr/dsfr-header

SocialGouv · Sep 10, 2024 · eb9af7a · eb9af7a
2 parents 0dcdb11 + 4e09b21
commit eb9af7a
Show file tree

Hide file tree

Showing 25 changed files with 905 additions and 154 deletions.
diff --git a/.kontinuous/env/dev/values.yaml b/.kontinuous/env/dev/values.yaml
@@ -34,11 +34,6 @@ jobs:
             secretKey: ELASTICSEARCH_URL
 
 app:
-  tolerations:
-    - key: startup
-      operator: Equal
-      value: cdtn
-      effect: NoSchedule
   env:
     - name: "NEXT_PUBLIC_BRANCH_NAME_SLUG"
       value: "{{.Values.global.branchSlug32}}"
diff --git a/.kontinuous/env/preprod/values.yaml b/.kontinuous/env/preprod/values.yaml
@@ -1,10 +1,3 @@
-app:
-  tolerations:
-    - key: startup
-      operator: Equal
-      value: cdtn
-      effect: NoSchedule
-
 jobs:
   runs:
     build-app:

diff --git a/.kontinuous/env/prod/values.yaml b/.kontinuous/env/prod/values.yaml
@@ -49,8 +49,3 @@ app:
       oblik.socialgouv.io/min-request-memory: 1280Mi
       oblik.socialgouv.io/min-limit-cpu: 900m
       oblik.socialgouv.io/min-limit-memory: 1536Mi
-  tolerations:
-    - key: startup
-      operator: Equal
-      value: cdtn
-      effect: NoSchedule
diff --git a/.kontinuous/values.yaml b/.kontinuous/values.yaml
@@ -43,11 +43,26 @@ app:
       name: next
   initContainers:
     - name: copy-next
-      image: "{{ .Values.global.registry }}/{{ .Values.global.projectName }}/{{
+      image:
+        "{{ .Values.global.registry }}/{{ .Values.global.projectName }}/{{
         .Values.global.imageRepository }}/app:{{ .Values.global.imageTag }}"
       command: ["/bin/sh", "-c"]
       args:
         - cp -r /app/packages/code-du-travail-frontend/.next/* /mnt/next;
       volumeMounts:
         - name: next
           mountPath: /mnt/next
+  tolerations:
+    - key: startup
+      operator: Equal
+      value: cdtn
+      effect: NoSchedule
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+          - matchExpressions:
+              - key: nodepool
+                operator: In
+                values:
+                  - cdtn-worker-nodepool
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.152.0](https://github.com/SocialGouv/code-du-travail-numerique/compare/v4.151.1...v4.152.0) (2024-09-04)
+
+### Bug Fixes
+
+- **csp:** remove reporting on sentry ([#6092](https://github.com/SocialGouv/code-du-travail-numerique/issues/6092)) ([a28634e](https://github.com/SocialGouv/code-du-travail-numerique/commit/a28634eddd7b55af23bc01c82c87bedaa1ae5771))
+
+### Features
+
+- ajout d'un questionnaire sur l'utilisation du site ([#6084](https://github.com/SocialGouv/code-du-travail-numerique/issues/6084)) ([5be1d4a](https://github.com/SocialGouv/code-du-travail-numerique/commit/5be1d4affee9d821b6f67914fc6e4b3ef45095b0))
+
 ## [4.151.1](https://github.com/SocialGouv/code-du-travail-numerique/compare/v4.151.0...v4.151.1) (2024-08-30)
 
 ### Bug Fixes

diff --git a/lerna.json b/lerna.json
@@ -8,5 +8,5 @@
   },
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "4.151.1"
+  "version": "4.152.0"
 }
diff --git a/packages/code-du-travail-frontend/CHANGELOG.md b/packages/code-du-travail-frontend/CHANGELOG.md
@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.152.0](https://github.com/SocialGouv/code-du-travail-numerique/compare/v4.151.1...v4.152.0) (2024-09-04)
+
+### Bug Fixes
+
+- **csp:** remove reporting on sentry ([#6092](https://github.com/SocialGouv/code-du-travail-numerique/issues/6092)) ([a28634e](https://github.com/SocialGouv/code-du-travail-numerique/commit/a28634eddd7b55af23bc01c82c87bedaa1ae5771))
+
+### Features
+
+- ajout d'un questionnaire sur l'utilisation du site ([#6084](https://github.com/SocialGouv/code-du-travail-numerique/issues/6084)) ([5be1d4a](https://github.com/SocialGouv/code-du-travail-numerique/commit/5be1d4affee9d821b6f67914fc6e4b3ef45095b0))
+
 ## [4.151.1](https://github.com/SocialGouv/code-du-travail-numerique/compare/v4.151.0...v4.151.1) (2024-08-30)
 
 ### 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
@@ -3,10 +3,10 @@
 exports[`<About /> should render 1`] = `
 <div>
   <div
-    class="sc-gweoQa bnxmsR"
+    class="sc-eHsDsR jvYoqI"
   >
     <div
-      class="sc-eIcdZJ jZjaFB"
+      class="sc-jdkBTo hwFMeW"
     />
     <header
       class="sc-fUBkdm cdIumq"
@@ -167,8 +167,77 @@ exports[`<About /> should render 1`] = `
         </button>
       </div>
     </header>
+    <div
+      class="sc-gweoQa kBXmsJ"
+    >
+      <div
+        class="sc-bddgXz koXLlw"
+      >
+        <span
+          class="sc-jdUcAg jEULqB"
+        >
+          <svg
+            class="sc-eIcdZJ ffrCUe"
+            fill="none"
+            height="24"
+            stroke="currentColor"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            viewBox="0 0 24 24"
+            width="24"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <circle
+              cx="12"
+              cy="12"
+              r="10"
+            />
+            <line
+              x1="12"
+              x2="12"
+              y1="8"
+              y2="12"
+            />
+            <line
+              x1="12"
+              x2="12.01"
+              y1="16"
+              y2="16"
+            />
+          </svg>
+          Votre avis compte ! Aidez-nous à nous améliorer.
+          <a
+            href="https://tally.so/r/3jLRW1"
+            target="_blank"
+          >
+            Répondre
+          </a>
+        </span>
+        <button
+          aria-label="fermer le bandeau"
+          class="sc-kOPcWz kyVwqT sc-fyVfxW ighGDQ"
+          title="fermer la bandeau"
+        >
+          <svg
+            aria-hidden="true"
+            fill="none"
+            title="Fermer le bandeau"
+            viewBox="0 0 32 32"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              clip-rule="evenodd"
+              d="M14.752 16.5 7.258 8.591A.957.957 0 0 1 7 7.932c0-.247.093-.484.259-.659A.858.858 0 0 1 7.883 7a.86.86 0 0 1 .625.273L16 15.183l7.492-7.91A.859.859 0 0 1 24.117 7c.234 0 .459.098.624.273a.957.957 0 0 1 .259.659.957.957 0 0 1-.259.66L17.249 16.5l7.492 7.909a.958.958 0 0 1 .259.659.957.957 0 0 1-.259.659.859.859 0 0 1-.624.273.86.86 0 0 1-.625-.273L16 17.817l-7.492 7.91a.859.859 0 0 1-.625.273.859.859 0 0 1-.624-.273.957.957 0 0 1-.259-.659.96.96 0 0 1 .259-.66l7.492-7.908z"
+              fill="currentColor"
+              fill-rule="evenodd"
+            />
+          </svg>
+        </button>
+      </div>
+    </div>
     <main
-      class="sc-jdUcAg kmqmj"
+      class="sc-fmzyuX cpFQIA"
       id="content"
       tabindex="-1"
     >

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
@@ -3,10 +3,10 @@
 exports[`<DroitDuTravail /> should render 1`] = `
 <div>
   <div
-    class="sc-cspYLC bfRidZ"
+    class="sc-cyRcrZ gjBWZE"
   >
     <div
-      class="sc-dwalKd dVYudr"
+      class="sc-kUdmhA bpiyAA"
     />
     <header
       class="sc-fFlnrN leQqcf"
@@ -167,8 +167,77 @@ exports[`<DroitDuTravail /> should render 1`] = `
         </button>
       </div>
     </header>
+    <div
+      class="sc-cspYLC MBSft"
+    >
+      <div
+        class="sc-epqpcT khryBk"
+      >
+        <span
+          class="sc-BQMaI OPPgB"
+        >
+          <svg
+            class="sc-dwalKd bKNSlA"
+            fill="none"
+            height="24"
+            stroke="currentColor"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            viewBox="0 0 24 24"
+            width="24"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <circle
+              cx="12"
+              cy="12"
+              r="10"
+            />
+            <line
+              x1="12"
+              x2="12"
+              y1="8"
+              y2="12"
+            />
+            <line
+              x1="12"
+              x2="12.01"
+              y1="16"
+              y2="16"
+            />
+          </svg>
+          Votre avis compte ! Aidez-nous à nous améliorer.
+          <a
+            href="https://tally.so/r/3jLRW1"
+            target="_blank"
+          >
+            Répondre
+          </a>
+        </span>
+        <button
+          aria-label="fermer le bandeau"
+          class="sc-kOPcWz kyVwqT sc-bvgPty gYMztu"
+          title="fermer la bandeau"
+        >
+          <svg
+            aria-hidden="true"
+            fill="none"
+            title="Fermer le bandeau"
+            viewBox="0 0 32 32"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              clip-rule="evenodd"
+              d="M14.752 16.5 7.258 8.591A.957.957 0 0 1 7 7.932c0-.247.093-.484.259-.659A.858.858 0 0 1 7.883 7a.86.86 0 0 1 .625.273L16 15.183l7.492-7.91A.859.859 0 0 1 24.117 7c.234 0 .459.098.624.273a.957.957 0 0 1 .259.659.957.957 0 0 1-.259.66L17.249 16.5l7.492 7.909a.958.958 0 0 1 .259.659.957.957 0 0 1-.259.659.859.859 0 0 1-.624.273.86.86 0 0 1-.625-.273L16 17.817l-7.492 7.91a.859.859 0 0 1-.625.273.859.859 0 0 1-.624-.273.957.957 0 0 1-.259-.659.96.96 0 0 1 .259-.66l7.492-7.908z"
+              fill="currentColor"
+              fill-rule="evenodd"
+            />
+          </svg>
+        </button>
+      </div>
+    </div>
     <main
-      class="sc-BQMaI VjSqX"
+      class="sc-hgRRfv jRurkG"
       id="content"
       tabindex="-1"
     >
@@ -194,7 +263,7 @@ exports[`<DroitDuTravail /> should render 1`] = `
             >
               Retrouvez la définition du droit du travail, les textes qui en sont à l’origine 
               <br
-                class="sc-epqpcT kZxqwb"
+                class="sc-emIrwa gYGcSV"
               />
               ainsi que leur articulation.
             </p>