read all working

public/site/plugins/notifications/index.php

@@ -24,10 +24,4 @@ Kirby::plugin("adrienpayet/pdc-notifications", [
     require(__DIR__ . "/routes/readAll.php"),
     require(__DIR__ . "/routes/read.php")
   ],
-  "userMethods" => [
-    // "sendNotification" => require(__DIR__ . "/user-methods/send.php"),
-    "deleteNotification" => require(__DIR__ . "/user-methods/delete.php"),
-    "readNotification" => require(__DIR__ . "/user-methods/read.php"),
-    "readAllNotifications" => require(__DIR__ . "/user-methods/readAll.php")
-  ]
 ]);

public/site/plugins/notifications/routes/readAll.php

@@ -4,7 +4,20 @@ return [
   'pattern' => '(:all)read-all-notifications.json',
   'method' => 'GET',
   'action'  => function () {
-      $newNotifications = kirby()->user()->readAllNotifications();
+      $projects = page("projects");
-      return $newNotifications;
+
+      foreach ($projects->children() as $project) {
+        try {
+          $project->readAllNotifications();
+          return json_encode([
+            "status" => "success"
+          ]);
+        } catch (\Throwable $th) {
+          return json_encode([
+            "status" => "error",
+            "message" => $th->getMessage() . ' line ' . $th->getLine() . " in file " . $th->getFile()
+          ]);
+        }
+      }
   }
 ];

public/site/plugins/notifications/src/NotificationsPage.php

@@ -5,62 +5,88 @@ use Kirby\Data\Yaml;
 use adrienpayet\notifications\Notification;
 
 class NotificationsPage extends Page {
-   public function createNotification($notificationData) {
+    public function createNotification($notificationData) {
-      $newNotification = new Notification($notificationData);
+        $newNotification = new Notification($notificationData);
 
-      $notifications = $this->notifications()->isNotEmpty()
+        $notifications = $this->notifications()->isNotEmpty()
-         ? Yaml::decode($this->notifications()->value())
+            ? Yaml::decode($this->notifications()->value())
-         : [];
+            : [];
-      
+        
-      $notifications[] = $newNotification->toArray();
+        $notifications[] = $newNotification->toArray();
 
-      $this->update([
+        $this->update([
-         'notifications' => $notifications
+            'notifications' => $notifications
-      ]);
+        ]);
-   }
+    }
 
-   public function deleteNotification($notificationId) {
+    public function deleteNotification($notificationId) {
-      $notifications = $this->notifications()->isNotEmpty()
+        $notifications = $this->notifications()->isNotEmpty()
-         ? Yaml::decode($this->notifications()->value())
+            ? Yaml::decode($this->notifications()->value())
-         : [];
+            : [];
-      
+        
-      foreach ($notifications as $key => $notification) {
+        foreach ($notifications as $key => $notification) {
-         if ($notification['id'] === $notificationId) {
+            if ($notification['id'] === $notificationId) {
-            unset($notifications[$key]);
+                unset($notifications[$key]);
-         }
+            }
-      }
+        }
 
-      $this->update([
+        $this->update([
-         'notifications' => $notifications
+            'notifications' => $notifications
-      ]);
+        ]);
-   }
+    }
 
-   public function readNotification($notificationId) {
+    public function readNotification($notificationId) {
-      $notifications = $this->notifications()->isNotEmpty()
+        $notifications = $this->notifications()->isNotEmpty()
-          ? Yaml::decode($this->notifications()->value())
+            ? Yaml::decode($this->notifications()->value())
-          : [];
+            : [];
-      
+        
-      foreach ($notifications as $key => &$notification) {
+        foreach ($notifications as $key => &$notification) {
-          if ($notification['id'] !== $notificationId) {
+            if ($notification['id'] !== $notificationId) {
-              continue;
+                continue;
-          }
+            }
-  
+    
-          if (!isset($notification["readby"])) {
+            if (!isset($notification["readby"])) {
-              $notification["readby"] = [];
+                $notification["readby"] = [];
-          }
+            }
-  
+    
-          $userUuid = (string) kirby()->user()->uuid();
+            $userUuid = (string) kirby()->user()->uuid();
-          if (in_array($userUuid, $notification["readby"])) {
+            if (in_array($userUuid, $notification["readby"])) {
-              return;
+                continue;
-          }
+            }
-  
+    
-          $notification["readby"][] = $userUuid;  
+            $notification["readby"][] = $userUuid;  
-          break;
+            break;
-      }
+        }
 
-      $this->update([
+        $this->update([
-          'notifications' => Yaml::encode($notifications)
+            'notifications' => Yaml::encode($notifications)
-      ]);
+        ]);
-  }
+    }
+   
+    public function readAllNotifications() {
+        $notifications = $this->notifications()->isNotEmpty()
+            ? Yaml::decode($this->notifications()->value())
+            : [];
+        
+        foreach ($notifications as $key => &$notification) {  
+            if (!isset($notification["readby"])) {
+                $notification["readby"] = [];
+            }
+            
+            $userUuid = (string) kirby()->user()->uuid();
+            if (in_array($userUuid, $notification["readby"])) {
+                continue;
+            }
+
+            $notification["readby"][] = $userUuid;  
+            break;
+        }
+        
+        
+
+        $this->update([
+            'notifications' => Yaml::encode($notifications)
+        ]);
+    }
   
 }

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 { useUserStore } from "./user";
-import uniqid from "uniqid";
 
 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);
   }