Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Unify wording of standard permission names (#738)
Krzysztof Pajakf50ce4fec269
diff --git a/src/Core/Grand.Domain/Permissions/StandardPermission.cs b/src/Core/Grand.Domain/Permissions/StandardPermission.csindex 561f8fc9f..79c5516a7 100644--- a/src/Core/Grand.Domain/Permissions/StandardPermission.cs+++ b/src/Core/Grand.Domain/Permissions/StandardPermission.cs@@ -7,7 +7,7 @@ public static partial class StandardPermission{//admin area permissionspublic static readonly Permission ManageAccessAdminPanel = new() {- Name = "Access admin",+ Name = "Access Admin Panel",SystemName = PermissionSystemName.AccessAdminPanel,Area = "Admin area",Category = "Access Admin"diff --git a/src/Core/Grand.Domain/Permissions/StandardPermissionCatalog.cs b/src/Core/Grand.Domain/Permissions/StandardPermissionCatalog.csindex fd7419215..17aa41fc0 100644--- a/src/Core/Grand.Domain/Permissions/StandardPermissionCatalog.cs+++ b/src/Core/Grand.Domain/Permissions/StandardPermissionCatalog.cs@@ -95,7 +95,7 @@ public static partial class StandardPermission};public static readonly Permission ManageContactAttribute = new() {- Name = "Manage Contact Attribute",+ Name = "Manage Contact Attributes",SystemName = PermissionSystemName.ContactAttributes,Area = "Admin area",Category = CategoryCatalog,diff --git a/src/Core/Grand.Domain/Permissions/StandardPermissionMarketing.cs b/src/Core/Grand.Domain/Permissions/StandardPermissionMarketing.csindex 5cfdbf9a2..bf8aafd0a 100644--- a/src/Core/Grand.Domain/Permissions/StandardPermissionMarketing.cs+++ b/src/Core/Grand.Domain/Permissions/StandardPermissionMarketing.cs@@ -14,7 +14,7 @@ public static partial class StandardPermission};public static readonly Permission ManagePushEvents = new() {- Name = "Manage Push Events",+ Name = "Manage Push Notifications",SystemName = PermissionSystemName.PushNotifications,Area = "Admin area",Category = CategoryMarketing,diff --git a/src/Core/Grand.Domain/Permissions/StandardPermissionOrder.cs b/src/Core/Grand.Domain/Permissions/StandardPermissionOrder.csindex ed1776554..34336dac2 100644--- a/src/Core/Grand.Domain/Permissions/StandardPermissionOrder.cs+++ b/src/Core/Grand.Domain/Permissions/StandardPermissionOrder.cs@@ -26,7 +26,7 @@ public static partial class StandardPermission};public static readonly Permission ManageOrderStatus = new() {- Name = "Manage Order status",+ Name = "Manage Order Status",SystemName = PermissionSystemName.OrderStatus,Area = "Admin area",Category = CategoryOrder@@ -44,7 +44,7 @@ public static partial class StandardPermission};public static readonly Permission ManageGiftVouchers = new() {- Name = "Manage Gift vouchers",+ Name = "Manage Gift Vouchers",SystemName = PermissionSystemName.GiftVouchers,Area = "Admin area",Category = CategoryOrder,@@ -66,7 +66,7 @@ public static partial class StandardPermission};public static readonly Permission ManagePaymentTransactions = new() {- Name = "Manage Payment Transaction",+ Name = "Manage Payment Transactions",SystemName = PermissionSystemName.PaymentTransactions,Area = "Admin area",Category = CategoryOrder,diff --git a/src/Core/Grand.Domain/Permissions/StandardPermissionPublicStore.cs b/src/Core/Grand.Domain/Permissions/StandardPermissionPublicStore.csindex a73dceaa3..9870ced7e 100644--- a/src/Core/Grand.Domain/Permissions/StandardPermissionPublicStore.cs+++ b/src/Core/Grand.Domain/Permissions/StandardPermissionPublicStore.cs@@ -10,35 +10,35 @@ public static partial class StandardPermission};public static readonly Permission EnableShoppingCart = new() {- Name = "Enable shopping cart",+ Name = "Enable Shopping Cart",SystemName = PermissionSystemName.EnableShoppingCart,Area = "Public store",Category = CategoryPublicStore};public static readonly Permission EnableWishlist = new() {- Name = "Enable wishlist",+ Name = "Enable Wishlist",SystemName = PermissionSystemName.EnableWishlist,Area = "Public store",Category = CategoryPublicStore};public static readonly Permission PublicStoreAllowNavigation = new() {- Name = "Allow navigation",+ Name = "Allow Navigation",SystemName = PermissionSystemName.PublicStoreAllowNavigation,Area = "Public store",Category = CategoryPublicStore};public static readonly Permission AccessClosedStore = new() {- Name = "Access a closed store",+ Name = "Access Closed Store",SystemName = PermissionSystemName.AccessClosedStore,Area = "Public store",Category = CategoryPublicStore};public static readonly Permission AllowUseApi = new() {- Name = "Allow to use api for web",+ Name = "Allow Web API Access",SystemName = PermissionSystemName.AllowUseApi,Area = "Public store",Category = CategoryPublicStorediff --git a/src/Core/Grand.Domain/Permissions/StandardPermissionStore.cs b/src/Core/Grand.Domain/Permissions/StandardPermissionStore.csindex 40ff3e8ba..7ec259421 100644--- a/src/Core/Grand.Domain/Permissions/StandardPermissionStore.cs+++ b/src/Core/Grand.Domain/Permissions/StandardPermissionStore.cs@@ -7,7 +7,7 @@ public static partial class StandardPermission{//admin area permissionspublic static readonly Permission ManageAccessStoreManagerPanel = new() {- Name = "Access store manager panel",+ Name = "Access Store Manager Panel",SystemName = PermissionSystemName.AccessStorePanel,Area = "Store area",Category = "Access Store"diff --git a/src/Core/Grand.Domain/Permissions/StandardPermissionSystem.cs b/src/Core/Grand.Domain/Permissions/StandardPermissionSystem.csindex 18f3917bd..c299ded37 100644--- a/src/Core/Grand.Domain/Permissions/StandardPermissionSystem.cs+++ b/src/Core/Grand.Domain/Permissions/StandardPermissionSystem.cs@@ -14,7 +14,7 @@ public static partial class StandardPermission};public static readonly Permission ManageMessageContactForm = new() {- Name = "Manage Message Contact form",+ Name = "Manage Message Contact Form",SystemName = PermissionSystemName.MessageContactForm,Area = "Admin area",Category = CategorySystem,@@ -51,7 +51,7 @@ public static partial class StandardPermission};public static readonly Permission HtmlEditorManagePictures = new() {- Name = "HTML Editor. Manage pictures",+ Name = "Manage HTML Editor Pictures",SystemName = PermissionSystemName.HtmlEditor,Area = "Admin area",Category = "Configuration"diff --git a/src/Core/Grand.Domain/Permissions/StandardPermissionVendor.cs b/src/Core/Grand.Domain/Permissions/StandardPermissionVendor.csindex 1bc48f31f..744f9b79f 100644--- a/src/Core/Grand.Domain/Permissions/StandardPermissionVendor.cs+++ b/src/Core/Grand.Domain/Permissions/StandardPermissionVendor.cs@@ -7,7 +7,7 @@ public static partial class StandardPermission{//admin area permissionspublic static readonly Permission ManageAccessVendorPanel = new() {- Name = "Access vendor panel",+ Name = "Access Vendor Panel",SystemName = PermissionSystemName.AccessVendorPanel,Area = "Vendor area",Category = "Access Vendor"diff --git a/src/Modules/Grand.Module.Migration/Migrations/2.4/MigrationUpdateStandardPermissionNames.cs b/src/Modules/Grand.Module.Migration/Migrations/2.4/MigrationUpdateStandardPermissionNames.csnew file mode 100644index 000000000..754889148--- /dev/null+++ b/src/Modules/Grand.Module.Migration/Migrations/2.4/MigrationUpdateStandardPermissionNames.cs@@ -0,0 +1,83 @@+using System.Reflection;+using Grand.Data;+using Grand.Domain.Localization;+using Grand.Domain.Permissions;+using Grand.Infrastructure.Migrations;+using Microsoft.Extensions.DependencyInjection;+using Microsoft.Extensions.Logging;++namespace Grand.Module.Migration.Migrations._2._4;++/// <summary>+/// Unifies the wording of standard permission display names in already-installed databases.+/// Two problems existed side by side:+/// 1) a handful of names had inconsistent casing/singular-plural wording (e.g. "Manage Order status",+/// "Manage Contact Attribute" vs. "Manage Address Attributes") - now corrected on <see cref="StandardPermission" />.+/// 2) about 40 permissions additionally had a duplicate translation resource row with an+/// "{Area}. " prefix (e.g. "Admin area. Manage Brands") left over from an old resource export. The+/// Area field on TranslationResource is never actually used to filter which row is loaded, so whichever+/// row was inserted first simply won - meaning some permissions showed the prefixed text and others+/// (with no duplicate) didn't, for no functional reason. This drops the prefix everywhere so every+/// permission consistently shows its plain name.+/// </summary>+public class MigrationUpdateStandardPermissionNames : IMigration+{+ public int Priority => 2;+ public DbVersion Version => new(2, 4);+ public Guid Identity => new("DAEE04E0-573A-4001-9613-E682BE45BCE3");+ public string Name => "Unify wording of standard permission names and drop leftover 'Area. ' prefixes";++ public bool UpgradeProcess(IServiceProvider serviceProvider)+ {+ var permissionRepository = serviceProvider.GetRequiredService<IRepository<Permission>>();+ var translationRepository = serviceProvider.GetRequiredService<IRepository<TranslationResource>>();+ var logService = serviceProvider.GetRequiredService<ILogger<MigrationUpdateStandardPermissionNames>>();++ var standardPermissions = typeof(StandardPermission)+ .GetFields(BindingFlags.Public | BindingFlags.Static)+ .Where(f => f.FieldType == typeof(Permission))+ .Select(f => (Permission)f.GetValue(null)!);++ foreach (var standard in standardPermissions)+ try+ {+ var permission = permissionRepository.Table.FirstOrDefault(x => x.SystemName == standard.SystemName);+ if (permission != null && permission.Name != standard.Name)+ {+ permission.Name = standard.Name;+ permissionRepository.Update(permission);+ }++ //the display text is also cached as translation resources, under a couple of historical+ //key/casing variants (and sometimes duplicated with an "{Area}. " prefix) - normalize every+ //variant we can find to the plain name+ var candidateKeys = new[] {+ $"Permission.{standard.SystemName}",+ $"permission.{standard.SystemName}",+ $"permission.{standard.SystemName}".ToLowerInvariant()+ };++ var translations = translationRepository.Table+ .Where(x => candidateKeys.Contains(x.Name))+ .ToList();++ foreach (var translation in translations.Where(x => x.Value != standard.Name))+ {+ translation.Value = standard.Name;+ translationRepository.Update(translation);+ }+ }+ catch (InvalidOperationException ex)+ {+ logService.LogError(ex, "UpgradeProcess - MigrationUpdateStandardPermissionNames ({SystemName})",+ standard.SystemName);+ }+ catch (SystemException ex)+ {+ logService.LogError(ex, "UpgradeProcess - MigrationUpdateStandardPermissionNames ({SystemName})",+ standard.SystemName);+ }++ return true;+ }+}diff --git a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xmlindex 722947333..a4c6abe4d 100644Binary files a/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml and b/src/Web/Grand.Web/App_Data/Resources/DefaultLanguage.xml differ