MVC UI migration to AdminLTE 3

Author: iyilm4z

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/ITenantAppService.cs

@@ -1,5 +1,4 @@
 using Abp.Application.Services;
-using Abp.Application.Services.Dto;
 using AbpCompanyName.AbpProjectName.MultiTenancy.Dto;
 
 namespace AbpCompanyName.AbpProjectName.MultiTenancy

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/TenantAppService.cs

@@ -109,6 +109,7 @@ protected override void MapToEntity(TenantDto updateInput, Tenant entity)
         public override async Task DeleteAsync(EntityDto<int> input)
         {
             CheckDeletePermission();
+            var foo = DeletePermissionName;
 
             var tenant = await _tenantManager.GetByIdAsync(input.Id);
             await _tenantManager.DeleteAsync(tenant);

aspnet-core/src/AbpCompanyName.AbpProjectName.Application/Users/UserAppService.cs

@@ -222,7 +222,6 @@ public async Task<bool> ResetPassword(ResetPasswordDto input)
 
             return true;
         }
-
     }
 }
 

aspnet-core/src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/EntityFrameworkCore/Seed/Host/DefaultLanguagesCreator.cs

@@ -17,18 +17,18 @@ private static List<ApplicationLanguage> GetInitialLanguages()
             var tenantId = AbpProjectNameConsts.MultiTenancyEnabled ? null : (int?)MultiTenancyConsts.DefaultTenantId;
             return new List<ApplicationLanguage>
             {
-                new ApplicationLanguage(tenantId, "en", "English", "famfamfam-flags gb"),
-                new ApplicationLanguage(tenantId, "ar", "العربية", "famfamfam-flags sa"),
-                new ApplicationLanguage(tenantId, "de", "German", "famfamfam-flags de"),
-                new ApplicationLanguage(tenantId, "it", "Italiano", "famfamfam-flags it"),
-                new ApplicationLanguage(tenantId, "fr", "Français", "famfamfam-flags fr"),
-                new ApplicationLanguage(tenantId, "pt-BR", "Português", "famfamfam-flags br"),
-                new ApplicationLanguage(tenantId, "tr", "Türkçe", "famfamfam-flags tr"),
-                new ApplicationLanguage(tenantId, "ru", "Русский", "famfamfam-flags ru"),
-                new ApplicationLanguage(tenantId, "zh-Hans", "简体中文", "famfamfam-flags cn"),
-                new ApplicationLanguage(tenantId, "es-MX", "Español México", "famfamfam-flags mx"),
-                new ApplicationLanguage(tenantId, "nl", "Nederlands", "famfamfam-flags nl"),
-                new ApplicationLanguage(tenantId, "ja", "日本語", "famfamfam-flags jp")
+                new ApplicationLanguage(tenantId, "en", "English", "flag-icon flag-icon-us"),
+                new ApplicationLanguage(tenantId, "ar", "العربية", "flag-icon flag-icon-sa"),
+                new ApplicationLanguage(tenantId, "de", "German", "flag-icon flag-icon-de"),
+                new ApplicationLanguage(tenantId, "it", "Italiano", "flag-icon flag-icon-it"),
+                new ApplicationLanguage(tenantId, "fr", "Français", "flag-icon flag-icon-fr"),
+                new ApplicationLanguage(tenantId, "pt-BR", "Português", "flag-icon flag-icon-br"),
+                new ApplicationLanguage(tenantId, "tr", "Türkçe", "flag-icon flag-icon-tr"),
+                new ApplicationLanguage(tenantId, "ru", "Русский", "flag-icon flag-icon-ru"),
+                new ApplicationLanguage(tenantId, "zh-Hans", "简体中文", "flag-icon flag-icon-cn"),
+                new ApplicationLanguage(tenantId, "es-MX", "Español México", "flag-icon flag-icon-mx"),
+                new ApplicationLanguage(tenantId, "nl", "Nederlands", "flag-icon flag-icon-nl"),
+                new ApplicationLanguage(tenantId, "ja", "日本語", "flag-icon flag-icon-jp")
             };
         }
 

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

@@ -1,15 +1,32 @@
 using Microsoft.AspNetCore.Mvc;
 using Abp.AspNetCore.Mvc.Authorization;
 using AbpCompanyName.AbpProjectName.Controllers;
+using AbpCompanyName.AbpProjectName.MultiTenancy;
+using AbpCompanyName.AbpProjectName.Roles;
+using AbpCompanyName.AbpProjectName.Users;
+using System.Threading.Tasks;
 
 namespace AbpCompanyName.AbpProjectName.Web.Controllers
 {
     [AbpMvcAuthorize]
     public class HomeController : AbpProjectNameControllerBase
     {
-        public ActionResult Index()
+        private readonly ITenantAppService _tenantAppService;
+        private readonly IUserAppService _userAppService;
+        private readonly IRoleAppService _roleAppService;
+
+        public HomeController(ITenantAppService tenantAppService,
+            IUserAppService userAppService,
+            IRoleAppService roleAppService)
+        {
+            _tenantAppService = tenantAppService;
+            _userAppService = userAppService;
+            _roleAppService = roleAppService;
+        }
+
+        public async Task<ActionResult> Index()
         {
             return View();
         }
-	}
+    }
 }

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

@@ -5,7 +5,6 @@
 using AbpCompanyName.AbpProjectName.Authorization;
 using AbpCompanyName.AbpProjectName.Controllers;
 using AbpCompanyName.AbpProjectName.Roles;
-using AbpCompanyName.AbpProjectName.Roles.Dto;
 using AbpCompanyName.AbpProjectName.Web.Models.Roles;
 
 namespace AbpCompanyName.AbpProjectName.Web.Controllers
@@ -22,23 +21,21 @@ public RolesController(IRoleAppService roleAppService)
 
         public async Task<IActionResult> Index()
         {
-            var roles = (await _roleAppService.GetRolesAsync(new GetRolesInput())).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)
+        public async Task<ActionResult> EditModal(int roleId)
         {
             var output = await _roleAppService.GetRoleForEdit(new EntityDto(roleId));
             var model = ObjectMapper.Map<EditRoleModalViewModel>(output);
 
-            return View("_EditRoleModal", model);
+            return PartialView("_EditModal", model);
         }
     }
 }

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

@@ -5,7 +5,6 @@
 using AbpCompanyName.AbpProjectName.Authorization;
 using AbpCompanyName.AbpProjectName.Controllers;
 using AbpCompanyName.AbpProjectName.MultiTenancy;
-using AbpCompanyName.AbpProjectName.MultiTenancy.Dto;
 
 namespace AbpCompanyName.AbpProjectName.Web.Controllers
 {
@@ -19,16 +18,12 @@ public TenantsController(ITenantAppService tenantAppService)
             _tenantAppService = tenantAppService;
         }
 
-        public async Task<ActionResult> Index()
-        {
-            var output = await _tenantAppService.GetAllAsync(new PagedTenantResultRequestDto { MaxResultCount = int.MaxValue }); // Paging not implemented yet
-            return View(output);
-        }
+        public ActionResult Index() => View();
 
-        public async Task<ActionResult> EditTenantModal(int tenantId)
+        public async Task<ActionResult> EditModal(int tenantId)
         {
             var tenantDto = await _tenantAppService.GetAsync(new EntityDto(tenantId));
-            return View("_EditTenantModal", tenantDto);
+            return PartialView("_EditModal", tenantDto);
         }
     }
 }

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

@@ -6,7 +6,6 @@
 using AbpCompanyName.AbpProjectName.Controllers;
 using AbpCompanyName.AbpProjectName.Users;
 using AbpCompanyName.AbpProjectName.Web.Models.Users;
-using AbpCompanyName.AbpProjectName.Users.Dto;
 
 namespace AbpCompanyName.AbpProjectName.Web.Controllers
 {
@@ -22,17 +21,15 @@ public UsersController(IUserAppService userAppService)
 
         public async Task<ActionResult> Index()
         {
-            var users = (await _userAppService.GetAllAsync(new PagedUserResultRequestDto {MaxResultCount = int.MaxValue})).Items; // Paging not implemented yet
             var roles = (await _userAppService.GetRoles()).Items;
             var model = new UserListViewModel
             {
-                Users = users,
                 Roles = roles
             };
             return View(model);
         }
 
-        public async Task<ActionResult> EditUserModal(long userId)
+        public async Task<ActionResult> EditModal(long userId)
         {
             var user = await _userAppService.GetAsync(new EntityDto<long>(userId));
             var roles = (await _userAppService.GetRoles()).Items;
@@ -41,7 +38,7 @@ public async Task<ActionResult> EditUserModal(long userId)
                 User = user,
                 Roles = roles
             };
-            return View("_EditUserModal", model);
+            return PartialView("_EditModal", model);
         }
     }
 }

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

@@ -5,8 +5,6 @@ namespace AbpCompanyName.AbpProjectName.Web.Models.Roles
 {
     public class RoleListViewModel
     {
-        public IReadOnlyList<RoleListDto> Roles { get; set; }
-
         public IReadOnlyList<PermissionDto> Permissions { get; set; }
     }
 }