Merge pull request #19726 from abpframework/webapp-menu

Merge webapp menu contributors.

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Client/Menus/MyProjectNameMenuContributor.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using Microsoft.Extensions.Configuration;
 using MyCompanyName.MyProjectName.Localization;
 using MyCompanyName.MyProjectName.MultiTenancy;
@@ -65,15 +66,22 @@ public class MyProjectNameMenuContributor : IMenuContributor
 
     private Task ConfigureUserMenuAsync(MenuConfigurationContext context)
     {
+        if (!OperatingSystem.IsBrowser())
+        {
+            return Task.CompletedTask;
+        }
+
+        var authServerUrl = _configuration["AuthServer:Authority"] ?? "";
         var accountStringLocalizer = context.GetLocalizer<AccountResource>();
 
         context.Menu.AddItem(new ApplicationMenuItem(
-            "Account.Manage",
+                "Account.Manage",
-            accountStringLocalizer["MyAccount"],
+                accountStringLocalizer["MyAccount"],
-            $"Account/Manage",
+                $"{authServerUrl.EnsureEndsWith('/')}Account/Manage",
-            icon: "fa fa-cog",
+                icon: "fa fa-cog",
-            order: 1000,
+                order: 1000,
-            null).RequireAuthenticated());
+                target: "_blank")
+            .RequireAuthenticated());
 
         return Task.CompletedTask;
     }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client/Menus/MyProjectNameMenuContributor.cs

@@ -66,16 +66,22 @@ public class MyProjectNameMenuContributor : IMenuContributor
 
     private Task ConfigureUserMenuAsync(MenuConfigurationContext context)
     {
-        var accountStringLocalizer = context.GetLocalizer<AccountResource>();
+        if (!OperatingSystem.IsBrowser())
+        {
+            return Task.CompletedTask;
+        }
 
         var authServerUrl = _configuration["AuthServer:Authority"] ?? "";
+        var accountStringLocalizer = context.GetLocalizer<AccountResource>();
+
         context.Menu.AddItem(new ApplicationMenuItem(
-            "Account.Manage",
+                "Account.Manage",
-            accountStringLocalizer["MyAccount"],
+                accountStringLocalizer["MyAccount"],
-            $"{authServerUrl.EnsureEndsWith('/')}Account/Manage",
+                $"{authServerUrl.EnsureEndsWith('/')}Account/Manage",
-            icon: "fa fa-cog",
+                icon: "fa fa-cog",
-            order: 1000,
+                order: 1000,
-            target: "_blank").RequireAuthenticated());
+                target: "_blank")
+            .RequireAuthenticated());
 
         return Task.CompletedTask;
     }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/Menus/MyProjectNameMenuContributor.cs

@@ -1,79 +0,0 @@
-using System;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Configuration;
-using MyCompanyName.MyProjectName.Localization;
-using MyCompanyName.MyProjectName.MultiTenancy;
-using Volo.Abp.Account.Localization;
-using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Identity.Blazor;
-using Volo.Abp.SettingManagement.Blazor.Menus;
-using Volo.Abp.TenantManagement.Blazor.Navigation;
-using Volo.Abp.UI.Navigation;
-
-namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Menus;
-
-public class MyProjectNameMenuContributor : IMenuContributor
-{
-    private readonly IConfiguration _configuration;
-
-    public MyProjectNameMenuContributor(IConfiguration configuration)
-    {
-        _configuration = configuration;
-    }
-
-    public async Task ConfigureMenuAsync(MenuConfigurationContext context)
-    {
-        if (context.Menu.Name == StandardMenus.Main)
-        {
-            await ConfigureMainMenuAsync(context);
-        }
-        else if (context.Menu.Name == StandardMenus.User)
-        {
-            await ConfigureUserMenuAsync(context);
-        }
-    }
-
-    private Task ConfigureMainMenuAsync(MenuConfigurationContext context)
-    {
-        var administration = context.Menu.GetAdministration();
-        var l = context.GetLocalizer<MyProjectNameResource>();
-
-        context.Menu.Items.Insert(
-            0,
-            new ApplicationMenuItem(
-                MyProjectNameMenus.Home,
-                l["Menu:Home"],
-                "/",
-                icon: "fas fa-home",
-                order: 0
-            )
-        );
-
-        if (MultiTenancyConsts.IsEnabled)
-        {
-            administration.SetSubItemOrder(TenantManagementMenuNames.GroupName, 1);
-        }
-        else
-        {
-            administration.TryRemoveMenuItem(TenantManagementMenuNames.GroupName);
-        }
-
-        administration.SetSubItemOrder(IdentityMenuNames.GroupName, 2);
-        administration.SetSubItemOrder(SettingManagementMenus.GroupName, 3);
-
-        return Task.CompletedTask;
-    }
-
-    private Task ConfigureUserMenuAsync(MenuConfigurationContext context)
-    {
-        var l = context.GetLocalizer<MyProjectNameResource>();
-        var accountStringLocalizer = context.GetLocalizer<AccountResource>();
-        var authServerUrl = _configuration["AuthServer:Authority"] ?? "";
-
-        context.Menu.AddItem(new ApplicationMenuItem("Account.Manage", accountStringLocalizer["MyAccount"],
-                $"{authServerUrl.EnsureEndsWith('/')}Account/Manage?returnUrl={_configuration["App:SelfUrl"]}", icon: "fa fa-cog", order: 1000, null, "_blank").RequireAuthenticated());
-        context.Menu.AddItem(new ApplicationMenuItem("Account.Logout", l["Logout"], url: "~/Account/Logout", icon: "fa fa-power-off", order: int.MaxValue - 1000).RequireAuthenticated());
-
-        return Task.CompletedTask;
-    }
-}

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/Menus/MyProjectNameMenus.cs

@@ -1,10 +0,0 @@
-namespace MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Menus;
-
-public class MyProjectNameMenus
-{
-    private const string Prefix = "MyProjectName";
-    public const string Home = Prefix + ".Home";
-
-    //Add your menu items here...
-
-}

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp.Tiered/MyProjectNameBlazorModule.cs

@@ -16,6 +16,7 @@ using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Microsoft.OpenApi.Models;
 using MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client;
+using MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.Menus;
 using MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Components;
 using MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Menus;
 using MyCompanyName.MyProjectName.Localization;

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/Menus/MyProjectNameMenuContributor.cs

@@ -1,51 +0,0 @@
-using System.Threading.Tasks;
-using MyCompanyName.MyProjectName.Localization;
-using MyCompanyName.MyProjectName.MultiTenancy;
-using Volo.Abp.Identity.Blazor;
-using Volo.Abp.SettingManagement.Blazor.Menus;
-using Volo.Abp.TenantManagement.Blazor.Navigation;
-using Volo.Abp.UI.Navigation;
-
-namespace MyCompanyName.MyProjectName.Blazor.WebApp.Menus;
-
-public class MyProjectNameMenuContributor : IMenuContributor
-{
-    public async Task ConfigureMenuAsync(MenuConfigurationContext context)
-    {
-        if (context.Menu.Name == StandardMenus.Main)
-        {
-            await ConfigureMainMenuAsync(context);
-        }
-    }
-
-    private Task ConfigureMainMenuAsync(MenuConfigurationContext context)
-    {
-        var administration = context.Menu.GetAdministration();
-        var l = context.GetLocalizer<MyProjectNameResource>();
-
-        context.Menu.Items.Insert(
-            0,
-            new ApplicationMenuItem(
-                MyProjectNameMenus.Home,
-                l["Menu:Home"],
-                "/",
-                icon: "fas fa-home",
-                order: 0
-            )
-        );
-
-        if (MultiTenancyConsts.IsEnabled)
-        {
-            administration.SetSubItemOrder(TenantManagementMenuNames.GroupName, 1);
-        }
-        else
-        {
-            administration.TryRemoveMenuItem(TenantManagementMenuNames.GroupName);
-        }
-
-        administration.SetSubItemOrder(IdentityMenuNames.GroupName, 2);
-        administration.SetSubItemOrder(SettingManagementMenus.GroupName, 3);
-
-        return Task.CompletedTask;
-    }
-}

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/Menus/MyProjectNameMenus.cs

@@ -1,10 +0,0 @@
-namespace MyCompanyName.MyProjectName.Blazor.WebApp.Menus;
-
-public class MyProjectNameMenus
-{
-    private const string Prefix = "MyProjectName";
-    public const string Home = Prefix + ".Home";
-
-    //Add your menu items here...
-
-}

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebApp/MyProjectNameBlazorModule.cs

@@ -11,8 +11,8 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
 using MyCompanyName.MyProjectName.Blazor.WebApp.Client;
+using MyCompanyName.MyProjectName.Blazor.WebApp.Client.Menus;
 using MyCompanyName.MyProjectName.Blazor.WebApp.Components;
-using MyCompanyName.MyProjectName.Blazor.WebApp.Menus;
 using MyCompanyName.MyProjectName.EntityFrameworkCore;
 using MyCompanyName.MyProjectName.Localization;
 using MyCompanyName.MyProjectName.MultiTenancy;
@@ -226,7 +226,7 @@ public class MyProjectNameBlazorModule : AbpModule
     {
         Configure<AbpNavigationOptions>(options =>
         {
-            options.MenuContributors.Add(new MyProjectNameMenuContributor());
+            options.MenuContributors.Add(new MyProjectNameMenuContributor(context.Services.GetConfiguration()));
         });
     }