Fix and refactor admin menus.

Author: sarahelsaig

src/Libraries/OrchardCore.Commerce.Abstractions/Extensions/NavigationBuilderExtensions.cs

@@ -0,0 +1,23 @@
+using Microsoft.Extensions.Localization;
+using System;
+using System.Diagnostics.CodeAnalysis;
+
+namespace OrchardCore.Navigation;
+
+public static class NavigationBuilderExtensions
+{
+    /// <summary>
+    /// Applies <paramref name="callback"/> inside the Admin > Settings > Commerce menu.
+    /// </summary>
+    [SuppressMessage(
+        "StyleCop.CSharp.NamingRules",
+        "SA1313:Parameter names should begin with lower-case letter",
+        Justification = "String localizer convention.")]
+    public static NavigationBuilder AddCommerce(
+        this NavigationBuilder builder,
+        IStringLocalizer T,
+        Action<NavigationBuilder> callback) =>
+        builder
+            .Add(T["Settings"], settings => settings
+                .Add(T["Commerce"], commerce => callback(commerce.Id("settings-commerce"))));
+}

src/Modules/OrchardCore.Commerce.Payment.Exactly/AdminMenu.cs

@@ -13,12 +13,9 @@ public AdminMenu(IHttpContextAccessor hca, IStringLocalizer<AdminMenu> stringLoc
     { }
 
     protected override void Build(NavigationBuilder builder) =>
-        builder
-            .Add(T["Configuration"], configuration => configuration
-                .Add(T["Commerce"], commerce => commerce
-                    .Add(T["Exactly API"], T["Exactly API"], entry => entry
-                        .SiteSettings(ExactlySettingsDisplayDriver.EditorGroupId)
-                        .Permission(Permissions.ManageExactlySettings)
-                        .LocalNav())
-                ));
+        builder.AddCommerce(T, commerce => commerce
+            .Add(T["Exactly API"], T["Exactly API"], entry => entry
+                .SiteSettings(ExactlySettingsDisplayDriver.EditorGroupId)
+                .Permission(Permissions.ManageExactlySettings)
+                .LocalNav()));
 }

src/Modules/OrchardCore.Commerce.Payment.Stripe/AdminMenu.cs

@@ -13,11 +13,9 @@ public AdminMenu(IHttpContextAccessor hca, IStringLocalizer<AdminMenu> stringLoc
     { }
 
     protected override void Build(NavigationBuilder builder) =>
-        builder
-            .Add(T["Configuration"], configuration => configuration
-                .Add(T["Commerce"], commerce => commerce
-                    .Add(T["Stripe API"], T["Stripe API"], stripeApi => stripeApi
-                        .SiteSettings(StripeApiSettingsDisplayDriver.GroupId)
-                        .Permission(Permissions.ManageStripeApiSettings)
-                        .LocalNav())));
+        builder.AddCommerce(T, commerce => commerce
+            .Add(T["Stripe API"], T["Stripe API"], stripeApi => stripeApi
+                .SiteSettings(StripeApiSettingsDisplayDriver.GroupId)
+                .Permission(Permissions.ManageStripeApiSettings)
+                .LocalNav()));
 }

src/Modules/OrchardCore.Commerce.Payment/AdminMenu.cs

@@ -13,12 +13,9 @@ public AdminMenu(IHttpContextAccessor hca, IStringLocalizer<AdminMenu> stringLoc
     { }
 
     protected override void Build(NavigationBuilder builder) =>
-        builder
-            .Add(T["Configuration"], configuration => configuration
-                .Add(T["Commerce"], commerce => commerce
-                    .Add(T["Address Display"], T["Address Display"], entry => entry
-                        .SiteSettings(CheckoutAddressSettingsDisplayDriver.GroupId)
-                        .Permission(Permissions.ManageAddressDisplaySettings)
-                        .LocalNav())
-                ));
+        builder.AddCommerce(T, commerce => commerce
+            .Add(T["Address Display"], T["Address Display"], entry => entry
+                .SiteSettings(CheckoutAddressSettingsDisplayDriver.GroupId)
+                .Permission(Permissions.ManageAddressDisplaySettings)
+                .LocalNav()));
 }

src/Modules/OrchardCore.Commerce.Tax/Navigation/TaxRateAdminMenu.cs

@@ -16,15 +16,9 @@ public TaxRateAdminMenu(IHttpContextAccessor hca, IStringLocalizer<TaxRateAdminM
     { }
 
     protected override void Build(NavigationBuilder builder) =>
-        builder
-            .Add(T["Configuration"], configuration => configuration
-                .Add(T["Commerce"], commerce => commerce
-                    .Add(T["Custom Tax Rates"], T["Custom Tax Rates"], entry => entry
-                        .Action("Index", "Admin", new
-                        {
-                            area = "OrchardCore.Settings",
-                            groupId = nameof(TaxRateSettings),
-                        })
-                        .Permission(TaxRatePermissions.ManageCustomTaxRates)
-                        .LocalNav())));
+        builder.AddCommerce(T, commerce => commerce
+            .Add(T["Custom Tax Rates"], T["Custom Tax Rates"], entry => entry
+                .SiteSettings(nameof(TaxRateSettings))
+                .Permission(TaxRatePermissions.ManageCustomTaxRates)
+                .LocalNav()));
 }

src/Modules/OrchardCore.Commerce.Tax/Navigation/TaxSettingsAdminMenu.cs

@@ -15,15 +15,9 @@ public TaxSettingsAdminMenu(IHttpContextAccessor hca, IStringLocalizer<TaxSettin
     }
 
     protected override void Build(NavigationBuilder builder) =>
-        builder
-            .Add(T["Configuration"], configuration => configuration
-                .Add(T["Commerce"], commerce => commerce
-                    .Add(T["Tax"], T["Tax"], entry => entry
-                        .Action("Index", "Admin", new
-                        {
-                            area = "OrchardCore.Settings",
-                            groupId = TaxSettingsDisplayDriver.GroupId,
-                        })
-                        .Permission(TaxRatePermissions.ManageTaxSettings)
-                        .LocalNav())));
+        builder.AddCommerce(T, commerce => commerce
+            .Add(T["Tax"], T["Tax"], entry => entry
+                .SiteSettings(TaxSettingsDisplayDriver.GroupId)
+                .Permission(TaxRatePermissions.ManageTaxSettings)
+                .LocalNav()));
 }

src/Modules/OrchardCore.Commerce/AdminMenu.cs

@@ -14,19 +14,17 @@ public AdminMenu(IHttpContextAccessor hca, IStringLocalizer<AdminMenu> stringLoc
     { }
 
     protected override void Build(NavigationBuilder builder) =>
-        builder
-            .Add(T["Configuration"], configuration => configuration
-                .Add(T["Commerce"], commerce => commerce
-                    .Add(T["Currency"], T["Currency"], entry => entry
-                        .SiteSettings(CurrencySettingsDisplayDriver.GroupId)
-                        .Permission(Permissions.ManageCurrencySettings)
-                        .LocalNav())
-                    .Add(T["Price Display"], T["Price Display"], entry => entry
-                        .SiteSettings(PriceDisplaySettingsDisplayDriver.GroupId)
-                        .Permission(Permissions.ManagePriceDisplaySettings)
-                        .LocalNav())
-                    .Add(T["Region"], T["Region"], region => region
-                        .SiteSettings(RegionSettingsDisplayDriver.GroupId)
-                        .Permission(Permissions.ManageRegionSettings)
-                        .LocalNav())));
+        builder.AddCommerce(T, commerce => commerce
+            .Add(T["Currency"], T["Currency"], entry => entry
+                .SiteSettings(CurrencySettingsDisplayDriver.GroupId)
+                .Permission(Permissions.ManageCurrencySettings)
+                .LocalNav())
+            .Add(T["Price Display"], T["Price Display"], entry => entry
+                .SiteSettings(PriceDisplaySettingsDisplayDriver.GroupId)
+                .Permission(Permissions.ManagePriceDisplaySettings)
+                .LocalNav())
+            .Add(T["Region"], T["Region"], region => region
+                .SiteSettings(RegionSettingsDisplayDriver.GroupId)
+                .Permission(Permissions.ManageRegionSettings)
+                .LocalNav()));
 }