From 49b05c5e7cf657d040bb27380d7f214ff4072edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Tue, 6 Sep 2022 13:26:07 +0300 Subject: [PATCH] Remove DisplayNameKey and DisplayNameResource form PermissionGrantInfoDto Because localization can be properly done in the backend side now. --- .../PermissionGrantInfoDto.cs | 4 -- .../PermissionAppService.cs | 6 --- .../PermissionManagementModal.razor.cs | 45 ------------------ .../PermissionManagementModal.cshtml.cs | 46 ------------------- 4 files changed, 101 deletions(-) diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo/Abp/PermissionManagement/PermissionGrantInfoDto.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo/Abp/PermissionManagement/PermissionGrantInfoDto.cs index 12e4010f99..b608a69b54 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo/Abp/PermissionManagement/PermissionGrantInfoDto.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application.Contracts/Volo/Abp/PermissionManagement/PermissionGrantInfoDto.cs @@ -7,10 +7,6 @@ public class PermissionGrantInfoDto public string Name { get; set; } public string DisplayName { get; set; } - - public string DisplayNameKey { get; set; } - - public string DisplayNameResource { get; set; } public string ParentName { get; set; } diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs index fd0ccf0246..8579fa28ac 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Application/Volo/Abp/PermissionManagement/PermissionAppService.cs @@ -101,15 +101,9 @@ public class PermissionAppService : ApplicationService, IPermissionAppService private PermissionGrantInfoDto CreatePermissionGrantInfoDto(PermissionDefinition permission) { - var localizableDisplayName = permission.DisplayName as LocalizableString; - return new PermissionGrantInfoDto { Name = permission.Name, DisplayName = permission.DisplayName.Localize(StringLocalizerFactory), - DisplayNameKey = localizableDisplayName?.Name, - DisplayNameResource = localizableDisplayName?.ResourceType != null - ? LocalizationResourceNameAttribute.GetName(localizableDisplayName.ResourceType) - : null, ParentName = permission.Parent?.Name, AllowedProviders = permission.Providers, GrantedProviders = new List() diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs index 364fd5c300..b96a1c9d4d 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/PermissionManagementModal.razor.cs @@ -84,8 +84,6 @@ public partial class PermissionManagementModal var result = await PermissionAppService.GetAsync(_providerName, _providerKey); - UpdateLocalizations(result); - _entityDisplayName = entityDisplayName ?? result.EntityDisplayName; _groups = result.Groups; @@ -252,47 +250,4 @@ public partial class PermissionManagementModal eventArgs.Cancel = eventArgs.CloseReason == CloseReason.FocusLostClosing; return Task.CompletedTask; } - - protected virtual void UpdateLocalizations(GetPermissionListResultDto result) - { - foreach (var group in result.Groups) - { - group.DisplayName = Localize( - group.DisplayNameKey, - group.DisplayNameResource, - group.DisplayName - ); - - foreach (var permission in group.Permissions) - { - permission.DisplayName = Localize( - permission.DisplayNameKey, - permission.DisplayNameResource, - permission.DisplayName - ); - } - } - } - - protected virtual string Localize(string key, string resourceName, string fallbackValue) - { - if (key.IsNullOrEmpty() || resourceName.IsNullOrEmpty()) - { - return fallbackValue; - } - - var resource = LocalizationOptions.Value.Resources.GetOrDefault(resourceName); - if (resource == null) - { - return fallbackValue; - } - - var result = new LocalizableString(key, resourceName).Localize(StringLocalizerFactory); - if (result.ResourceNotFound) - { - return fallbackValue; - } - - return result.Value; - } } diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs index feb8481f27..9d91fc573e 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; @@ -60,8 +59,6 @@ public class PermissionManagementModal : AbpPageModel var result = await PermissionAppService.GetAsync(ProviderName, ProviderKey); - UpdateLocalizations(result); - EntityDisplayName = !string.IsNullOrWhiteSpace(ProviderKeyDisplayName) ? ProviderKeyDisplayName : result.EntityDisplayName; @@ -86,49 +83,6 @@ public class PermissionManagementModal : AbpPageModel return Page(); } - private void UpdateLocalizations(GetPermissionListResultDto result) - { - foreach (var group in result.Groups) - { - group.DisplayName = Localize( - group.DisplayNameKey, - group.DisplayNameResource, - group.DisplayName - ); - - foreach (var permission in group.Permissions) - { - permission.DisplayName = Localize( - permission.DisplayNameKey, - permission.DisplayNameResource, - permission.DisplayName - ); - } - } - } - - private string Localize(string key, string resourceName, string fallbackValue) - { - if (key.IsNullOrEmpty() || resourceName.IsNullOrEmpty()) - { - return fallbackValue; - } - - var resource = LocalizationOptions.Resources.GetOrDefault(resourceName); - if (resource == null) - { - return fallbackValue; - } - - var result = new LocalizableString(key, resourceName).Localize(StringLocalizerFactory); - if (result.ResourceNotFound) - { - return fallbackValue; - } - - return result.Value; - } - public virtual async Task OnPostAsync() { ValidateModel();