show error when remove group failed

cheminfo · Sep 26, 2017 · 580b952 · 580b952
1 parent 9f44a47
commit 580b952
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/src/client/components/GroupCreator.js b/src/client/components/GroupCreator.js
@@ -44,7 +44,7 @@ class GroupCreator extends Component {
                             value="Create LDAP group"
                         />
                     </form>
-                    {error ? <div style={{marginTop: 8}} className="alert alert-danger">{error}</div> : null }
+                    {error ? <div style={{marginTop: 20}} className="alert alert-danger">{error}</div> : null }
                 </div>
             </div>
         );

diff --git a/src/client/reducers/db.js b/src/client/reducers/db.js
@@ -37,24 +37,21 @@ const dbReducer = (state = initialState, action) => {
             return Object.assign({}, state, {userGroups: newGroupList});
         }
         case `${REMOVE_GROUP}_FULFILLED`: {
+            if (action.payload.error) {
+                return getNewStateOnGroupError(state, action);
+            }
             const newGroupList = state.userGroups.filter(group => group.name !== action.meta);
             return Object.assign({}, state, {userGroups: newGroupList});
         }
         case `${UPDATE_GROUP}_FULFILLED`: {
-            const index = state.userGroups.findIndex(group => group.name === action.meta);
-            if (index === -1) {
-                throw new Error('should not happen');
-            }
-            const newGroupList = state.userGroups.slice();
             if (action.payload.error) {
-                newGroupList[index] = Object.assign({}, newGroupList[index], {error: action.payload.error, success: null});
-                return Object.assign({}, state, {
-                    userGroups: newGroupList
-                });
+                return getNewStateOnGroupError(state, action);
             } else {
                 if (action.payload.name !== action.meta) {
                     throw new Error('should not happen');
                 }
+                const index = getGroupIndex(state.userGroups, action);
+                const newGroupList = state.userGroups.slice();
                 newGroupList[index] = action.payload;
                 newGroupList[index].success = 'Group sucessfully updated';
                 newGroupList[index].error = null;
@@ -79,6 +76,23 @@ const dbReducer = (state = initialState, action) => {
     }
 };
 
+function getGroupIndex(userGroups, action) {
+    const index = userGroups.findIndex(group => group.name === action.meta);
+    if (index === -1) {
+        throw new Error('should not happen');
+    }
+    return index;
+}
+
+function getNewStateOnGroupError(state, action) {
+    const index = getGroupIndex(state.userGroups, action);
+    const newGroupList = state.userGroups.slice();
+    newGroupList[index] = Object.assign({}, newGroupList[index], {error: action.payload.error, success: null});
+    return Object.assign({}, state, {
+        userGroups: newGroupList
+    });
+}
+
 export default dbReducer;
 
 function sortByName(group1, group2) {