From b023686424cce5c223d062763f6d939bd642b2af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Sun, 13 Sep 2020 17:57:11 +0300 Subject: [PATCH] Rename BlazorisePageBase to BlazoriseCrudPageBase --- ...sePageBase.cs => BlazoriseCrudPageBase.cs} | 20 ++++++++--------- .../Pages/Identity/RoleManagement.razor | 4 ++-- .../Pages/Identity/UserManagement.razor.cs | 22 +++++++++---------- 3 files changed, 23 insertions(+), 23 deletions(-) rename framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/{BlazorisePageBase.cs => BlazoriseCrudPageBase.cs} (88%) diff --git a/framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/BlazorisePageBase.cs b/framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/BlazoriseCrudPageBase.cs similarity index 88% rename from framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/BlazorisePageBase.cs rename to framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/BlazoriseCrudPageBase.cs index ddf22dbbc9..437e2a383a 100644 --- a/framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/BlazorisePageBase.cs +++ b/framework/src/Volo.Abp.BlazoriseUI/Volo/Abp/BlazoriseUI/BlazoriseCrudPageBase.cs @@ -15,16 +15,16 @@ using Volo.Abp.ObjectMapping; namespace Volo.Abp.BlazoriseUI { - public abstract class BlazorisePageBase - : BlazorisePageBase + public abstract class BlazoriseCrudPageBase + : BlazoriseCrudPageBase where TAppService : ICrudAppService where TEntityDto : IEntityDto, new() { } - public abstract class BlazorisePageBase - : BlazorisePageBase + public abstract class BlazoriseCrudPageBase + : BlazoriseCrudPageBase where TAppService : ICrudAppService where TEntityDto : IEntityDto, new() where TGetListInput : new() @@ -33,8 +33,8 @@ namespace Volo.Abp.BlazoriseUI } - public abstract class BlazorisePageBase - : BlazorisePageBase + public abstract class BlazoriseCrudPageBase + : BlazoriseCrudPageBase where TAppService : ICrudAppService where TEntityDto : IEntityDto where TCreateInput : new() @@ -43,8 +43,8 @@ namespace Volo.Abp.BlazoriseUI } - public abstract class BlazorisePageBase - : BlazorisePageBase + public abstract class BlazoriseCrudPageBase + : BlazoriseCrudPageBase where TAppService : ICrudAppService where TEntityDto : IEntityDto where TCreateInput : new() @@ -54,7 +54,7 @@ namespace Volo.Abp.BlazoriseUI } - public abstract class BlazorisePageBase + public abstract class BlazoriseCrudPageBase : OwningComponentBase where TAppService : ICrudAppService where TGetOutputDto : IEntityDto @@ -120,7 +120,7 @@ namespace Volo.Abp.BlazoriseUI return reference; } - protected BlazorisePageBase() + protected BlazoriseCrudPageBase() { NewEntity = new TCreateInput(); EditingEntity = new TUpdateInput(); diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor index 557f832854..7693f9df56 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor @@ -6,7 +6,7 @@ @using Volo.Abp.Application.Dtos @using Volo.Abp.Identity.Localization @using Volo.Abp.PermissionManagement.Blazor.Components -@inherits BlazorisePageBase +@inherits BlazoriseCrudPageBase @inject IStringLocalizer L @* ************************* PAGE HEADER ************************* *@ @@ -110,4 +110,4 @@ - \ No newline at end of file + diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs index 05cded2e0f..4eb013a96e 100644 --- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs +++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor.cs @@ -8,7 +8,7 @@ using Volo.Abp.Threading; namespace Volo.Abp.Identity.Blazor.Pages.Identity { - public class UserManagementBase : BlazorisePageBase + public class UserManagementBase : BlazoriseCrudPageBase { protected const string PermissionProviderName = "U"; @@ -17,9 +17,9 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity protected IReadOnlyList Roles; protected AssignedRoleViewModel[] NewUserRoles; - + protected AssignedRoleViewModel[] EditUserRoles; - + public UserManagementBase() { ObjectMapperContext = typeof(AbpIdentityBlazorModule); @@ -28,50 +28,50 @@ namespace Volo.Abp.Identity.Blazor.Pages.Identity protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); - + Roles = (await AppService.GetAssignableRolesAsync()).Items; } protected override void OpenCreateModal() { - + NewUserRoles = Roles.Select(x => new AssignedRoleViewModel { Name = x.Name, IsAssigned = x.IsDefault }).ToArray(); - + base.OpenCreateModal(); } protected override Task CreateEntityAsync() { NewEntity.RoleNames = NewUserRoles.Where(x => x.IsAssigned).Select(x => x.Name).ToArray(); - + return base.CreateEntityAsync(); } protected override async Task OpenEditModalAsync(Guid id) { var userRoleNames = (await AppService.GetRolesAsync(id)).Items.Select(r => r.Name).ToList(); - + EditUserRoles = Roles.Select(x => new AssignedRoleViewModel { Name = x.Name, IsAssigned = userRoleNames.Contains(x.Name) }).ToArray(); - + await base.OpenEditModalAsync(id); } protected override Task UpdateEntityAsync() { EditingEntity.RoleNames = EditUserRoles.Where(x => x.IsAssigned).Select(x => x.Name).ToArray(); - + return base.UpdateEntityAsync(); } } - + public class AssignedRoleViewModel { public string Name { get; set; }