feat(admin-ui): update api for the user management

GluuFederation · Jun 2, 2022 · 7b97e7f · 7b97e7f
1 parent 251436d
commit 7b97e7f
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 20 deletions.
diff --git a/admin-ui/plugins/admin/components/UserManagement/UserAddPage.js b/admin-ui/plugins/admin/components/UserManagement/UserAddPage.js
@@ -24,7 +24,7 @@ function UserAddPage() {
     let customAttributes = []
     if (values) {
       for (let key in values) {
-        if (personAttributes.some((e) => e.claimName == key)) {
+        if (personAttributes.some((e) => e.name == key)) {
           let val = []
           val.push(values[key])
           let obj = {

diff --git a/admin-ui/plugins/admin/components/UserManagement/UserClaimEntry.js b/admin-ui/plugins/admin/components/UserManagement/UserClaimEntry.js
@@ -3,15 +3,15 @@ import GluuRemovableInputRow from '../../../../app/routes/Apps/Gluu/GluuRemovabl
 import GluuRemovableSelectRow from '../../../../app/routes/Apps/Gluu/GluuRemovableSelectRow'
 function UserClaimEntry({ data, type, entry, formik, handler }) {
   const doHandle = () => {
-    handler(data.claimName)
+    handler(data.name)
   }
   return (
     <div key={entry}>
       {type === 'input' && (
         <GluuRemovableInputRow
           label={data.displayName}
-          name={data.claimName}
-          value={formik.values[data.claimName] || ''}
+          name={data.name}
+          value={formik.values[data.name] || ''}
           formik={formik}
           handler={doHandle}
           lsize={3}
@@ -21,8 +21,8 @@ function UserClaimEntry({ data, type, entry, formik, handler }) {
       {type === 'select' && (
         <GluuRemovableSelectRow
           label={data.displayName}
-          name={data.claimName}
-          value={formik.values[data.claimName] || ''}
+          name={data.name}
+          value={formik.values[data.name] || ''}
           values={data.attributes.values}
           formik={formik}
           required

diff --git a/admin-ui/plugins/admin/components/UserManagement/UserEditPage.js b/admin-ui/plugins/admin/components/UserManagement/UserEditPage.js
@@ -27,7 +27,7 @@ function UserEditPage() {
     let customAttributes = []
     if (values) {
       for (let key in values) {
-        if (personAttributes.some((e) => e.claimName == key)) {
+        if (personAttributes.some((e) => e.name == key)) {
           let val = []
           val.push(values[key])
           let obj = {

diff --git a/admin-ui/plugins/admin/components/UserManagement/UserForm.js b/admin-ui/plugins/admin/components/UserManagement/UserForm.js
@@ -24,7 +24,15 @@ function UserForm({ formik }) {
     tempList.push(data)
     setSelectedClaims(tempList)
   }
-
+  const usedClaimes = [
+    'userId',
+    'displayName',
+    'mail',
+    'jansStatus',
+    'userPassword',
+    'givenName',
+    'sn',
+  ]
   const getCustomAttributeById = (id) => {
     let claimData = null
     for (let i in initialClaims) {
@@ -58,7 +66,7 @@ function UserForm({ formik }) {
   const removeSelectedClaimsFromState = (id) => {
     console.log(id)
     let tempList = [...selectedClaims]
-    let newList = tempList.filter((data, index) => data.claimName !== id)
+    let newList = tempList.filter((data, index) => data.name !== id)
     setSelectedClaims(newList)
   }
 
@@ -69,23 +77,33 @@ function UserForm({ formik }) {
           <Col sm={8}>
             <GluuInputRow
               doc_category={DOC_SECTION}
-              label="User Id"
-              name="userId"
-              value={formik.values.userId || ''}
+              label="First Name"
+              name="givenName"
+              value={formik.values.givenName || ''}
               formik={formik}
-              required
               lsize={3}
               rsize={9}
             />
+
             <GluuInputRow
               doc_category={DOC_SECTION}
-              label="Given Name"
-              name="givenName"
-              value={formik.values.givenName || ''}
+              label="Last Name"
+              name="sn"
+              value={formik.values.sn || ''}
               formik={formik}
               lsize={3}
               rsize={9}
             />
+            <GluuInputRow
+              doc_category={DOC_SECTION}
+              label="User Id"
+              name="userId"
+              value={formik.values.userId || ''}
+              formik={formik}
+              required
+              lsize={3}
+              rsize={9}
+            />
             <GluuInputRow
               doc_category={DOC_SECTION}
               label="Display Name"
@@ -152,13 +170,16 @@ function UserForm({ formik }) {
               />
               <ul className="list-group">
                 {personAttributes.map((data, key) => {
-                  let claimName = data.claimName.toLowerCase()
+                  let name = data.name.toLowerCase()
                   const alreadyAddedClaim = selectedClaims.some(
-                    (el) => el.claimName === data.claimName,
+                    (el) => el.name === data.name,
                   )
-                  if (data.status == 'ACTIVE') {
+                  if (
+                    data.status == 'ACTIVE' &&
+                    !usedClaimes.includes(data.name)
+                  ) {
                     if (
-                      (claimName.includes(searchClaims.toLowerCase()) ||
+                      (name.includes(searchClaims.toLowerCase()) ||
                         searchClaims == '') &&
                       !alreadyAddedClaim
                     ) {