fix(admin-ui): resolve all bugs displayed for admin-ui bug #308

GluuFederation · Nov 26, 2021 · b7c9665 · b7c9665
1 parent 194e158
commit b7c9665
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 0 deletions.
diff --git a/plugins/auth-server/redux/reducers/AcrReducer.js b/plugins/auth-server/redux/reducers/AcrReducer.js
@@ -27,6 +27,11 @@ export default function acrReducer(state = INIT_STATE, action) {
           acrs: action.payload.data,
           loading: false,
         }
+      } else {
+        return {
+          ...state,
+          loading: false,
+        }
       }
 
     case PUT_ACRS:
@@ -41,6 +46,11 @@ export default function acrReducer(state = INIT_STATE, action) {
           acrs: action.payload.data,
           loading: false,
         }
+      } else {
+        return {
+          ...state,
+          loading: false,
+        }
       }
     default:
       return {

diff --git a/plugins/auth-server/redux/reducers/JsonConfigReducer.js b/plugins/auth-server/redux/reducers/JsonConfigReducer.js
@@ -26,6 +26,11 @@ export default function jsonConfigReducer(state = INIT_STATE, action) {
           configuration: action.payload.data,
           loading: false,
         }
+      } else {
+        return {
+          ...state,
+          loading: false,
+        }
       }
 
     case PATCH_JSON_CONFIG:
@@ -40,6 +45,11 @@ export default function jsonConfigReducer(state = INIT_STATE, action) {
           configuration: action.payload.data,
           loading: false,
         }
+      } else {
+        return {
+          ...state,
+          loading: false,
+        }
       }
     default:
       return {

diff --git a/plugins/auth-server/redux/reducers/JwksReducer.js b/plugins/auth-server/redux/reducers/JwksReducer.js
@@ -22,6 +22,11 @@ export default function jwksReducer(state = INIT_STATE, action) {
           jwks: action.payload.data,
           loading: false,
         }
+      } else {
+        return {
+          ...state,
+          loading: false,
+        }
       }
     case RESET:
       return {

diff --git a/plugins/auth-server/redux/reducers/LoggingReducer.js b/plugins/auth-server/redux/reducers/LoggingReducer.js
@@ -27,6 +27,11 @@ export default function loggingReducer(state = INIT_STATE, action) {
           logging: action.payload.data,
           loading: false,
         }
+      } else {
+        return {
+          ...state,
+          loading: false,
+        }
       }
     case PUT_LOGGING:
       return {
@@ -40,6 +45,11 @@ export default function loggingReducer(state = INIT_STATE, action) {
           logging: action.payload.data,
           loading: false,
         }
+      } else {
+        return {
+          ...state,
+          loading: false,
+        }
       }
 
     case RESET:

diff --git a/plugins/auth-server/redux/reducers/ScopeReducer.js b/plugins/auth-server/redux/reducers/ScopeReducer.js
@@ -43,6 +43,11 @@ export default function scopeReducer(state = INIT_STATE, action) {
           items: action.payload.data,
           loading: false,
         }
+      } else {
+        return {
+          ...state,
+          loading: false,
+        }
       }
     case GET_SCOPE_BY_INUM:
       return {
@@ -56,6 +61,11 @@ export default function scopeReducer(state = INIT_STATE, action) {
           item: action.payload.data,
           loading: false,
         }
+      } else {
+        return {
+          ...state,
+          loading: false,
+        }
       }
     case GET_SCOPE_BY_PATTERN:
       return {
@@ -69,6 +79,11 @@ export default function scopeReducer(state = INIT_STATE, action) {
           item: action.payload.data,
           loading: false,
         }
+      } else {
+        return {
+          ...state,
+          loading: false,
+        }
       }
 
     case ADD_SCOPE:
@@ -83,6 +98,11 @@ export default function scopeReducer(state = INIT_STATE, action) {
           items: [...state.items],
           loading: false,
         }
+      } else {
+        return {
+          ...state,
+          loading: false,
+        }
       }
 
     case EDIT_SCOPE:
@@ -98,6 +118,11 @@ export default function scopeReducer(state = INIT_STATE, action) {
           items: [...state.items],
           loading: false,
         }
+      } else {
+        return {
+          ...state,
+          loading: false,
+        }
       }
     case DELETE_SCOPE:
       return {
@@ -111,6 +136,11 @@ export default function scopeReducer(state = INIT_STATE, action) {
           items: state.items.filter((i) => i.inum !== action.payload.data),
           loading: false,
         }
+      } else {
+        return {
+          ...state,
+          loading: false,
+        }
       }
 
     case SET_ITEM: