fix(admin-ui): put check for values in users

GluuFederation · Jun 27, 2022 · 893ad2a · 893ad2a
1 parent b484db6
commit 893ad2a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 17 deletions.
diff --git a/admin-ui/plugins/user-management/components/UserManagement/UserEditPage.js b/admin-ui/plugins/user-management/components/UserManagement/UserEditPage.js
@@ -112,20 +112,22 @@ function UserEditPage() {
     jansStatus: userDetails.jansStatus || '',
   }
   for (let i in userDetails.customAttributes) {
-    let customAttribute = personAttributes.filter(
-      (e) => e.name == userDetails.customAttributes[i].name,
-    )
-    if (userDetails.customAttributes[i].name == 'birthdate') {
-      initialValues[userDetails.customAttributes[i].name] = moment(
-        userDetails.customAttributes[i].values[0],
-      ).format('YYYY-MM-DD')
-    } else {
-      if (customAttribute[0].oxMultiValuedAttribute) {
-        initialValues[userDetails.customAttributes[i].name] =
-          userDetails.customAttributes[i].values
+    if (userDetails.customAttributes[i].values) {
+      let customAttribute = personAttributes.filter(
+        (e) => e.name == userDetails.customAttributes[i].name,
+      )
+      if (userDetails.customAttributes[i].name == 'birthdate') {
+        initialValues[userDetails.customAttributes[i].name] = moment(
+          userDetails.customAttributes[i].values[0],
+        ).format('YYYY-MM-DD')
       } else {
-        initialValues[userDetails.customAttributes[i].name] =
-          userDetails.customAttributes[i].values[0]
+        if (customAttribute[0].oxMultiValuedAttribute) {
+          initialValues[userDetails.customAttributes[i].name] =
+            userDetails.customAttributes[i].values
+        } else {
+          initialValues[userDetails.customAttributes[i].name] =
+            userDetails.customAttributes[i].values[0]
+        }
       }
     }
   }

diff --git a/admin-ui/plugins/user-management/components/UserManagement/UserForm.js b/admin-ui/plugins/user-management/components/UserManagement/UserForm.js
@@ -86,10 +86,15 @@ function UserForm({ formik }) {
   const setAttributes = () => {
     let tempList = [...selectedClaims]
     for (let i in userDetails.customAttributes) {
-      let data = getCustomAttributeById(userDetails.customAttributes[i].name)
-      if (data && !usedClaimes.includes(userDetails.customAttributes[i].name)) {
-        data.options = userDetails.customAttributes[i].values
-        tempList.push(data)
+      if (userDetails.customAttributes[i].values) {
+        let data = getCustomAttributeById(userDetails.customAttributes[i].name)
+        if (
+          data &&
+          !usedClaimes.includes(userDetails.customAttributes[i].name)
+        ) {
+          data.options = userDetails.customAttributes[i].values
+          tempList.push(data)
+        }
       }
     }
     setSelectedClaims(tempList)