Merge pull request #468 from bento-platform/fix/notification-mark-as-…

…read fix: proper notification mark-as-read behaviour
bento-platform · Nov 15, 2024 · e5019cd · e5019cd
2 parents cd8ff0e + 25e09c5
commit e5019cd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/src/modules/notifications/actions.js b/src/modules/notifications/actions.js
@@ -25,6 +25,8 @@ export const MARK_NOTIFICATION_AS_READ = createNetworkActionTypes("MARK_NOTIFICA
 export const markNotificationAsRead = networkAction((notificationID) => (_dispatch, getState) => ({
   types: MARK_NOTIFICATION_AS_READ,
   params: { notificationID },
+  check: (state) =>
+    state.services.notificationService && !state.notifications.itemsByID[notificationID]?.isMarkingAsRead,
   url: `${getState().services.notificationService.url}/notifications/${notificationID}/read`,
   req: { method: "PUT" },
   err: "Error marking notification as read",

diff --git a/src/modules/notifications/reducers.js b/src/modules/notifications/reducers.js
@@ -8,6 +8,9 @@ import {
 } from "./actions";
 
 const unreadNotifications = (items) => items.filter((n) => !n.read);
+const setMarkingAsRead = (i) => ({ ...i, isMarkingAsRead: true });
+const setRead = (i) => ({ ...i, read: true });
+const setNotMarkingAsRead = (i) => ({ ...i, isMarkingAsRead: false });
 
 export const notifications = (
   state = {
@@ -57,33 +60,32 @@ export const notifications = (
       return { ...state, isFetching: false };
 
     case MARK_NOTIFICATION_AS_READ.REQUEST: {
-      const rp = (i) => ({ ...i, isMarkingAsRead: true });
+      const items = replaceNotificationInArray(setMarkingAsRead);
       return {
         ...state,
         isMarkingAsRead: true,
-        items: replaceNotificationInArray(rp),
-        unreadItems: replaceNotificationInArray(rp),
-        itemsByID: replaceNotificationInObject(rp),
+        items,
+        unreadItems: unreadNotifications(items),
+        itemsByID: replaceNotificationInObject(setMarkingAsRead),
       };
     }
     case MARK_NOTIFICATION_AS_READ.RECEIVE: {
-      const rp = (i) => ({ ...i, read: true });
-      const items = replaceNotificationInArray(rp);
+      const items = replaceNotificationInArray(setRead);
       return {
         ...state,
-        items: items,
+        items,
         unreadItems: unreadNotifications(items),
-        itemsByID: replaceNotificationInObject(rp),
+        itemsByID: replaceNotificationInObject(setRead),
       };
     }
     case MARK_NOTIFICATION_AS_READ.FINISH: {
-      const rp = (i) => ({ ...i, isMarkingAsRead: false });
+      const items = replaceNotificationInArray(setNotMarkingAsRead);
       return {
         ...state,
         isMarkingAsRead: false,
-        items: replaceNotificationInArray(rp),
-        unreadItems: replaceNotificationInArray(rp), // should do nothing unless there's an error
-        itemsByID: replaceNotificationInObject(rp),
+        items,
+        unreadItems: unreadNotifications(items), // should do nothing unless there's an error
+        itemsByID: replaceNotificationInObject(setNotMarkingAsRead),
       };
     }