Error notification gets recreated when navigating after failed proces…

…s start #1150
metasfresh · Aug 24, 2017 · 6bce723 · 6bce723
1 parent b715a63
commit 6bce723
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 1 deletion.
diff --git a/src/actions/AppActions.js b/src/actions/AppActions.js
@@ -322,6 +322,12 @@ export function deleteNotification(key){
     }
 }
 
+export function clearNotifications() {
+    return {
+        type: types.CLEAR_NOTIFICATIONS,
+    }
+}
+
 export function updateUri(pathname, query, prop, value) {
     return (dispatch) => {
         let url = pathname + '?';

diff --git a/src/actions/WindowActions.js b/src/actions/WindowActions.js
@@ -646,7 +646,10 @@ export function createProcess(processType, viewId, type, ids, tabId, rowId) {
                     startProcess(processType, pid).then(response => {
                         dispatch(handleProcessResponse(response, processType, pid));
                     }).catch(err => {
+                        dispatch(closeModal());
+
                         dispatch(setProcessSaved());
+
                         throw err;
                     });
                 }

diff --git a/src/constants/ActionTypes.js b/src/constants/ActionTypes.js
@@ -37,6 +37,7 @@ export const CHANGE_INDICATOR_STATE = 'CHANGE_INDICATOR_STATE';
 export const ADD_NOTIFICATION = 'ADD_NOTIFICATION';
 export const SET_NOTIFICATION_PROGRESS = 'SET_NOTIFICATION_PROGRESS';
 export const DELETE_NOTIFICATION = 'DELETE_NOTIFICATION';
+export const CLEAR_NOTIFICATIONS = 'CLEAR_NOTIFICATIONS';
 // END OF NOTIFICATION ACTIONS
 
 //AUTH ACTIONS

diff --git a/src/reducers/appHandler.js b/src/reducers/appHandler.js
@@ -70,6 +70,11 @@ export default function appHandler(state = initialState, action) {
                 }, {})
             });
 
+        case types.CLEAR_NOTIFICATIONS:
+            return Object.assign({}, state, {
+                notifications: {}
+            });
+
         // END OF NOTIFICATION ACTIONS
         case types.GET_NOTIFICATIONS_SUCCESS:
             return Object.assign({}, state, {

diff --git a/src/routes.js b/src/routes.js
@@ -14,7 +14,8 @@ import {
     logoutRequest,
     logoutSuccess,
     loginSuccess,
-    localLoginRequest
+    localLoginRequest,
+    clearNotifications
 } from './actions/AppActions';
 
 import {
@@ -35,7 +36,10 @@ export const getRoutes = (store, auth) => {
                 }
             })
         }else{
+            store.dispatch(clearNotifications());
+
             store.dispatch(loginSuccess(auth));
+
             callback();
         }
     }