Allowing multiple INavigationManager

src/OrchardCore.Modules/OrchardCore.AdminMenu/Startup.cs

@@ -36,7 +36,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<IAdminMenuPermissionService, AdminMenuPermissionService>();
 
             services.AddScoped<IAdminMenuService, AdminMenuService>();
-            services.AddScoped<AdminMenuNavigationProvidersCoordinator, AdminMenuNavigationProvidersCoordinator>();
+            services.AddScoped<AdminMenuNavigationProvidersCoordinator>();
 
             services.AddRecipeExecutionStep<AdminMenuStep>();
 

src/OrchardCore.Modules/OrchardCore.Navigation/NavigationShapes.cs

@@ -38,34 +38,37 @@ public void Discover(ShapeTableBuilder builder)
 
                     var viewContextAccessor = context.ServiceProvider.GetRequiredService<ViewContextAccessor>();
                     var viewContext = viewContextAccessor.ViewContext;
-
-                    var navigationManager = context.ServiceProvider.GetRequiredService<INavigationManager>();
+                    var navigationManagers = context.ServiceProvider.GetServices<INavigationManager>();
                     var shapeFactory = context.ServiceProvider.GetRequiredService<IShapeFactory>();
                     var httpContextAccessor = context.ServiceProvider.GetRequiredService<IHttpContextAccessor>();
-                    var menuItems = await navigationManager.BuildMenuAsync(menuName, viewContext);
-                    var httpContext = httpContextAccessor.HttpContext;
 
-                    if (httpContext != null)
+                    foreach (var navigationManager in navigationManagers)
                     {
-                        // adding query string parameters
-                        var route = menu.GetProperty<RouteData>("RouteData");
-                        var routeData = new RouteValueDictionary(route.Values);
-                        var query = httpContext.Request.Query;
+                        var menuItems = await navigationManager.BuildMenuAsync(menuName, viewContext);
+                        var httpContext = httpContextAccessor.HttpContext;
 
-                        if (query != null)
+                        if (httpContext != null)
                         {
-                            foreach (var pair in query)
+                            // adding query string parameters
+                            var route = menu.GetProperty<RouteData>("RouteData");
+                            var routeData = new RouteValueDictionary(route.Values);
+                            var query = httpContext.Request.Query;
+
+                            if (query != null)
                             {
-                                if (pair.Key != null && !routeData.ContainsKey(pair.Key))
+                                foreach (var pair in query)
                                 {
-                                    routeData[pair.Key] = pair.Value;
+                                    if (pair.Key != null && !routeData.ContainsKey(pair.Key))
+                                    {
+                                        routeData[pair.Key] = pair.Value;
+                                    }
                                 }
                             }
                         }
-                    }
 
-                    // TODO: Flag Selected menu item
-                    await NavigationHelper.PopulateMenuAsync(shapeFactory, menu, menu, menuItems, viewContext);
+                        // TODO: Flag Selected menu item
+                        await NavigationHelper.PopulateMenuAsync(shapeFactory, menu, menu, menuItems, viewContext);
+                    }
                 });
 
             builder.Describe("NavigationItem")

src/OrchardCore/OrchardCore.Navigation.Core/ServiceCollectionExtensions.cs

@@ -12,8 +12,8 @@ public static class ServiceCollectionExtensions
         /// <returns></returns>
         public static IServiceCollection AddNavigation(this IServiceCollection services)
         {
-            services.TryAddScoped<INavigationManager, NavigationManager>();
-
+            services.TryAddEnumerable(ServiceDescriptor.Scoped<INavigationManager, NavigationManager>());
+            
             return services;
         }
     }