Redesign role editing - MVC side

Author: alirizaadiyahsi

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/Dto/FlatPermissionDto.cs

@@ -0,0 +1,13 @@
+namespace AbpCompanyName.AbpProjectName.Roles.Dto
+{
+    public class FlatPermissionDto
+    {
+        public string ParentName { get; set; }
+        
+        public string Name { get; set; }
+        
+        public string DisplayName { get; set; }
+        
+        public string Description { get; set; }
+    }
+}

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/Dto/GetRoleForEditOutput.cs

@@ -0,0 +1,13 @@
+using System.Collections.Generic;
+
+namespace AbpCompanyName.AbpProjectName.Roles.Dto
+{
+    public class GetRoleForEditOutput
+    {
+        public RoleEditDto Role { get; set; }
+
+        public List<FlatPermissionDto> Permissions { get; set; }
+
+        public List<string> GrantedPermissionNames { get; set; }
+    }
+}

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/Dto/RoleDto.cs

@@ -27,4 +27,4 @@ public class RoleDto : EntityDto<int>
 
         public List<string> Permissions { get; set; }
     }
-}
+}

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/Dto/RoleEditDto.cs

@@ -0,0 +1,19 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace AbpCompanyName.AbpProjectName.Roles.Dto
+{
+    public class RoleEditDto
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public string Name { get; set; }
+
+        [Required]
+        public string DisplayName { get; set; }
+
+        public string Description { get; set; }
+
+        public bool IsStatic { get; set; }
+    }
+}

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/IRoleAppService.cs

@@ -8,5 +8,7 @@ namespace AbpCompanyName.AbpProjectName.Roles
     public interface IRoleAppService : IAsyncCrudAppService<RoleDto, int, PagedResultRequestDto, CreateRoleDto, RoleDto>
     {
         Task<ListResultDto<PermissionDto>> GetAllPermissions();
+
+        Task<GetRoleForEditOutput> GetRoleForEdit(EntityDto input);
     }
-}
+}

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Roles/RoleAppService.cs

@@ -112,14 +112,19 @@ protected virtual void CheckErrors(IdentityResult identityResult)
             identityResult.CheckErrors(LocalizationManager);
         }
 
-        public override async Task<RoleDto> Get(EntityDto<int> input)
+        public async Task<GetRoleForEditOutput> GetRoleForEdit(EntityDto input)
         {
-            CheckGetPermission();
-
-            var role = await GetEntityByIdAsync(input.Id);
-            role.Permissions = role.Permissions.Where(p => p.IsGranted).ToList();
+            var permissions = PermissionManager.GetAllPermissions();
+            var role = await _roleManager.GetRoleByIdAsync(input.Id);
+            var grantedPermissions = (await _roleManager.GetGrantedPermissionsAsync(role)).ToArray();
+            var roleEditDto = ObjectMapper.Map<RoleEditDto>(role);
 
-            return MapToEntityDto(role);
+            return new GetRoleForEditOutput
+            {
+                Role = roleEditDto,
+                Permissions = ObjectMapper.Map<List<FlatPermissionDto>>(permissions).OrderBy(p => p.DisplayName).ToList(),
+                GrantedPermissionNames = grantedPermissions.Select(p => p.Name).ToList()
+            };
         }
     }
 }

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Controllers/RolesController.cs

@@ -34,13 +34,9 @@ public async Task<IActionResult> Index()
 
         public async Task<ActionResult> EditRoleModal(int roleId)
         {
-            var role = await _roleAppService.Get(new EntityDto(roleId));
-            var permissions = (await _roleAppService.GetAllPermissions()).Items;
-            var model = new EditRoleModalViewModel
-            {
-                Role = role,
-                Permissions = permissions
-            };
+            var output = await _roleAppService.GetRoleForEdit(new EntityDto(roleId));
+            var model = new EditRoleModalViewModel(output);
+
             return View("_EditRoleModal", model);
         }
     }

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Models/Common/IPermissionsEditViewModel.cs

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using AbpCompanyName.AbpProjectName.Roles.Dto;
+
+namespace AbpCompanyName.AbpProjectName.Web.Models.Common
+{
+    public interface IPermissionsEditViewModel
+    {
+        List<FlatPermissionDto> Permissions { get; set; }
+
+        List<string> GrantedPermissionNames { get; set; }
+    }
+}

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Models/Roles/EditRoleModalViewModel.cs

@@ -1,18 +1,20 @@
-using System.Collections.Generic;
-using System.Linq;
+using Abp.AutoMapper;
 using AbpCompanyName.AbpProjectName.Roles.Dto;
+using AbpCompanyName.AbpProjectName.Web.Models.Common;
 
 namespace AbpCompanyName.AbpProjectName.Web.Models.Roles
 {
-    public class EditRoleModalViewModel
+    [AutoMapFrom(typeof(GetRoleForEditOutput))]
+    public class EditRoleModalViewModel : GetRoleForEditOutput, IPermissionsEditViewModel
     {
-        public RoleDto Role { get; set; }
-
-        public IReadOnlyList<PermissionDto> Permissions { get; set; }
+        public EditRoleModalViewModel(GetRoleForEditOutput output)
+        {
+            output.MapTo(this);
+        }
 
-        public bool HasPermission(PermissionDto permission)
+        public bool HasPermission(FlatPermissionDto permission)
         {
-            return Permissions != null && Role.Permissions.Any(p => p == permission.Name);
+            return GrantedPermissionNames.Contains(permission.Name);
         }
     }
 }