Rework admin multitenancy role #14

change after CR
jmix-projects · Jul 21, 2021 · 0d45c27 · 0d45c27
1 parent 15faa17
commit 0d45c27
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -57,15 +57,15 @@ system entities.
 
 **Note**. The role does not allow manage users if you want you should create a role that  allows that. For example
 ```java
-@ResourceRole(name = "Manage user access", code = ManageUserAccessRole.CODE)
-public interface ManageUserAccessRole {
+@ResourceRole(name = "Multitenancy: user management", code = TenantUserManagementRole.CODE)
+public interface TenantUserManagementRole extends TenantManagementRole {
 
-    String CODE = "manage-user-access";
+    String CODE = "tenant-user-management-role";
 
     @EntityPolicy(entityClass = User.class, actions = {EntityPolicyAction.ALL})
     @EntityAttributePolicy(entityClass = User.class, attributes = "*", action = EntityAttributePolicyAction.MODIFY)
-    @ScreenPolicy(screenIds = {"mtensmp_User.browse", "mtensmp_User.edit"})
-    @MenuPolicy(menuIds = {"mtensmp_User.browse"})
+    @ScreenPolicy(screenIds = {"<UserBrowse_screen_id>", "UserEdit_screen_id"})
+    @MenuPolicy(menuIds = {"<UserBrowse_screen_id>"})
     void createUserAccess();
 }
 ```

diff --git a/multitenancy-ui/src/main/java/io/jmix/multitenancyui/screen/tenant/TenantEdit.java b/multitenancy-ui/src/main/java/io/jmix/multitenancyui/screen/tenant/TenantEdit.java
@@ -65,8 +65,7 @@ private void initField(TextField<?> textField, Predicate<Tenant> predicate, Stri
                     .all()
                     .list()
                     .stream()
-                    .filter(predicate)
-                    .anyMatch(tenant -> tenant.getTenantId().equals(s));
+                    .anyMatch(predicate);
             if (exist) {
                 throw new ValidationException(messages.getMessage(messageKey));
             }

diff --git a/.../security/role/MultitenancyAdminRole.java → ...y/security/role/TenantManagementRole.java b/.../security/role/MultitenancyAdminRole.java → ...y/security/role/TenantManagementRole.java
@@ -28,10 +28,10 @@
 import io.jmix.securityui.role.annotation.ScreenPolicy;
 import io.jmix.securityui.screen.resourcepolicy.AttributeResourceModel;
 
-@ResourceRole(name = "Multitenancy: administration", code = MultitenancyAdminRole.CODE)
-public interface MultitenancyAdminRole {
+@ResourceRole(name = "Multitenancy: management", code = TenantManagementRole.CODE)
+public interface TenantManagementRole {
 
-    String CODE = "multitenancy-admin-role";
+    String CODE = "tenant-management-role";
 
     @EntityPolicy(entityClass = Tenant.class, actions = {EntityPolicyAction.READ})
     @EntityPolicy(entityClass = BaseRoleModel.class, actions = {EntityPolicyAction.ALL})