fix(admin-ui): bugs in admin-ui #1225

GluuFederation · Jul 21, 2023 · 1779f62 · 1779f62
1 parent 3241e97
commit 1779f62
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 17 deletions.
diff --git a/admin-ui/app/routes/Apps/Gluu/GluuTypeAheadWithAdd.js b/admin-ui/app/routes/Apps/Gluu/GluuTypeAheadWithAdd.js
@@ -20,6 +20,7 @@ function GluuTypeAheadWithAdd({
   lsize = 4,
   rsize = 8,
   disabled,
+  multiple = true
 }) {
   const [items, setItems] = useState(value)
   const [opts, setOpts] = useState(options)
@@ -91,7 +92,7 @@ function GluuTypeAheadWithAdd({
           id={name}
           name={name}
           data-testid={name}
-          multiple={true}
+          multiple={multiple}
           selected={items}
           options={opts}
         />

diff --git a/admin-ui/plugins/admin/components/Roles/UiRoleListPage.js b/admin-ui/plugins/admin/components/Roles/UiRoleListPage.js
@@ -66,7 +66,6 @@ function UiRoleListPage({ apiRoles, permissions, loading, dispatch }) {
     buildPayload(userAction, 'message', roleData)
     dispatch(addRole({ action: userAction }))
     toggle()
-    doFetchList()
   }
   return (
     <Card style={applicationStyle.mainCard}>

diff --git a/admin-ui/plugins/auth-server/components/Clients/ClientBasicPanel.js b/admin-ui/plugins/auth-server/components/Clients/ClientBasicPanel.js
@@ -250,7 +250,9 @@ const ClientBasicPanel = ({
         <Col sm={6}>
           <GluuToogleRow
             name="disabled"
-            formik={formik}
+            handler={(event) => {
+              formik.setFieldValue('disabled', !event?.target?.checked)
+            }}
             label="fields.is_active"
             value={!client.disabled}
             doc_category={DOC_CATEGORY}
@@ -301,6 +303,7 @@ const ClientBasicPanel = ({
         validator={uriValidator}
         inputId={uri_id}
         doc_category={DOC_CATEGORY}
+        multiple={false}
         lsize={3}
         rsize={9}
         disabled={viewOnly}

diff --git a/admin-ui/plugins/auth-server/components/Scopes/ScopeForm.js b/admin-ui/plugins/auth-server/components/Scopes/ScopeForm.js
@@ -170,8 +170,6 @@ function ScopeForm({ scope, scripts, attributes, handleSubmit }) {
           result['id'] = result.id
           result['creatorType'] = 'user'
           result['creatorId'] = authReducer.userinfo.inum
-          result['attributes'].showInConfigurationEndpoint =
-            scope.attributes.showInConfigurationEndpoint
           result['attributes'].spontaneousClientId =
             scope.attributes.spontaneousClientId
           result['attributes'].spontaneousClientScopes =

diff --git a/admin-ui/plugins/jans-link/components/CacheRefresh/JansLinkPage.js b/admin-ui/plugins/jans-link/components/CacheRefresh/JansLinkPage.js
@@ -3,7 +3,7 @@ import SetTitle from "Utils/SetTitle";
 import GluuLoader from "Routes/Apps/Gluu/GluuLoader";
 import { Card, CardBody } from "Components";
 import GluuTabs from "Routes/Apps/Gluu/GluuTabs";
-import CacheRefreshTab from "../Tabs/CacheRefreshTab";
+import ConfigurationTab from "../Tabs/ConfigurationTab";
 import CustomerBackendKeyTab from "../Tabs/CustomerBackendKeyTab";
 import SourceBackendServersTab from "../Tabs/SourceBackendServersTab";
 import InumDBServerTab from "../Tabs/InumDBServerTab";
@@ -23,16 +23,16 @@ const JansLinkPage = () => {
   }, []);
 
   const tabNames = [
-    t("menus.cache_refresh"),
+    t("menus.configuration"),
     t("menus.customer_backend_key_attributes"),
     t("menus.source_backend_ldap_servers"),
     t("menus.inum_db_server"),
   ];
 
   const tabToShow = (tabName) => {
     switch (tabName) {
-      case t("menus.cache_refresh"):
-        return <CacheRefreshTab />;
+      case t("menus.configuration"):
+        return <ConfigurationTab />;
       case t("menus.customer_backend_key_attributes"):
         return <CustomerBackendKeyTab />;
       case t("menus.source_backend_ldap_servers"):

diff --git a/...s-link/components/Tabs/CacheRefreshTab.js → ...-link/components/Tabs/ConfigurationTab.js b/...s-link/components/Tabs/CacheRefreshTab.js → ...-link/components/Tabs/ConfigurationTab.js
@@ -16,7 +16,7 @@ import { useTranslation } from 'react-i18next'
 import { buildPayload } from 'Utils/PermChecker'
 import moment from 'moment/moment'
 
-const CacheRefreshTab = () => {
+const ConfigurationTab = () => {
   const { t } = useTranslation()
   const dispatch = useDispatch()
   const cacheRefreshConfiguration = useSelector(
@@ -264,7 +264,7 @@ const CacheRefreshTab = () => {
           </Col>
           <Col sm={12}>
             <GluuToogleRow
-              label='fields.cache_refresh'
+              label='fields.enabled'
               name='linkEnabled'
               handler={(e) => {
                 formik.setFieldValue('linkEnabled', e.target.checked)
@@ -295,4 +295,4 @@ const CacheRefreshTab = () => {
   )
 }
 
-export default CacheRefreshTab
+export default ConfigurationTab
diff --git a/admin-ui/plugins/user-management/components/UserManagement/UserEditPage.js b/admin-ui/plugins/user-management/components/UserManagement/UserEditPage.js
@@ -1,15 +1,15 @@
 import React, { useEffect } from 'react'
 import { useNavigate } from 'react-router-dom'
-import { Container, CardBody, Card } from '../../../../app/components'
+import { Container, CardBody, Card } from 'Components'
 import UserForm from './UserForm'
-import GluuAlert from '../../../../app/routes/Apps/Gluu/GluuAlert'
+import GluuAlert from 'Routes/Apps/Gluu/GluuAlert'
 import { useTranslation } from 'react-i18next'
-import { updateUser } from '../../redux/features/userSlice'
+import { updateUser } from 'Plugins/user-management/redux/features/userSlice'
 import { useDispatch, useSelector } from 'react-redux'
-import { getAttributesRoot } from '../../../../app/redux/actions'
+import { getAttributesRoot } from 'Redux/features/attributesSlice'
 import moment from 'moment'
 import GluuLoader from 'Routes/Apps/Gluu/GluuLoader'
-import { getPersistenceType } from '../../../services/redux/features/persistenceTypeSlice'
+import { getPersistenceType } from 'Plugins/services/redux/features/persistenceTypeSlice'
 
 function UserEditPage() {
   const dispatch = useDispatch()