fix(messagerie): correction pb composant ToolTip et autres

SocialGouv · Oct 1, 2024 · 87d16b0 · 87d16b0
1 parent c7ea9d0
commit 87d16b0
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 15 deletions.
diff --git a/packages/frontend-bo/src/components/demandes-sejour/liste.vue b/packages/frontend-bo/src/components/demandes-sejour/liste.vue
@@ -25,7 +25,11 @@
           ]"
         />
         <CardsNumber
-          v-if="!props.organisme && props.display === displayType.Messagerie"
+          v-if="
+            !props.organisme &&
+            props.display === displayType.Messagerie &&
+            userStore.user.serviceCompetent === 'DEP'
+          "
           :values="[
             {
               title: 'Messages non lus',

diff --git a/packages/frontend-bo/src/pages/messagerie/index.vue b/packages/frontend-bo/src/pages/messagerie/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="fr-container">
-    <DemandesSejourListe :display="'Messagerie'" />
+    <DemandesSejourListe display="Messagerie" />
   </div>
 </template>
 

diff --git a/packages/frontend-bo/src/pages/organismes/[[organismeId]].vue b/packages/frontend-bo/src/pages/organismes/[[organismeId]].vue
@@ -121,6 +121,7 @@
         <DemandesSejourListe
           v-if="organismeName"
           :organisme="organismeName"
+          display="Organisme"
         ></DemandesSejourListe>
       </DsfrTabContent>
     </DsfrTabs>

diff --git a/packages/frontend-bo/src/pages/sejours/[declarationId].vue b/packages/frontend-bo/src/pages/sejours/[declarationId].vue
@@ -186,6 +186,8 @@ definePageMeta({
   roles: ["DemandeSejour_Lecture", "DemandeSejour_Ecriture"],
 });
 
+const usersStore = useUserStore();
+
 const log = logger("pages/sejours");
 
 const toaster = useToaster();
@@ -205,7 +207,7 @@ const selectTab = async (idx) => {
   if (idx === 2 && !historique.value) {
     execute();
   }
-  if (idx === 3) {
+  if (idx === 3 && userStore.user.serviceCompetent === "DEP") {
     await demandeStore.readMessages(route.params.declarationId);
     demandeStore.fetchMessages(route.params.declarationId);
   }
@@ -249,10 +251,19 @@ const isOrganismeNonAgree = computed(() => {
 });
 
 onMounted(async () => {
+  if (!usersStore.user.serviceCompetent) {
+    await usersStore.refreshProfile();
+  }
   try {
     await demandeStore.setCurrentDemande(route.params.declarationId);
     demandeStore.fetchMessages(route.params.declarationId);
-    if (parseInt(route.query.defaultTabIndex) === 3)
+    if (!usersStore.user.serviceCompetent) {
+      await usersStore.refreshProfile();
+    }
+    if (
+      parseInt(route.query.defaultTabIndex) === 3 &&
+      userStore.user.serviceCompetent === "DEP"
+    )
       await demandeStore.readMessages(route.params.declarationId);
   } catch (e) {
     navigateTo("/sejours");

diff --git a/packages/frontend-bo/src/pages/sejours/index.vue b/packages/frontend-bo/src/pages/sejours/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="fr-container">
-    <DemandesSejourListe :display="'Organisme'" />
+    <DemandesSejourListe display="Organisme" />
   </div>
 </template>
 

diff --git a/packages/frontend-usagers/src/pages/demande-sejour/liste.vue b/packages/frontend-usagers/src/pages/demande-sejour/liste.vue
@@ -1,3 +1,3 @@
 <template>
-  <DemandeSejourListe :display="'Organisme'" />
+  <DemandeSejourListe display="Organisme" />
 </template>
diff --git a/packages/frontend-usagers/src/pages/messagerie/index.vue b/packages/frontend-usagers/src/pages/messagerie/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="fr-container">
-    <DemandeSejourListe :display="'Messagerie'" />
+    <DemandeSejourListe display="Messagerie" />
   </div>
 </template>
 

diff --git a/packages/shared/src/components/messages/MessageEtat.vue b/packages/shared/src/components/messages/MessageEtat.vue
@@ -25,10 +25,6 @@ const props = defineProps({
     type: String,
     validator: (value) => Object.values(messageEtat.etat).includes(value),
   },
-  message: {
-    required: true,
-    type: String,
-  },
 });
 
 import messageEtat from "@vao/shared/src/utils/messageUtils";

diff --git a/packages/shared/src/components/messages/MessageHover.vue b/packages/shared/src/components/messages/MessageHover.vue
@@ -1,7 +1,9 @@
 <template>
-  <DsfrTooltip on-hover :content="content">
-    <div class="fr-icon-mail-line"></div>
-  </DsfrTooltip>
+  <div>
+    <DsfrTooltip on-hover :content="content">
+      <div class="fr-icon-mail-line"></div>
+    </DsfrTooltip>
+  </div>
 </template>
 
 <script setup>

diff --git a/packages/shared/src/utils/index.js b/packages/shared/src/utils/index.js
@@ -3,5 +3,15 @@ import hebergement from "./hebergement";
 import regex from "./hebergement";
 import eigUtils from "./hebergement";
 import messageUtils from "./messageUtils";
+import MessageHover from "../components/messages/MessageHover.vue";
+import MessageEtat from "../components/messages/MessageEtat.vue";
 
-export { createLogger, hebergement, regex, eigUtils, messageUtils };
+export {
+  createLogger,
+  hebergement,
+  regex,
+  eigUtils,
+  messageUtils,
+  MessageHover,
+  MessageEtat,
+};