Listen to WS notification to update inbox #1157

metasfresh · Sep 1, 2017 · 62d9fec · 62d9fec
1 parent 730981c
commit 62d9fec
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/src/actions/AppActions.js b/src/actions/AppActions.js
@@ -264,6 +264,10 @@ export function loginSuccess(auth) {
                     dispatch(updateNotification(
                         notification.notification, notification.unreadCount
                     ));
+                }else if(notification.eventType === 'Delete') {
+                    dispatch(removeNotification(
+                        notification.notificationId, notification.unreadCount
+                    ));
                 }else if(notification.eventType === 'New'){
                     dispatch(newNotification(
                         notification.notification, notification.unreadCount
@@ -326,7 +330,7 @@ export function setNotificationProgress(key, progress){
     }
 }
 
-export function deleteNotification(key){
+export function deleteNotification(key) {
     return {
         type: types.DELETE_NOTIFICATION,
         key: key
@@ -381,6 +385,14 @@ export function newNotification(msg, count) {
     }
 }
 
+export function removeNotification(msg, count) {
+    return {
+        type: types.REMOVE_NOTIFICATION,
+        notification: msg,
+        unreadCount: count
+    }
+}
+
 export function setProcessPending() {
     return {
         type: types.SET_PROCESS_STATE_PENDING

diff --git a/src/components/inbox/Inbox.js b/src/components/inbox/Inbox.js
@@ -65,14 +65,7 @@ class Inbox extends Component {
         e.preventDefault();
         e.stopPropagation();
 
-        deleteUserNotification(item.id).then( () => {
-            getNotifications().then(response => {
-                dispatch(getNotificationsSuccess(
-                    response.data.notifications,
-                    response.data.unreadCount
-                ));
-            });
-        });
+        deleteUserNotification(item.id).then( () => {});
     }
 
     componentDidUpdate() {

diff --git a/src/constants/ActionTypes.js b/src/constants/ActionTypes.js
@@ -58,6 +58,7 @@ export const SELECT_TABLE_ITEMS = 'SELECT_TABLE_ITEMS';
 
 export const GET_NOTIFICATIONS_SUCCESS = 'GET_NOTIFICATIONS_SUCCESS';
 export const NEW_NOTIFICATION = 'NEW_NOTIFICATION';
+export const REMOVE_NOTIFICATION = 'REMOVE_NOTIFICATION';
 export const UPDATE_NOTIFICATION = 'UPDATE_NOTIFICATION';
 
 export const OPEN_RAW_MODAL = 'OPEN_RAW_MODAL';

diff --git a/src/reducers/appHandler.js b/src/reducers/appHandler.js
@@ -96,6 +96,16 @@ export default function appHandler(state = initialState, action) {
                     unreadCount: {$set: action.unreadCount}
                 }
             })
+        case types.REMOVE_NOTIFICATION:
+            return update(state, {
+                inbox: {
+                    notifications: { $set:
+                        state.inbox.notifications.filter(item =>
+                            item.id !== action.notification
+                        )},
+                    unreadCount: {$set: action.unreadCount}
+                }
+            })
         case types.UPDATE_NOTIFICATION:
             return update(state, {
                 inbox: {