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

GluuFederation · Nov 26, 2021 · ec60500 · ec60500
1 parent b4d6521
commit ec60500
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 117 deletions.
diff --git a/app/redux/reducers/AuthReducer.js b/app/redux/reducers/AuthReducer.js
@@ -26,24 +26,18 @@ const reducerName = 'authReducer'
 export default function authReducer(state = INIT_STATE, action) {
   switch (action.type) {
     case GET_USER_LOCATION:
-      return {
-        ...state,
-      }
+      return handleDefault()
     case GET_USER_LOCATION_RESPONSE:
       if (action.payload.location) {
         return {
           ...state,
           location: action.payload.location,
         }
       } else {
-        return {
-          ...state,
-        }
+        return handleDefault()
       }
     case GET_OAUTH2_CONFIG:
-      return {
-        ...state,
-      }
+      return handleDefault()
     case GET_OAUTH2_CONFIG_RESPONSE:
       if (action.payload.config && action.payload.config != -1) {
         return {
@@ -59,9 +53,7 @@ export default function authReducer(state = INIT_STATE, action) {
       }
 
     case USERINFO_REQUEST:
-      return {
-        ...state,
-      }
+      return handleDefault()
     case USERINFO_RESPONSE:
       if (action.payload.uclaims) {
         return {
@@ -79,9 +71,7 @@ export default function authReducer(state = INIT_STATE, action) {
       }
 
     case GET_API_ACCESS_TOKEN:
-      return {
-        ...state,
-      }
+      return handleDefault()
 
     case GET_API_ACCESS_TOKEN_RESPONSE:
       if (action.payload.accessToken) {
@@ -93,15 +83,17 @@ export default function authReducer(state = INIT_STATE, action) {
           isAuthenticated: true,
         }
       } else {
-        return {
-          ...state,
-        }
+        return handleDefault()
       }
 
     default:
-      return {
-        ...state,
-      }
+      return handleDefault()
+  }
+
+  function handleDefault() {
+    return {
+      ...state,
+    }
   }
 }
 reducerRegistry.register(reducerName, authReducer)
diff --git a/app/redux/reducers/FidoReducer.js b/app/redux/reducers/FidoReducer.js
@@ -16,10 +16,7 @@ const reducerName = 'fidoReducer'
 export default function fidoReducer(state = INIT_STATE, action) {
   switch (action.type) {
     case GET_FIDO:
-      return {
-        ...state,
-        loading: true,
-      }
+      return handleLoading()
     case GET_FIDO_RESPONSE:
       if (action.payload.data) {
         return {
@@ -28,15 +25,10 @@ export default function fidoReducer(state = INIT_STATE, action) {
           loading: false,
         }
       } else {
-        return {
-          ...state,
-        }
+        return handleDefault()
       }
     case PUT_FIDO:
-      return {
-        ...state,
-        loading: true,
-      }
+      return handleLoading()
     case PUT_FIDO_RESPONSE:
       if (action.payload.data) {
         return {
@@ -45,9 +37,7 @@ export default function fidoReducer(state = INIT_STATE, action) {
           loading: false,
         }
       } else {
-        return {
-          ...state,
-        }
+        return handleDefault()
       }
 
     case RESET:
@@ -57,10 +47,21 @@ export default function fidoReducer(state = INIT_STATE, action) {
         loading: INIT_STATE.loading,
       }
     default:
-      return {
-        ...state,
-        loading: false,
-      }
+      return handleDefault()
+  }
+
+  function handleLoading() {
+    return {
+      ...state,
+      loading: true,
+    }
+  }
+
+  function handleDefault() {
+    return {
+      ...state,
+      loading: false,
+    }
   }
 }
 

diff --git a/app/redux/reducers/InitReducer.js b/app/redux/reducers/InitReducer.js
@@ -21,9 +21,7 @@ const reducerName = 'initReducer'
 export default function initReducer(state = INIT_STATE, action) {
   switch (action.type) {
     case GET_SCRIPTS_FOR_STAT:
-      return {
-        ...state,
-      }
+      return handleDefault()
 
     case GET_SCRIPTS_FOR_STAT_RESPONSE:
       if (action.payload.data) {
@@ -32,25 +30,19 @@ export default function initReducer(state = INIT_STATE, action) {
           scripts: action.payload.data,
         }
       } else {
-        return {
-          ...state,
-        }
+        return handleDefault()
       }
 
     case GET_CLIENTS_FOR_STAT:
-      return {
-        ...state,
-      }
+      return handleDefault()
     case GET_CLIENTS_FOR_STAT_RESPONSE:
       if (action.payload.data) {
         return {
           ...state,
           clients: action.payload.data,
         }
       } else {
-        return {
-          ...state,
-        }
+        return handleDefault()
       }
 
     case GET_ATTRIBUTES_FOR_STAT:
@@ -61,30 +53,28 @@ export default function initReducer(state = INIT_STATE, action) {
           attributes: action.payload.data,
         }
       } else {
-        return {
-          ...state,
-        }
+        return handleDefault()
       }
 
     case GET_SCOPES_FOR_STAT:
-      return {
-        ...state,
-      }
+      return handleDefault()
     case GET_SCOPES_FOR_STAT_RESPONSE:
       if (action.payload.data) {
         return {
           ...state,
           scopes: action.payload.data,
         }
       } else {
-        return {
-          ...state,
-        }
+        return handleDefault()
       }
     default:
-      return {
-        ...state,
-      }
+      return handleDefault()
+  }
+
+  function handleDefault() {
+    return {
+      ...state,
+    }
   }
 }
 reducerRegistry.register(reducerName, initReducer)
diff --git a/app/redux/reducers/JsonConfigReducer.js b/app/redux/reducers/JsonConfigReducer.js
@@ -15,47 +15,46 @@ const reducerName = 'jsonConfigReducer'
 export default function jsonConfigReducer(state = INIT_STATE, action) {
   switch (action.type) {
     case GET_JSON_CONFIG:
-      return {
-        ...state,
-        loading: true,
-      }
+      return handleLoading()
     case GET_JSONCONFIG_RESPONSE:
       if (action.payload.data) {
         return {
           ...state,
           configuration: action.payload.data,
           loading: false,
         }
-      }
-      else {
-        return {
-          ...state,
-        }
+      } else {
+        return handleDefault()
       }
 
     case PATCH_JSON_CONFIG:
-      return {
-        ...state,
-        loading: true,
-      }
+      return handleLoading()
     case PATCH_JSONCONFIG_RESPONSE:
       if (action.payload.data) {
         return {
           ...state,
           configuration: action.payload.data,
           loading: false,
         }
-      }
-      else {
-        return {
-          ...state,
-        }
+      } else {
+        return handleDefault()
       }
     default:
-      return {
-        ...state,
-        loading: false,
-      }
+      return handleDefault()
+  }
+
+  function handleLoading() {
+    return {
+      ...state,
+      loading: true,
+    }
+  }
+
+  function handleDefault() {
+    return {
+      ...state,
+      loading: false,
+    }
   }
 }
 reducerRegistry.register(reducerName, jsonConfigReducer)
diff --git a/app/routes/Apps/Gluu/GluuNameValuesProperty.js b/app/routes/Apps/Gluu/GluuNameValuesProperty.js
@@ -41,7 +41,6 @@ function GluuNameValuesProperty({
         return
       }
       for (var i = 0; i < value.length; i++) {
-        var elm = value[i]
         var valueList = []
         var opts = []
         valueList = value[i].domains

diff --git a/plugins/admin/components/Configuration/LicenseDetailsPage.js b/plugins/admin/components/Configuration/LicenseDetailsPage.js
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { useEffect} from 'react'
 import { connect } from 'react-redux'
 import LicenseDetailsForm from './LicenseDetailsForm'
 import GluuLabel from '../../../../app/routes/Apps/Gluu/GluuLabel'
@@ -13,15 +13,9 @@ import GluuLoader from '../../../../app/routes/Apps/Gluu/GluuLoader'
 import Alert from '@material-ui/lab/Alert'
 
 function LicenseDetailsPage({ item, loading, dispatch }) {
-  const [validityPeriod, setValidityPeriod] = useState(
-    !!item.validityPeriod ? new Date(item.validityPeriod) : new Date(),
-  )
   useEffect(() => {
     dispatch(getLicenseDetails())
   }, [])
-  useEffect(() => {
-    setValidityPeriod(new Date(item.validityPeriod))
-  }, [item.validityPeriod])
 
   function handleSubmit(data) {
     if (data) {
@@ -31,7 +25,6 @@ function LicenseDetailsPage({ item, loading, dispatch }) {
 
   return (
     <React.Fragment>
-      {/* <Container> */}
       <GluuLabel label="fields.licenseDetails" size={8} />
       <GluuLoader blocking={loading}>
         {item.licenseEnable ? (

diff --git a/plugins/auth-server/components/Configuration/ConfigPage.js b/plugins/auth-server/components/Configuration/ConfigPage.js
@@ -6,7 +6,6 @@ import GluuCommitDialog from '../../../../app/routes/Apps/Gluu/GluuCommitDialog'
 import useExitPrompt from '../../../../app/routes/Apps/Gluu/useExitPrompt'
 import PropertyBuilder from './JsonPropertyBuilder'
 import { connect } from 'react-redux'
-import { useTranslation } from 'react-i18next'
 import { buildPayload } from '../../../../app/utils/PermChecker'
 import {
   getJsonConfig,
@@ -15,7 +14,6 @@ import {
 import { FETCHING_JSON_PROPERTIES } from '../../common/Constants'
 
 function ConfigPage({ configuration, loading, dispatch }) {
-  const { t } = useTranslation()
   const lSize = 6
   const userAction = {}
   const [modal, setModal] = useState(false)

diff --git a/plugins/auth-server/components/Configuration/JsonPropertyBuilder.js b/plugins/auth-server/components/Configuration/JsonPropertyBuilder.js
@@ -37,7 +37,6 @@ function JsonPropertyBuilder({
     handler(patch)
     setShow(false)
   }
-  const addHandler = () => {}
 
   function isStringArray(item) {
     return (