From b0c63bac5780a31095586174c87e557547d691fd Mon Sep 17 00:00:00 2001
From: Alper Ebicoglu <alperonline@hotmail.com>
Date: Fri, 29 Dec 2017 14:42:16 +0300
Subject: [PATCH] Edit role implemented.

---
 .../AbpIdentityWebAutoMapperProfile.cs        | 39 +++++++++++++------
 .../Pages/Identity/Roles/CreateModal.cshtml   | 32 +++++++++++++++
 .../Identity/Roles/CreateModal.cshtml.cs      | 30 ++++++++++++++
 .../Identity/Roles/CreateRoleInfoModel.cs     | 12 ++++++
 .../Pages/Identity/Roles/EditModal.cshtml     | 17 ++++----
 .../Pages/Identity/Roles/EditModal.cshtml.cs  | 14 +++++--
 .../Volo.Abp.Identity.Web.csproj              |  1 +
 7 files changed, 120 insertions(+), 25 deletions(-)
 create mode 100644 src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml
 create mode 100644 src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs
 create mode 100644 src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateRoleInfoModel.cs

diff --git a/src/Volo.Abp.Identity.Web/ObjectMappings/AbpIdentityWebAutoMapperProfile.cs b/src/Volo.Abp.Identity.Web/ObjectMappings/AbpIdentityWebAutoMapperProfile.cs
index 0b0027cc7a..6d05954565 100644
--- a/src/Volo.Abp.Identity.Web/ObjectMappings/AbpIdentityWebAutoMapperProfile.cs
+++ b/src/Volo.Abp.Identity.Web/ObjectMappings/AbpIdentityWebAutoMapperProfile.cs
@@ -1,7 +1,7 @@
 using AutoMapper;
 using Volo.Abp.Identity.Web.Pages.Identity.Roles;
-using Volo.Abp.Identity.Web.Pages.Identity.Users;
-using EditModalModel = Volo.Abp.Identity.Web.Pages.Identity.Users.EditModalModel;
+using CreateUserModalModel = Volo.Abp.Identity.Web.Pages.Identity.Users.CreateModalModel;
+using EditUserModalModel = Volo.Abp.Identity.Web.Pages.Identity.Users.EditModalModel;
 
 namespace Volo.Abp.Identity.Web.ObjectMappings
 {
@@ -9,26 +9,41 @@ namespace Volo.Abp.Identity.Web.ObjectMappings
     {
         public AbpIdentityWebAutoMapperProfile()
         {
-            //EditModal
+            CreateUserMappings();
+            CreateRoleMappings();
+        }
 
-            CreateMap<IdentityUserDto, EditModalModel.UserInfoViewModel>();
+        private void CreateUserMappings()
+        {
+            //List
+            CreateMap<IdentityUserDto, EditUserModalModel.UserInfoViewModel>();
 
-            CreateMap<EditModalModel.UserInfoViewModel, IdentityUserUpdateDto>()
+            //CreateModal
+            CreateMap<CreateUserModalModel.UserInfoViewModel, IdentityUserCreateDto>()
                 .ForMember(dest => dest.RoleNames, opt => opt.Ignore());
 
-            CreateMap<IdentityRoleDto, EditModalModel.AssignedRoleViewModel>()
+            CreateMap<IdentityRoleDto, CreateUserModalModel.AssignedRoleViewModel>()
                 .ForMember(dest => dest.IsAssigned, opt => opt.Ignore());
 
-            CreateMap<IdentityRoleDto, RoleInfoModel>();
+            //EditModal
+            CreateMap<EditUserModalModel.UserInfoViewModel, IdentityUserUpdateDto>()
+                .ForMember(dest => dest.RoleNames, opt => opt.Ignore());
 
+            CreateMap<IdentityRoleDto, EditUserModalModel.AssignedRoleViewModel>()
+                .ForMember(dest => dest.IsAssigned, opt => opt.Ignore());
+        }
 
-            //CreateModal
+        private void CreateRoleMappings()
+        {
+            //List
+            CreateMap<IdentityRoleDto, RoleInfoModel>();
 
-            CreateMap<CreateModalModel.UserInfoViewModel, IdentityUserCreateDto>()
-                .ForMember(dest => dest.RoleNames, opt => opt.Ignore());
+            //CreateModal
+            CreateMap<CreateRoleInfoModel, IdentityRoleCreateDto>();
 
-            CreateMap<IdentityRoleDto, CreateModalModel.AssignedRoleViewModel>()
-                .ForMember(dest => dest.IsAssigned, opt => opt.Ignore());
+            //EditModal
+            CreateMap<RoleInfoModel, IdentityRoleUpdateDto>();
         }
+
     }
 }
diff --git a/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml
new file mode 100644
index 0000000000..c76d414a34
--- /dev/null
+++ b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml
@@ -0,0 +1,32 @@
+@page
+@using Microsoft.Extensions.Localization
+@using Volo.Abp.Identity.Web.Localization.Resources.AbpIdentity
+@model Volo.Abp.Identity.Web.Pages.Identity.Roles.CreateModalModel
+@inject IStringLocalizer<IdentityResource> L
+@{
+    Layout = null;
+}
+
+<form method="post" asp-page="/Identity/Roles/CreateModal">
+
+    <abp-modal>
+
+        <abp-modal-header title="@L["NewRole"]"></abp-modal-header>
+
+        <abp-modal-body>
+
+            <div class="form-group">
+                <label asp-for="RoleModel.Name"></label>
+                <input asp-for="RoleModel.Name" class="form-control"/>
+                <span asp-validation-for="RoleModel.Name" class="text-danger"></span>
+            </div>
+
+            <div asp-validation-summary="All" class="text-danger"></div>
+
+        </abp-modal-body>
+
+        <abp-modal-footer></abp-modal-footer>
+
+    </abp-modal>
+
+</form>
diff --git a/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs
new file mode 100644
index 0000000000..3c0e1dbae0
--- /dev/null
+++ b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs
@@ -0,0 +1,30 @@
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Volo.Abp.AspNetCore.Mvc.RazorPages;
+
+namespace Volo.Abp.Identity.Web.Pages.Identity.Roles
+{
+    public class CreateModalModel : AbpPageModel
+    {
+        [BindProperty]
+        public CreateRoleInfoModel RoleModel { get; set; }
+
+        private readonly IIdentityRoleAppService _identityRoleAppService;
+
+        public CreateModalModel(IIdentityRoleAppService identityRoleAppService)
+        {
+            _identityRoleAppService = identityRoleAppService;
+            RoleModel = new CreateRoleInfoModel();
+        }
+
+        public async Task<IActionResult> OnPostAsync()
+        {
+            ValidateModel();
+
+            var input = ObjectMapper.Map<CreateRoleInfoModel, IdentityRoleCreateDto>(RoleModel);
+            await _identityRoleAppService.CreateAsync(input);
+
+            return NoContent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateRoleInfoModel.cs b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateRoleInfoModel.cs
new file mode 100644
index 0000000000..7d98d1bf10
--- /dev/null
+++ b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateRoleInfoModel.cs
@@ -0,0 +1,12 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Volo.Abp.Identity.Web.Pages.Identity.Roles
+{
+    public class CreateRoleInfoModel
+    {
+        [Required]
+        [StringLength(IdentityRoleConsts.MaxNameLength)]
+        [Display(Name = "RoleName")]
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml
index ae54404e60..70b6bd3c10 100644
--- a/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml
+++ b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml
@@ -7,7 +7,7 @@
     Layout = null;
 }
 
-<form method="post" asp-page="/Identity/Roles/EditModal">
+<form method="post" asp-page="/Identity/Roles/EditModal" autocomplete="off">
 
     <abp-modal>
 
@@ -15,16 +15,13 @@
 
         <abp-modal-body>
 
-                <div class="tab-pane active" id="EditUser_UserInfoTab" role="tabpanel">
+            <input asp-for="RoleInfo.Id" />
 
-                    <input asp-for="RoleInfo.Id" />
-
-                    <div class="form-group">
-                        <label asp-for="RoleInfo.Name"></label>
-                        <input asp-for="RoleInfo.Name" class="form-control" />
-                        <span asp-validation-for="RoleInfo.Name" class="text-danger"></span>
-                    </div>
-                </div>
+            <div class="form-group">
+                <label asp-for="RoleInfo.Name"></label>
+                <input asp-for="RoleInfo.Name" class="form-control"/>
+                <span asp-validation-for="RoleInfo.Name" class="text-danger"></span>
+            </div>
 
             <div asp-validation-summary="All" class="text-danger"></div>
 
diff --git a/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs
index 9fe26e56be..29d74108af 100644
--- a/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs
+++ b/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs
@@ -19,11 +19,19 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Roles
 
         public async Task OnGetAsync(Guid id)
         {
-            var role = await _identityRoleAppService.GetAsync(id);
-            RoleInfo =  ObjectMapper.Map<IdentityRoleDto, RoleInfoModel>(role);
+            RoleInfo = ObjectMapper.Map<IdentityRoleDto, RoleInfoModel>(
+                await _identityRoleAppService.GetAsync(id)
+            );
         }
 
-        
+        public async Task<IActionResult> OnPostAsync()
+        {
+            ValidateModel();
+
+            var input = ObjectMapper.Map<RoleInfoModel, IdentityRoleUpdateDto>(RoleInfo);
+            await _identityRoleAppService.UpdateAsync(RoleInfo.Id, input);
 
+            return NoContent();
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj b/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj
index a639cf9db1..2431c114a9 100644
--- a/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj
+++ b/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj
@@ -17,6 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Content Remove="Pages\Identity\Roles\CreateModal.cshtml" />
     <Content Remove="Pages\Identity\Roles\EditModal.cshtml" />
     <Content Remove="Pages\Identity\Roles\Index.cshtml" />
   </ItemGroup>