read all working

src/components/comments/Comment.vue

@@ -151,7 +151,6 @@ async function read() {
       comment.id,
       page.value.uri
     );
-    userStore.readNotification(comment.id, route.params.id);
   } catch (error) {
     console.log("Erreur lors de la lecture de la notification : ", error);
   }

src/stores/api.js

@@ -1,8 +1,9 @@
 import { defineStore, storeToRefs } from "pinia";
-import { usePageStore } from "./page.js";
-import uniqid from "uniqid";
+import { useUserStore } from "./user";
 
 export const useApiStore = defineStore("api", () => {
+  const userStore = useUserStore();
+
   async function fetchData(path = window.location.pathname) {
     const isHomePage = path === "/";
     path = path === "/" ? "/home" : path;
@@ -166,6 +167,10 @@ export const useApiStore = defineStore("api", () => {
       if (data.error) {
         throw new Error(data);
       } else {
+        if (!projectId.startsWith("/")) {
+          projectId = "/" + projectId;
+        }
+        userStore.readNotification(notificationId, projectId);
         return data;
       }
     } catch (error) {
@@ -208,7 +213,10 @@ export const useApiStore = defineStore("api", () => {
       if (data.error) {
         throw new Error(data);
       } else {
+        console.log(data);
+        userStore.readAllNotifications();
         console.log("All notifications read.");
+        return data;
       }
     } catch (error) {
       throw error;

src/stores/user.js

@@ -21,11 +21,12 @@ export const useUserStore = defineStore("user", () => {
     });
   });
 
-  function readNotification(notificationId, projectSlug) {
+  function readNotification(notificationId, projectId) {
+    console.log("Read notification", notificationId, projectId);
     projects.value = projects.value.map((project) => ({
       ...project,
       notifications:
-        project.slug === projectSlug
+        project.uuid === projectId || project.uri === projectId
           ? project.notifications.map((notification) =>
               notification.id === notificationId
                 ? {

src/views/Notifications.vue

@@ -117,7 +117,6 @@ function changeTab(newValue) {
 function readAll() {
   try {
     api.readAllNotifications();
-    userStore.readAllNotifications();
   } catch (error) {
     console.log("Could not read all notifications : ", error);
   }