UIU-3243: Fix user edit without Auth-Users by adding users-keycloak.i…

…tem.get to ui-users.edit subPermissions. (#2782)

Refs UIU-3243.

(cherry picked from commit 2f711ee)

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * If keycloak user record doesn't exist, create it before resetting password. Refs UIU-3236.
 * Conditionally use delete method of the `mod-users-keycloak` if `users-keycloak` interface is present in UserRecordContainer. Refs UIU-3234.
+* Fix user edit without "Auth-Users" capability sets. Refs UIU-3243.
 
 ## [11.0.1](https://github.com/folio-org/ui-users/tree/v11.1.0) (2024-11-08)
 [Full Changelog](https://github.com/folio-org/ui-users/compare/v11.0.0...v11.0.1)

package.json

@@ -97,6 +97,7 @@
           "ui-users.view",
           "users-bl.item.put",
           "users.item.put",
+          "users-keycloak.item.get",
           "users-keycloak.item.put",
           "tags.collection.get",
           "tags.item.post",

src/components/Wrappers/withUserRoles.js

@@ -45,7 +45,7 @@ const withUserRoles = (WrappedComponent) => (props) => {
 
   useEffect(() => {
     // eslint-disable-next-line react/prop-types
-    if (props.stripes.hasInterface('roles') && !isAllRolesDataLoading) {
+    if (props.stripes.hasInterface('users-keycloak') && !isAllRolesDataLoading) {
       api.get(
         'roles/users', { searchParams },
       )
@@ -86,15 +86,15 @@ const withUserRoles = (WrappedComponent) => (props) => {
   };
 
   const handleKeycloakUserExists = async (onFinish) => {
-    if (isEqual(assignedRoleIds, initialAssignedRoleIds)) {
-      onFinish();
-      return;
-    }
     await updateUserRoles(assignedRoleIds);
     onFinish();
   };
 
   const checkAndHandleKeycloakAuthUser = async (onFinish) => {
+    if (isEqual(assignedRoleIds, initialAssignedRoleIds)) {
+      onFinish();
+      return;
+    }
     const userKeycloakStatus = await checkUserInKeycloak();
     switch (userKeycloakStatus) {
       case KEYCLOAK_USER_EXISTANCE.exist:

src/views/UserEdit/UserEdit.js

@@ -332,7 +332,7 @@ class UserEdit extends React.Component {
     try {
       await mutator.selUser.PUT(data);
 
-      if (!stripes.hasInterface('roles')) {
+      if (!stripes.hasInterface('users-keycloak')) {
         this.onCompleteEdit();
         return;
       }