Merge branch 'main' into 271-espacement-des-caractères

Author: bellangerq

CHANGELOG.md

@@ -7,6 +7,7 @@ Tous les changements notables de Ara sont documentés ici avec leur date, leur c
 ### Correction 🐛
 
 - Améliore la lisibilité du texte lorsque l'espacement des caractères est agrandi ([#305](https://github.com/DISIC/Ara/pull/305))
+- Corrige l’affichage des longues URL dans le rapport ([#306](https://github.com/DISIC/Ara/pull/306))
 
 ## 15/02/2023
 

confiture-web-app/package.json

@@ -13,8 +13,8 @@
   },
   "dependencies": {
     "@gouvfr/dsfr": "1.7.2",
-    "@sentry/tracing": "^7.27.0",
-    "@sentry/vue": "^7.27.0",
+    "@sentry/tracing": "^7.37.2",
+    "@sentry/vue": "^7.37.2",
     "@vueuse/head": "^1.0.22",
     "chart.js": "^4.1.0",
     "dompurify": "^2.4.1",

confiture-web-app/src/components/ReportA11yStatement.vue

@@ -374,7 +374,7 @@ function hideCopyAlert() {
         </h5>
         <ul class="fr-mb-9v fr-mb-md-6w">
           <li v-for="page in report.data.context.samples" :key="page.name">
-            {{ page.name }} <strong>{{ page.url }}</strong>
+            {{ page.name }} <strong class="page-url">{{ page.url }}</strong>
           </li>
         </ul>
         <h4 class="fr-h2">Retour d’information et contact</h4>
@@ -433,4 +433,8 @@ function hideCopyAlert() {
   border: 1px solid var(--border-default-grey);
   max-width: 58rem;
 }
+
+.page-url {
+  word-break: break-all;
+}
 </style>

confiture-web-app/src/components/ReportErrors.vue

@@ -377,15 +377,18 @@ function updateActiveAnchorLink(id: string, event: MouseEvent) {
           >
             {{ page.pageName }}
           </h2>
-          <a
-            :href="page.pageUrl"
-            class="fr-mb-4w page-url"
-            target="_blank"
-            rel="noopener"
-          >
-            {{ page.pageUrl }}
-            <span class="sr-only">(nouvelle fenêtre)</span>
-          </a>
+          <!-- FIXME: remove this <div> with DSFR >= 1.8 -->
+          <div class="fr-mb-4w">
+            <a
+              :href="page.pageUrl"
+              class="page-url"
+              target="_blank"
+              rel="noopener"
+            >
+              {{ page.pageUrl }}
+              <span class="sr-only">(nouvelle fenêtre)</span>
+            </a>
+          </div>
 
           <div
             v-for="(topic, i) in page.topics"
@@ -519,7 +522,7 @@ function updateActiveAnchorLink(id: string, event: MouseEvent) {
 }
 
 .page-url {
-  display: inline-block;
+  word-break: break-all;
 }
 
 .criterium-title {

confiture-web-app/src/main.ts

@@ -57,12 +57,22 @@ if (import.meta.env.VITE_SENTRY_DSN) {
         routingInstrumentation: Sentry.vueRouterInstrumentation(router),
         tracePropagationTargets: [window.location.hostname, /^\//],
       }),
+      new Sentry.Replay({
+        // anonymization settings
+        maskAllText: true,
+        maskAllInputs: true,
+        blockAllMedia: true,
+      }),
     ],
 
     // Set to a value between 0 and 1.0 to enable performance monitoring
     // 0.5 means half the events will be transferred
     tracesSampleRate: 0,
 
+    // When an error happen save a replay of what happened similar to birdeatsbug
+    // See https://docs.sentry.io/platforms/javascript/guides/react/session-replay/#replay-captures-on-errors-only
+    replaysOnErrorSampleRate: 1,
+
     /*
       Differentiate between the various environments of the app
       example values :

confiture-web-app/src/pages/consult/ContextPage.vue

@@ -153,7 +153,7 @@ useWrappedFetch(() => report.fetchReport(uniqueId));
             <td>{{ i + 1 }}</td>
             <td>{{ page.name }}</td>
             <td>
-              <a class="fr-link" target="_blank" :href="page.url">
+              <a class="fr-link page-url" target="_blank" :href="page.url">
                 {{ page.url }} <span class="sr-only">(nouvelle fenêtre)</span>
               </a>
             </td>
@@ -334,4 +334,8 @@ useWrappedFetch(() => report.fetchReport(uniqueId));
 .content > *:not(.fr-table) {
   max-width: 49.5rem;
 }
+
+.page-url {
+  word-break: break-all;
+}
 </style>

confiture-web-app/yarn.lock

@@ -187,15 +187,15 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@sentry/browser@7.27.0":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.27.0.tgz#540d292d418abbf0ac7cabb39fe1863b8fa0c85f"
-  integrity sha512-6z+q+omLqmdEvy+9i4j7xzIT6zgmWJnXqEiLCURnE34KsPq6wr6Nij1XHsTlApMcohOpPlo+C3nMTmz+oYUf5w==
-  dependencies:
-    "@sentry/core" "7.27.0"
-    "@sentry/replay" "7.27.0"
-    "@sentry/types" "7.27.0"
-    "@sentry/utils" "7.27.0"
+"@sentry/browser@7.37.2":
+  version "7.37.2"
+  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-7.37.2.tgz#355dd28ad12677d63e0b12c5209d12b3f98ac3a4"
+  integrity sha512-UvKfpx6+BUdV+rGAXqDBznagfz44Ut+x2h/i0OZPNCEpXaH9KAQOlv06I66861aXiucWFRb1lAMrN4+cE9aJIg==
+  dependencies:
+    "@sentry/core" "7.37.2"
+    "@sentry/replay" "7.37.2"
+    "@sentry/types" "7.37.2"
+    "@sentry/utils" "7.37.2"
     tslib "^1.9.3"
 
 "@sentry/bundler-plugin-core@0.3.0":
@@ -229,6 +229,15 @@
     "@sentry/utils" "7.27.0"
     tslib "^1.9.3"
 
+"@sentry/core@7.37.2":
+  version "7.37.2"
+  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-7.37.2.tgz#959b2bf953f442b07f8377d90f4f7735cf260ae4"
+  integrity sha512-LjofMDSTyVeBErl9N7TTqlyEVuW1g6U4iuJtdZ75JohnvVxzWdpZfWfddwQ6h7nGWfe9dNg0fGs1wxKtMhY+MA==
+  dependencies:
+    "@sentry/types" "7.37.2"
+    "@sentry/utils" "7.37.2"
+    tslib "^1.9.3"
+
 "@sentry/node@^7.19.0":
   version "7.27.0"
   resolved "https://registry.yarnpkg.com/@sentry/node/-/node-7.27.0.tgz#a43ca519b2cbcbc5eade9bae98cf1c26da7cb82f"
@@ -242,16 +251,16 @@
     lru_map "^0.3.3"
     tslib "^1.9.3"
 
-"@sentry/replay@7.27.0":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.27.0.tgz#9529dd2603c6581ffc88857a1f43fc875c80857b"
-  integrity sha512-Db1TBx4JZWWbsAXSzWfAE55d4ekpPspZheyF66j84xq8jaFxgmlMMO7wBD8P7CHuQ6VUkgwa4glMkcamj/sfSg==
+"@sentry/replay@7.37.2":
+  version "7.37.2"
+  resolved "https://registry.yarnpkg.com/@sentry/replay/-/replay-7.37.2.tgz#eb49b7a1286335c1a4de49b386d0258e5c789682"
+  integrity sha512-y8Gfc7EGfGU4eVae5HAtch2YgkiTzNPi16dcqPX9jtIHDwiurGqWcaOgs5HoGJm45eMfl6LvcE7MPbwqcDkPIA==
   dependencies:
-    "@sentry/core" "7.27.0"
-    "@sentry/types" "7.27.0"
-    "@sentry/utils" "7.27.0"
+    "@sentry/core" "7.37.2"
+    "@sentry/types" "7.37.2"
+    "@sentry/utils" "7.37.2"
 
-"@sentry/tracing@^7.19.0", "@sentry/tracing@^7.27.0":
+"@sentry/tracing@^7.19.0":
   version "7.27.0"
   resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.27.0.tgz#455a032c6ccf9bc8e27905dc8e624e6e2f45737b"
   integrity sha512-lxAiGAajbZgZkaViwYuxavbu/c8JUp56XOYzSAi7Km9jGnTFLNF4JCoyG0INy7lXipFJiWSd0Xq3aej0Lb+Cvg==
@@ -261,11 +270,26 @@
     "@sentry/utils" "7.27.0"
     tslib "^1.9.3"
 
+"@sentry/tracing@^7.37.2":
+  version "7.37.2"
+  resolved "https://registry.yarnpkg.com/@sentry/tracing/-/tracing-7.37.2.tgz#88f149aea6a4d5a3cfb9145868d885fac9fffb52"
+  integrity sha512-XBVvxbV5TADq2rHg/kJqGqDfOP8n2myMUxMMpfHMb38NrxkxQwXy+gDe41bA8FJKA2k7Y3Wkn8ZC/PelQ8c+ag==
+  dependencies:
+    "@sentry/core" "7.37.2"
+    "@sentry/types" "7.37.2"
+    "@sentry/utils" "7.37.2"
+    tslib "^1.9.3"
+
 "@sentry/types@7.27.0":
   version "7.27.0"
   resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.27.0.tgz#1af8eae05465ad00722e319c066c950cc389b585"
   integrity sha512-vapN3jchu3/WEMWQkrCOy2XDlOLj0l7IewYXKMr15Q21dlfM1QZMigU/r5rtYj5L8a2ISIHx+cRECxX5UIKH7w==
 
+"@sentry/types@7.37.2":
+  version "7.37.2"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-7.37.2.tgz#99fd76230d7c1d3c6901ed4c0bea35be7d6fe26d"
+  integrity sha512-SxKQOCX94ZaQM4C2ysNjHdJsjYapu/NYZCz1cnPyCdDvYfhwiVge1uq6ZHiQ/ARfxAAOmc3R4Mh3VvEz7WUOdw==
+
 "@sentry/utils@7.27.0":
   version "7.27.0"
   resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.27.0.tgz#1a0b4e62db32fb56e737c59bd67c847bb888fa8a"
@@ -274,22 +298,30 @@
     "@sentry/types" "7.27.0"
     tslib "^1.9.3"
 
+"@sentry/utils@7.37.2":
+  version "7.37.2"
+  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-7.37.2.tgz#14dea644454e3df247fb113fc834f509c1f0e48c"
+  integrity sha512-5irN1nN/mtdOoWwsJiwBK0gPgNMkciUubEMbCaaXqJaGyGz8+yfDvXj7L+xGYiU57z+7+QkkSKxKEZ/IcBpjVQ==
+  dependencies:
+    "@sentry/types" "7.37.2"
+    tslib "^1.9.3"
+
 "@sentry/vite-plugin@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@sentry/vite-plugin/-/vite-plugin-0.3.0.tgz#37d6a99ab7bf307b6ac3a5dc85ca16c52c2fff9c"
   integrity sha512-clu0yfVk9ejk3l22NHrFUPqHzR9ukYccm7Q5qBKgMyLXnWGLRf4WahmzzuW9XHDu4s3tYVjV/rTTxGxLPT9dMQ==
   dependencies:
     "@sentry/bundler-plugin-core" "0.3.0"
 
-"@sentry/vue@^7.27.0":
-  version "7.27.0"
-  resolved "https://registry.yarnpkg.com/@sentry/vue/-/vue-7.27.0.tgz#294d81372c79980f7c5ea54f0103083faec12196"
-  integrity sha512-8ZTfXo+s+oq3/7+c2qbiX+J5j3BpMya1a9ESeekx+bS7iwlRxMZWQslWDEJKheoS0J6/wy43fhb+8OS5cKvc6g==
+"@sentry/vue@^7.37.2":
+  version "7.37.2"
+  resolved "https://registry.yarnpkg.com/@sentry/vue/-/vue-7.37.2.tgz#8bc5768b6849a9214ce6479be774d641326190d5"
+  integrity sha512-cX2DXHC40pI8dBlGd95iPVHGZb0qwFiz1rFnrOdb3M3ekTHgVnqcG0wsdL6Z5UD0by6zhGqBbS2Lw2Y/pHUztw==
   dependencies:
-    "@sentry/browser" "7.27.0"
-    "@sentry/core" "7.27.0"
-    "@sentry/types" "7.27.0"
-    "@sentry/utils" "7.27.0"
+    "@sentry/browser" "7.37.2"
+    "@sentry/core" "7.37.2"
+    "@sentry/types" "7.37.2"
+    "@sentry/utils" "7.37.2"
     tslib "^1.9.3"
 
 "@types/dompurify@^2.4.0":