Merge pull request #1334 from GluuFederation/admin-ui-issue-1333

feat(admin-ui): implement navigation path for tab view in a page #1333
GluuFederation · Sep 21, 2023 · 3b3a3e0 · 3b3a3e0
2 parents 142b580 + dbb8675
commit 3b3a3e0
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 10 deletions.
diff --git a/admin-ui/app/locales/en/translation.json b/admin-ui/app/locales/en/translation.json
@@ -473,7 +473,9 @@
     "cache_refresh": "Cache Refresh",
     "customer_backend_key_attributes": "Customer Backend Key/Attributes",
     "source_backend_ldap_servers": "Source Backend LDAP Servers",
-    "inum_db_server": "Inum DB Server"
+    "inum_db_server": "Inum DB Server",
+    "static_configuration": "Static Configuration",
+    "dynamic_configuration": "Dynamic Configuration"
   },
   "messages": {
     "add_permission": "Add Permission",

diff --git a/admin-ui/app/locales/fr/translation.json b/admin-ui/app/locales/fr/translation.json
@@ -73,7 +73,9 @@
     "cache_refresh": "Actualisation du cache",
     "customer_backend_key_attributes": "Clé/attributs du backend client",
     "source_backend_ldap_servers": "Serveurs LDAP dorsaux sources",
-    "inum_db_server": "Serveur de base de données Inum"
+    "inum_db_server": "Serveur de base de données Inum",
+    "static_configuration": "Configuration statique",
+    "dynamic_configuration": "Configuration dynamique"
   },
   "actions": {
     "accept": "J'accepte",

diff --git a/admin-ui/app/locales/pt/translation.json b/admin-ui/app/locales/pt/translation.json
@@ -73,7 +73,9 @@
     "cache_refresh": "Atualização de Cache",
     "customer_backend_key_attributes": "Chave/atributos de back-end do cliente",
     "source_backend_ldap_servers": "Servidores LDAP de back-end de origem",
-    "inum_db_server": "Servidor DB Inum"
+    "inum_db_server": "Servidor DB Inum",
+    "static_configuration": "Configuração estática",
+    "dynamic_configuration": "Configuração Dinâmica"
   },
   "actions": {
     "accept": "Aceitar",

diff --git a/admin-ui/plugins/auth-server/redux/features/scopeSlice.js b/admin-ui/plugins/auth-server/redux/features/scopeSlice.js
@@ -30,7 +30,7 @@ const scopeSlice = createSlice({
     handleUpdateScopeResponse: (state, action) => {
       state.loading = false
       if (action.payload.data) {
-        state.items = action.payload.data.entries
+        state.items = action.payload.data.entries || []
         state.totalItems = action.payload.data.totalEntriesCount
         state.entriesCount = action.payload.data.entriesCount
       } else {

diff --git a/admin-ui/plugins/fido/components/Fido.js b/admin-ui/plugins/fido/components/Fido.js
@@ -13,8 +13,6 @@ import {
 } from '../redux/features/fidoSlice'
 import applicationStyle from 'Routes/Apps/Gluu/styles/applicationstyle'
 
-const tabNames = ['Dynamic Configuration', 'Static Configuration']
-
 const fidoApiPayload = ({ fidoConfiguration, data }) => {
   const payload = fidoConfiguration.fido
   payload.authenticatorCertsFolder = data.authenticatorCertsFolder
@@ -84,16 +82,21 @@ export default function Fido() {
     dispatch(getFidoConfiguration())
   }, [])
 
+  const tabNames = [
+    { name: t("menus.static_configuration"), path: '/fido/fidomanagement/static-configuration' },
+    { name: t("menus.dynamic_configuration"), path: '/fido/fidomanagement/dynamic-configuration' },
+  ];
+
   const tabToShow = (tabName) => {
     switch (tabName) {
-      case 'Static Configuration':
+      case t("menus.static_configuration"):
         return (
           <StaticConfiguration
             handleSubmit={handleStaticConfigurationSubmit}
             fidoConfiguration={fidoConfiguration}
           />
         )
-      case 'Dynamic Configuration':
+      case t("menus.dynamic_configuration"):
         return (
           <DynamicConfiguration
             handleSubmit={handleDyamicConfigurationSubmit}
@@ -119,7 +122,7 @@ export default function Fido() {
         <Card className='mb-3' style={applicationStyle.mainCard}>
           <CardBody>
             {!fidoConfiguration?.loading && (
-              <GluuTabs tabNames={tabNames} tabToShow={tabToShow} />
+              <GluuTabs tabNames={tabNames} tabToShow={tabToShow} withNavigation={true} />
             )}
           </CardBody>
         </Card>

diff --git a/admin-ui/plugins/fido/plugin-metadata.js b/admin-ui/plugins/fido/plugin-metadata.js
@@ -1,6 +1,6 @@
 import { reducer as fidoReducer } from './redux/features/fidoSlice'
 import fidoSaga from './redux/sagas/FidoSaga'
-import { FIDO_READ, FIDO_WRITE } from '../../app/utils/PermChecker'
+import { FIDO_READ, FIDO_WRITE } from 'Utils/PermChecker'
 import Fido from './components/Fido'
 
 const PLUGIN_BASE_PATH = '/fido'
@@ -19,6 +19,16 @@ const pluginMetadata = {
       component: Fido,
       path: PLUGIN_BASE_PATH + '/fidomanagement',
       permission: FIDO_WRITE,
+    },
+    {
+      component: Fido,
+      path: PLUGIN_BASE_PATH + '/fidomanagement' + '/static-configuration',
+      permission: FIDO_WRITE,
+    },
+    {
+      component: Fido,
+      path: PLUGIN_BASE_PATH + '/fidomanagement' + '/dynamic-configuration',
+      permission: FIDO_WRITE,
     }
   ],
   reducers: [{ name: 'fidoReducer', reducer: fidoReducer }],