From 44ff921a6a7a2f7c9f0a498f977b29a12d235cc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?alir=C4=B1za=20ad=C4=B1yah=C5=9Fi?= Date: Wed, 11 Oct 2017 10:58:29 +0300 Subject: [PATCH] user crud operations --- src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll | Bin 15872 -> 15360 bytes .../Abp/Identity/GetIdentityUsersInput.cs | 10 ++ .../Abp/Identity/IIdentityUserAppService.cs | 2 +- .../IdentityUserCreateOrUpdateOutput.cs | 11 ++ .../Volo/Abp/Identity/IdentityUserRoleDto.cs | 13 ++ .../Abp/Identity/IdentityUserUpdateDto.cs | 1 - ...pDeskApplicationModuleAutoMapperProfile.cs | 1 + .../Abp/Identity/IdentityUserAppService.cs | 29 +++- .../Abp/Identity/IIdentityUserRepository.cs | 3 +- .../Identity/EfCoreIdentityUserRepository.cs | 12 ++ .../Identity/Controllers/UsersController.cs | 25 +++- .../Areas/Identity/Views/Users/Index.cshtml | 43 +++--- .../Areas/Identity/Views/Users/_Create.cshtml | 63 ++++++++ .../Areas/Identity/Views/Users/_Update.cshtml | 30 ++++ .../Volo.Abp.Identity.Web.csproj | 11 +- .../modules/identity/views/users/index.css | 5 +- .../modules/identity/views/users/index.js | 141 +++++++++++++++++- .../modules/identity/views/users/index.less | 5 +- .../identity/views/users/index.min.css | 2 +- .../Services/IAsyncCrudAppService.cs | 2 + .../Identity/IdentityUserAppService_Tests.cs | 2 +- 21 files changed, 368 insertions(+), 43 deletions(-) create mode 100644 src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/GetIdentityUsersInput.cs create mode 100644 src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserCreateOrUpdateOutput.cs create mode 100644 src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserRoleDto.cs create mode 100644 src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/_Create.cshtml create mode 100644 src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/_Update.cshtml diff --git a/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll b/src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll index 243e6fa82e786a375d8e95b05012435cd1ccff0c..b7cc055fbd1dab34af45b3dcaa3e4568c123b15d 100644 GIT binary patch delta 5005 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 diff --git a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/GetIdentityUsersInput.cs b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/GetIdentityUsersInput.cs new file mode 100644 index 0000000000..274800728a --- /dev/null +++ b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/GetIdentityUsersInput.cs @@ -0,0 +1,10 @@ +using Volo.Abp.Application.Dtos; +using Volo.Abp.Validation; + +namespace Volo.Abp.Identity +{ + public class GetIdentityUsersInput : PagedAndSortedResultRequestDto + { + public string Filter { get; set; } + } +} diff --git a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityUserAppService.cs b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityUserAppService.cs index 8738265374..c620ebd917 100644 --- a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityUserAppService.cs +++ b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IIdentityUserAppService.cs @@ -5,7 +5,7 @@ using Volo.Abp.Application.Services; namespace Volo.Abp.Identity { - public interface IIdentityUserAppService : IAsyncCrudAppService + public interface IIdentityUserAppService : IAsyncCrudAppService { Task> GetRolesAsync(Guid id); diff --git a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserCreateOrUpdateOutput.cs b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserCreateOrUpdateOutput.cs new file mode 100644 index 0000000000..e107db6b71 --- /dev/null +++ b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserCreateOrUpdateOutput.cs @@ -0,0 +1,11 @@ +using Volo.Abp.Application.Dtos; + +namespace Volo.Abp.Identity +{ + public class IdentityUserCreateOrUpdateOutput: EntityDto + { + public IdentityUserDto User { get; set; } + + public IdentityUserRoleDto[] Roles { get; set; } + } +} \ No newline at end of file diff --git a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserRoleDto.cs b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserRoleDto.cs new file mode 100644 index 0000000000..eea833d957 --- /dev/null +++ b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserRoleDto.cs @@ -0,0 +1,13 @@ +using System; + +namespace Volo.Abp.Identity +{ + public class IdentityUserRoleDto + { + public Guid Id { get; set; } + + public string Name { get; set; } + + public bool IsAssigned { get; set; } + } +} diff --git a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserUpdateDto.cs b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserUpdateDto.cs index cc551a7398..3117ff8003 100644 --- a/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserUpdateDto.cs +++ b/src/Volo.Abp.Identity.Application.Contracts/Volo/Abp/Identity/IdentityUserUpdateDto.cs @@ -2,6 +2,5 @@ { public class IdentityUserUpdateDto : IdentityUserCreateOrUpdateDtoBase { - } } \ No newline at end of file diff --git a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpDeskApplicationModuleAutoMapperProfile.cs b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpDeskApplicationModuleAutoMapperProfile.cs index e796a0a7ae..6f922c9707 100644 --- a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpDeskApplicationModuleAutoMapperProfile.cs +++ b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/AbpDeskApplicationModuleAutoMapperProfile.cs @@ -8,6 +8,7 @@ namespace Volo.Abp.Identity { CreateMap(); CreateMap(); + CreateMap(); } } } \ No newline at end of file diff --git a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs index fc264b4a60..68b92a04c5 100644 --- a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs +++ b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; @@ -12,11 +13,13 @@ namespace Volo.Abp.Identity { private readonly IdentityUserManager _userManager; private readonly IIdentityUserRepository _userRepository; + private readonly IIdentityRoleRepository _roleRepository; - public IdentityUserAppService(IdentityUserManager userManager, IIdentityUserRepository userRepository) + public IdentityUserAppService(IdentityUserManager userManager, IIdentityUserRepository userRepository, IIdentityRoleRepository roleRepository) { _userManager = userManager; _userRepository = userRepository; + _roleRepository = roleRepository; } public async Task GetAsync(Guid id) @@ -26,10 +29,30 @@ namespace Volo.Abp.Identity ); } - public async Task> GetListAsync(PagedAndSortedResultRequestDto input) + public async Task GetUserForCreateOrUpdateAsync(Guid id) + { + var userRoleDtos = ObjectMapper.Map, IdentityUserRoleDto[]>(await _roleRepository.GetListAsync()); + var output = new IdentityUserCreateOrUpdateOutput + { + Roles = userRoleDtos + }; + + var user = await _userManager.GetByIdAsync(id); + + output.User = ObjectMapper.Map(user); + + foreach (var userRoleDto in userRoleDtos) + { + userRoleDto.IsAssigned = await _userManager.IsInRoleAsync(user, userRoleDto.Name); + } + + return output; + } + + public async Task> GetListAsync(GetIdentityUsersInput input) { var count = (int)await _userRepository.GetCountAsync(); - var list = await _userRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount); + var list = await _userRepository.GetListAsync(input.Sorting, input.MaxResultCount, input.SkipCount, input.Filter); return new PagedResultDto( count, diff --git a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs index d583b83f46..39b1b649bb 100644 --- a/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs +++ b/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IIdentityUserRepository.cs @@ -24,7 +24,8 @@ namespace Volo.Abp.Identity //TODO: Why not return List instead of IList Task> GetListByNormalizedRoleNameAsync(string normalizedRoleName, CancellationToken cancellationToken); - Task> GetListAsync(string sorting, int maxResultCount, int skipCount); + //TODO: DTO can be used instead of parameters + Task> GetListAsync(string sorting, int maxResultCount, int skipCount, string filter); Task> GetRolesAsync(Guid userId); } diff --git a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EfCoreIdentityUserRepository.cs b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EfCoreIdentityUserRepository.cs index a845d8faf8..65ab54b5a6 100644 --- a/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EfCoreIdentityUserRepository.cs +++ b/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EfCoreIdentityUserRepository.cs @@ -78,6 +78,18 @@ namespace Volo.Abp.Identity return await query.ToListAsync(cancellationToken); } + public async Task> GetListAsync(string sorting, int maxResultCount, int skipCount, string filter) + { + return await this.WhereIf( + !filter.IsNullOrWhiteSpace(), + u => + u.UserName.Contains(filter) || + u.Email.Contains(filter) + ) + .OrderBy(sorting ?? nameof(IdentityUser.UserName)) + .PageBy(skipCount, maxResultCount).ToListAsync(); + } + public async Task> GetListAsync(string sorting, int maxResultCount, int skipCount) { return await this.OrderBy(sorting ?? nameof(IdentityUser.UserName)).PageBy(skipCount, maxResultCount).ToListAsync(); diff --git a/src/Volo.Abp.Identity.Web/Areas/Identity/Controllers/UsersController.cs b/src/Volo.Abp.Identity.Web/Areas/Identity/Controllers/UsersController.cs index 9450115d66..300395bf19 100644 --- a/src/Volo.Abp.Identity.Web/Areas/Identity/Controllers/UsersController.cs +++ b/src/Volo.Abp.Identity.Web/Areas/Identity/Controllers/UsersController.cs @@ -1,6 +1,6 @@ -using System.Threading.Tasks; +using System; +using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; -using Volo.Abp.Application.Dtos; using Volo.Abp.AspNetCore.Mvc; namespace Volo.Abp.Identity.Web.Areas.Identity.Controllers @@ -8,17 +8,28 @@ namespace Volo.Abp.Identity.Web.Areas.Identity.Controllers [Area("Identity")] public class UsersController : AbpController { - private readonly IIdentityUserAppService _userAppService; + private readonly IIdentityUserAppService _identityUserAppService; - public UsersController(IIdentityUserAppService userAppService) + public UsersController(IIdentityUserAppService identityUserAppService) { - _userAppService = userAppService; + _identityUserAppService = identityUserAppService; } public async Task Index() { - var result = await _userAppService.GetListAsync(new PagedAndSortedResultRequestDto()); - return View(result.Items); + return View(); + } + + public async Task _Create() + { + return PartialView(); + } + + public async Task _Update(Guid id) + { + var identityUser = await _identityUserAppService.GetUserForCreateOrUpdateAsync(id); + + return PartialView(identityUser); } } } diff --git a/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/Index.cshtml b/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/Index.cshtml index ed16546d72..7e498ddaa8 100644 --- a/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/Index.cshtml +++ b/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/Index.cshtml @@ -1,34 +1,37 @@ -@model IReadOnlyList - -@section styles { +@section styles { } @section scripts { - + }

Users

- + + + + + + +
- - - - - + + + + + + - - @foreach (var user in Model) - { - - - - - - } -
UsernameEmail AddressPhone Number
ActionsUsernameEmail AddressPhone Number
@user.UserName@user.Email@(user.PhoneNumber ?? "-")
\ No newline at end of file diff --git a/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/_Create.cshtml b/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/_Create.cshtml new file mode 100644 index 0000000000..623fae0570 --- /dev/null +++ b/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/_Create.cshtml @@ -0,0 +1,63 @@ +@model Volo.Abp.Identity.IdentityUserDto + +
+ + +
+
+ + + + + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ @foreach (var role in Model.Roles) + { +
+ +
+ } +
+
+ + + +
+
+ + +
\ No newline at end of file diff --git a/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/_Update.cshtml b/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/_Update.cshtml new file mode 100644 index 0000000000..0f1b7fedc2 --- /dev/null +++ b/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/_Update.cshtml @@ -0,0 +1,30 @@ +@model Volo.Abp.Identity.IdentityUserDto + +
+ + +
+
+
+ + +
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
\ 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 4cb0a66f59..efe55cc4a5 100644 --- a/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj +++ b/src/Volo.Abp.Identity.Web/Volo.Abp.Identity.Web.csproj @@ -11,7 +11,16 @@ - + + + + + + + + + + diff --git a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.css b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.css index 00bc312198..ee22283b8e 100644 --- a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.css +++ b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.css @@ -1,3 +1,4 @@ -#IdentityUsersTable { - width: 100%; +.dataTable { + width: 100% !important; + border-spacing: 0 !important; } \ No newline at end of file diff --git a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js index 7170f72224..393c59095c 100644 --- a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js +++ b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js @@ -1,3 +1,138 @@ -$(function() { - $('#IdentityUsersTable').DataTable(); -}); \ No newline at end of file +$(function () { + var identityUserAppService = volo.abp.identity.identityUser; + + var dataTable = $('#IdentityUsersTable').DataTable({ + processing: true, + serverSide: true, + ajax: function (requestData, callback, settings) { + var inputFilter = {}; + + //set paging filters + if (settings.oInit.paging) { + inputFilter = $.extend(inputFilter, { + maxResultCount: requestData.length, + skipCount: requestData.start + }); + } + + //set sorting filter + if (requestData.order && requestData.order.length > 0) { + var orderingField = requestData.order[0]; + if (requestData.columns[orderingField.column].data) { + inputFilter.sorting = requestData.columns[orderingField.column].data + " " + orderingField.dir; + } + } + + //set searching filter + if (requestData.search && requestData.search.value !== "") { + inputFilter.filter = requestData.search.value; + } + + if (callback) { + identityUserAppService.getList(inputFilter).done(function (result) { + callback({ + recordsTotal: result.totalCount, + recordsFiltered: result.totalCount, + data: result.items + }); + }); + } + }, + responsive: true, + columnDefs: [ + { + targets: 0, + data: null, + orderable: false, + autoWidth: false, + defaultContent: '', + render: function (list, type, record, meta) { + return '
' + + '' + + '
' + + 'Edit' + + 'Delete' + + '
' + + '
'; + } + }, + { + targets: 1, + data: "userName" + }, + { + targets: 2, + data: "email" + }, + { + targets: 3, + data: "phoneNumber" + } + ] + }); + + $(document).on('click', '.update-user', function () { + var id = $(this).data('id'); + + $('#createUpdateUserModal').modal('show') + .find('.modal-content') + .load(abp.appPath + 'Identity/Users/_Update', { id: id }); + }); + + $(document).on('click', '.delete-user', function () { + var id = $(this).data('id'); + + if (confirm('Are you sure you want to delete?')) { + identityUserAppService.delete(id).done(function () { + dataTable.ajax.reload(); + }); + } + }); + + $('.create-user').click(function () { + $('#createUpdateUserModal').modal('show') + .find('.modal-content') + .load(abp.appPath + 'Identity/Users/_Create'); + }); + + $(document).on('click', '#btnCreateUserSave', function () { + var $createUserForm = $('#createUserForm'); + var user = $createUserForm.serializeFormToObject(); + + identityUserAppService.create(user).done(function () { + $('#createUpdateUserModal').modal('hide'); + + dataTable.ajax.reload(); + }); + }); + + $(document).on('click', '#btnUpdateUserSave', function () { + var $updateUserForm = $('#updateUserForm'); + var user = $updateUserForm.serializeFormToObject(); + + identityUserAppService.update(user.Id, user).done(function () { + $('#createUpdateUserModal').modal('hide'); + + dataTable.ajax.reload(); + }); + }); +}); + +$.fn.serializeFormToObject = function () { + //serialize to array + var data = $(this).serializeArray(); + + //add also disabled items + $(':disabled[name]', this) + .each(function () { + data.push({ name: this.name, value: $(this).val() }); + }); + + //map to object + var obj = {}; + data.map(function (x) { obj[x.name] = x.value; }); + + return obj; +}; diff --git a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.less b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.less index f267dfefb8..b566f7d35c 100644 --- a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.less +++ b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.less @@ -1,3 +1,4 @@ -#IdentityUsersTable { - width: 100%; +.dataTable { + width: 100% !important; + border-spacing: 0 !important; } diff --git a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.min.css b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.min.css index 3690048700..557de2f607 100644 --- a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.min.css +++ b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.min.css @@ -1 +1 @@ -#IdentityUsersTable{width:100%;} \ No newline at end of file +.dataTable{width:100% !important;border-spacing:0 !important;} \ No newline at end of file diff --git a/src/Volo.Abp/Volo/Abp/Application/Services/IAsyncCrudAppService.cs b/src/Volo.Abp/Volo/Abp/Application/Services/IAsyncCrudAppService.cs index a94d0ce554..50f9314875 100644 --- a/src/Volo.Abp/Volo/Abp/Application/Services/IAsyncCrudAppService.cs +++ b/src/Volo.Abp/Volo/Abp/Application/Services/IAsyncCrudAppService.cs @@ -38,6 +38,8 @@ namespace Volo.Abp.Application.Services { Task GetAsync(TPrimaryKey id); + Task GetUserForCreateOrUpdateAsync(Guid id); + Task> GetListAsync(TGetListInput input); Task CreateAsync(TCreateInput input); diff --git a/test/Volo.Abp.Identity.Application.Tests/Volo/Abp/Identity/IdentityUserAppService_Tests.cs b/test/Volo.Abp.Identity.Application.Tests/Volo/Abp/Identity/IdentityUserAppService_Tests.cs index a4bbb9af11..4025713ae1 100644 --- a/test/Volo.Abp.Identity.Application.Tests/Volo/Abp/Identity/IdentityUserAppService_Tests.cs +++ b/test/Volo.Abp.Identity.Application.Tests/Volo/Abp/Identity/IdentityUserAppService_Tests.cs @@ -44,7 +44,7 @@ namespace Volo.Abp.Identity { //Act - var result = await _userAppService.GetListAsync(new PagedAndSortedResultRequestDto()); + var result = await _userAppService.GetListAsync(new GetIdentityUsersInput()); //Assert