[web] fix bugs

2 files changed, 21 insertions, 12 deletions

diff --git a/web/src/js/ducks/utils/list.js b/web/src/js/ducks/utils/list.js
index 9649dde3..e66a8549 100644
--- a/web/src/js/ducks/utils/list.js
+++ b/web/src/js/ducks/utils/list.js
@@ -11,22 +11,27 @@ const defaultState = {
 }
 
 export default function reduce(state = defaultState, action) {
-    if (state.pendingActions && action.type !== RECEIVE) {
-        return {
-            ...state,
-            pendingActions: [...state.pendingActions, action]
-        }
-    }
-
     switch (action.type) {
 
         case SET:
+            if (state.pendingActions) {
+                return {
+                    ...state,
+                    pendingActions: [...state.pendingActions, action]
+                }
+            }
             return {
                 ...state,
                 data: { ...state.data, [action.id]: null, [action.item.id]: action.item }
             }
 
         case CLEAR:
+            if (state.pendingActions) {
+                return {
+                    ...state,
+                    pendingActions: [...state.pendingActions, action]
+                }
+            }
             return {
                 ...state,
                 data: { ...state.data, [action.id]: null }
diff --git a/web/src/js/ducks/utils/view.js b/web/src/js/ducks/utils/view.js
index 31331cf9..3b552378 100755
--- a/web/src/js/ducks/utils/view.js
+++ b/web/src/js/ducks/utils/view.js
@@ -15,21 +15,23 @@ const defaultState = {
 export default function reduce(state = defaultState, action) {
     switch (action.type) {
 
-        case UPDATE_FILTER:
+        case UPDATE_FILTER: {
             const data = _.values(action.list.data).filter(action.filter).sort(action.sorter)
             return {
                 ...state,
                 data,
                 indexOf: _.fromPairs(data.map((item, index) => [item.id, index])),
             }
+        }
 
-        case UPDATE_SORTER:
-            const data = state.data.slice().sort(action.sorter)
+        case UPDATE_SORTER: {
+            const data = [...state.data].sort(action.sorter)
             return {
                 ...state,
                 data,
                 indexOf: _.fromPairs(data.map((item, index) => [item.id, index]))
             }
+        }
 
         case ADD:
             if (state.indexOf[action.item.id] != null || !action.filter(action.item)) {
@@ -49,7 +51,7 @@ export default function reduce(state = defaultState, action) {
                 ...sortedRemove(state, action.id),
             }
 
-        case UPDATE:
+        case UPDATE: {
             if (state.indexOf[action.item.id] == null) {
                 return
             }
@@ -64,14 +66,16 @@ export default function reduce(state = defaultState, action) {
                 ...nextState,
                 ...sortedInsert(nextState, action.item, action.sorter)
             }
+        }
 
-        case RECEIVE:
+        case RECEIVE: {
             const data = _.values(action.list.data).filter(action.filter).sort(action.sorter)
             return {
                 ...state,
                 data,
                 indexOf: _.fromPairs(data.map((item, index) => [item.id, index])),
             }
+        }
 
         default:
             return state