feat(admin-ui): fix issues with material list #43

GluuFederation · Feb 15, 2022 · 0a98d9e · 0a98d9e
1 parent 87eb557
commit 0a98d9e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 9 deletions.
diff --git a/admin-ui/plugins/admin/components/CustomScripts/ScriptListPage.js b/admin-ui/plugins/admin/components/CustomScripts/ScriptListPage.js
@@ -202,7 +202,7 @@ function ScriptListTable({ scripts, loading, dispatch, permissions }) {
               actionsColumnIndex: -1,
             }}
             detailPanel={(rowData) => {
-              return <CustomScriptDetailPage row={rowData} />
+              return <CustomScriptDetailPage row={rowData.rowData} />
             }}
           />
         </GluuViewWrapper>

diff --git a/admin-ui/plugins/admin/components/Roles/UiRoleListPage.js b/admin-ui/plugins/admin/components/Roles/UiRoleListPage.js
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import MaterialTable from '@material-table/core';
+import MaterialTable from '@material-table/core'
 import { Paper } from '@material-ui/core'
 import UiRoleDetailPage from './UiRoleDetailPage'
 import RoleAddDialogForm from './RoleAddDialogForm'

diff --git a/admin-ui/plugins/auth-server/components/Clients/ClientListPage.js b/admin-ui/plugins/auth-server/components/Clients/ClientListPage.js
@@ -240,7 +240,7 @@ function ClientListPage({ clients, permissions, scopes, loading, dispatch }) {
               actionsColumnIndex: -1,
             }}
             detailPanel={(rowData) => {
-              return <ClientDetailPage row={rowData} scopes={scopes} />
+              return <ClientDetailPage row={rowData.rowData} scopes={scopes} />
             }}
           />
         </GluuViewWrapper>

diff --git a/admin-ui/plugins/auth-server/components/Scopes/ScopeDetailPage.js b/admin-ui/plugins/auth-server/components/Scopes/ScopeDetailPage.js
@@ -5,6 +5,7 @@ import { SCOPE } from '../../../../app/utils/ApiResources'
 import { useTranslation } from 'react-i18next'
 
 function ScopeDetailPage({ row }) {
+  console.log("========================="+JSON.stringify(row))
   const { t } = useTranslation()
   function getBadgeTheme(status) {
     if (status) {
@@ -76,7 +77,7 @@ function ScopeDetailPage({ row }) {
         <Row>
           <Col sm={3}>{t('fields.attributes')}:</Col>
           <Col sm={9}>
-            {Object.keys(row.attributes).map((item, key) => (
+            {Object.keys(row.attributes || []).map((item, key) => (
               <GluuFormDetailRow
                 key={key}
                 label={item}

diff --git a/admin-ui/plugins/auth-server/components/Scopes/ScopeListPage.js b/admin-ui/plugins/auth-server/components/Scopes/ScopeListPage.js
@@ -54,7 +54,11 @@ function ScopeListPage({ scopes, permissions, loading, dispatch }) {
     {
       title: `${t('fields.scope_type')}`,
       field: 'scopeType',
-      render: (rowData) => <Badge color="primary">{rowData.scopeType}</Badge>,
+      render: (rowData) => (
+        <Badge key={rowData.inum} color="primary">
+          {rowData.scopeType}
+        </Badge>
+      ),
     },
   ]
 
@@ -188,7 +192,7 @@ function ScopeListPage({ scopes, permissions, loading, dispatch }) {
               actionsColumnIndex: -1,
             }}
             detailPanel={(rowData) => {
-              return <ScopeDetailPage row={rowData} />
+              return <ScopeDetailPage row={rowData.rowData} />
             }}
           />
         </GluuViewWrapper>

diff --git a/admin-ui/plugins/schema/components/Person/AttributeListPage.js b/admin-ui/plugins/schema/components/Person/AttributeListPage.js
@@ -194,7 +194,7 @@ function AttributeListPage({ attributes, permissions, loading, dispatch }) {
               actionsColumnIndex: -1,
             }}
             detailPanel={(rowData) => {
-              return <AttributeDetailPage row={rowData} />
+              return <AttributeDetailPage row={rowData.rowData} />
             }}
           />
         </GluuViewWrapper>

diff --git a/admin-ui/plugins/services/Components/Configuration/LdapListPage.js b/admin-ui/plugins/services/Components/Configuration/LdapListPage.js
@@ -198,7 +198,7 @@ function LdapListPage({
               detailPanel={(rowData) => {
                 return (
                   <LdapDetailPage
-                    row={rowData}
+                    row={rowData.rowData}
                     testLdapConnection={testLdapConnect}
                   />
                 )

diff --git a/admin-ui/plugins/services/Components/Configuration/SqlListPage.js b/admin-ui/plugins/services/Components/Configuration/SqlListPage.js
@@ -182,7 +182,7 @@ function SqlListPage({
               detailPanel={(rowData) => {
                 return (
                   <SqlDetailPage
-                    row={rowData}
+                    row={rowData.rowData}
                     testSqlConnection={testSqlConnect}
                   />
                 )