Merge branch 'rel-4.0' into dev

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor

@@ -141,4 +141,7 @@
     </Modal>
 }
 
-<PermissionManagementModal @ref="PermissionManagementModal" />
+@if (HasManagePermissionsPermission)
+{
+    <PermissionManagementModal @ref="PermissionManagementModal" />
+}

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor.cs

@@ -12,12 +12,11 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
         protected const string PermissionProviderName = "R";
 
         protected PermissionManagementModal PermissionManagementModal;
+        
         protected string ManagePermissionsPolicyName;
-
+        
         protected bool HasManagePermissionsPermission { get; set; }
 
-        protected bool ShouldShowEntityActions { get; set; }
-
         public RoleManagement()
         {
             ObjectMapperContext = typeof(AbpIdentityBlazorModule);
@@ -29,6 +28,13 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
             ManagePermissionsPolicyName = IdentityPermissions.Roles.ManagePermissions;
         }
 
+        protected override async Task SetPermissionsAsync()
+        {
+            await base.SetPermissionsAsync();
+
+            HasManagePermissionsPermission = await AuthorizationService.IsGrantedAsync(IdentityPermissions.Roles.ManagePermissions);
+        }
+
         protected override string GetDeleteConfirmationMessage(IdentityRoleDto entity)
         {
             return string.Format(L["RoleDeletionConfirmationMessage"], entity.Name);

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor

@@ -286,4 +286,7 @@
     </Modal>
 }
 
-<PermissionManagementModal @ref="PermissionManagementModal" />
+@if (HasManagePermissionsPermission)
+{
+    <PermissionManagementModal @ref="PermissionManagementModal" />
+}

modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs

@@ -24,6 +24,8 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
         protected AssignedRoleViewModel[] EditUserRoles;
 
         protected string ManagePermissionsPolicyName;
+        
+        protected bool HasManagePermissionsPermission { get; set; }
 
         protected string CreateModalSelectedTab = DefaultSelectedTab;
 
@@ -40,13 +42,19 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
             ManagePermissionsPolicyName = IdentityPermissions.Users.ManagePermissions;
         }
 
-        protected async override Task OnInitializedAsync()
+        protected override async Task OnInitializedAsync()
         {
             await base.OnInitializedAsync();
 
             Roles = (await AppService.GetAssignableRolesAsync()).Items;
         }
+        
+        protected override async Task SetPermissionsAsync()
+        {
+            await base.SetPermissionsAsync();
 
+            HasManagePermissionsPermission = await AuthorizationService.IsGrantedAsync(IdentityPermissions.Users.ManagePermissions);
+        }
 
         protected override Task OpenCreateModalAsync()
         {
@@ -69,7 +77,7 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity
             return base.OnCreatingEntityAsync();
         }
 
-        protected async override Task OpenEditModalAsync(IdentityUserDto entity)
+        protected override async Task OpenEditModalAsync(IdentityUserDto entity)
         {
             EditModalSelectedTab = DefaultSelectedTab;
 

modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor

@@ -148,7 +148,7 @@
 }
 
 @* ************************* EDIT CONNECTION STRING MODAL ************************* *@
-@if (HasUpdatePermission)
+@if (HasManageConnectionStringsPermission)
 {
     <Modal @ref="@ManageConnectionStringModal">
         <ModalBackdrop />

modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs

@@ -39,7 +39,7 @@ namespace Volo.Abp.TenantManagement.Blazor.Pages.TenantManagement
             TenantInfo = new TenantInfoModel();
         }
 
-        protected async override Task SetPermissionsAsync()
+        protected override async Task SetPermissionsAsync()
         {
             await base.SetPermissionsAsync();