Merge pull request #7531 from DonOmalVindula/fix/is/22534

Fix state issue in distinct attribute profile matrix and loading states in user profile section
wso2 · Feb 7, 2025 · 1a5a78a · 1a5a78a
2 parents b75c095 + d47349b
commit 1a5a78a
Show file tree

Hide file tree

Showing 5 changed files with 179 additions and 154 deletions.
diff --git a/.changeset/long-cows-sing.md b/.changeset/long-cows-sing.md
@@ -0,0 +1,7 @@
+---
+"@wso2is/admin.claims.v1": patch
+"@wso2is/admin.users.v1": patch
+"@wso2is/i18n": patch
+---
+
+Fix state and loading issues in the users section
diff --git a/features/admin.claims.v1/components/edit/local-claim/edit-basic-details-local-claims.tsx b/features/admin.claims.v1/components/edit/local-claim/edit-basic-details-local-claims.tsx
@@ -221,6 +221,19 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
         }
     }, [ fetchDialectsRequestError ]);
 
+    /**
+     * Update attribute profile states from claims
+     */
+    useEffect(() => {
+        setIsConsoleRequired(claim?.profiles?.console?.required ?? claim?.required);
+        setIsEndUserRequired(claim?.profiles?.endUser?.required ?? claim?.required);
+        setIsSelfRegistrationRequired(claim?.profiles?.selfRegistration?.required ?? claim?.required);
+
+        setIsConsoleReadOnly(claim?.profiles?.console?.readOnly ?? claim?.readOnly);
+        setIsEndUserReadOnly(claim?.profiles?.endUser?.readOnly ?? claim?.readOnly);
+        setIsSelfRegistrationReadOnly(claim?.profiles?.selfRegistration?.readOnly ?? claim?.readOnly);
+    }, [ claim ]);
+
     /**
      * Get username configuration.
      */
@@ -845,18 +858,25 @@ export const EditBasicDetailsLocalClaims: FunctionComponent<EditBasicDetailsLoca
                     />
                 </TableCell>
                 <TableCell align="center">
-                    <Field.Checkbox
-                        ariaLabel="Read-only in self-registration"
-                        name="selfRegistrationReadOnly"
-                        required={ false }
-                        requiredErrorMessage=""
-                        defaultValue={ claim?.profiles?.selfRegistration?.readOnly ?? claim?.readOnly }
-                        data-componentid={ `${ testId }-form-self-registration-readOnly-checkbox` }
-                        readOnly={ isSubOrganization() || isReadOnly }
-                        disabled={ isReadOnlyCheckboxDisabled }
-                        listen ={ (value: boolean) => {
-                            setIsSelfRegistrationReadOnly(value);
-                        } }
+                    <Tooltip
+                        trigger={ (
+                            <Field.Checkbox
+                                ariaLabel="Read-only in self-registration"
+                                name="selfRegistrationReadOnly"
+                                required={ false }
+                                requiredErrorMessage=""
+                                defaultValue={ claim?.profiles?.selfRegistration?.readOnly ?? claim?.readOnly }
+                                data-componentid={ `${ testId }-form-self-registration-readOnly-checkbox` }
+                                readOnly
+                                listen ={ (value: boolean) => {
+                                    setIsSelfRegistrationReadOnly(value);
+                                } }
+                            />
+                        ) }
+                        content={
+                            t("claims:local.forms.profiles.selfRegistrationReadOnlyHint")
+                        }
+                        compact
                     />
                 </TableCell>
             </TableRow>