feat(admin-ui): get scope data in the edit page instead

Author: harryandriyan

admin-ui/plugins/auth-server/components/Clients/ClientCibaParUmaPanel.js

@@ -1,4 +1,4 @@
-import React, { useState, useContext } from 'react'
+import React, { useState, useContext, useEffect } from 'react'
 import Box from '@material-ui/core/Box'
 import { Link } from 'react-router-dom'
 import {
@@ -25,14 +25,12 @@ import { ThemeContext } from 'Context/theme/themeContext'
 import applicationStyle from 'Routes/Apps/Gluu/styles/applicationstyle'
 const DOC_CATEGORY = 'openid_client'
 
-function ClientCibaParUmaPanel({ client, dispatch, scope, umaResources, scripts, formik }) {
+function ClientCibaParUmaPanel({ client, scope, umaResources, scripts, formik }) {
   const { t } = useTranslation()
   const theme = useContext(ThemeContext)
   const selectedTheme = theme.state.theme
   const claim_uri_id = 'claim_uri_id'
-
   const cibaDeliveryModes = ['poll', 'push', 'ping']
-
   const claimRedirectURI = []
 
   scripts = scripts
@@ -42,9 +40,7 @@ function ClientCibaParUmaPanel({ client, dispatch, scope, umaResources, scripts,
   function uriValidator(uri) {
     return uri
   }
-  
-  const [softwareSection, setSoftwareSection] = useState(false)
-  const [cibaSection, setCibaSection] = useState(false)
+
   const [open, setOpen] = useState(false)
   const [selectedUMA, setSelectedUMA] = useState()
   const [scopeExpression, setScopeExpression] = useState()
@@ -58,15 +54,13 @@ function ClientCibaParUmaPanel({ client, dispatch, scope, umaResources, scripts,
     if (!isEmpty(uma)) {
       setSelectedUMA(uma)
       setScopeExpression(JSON.parse(uma.scopeExpression)?.data)
-      console.log('uma', uma)
-      const getClientInum = uma?.clients[0].split(',')[0]
-      const inum = getClientInum.split('=')[1]
-      dispatch(getScope(inum))
     }
 
     setOpen(true)
   }
 
+  console.log('scope', scope)
+
   return (
     <Container>
       <h2>{t(`titles.CIBA`)}</h2>
@@ -186,7 +180,6 @@ function ClientCibaParUmaPanel({ client, dispatch, scope, umaResources, scripts,
         </ModalHeader>
         <ModalBody>
           <Card style={applicationStyle.mainCard}>
-            <h2>UMA Resource Detail</h2>
             <FormGroup row>
               <GluuLabel label={t('fields.resourceId')} size={3} />
               <Col sm={9} className="top-5">
@@ -286,7 +279,6 @@ const mapStateToProps = (state) => {
   return {
     clientData: state.oidcReducer.item,
     loading: state.oidcReducer.loading,
-    scope: state.scopeReducer.item,
   }
 }
 export default connect(mapStateToProps)(ClientCibaParUmaPanel)

admin-ui/plugins/auth-server/components/Clients/ClientEditPage.js

@@ -5,7 +5,7 @@ import { useHistory } from 'react-router-dom'
 import { connect } from 'react-redux'
 import { editClient } from 'Plugins/auth-server/redux/actions/OIDCActions'
 import { getUMAResourcesByClient } from 'Plugins/auth-server/redux/actions/UMAResourceActions'
-import { getScopes } from 'Plugins/auth-server/redux/actions/ScopeActions'
+import { getScopes, getScope } from 'Plugins/auth-server/redux/actions/ScopeActions'
 import { getOidcDiscovery } from 'Redux/actions/OidcDiscoveryActions'
 import { getScripts } from 'Redux/actions/InitActions'
 import { buildPayload } from 'Utils/PermChecker'
@@ -17,6 +17,7 @@ function ClientEditPage({
   clientData,
   view_only,
   scopes,
+  scope,
   scripts,
   loading,
   permissions,
@@ -43,6 +44,9 @@ function ClientEditPage({
     if (isEmpty(umaResources)) {
       dispatch(getUMAResourcesByClient(clientData?.inum))
     }
+    if (isEmpty(scope)) {
+      dispatch(getScope(clientData?.inum))
+    }
     dispatch(getOidcDiscovery())
   }, [])
   useEffect(() => {
@@ -73,6 +77,7 @@ function ClientEditPage({
         client_data={clientData}
         view_only={view_only}
         scopes={scopes}
+        scope={scope}
         scripts={scripts}
         permissions={permissions}
         oidcConfiguration={oidcConfiguration}
@@ -88,6 +93,7 @@ const mapStateToProps = (state) => {
     view_only: state.oidcReducer.view,
     loading: state.oidcReducer.loading,
     scopes: state.scopeReducer.items,
+    scope: state.scopeReducer.item,
     scripts: state.initReducer.scripts,
     permissions: state.authReducer.permissions,
     oidcConfiguration: state.oidcDiscoveryReducer.configuration,

admin-ui/plugins/auth-server/components/Clients/ClientWizardForm.js

@@ -32,6 +32,7 @@ function ClientWizardForm({
   client_data,
   view_only,
   scopes,
+  scope,
   scripts,
   permissions,
   customOnSubmit,
@@ -425,6 +426,7 @@ function ClientWizardForm({
                             <ClientCibaParUmaPanel
                               client={client}
                               umaResources={umaResources}
+                              scope={scope}
                               scripts={scripts}
                               formik={formik}
                             />