resolved #79: MVC template is aligned with angular UI

Author: ismcagdas

angular/src/app/roles/create-role/create-role.component.html

@@ -19,7 +19,7 @@ <h4 class="modal-title">
                             <div class="form-group form-float">
                                 <div class="form-line">
                                     <input id="rolename" type="text" name="RoleName" [(ngModel)]="role.name" required maxlength="32" minlength="2" class="validate form-control">
-                                    <label for="username" class="form-label">{{l("RoleName")}}</label>
+                                    <label for="rolename" class="form-label">{{l("RoleName")}}</label>
                                 </div>
                             </div>
                         </div>

angular/src/app/roles/edit-role/edit-role.component.html

@@ -20,7 +20,7 @@ <h4 class="modal-title">
                             <div class="form-group form-float">
                                 <div class="form-line">
                                     <input id="rolename" [disabled]="role.isStatic" type="text" name="RoleName" [(ngModel)]="role.name" required maxlength="32" minlength="2" class="validate form-control">
-                                    <label for="username" class="form-label">{{l("RoleName")}}</label>
+                                    <label for="rolename" class="form-label">{{l("RoleName")}}</label>
                                 </div>
                             </div>
                         </div>

aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName-tr.xml

@@ -71,5 +71,9 @@
 
     <text name="Edit">Düzenle</text>
     <text name="Delete">Sil</text>
+
+    <text name="CreateNewRole">Yeni rol oluştur</text>
+    <text name="RoleName">Rol adı</text>
+    <text name="Actions">İşlemler</text>
   </texts>
 </localizationDictionary>

aspnet-core/src/AbpCompanyName.AbpProjectName.Core/Localization/SourceFiles/AbpProjectName.xml

@@ -71,5 +71,9 @@
 
     <text name="Edit">Edit</text>
     <text name="Delete">Delete</text>
+
+    <text name="CreateNewRole">Create New Role</text>
+    <text name="RoleName">Role Name</text>
+    <text name="Actions">Actions</text>
   </texts>
 </localizationDictionary>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj

@@ -16,6 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Content Include="wwwroot\view-resources\Views\Roles\Index.js" />
+    <Content Include="wwwroot\view-resources\Views\Roles\_EditRoleModal.js" />
     <Content Include="wwwroot\view-resources\Views\Shared\_Layout.js" />
     <Content Include="wwwroot\view-resources\Views\Tenants\_EditTenantModal.js" />
     <Content Include="wwwroot\view-resources\Views\Users\_EditUserModal.js" />

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

@@ -0,0 +1,48 @@
+using System.Threading.Tasks;
+using Abp.Application.Services.Dto;
+using Abp.AspNetCore.Mvc.Authorization;
+using AbpCompanyName.AbpProjectName.Authorization;
+using AbpCompanyName.AbpProjectName.Controllers;
+using AbpCompanyName.AbpProjectName.Roles;
+using AbpCompanyName.AbpProjectName.Web.Models.Roles;
+using Microsoft.AspNetCore.Mvc;
+
+namespace AbpCompanyName.AbpProjectName.Web.Controllers
+{
+    [AbpMvcAuthorize(PermissionNames.Pages_Roles)]
+    public class RolesController : AbpProjectNameControllerBase
+    {
+        private readonly IRoleAppService _roleAppService;
+
+        public RolesController(IRoleAppService roleAppService)
+        {
+            _roleAppService = roleAppService;
+        }
+
+
+        public async Task<IActionResult> Index()
+        {
+            var roles = (await _roleAppService.GetAll(new PagedAndSortedResultRequestDto())).Items;
+            var permissions = (await _roleAppService.GetAllPermissions()).Items;
+            var model = new RoleListViewModel
+            {
+                Roles = roles,
+                Permissions = permissions
+            };
+
+            return View(model);
+        }
+
+        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
+            };
+            return View("_EditRoleModal", model);
+        }
+    }
+}

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

@@ -1,10 +1,8 @@
-using System.Linq;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Abp.Application.Services.Dto;
 using Abp.AspNetCore.Mvc.Authorization;
 using AbpCompanyName.AbpProjectName.Authorization;
 using AbpCompanyName.AbpProjectName.Controllers;
-using AbpCompanyName.AbpProjectName.Roles;
 using AbpCompanyName.AbpProjectName.Users;
 using AbpCompanyName.AbpProjectName.Web.Models.Users;
 using Microsoft.AspNetCore.Mvc;

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

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using System.Linq;
+using AbpCompanyName.AbpProjectName.Roles.Dto;
+
+namespace AbpCompanyName.AbpProjectName.Web.Models.Roles
+{
+    public class EditRoleModalViewModel
+    {
+        public RoleDto Role { get; set; }
+
+        public IReadOnlyList<PermissionDto> Permissions { get; set; }
+
+        public bool HasPermission(PermissionDto permission)
+        {
+            return Permissions != null && Role.Permissions.Any(p => p == permission.Name);
+        }
+    }
+}

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

@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using AbpCompanyName.AbpProjectName.Roles.Dto;
+
+namespace AbpCompanyName.AbpProjectName.Web.Models.Roles
+{
+    public class RoleListViewModel
+    {
+        public IReadOnlyList<RoleDto> Roles { get; set; }
+
+        public IReadOnlyList<PermissionDto> Permissions { get; set; }
+    }
+}

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Models/Users/EditTenantModalViewModel.cs

@@ -13,14 +13,7 @@ public class EditUserModalViewModel
 
         public bool UserIsInRole(RoleDto role)
         {
-            return User.Roles != null && User.Roles.Any(r => r == role.Name);
+            return User.Roles != null && User.Roles.Any(r => r == role.DisplayName);
         }
     }
-
-    public class UserListViewModel
-    {
-        public IReadOnlyList<UserDto> Users { get; set; }
-
-        public IReadOnlyList<RoleDto> Roles { get; set; }
-    }
 }