Merge branch 'main' into 571-déplacer-nom-structure-dans-la-déclaration

Author: bellangerq

confiture-web-app/package.json

@@ -26,7 +26,7 @@
     "slugify": "^1.6.5",
     "vue": "^3.2.45",
     "vue-matomo": "^4.2.0",
-    "vue-router": "^4.1.6"
+    "vue-router": "^4.2.5"
   },
   "devDependencies": {
     "@sentry/vite-plugin": "^0.3.0",

confiture-web-app/src/assets/CHANGELOG.md

@@ -8,6 +8,12 @@ Tous les changements notables de Ara sont documentés ici avec leur date, leur c
 
 - Déplace le champ du nom de la structure qui audite le site dans la page de déclaration ([#574](https://github.com/DISIC/Ara/pull/574))
 
+## 01/12/2023
+
+### Autres changements ⚙️
+
+- Ajout de plus de contexte le message indiquant qu’aucun audit n’est présent sur le tableau de bord ([#577](https://github.com/DISIC/Ara/pull/577))
+
 ## 30/11/2023
 
 ### Nouvelles fonctionnalités 🚀

confiture-web-app/src/components/account/dashboard/NoAudit.vue

@@ -3,16 +3,21 @@ defineProps<{ label: string }>();
 </script>
 
 <template>
-  <div class="fr-py-3w fr-px-2w wrapper">
-    <RouterLink :to="{ name: 'missing-audit' }">{{ label }}</RouterLink>
-  </div>
+  <p class="fr-pt-2w fr-pb-3w fr-px-2w wrapper">
+    <span class="fr-text--md fr-text--bold fr-mb-1v">{{ label }}</span>
+
+    <RouterLink :to="{ name: 'missing-audit' }" class="fr-text--sm fr-mb-0">
+      Vous ne retrouvez pas un audit ?
+    </RouterLink>
+  </p>
 </template>
 
 <style scoped>
 .wrapper {
   background: var(--background-alt-blue-france);
   display: flex;
   align-items: center;
+  flex-direction: column;
   justify-content: center;
 }
 </style>

confiture-web-app/src/composables/useWrappedFetch.ts

@@ -1,6 +1,7 @@
 import { onMounted, watch } from "vue";
 import { onBeforeRouteLeave, useRoute, useRouter } from "vue-router";
 import { TimeoutError } from "ky";
+import { isEqual } from "lodash-es";
 
 import { captureWithPayloads } from "../utils";
 
@@ -51,8 +52,12 @@ export function useWrappedFetch(
   if (watchParams) {
     const watchStopHandle = watch(
       () => route.params,
-      () => {
-        func().catch(handleError);
+      (newParams, oldParams) => {
+        // Make sure the params actually changed because if only the hash of the route
+        // changed, the `params` objects will be equal but different references, which will trigger the watcher
+        if (!isEqual(newParams, oldParams)) {
+          func().catch(handleError);
+        }
       }
     );
 

confiture-web-app/yarn.lock

@@ -581,6 +581,11 @@
   resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.4.5.tgz#d54e844c1adbb1e677c81c665ecef1a2b4bb8380"
   integrity sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==
 
+"@vue/devtools-api@^6.5.0":
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.5.1.tgz#7f71f31e40973eeee65b9a64382b13593fdbd697"
+  integrity sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==
+
 "@vue/reactivity-transform@3.2.45":
   version "3.2.45"
   resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.45.tgz#07ac83b8138550c83dfb50db43cde1e0e5e8124d"
@@ -1788,12 +1793,12 @@ vue-matomo@^4.2.0:
   resolved "https://registry.yarnpkg.com/vue-matomo/-/vue-matomo-4.2.0.tgz#d65e369e4ead1d95ef790bef3627512cac3d25e9"
   integrity sha512-m5hCw7LH3wPDcERaF4sp/ojR9sEx7Rl8TpOyH/4jjQxMF2DuY/q5pO+i9o5Dx+BXLSa9+IQ0qhAbWYRyESQXmA==
 
-vue-router@^4.1.6:
-  version "4.1.6"
-  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.1.6.tgz#b70303737e12b4814578d21d68d21618469375a1"
-  integrity sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==
+vue-router@^4.2.5:
+  version "4.2.5"
+  resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.2.5.tgz#b9e3e08f1bd9ea363fdd173032620bc50cf0e98a"
+  integrity sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw==
   dependencies:
-    "@vue/devtools-api" "^6.4.5"
+    "@vue/devtools-api" "^6.5.0"
 
 vue-template-compiler@^2.7.14:
   version "2.7.14"