Merge pull request #17438 from abpframework/salihozkara/fixLayout

Fix layout hooks filtering and show layout hooks for the specified layouts

framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Components/LayoutHooks/LayoutHook.razor.cs

@@ -25,8 +25,7 @@ public partial class LayoutHook : ComponentBase
         if (LayoutHookOptions.Value.Hooks.TryGetValue(Name, out var layoutHooks))
         {
             layoutHooks = layoutHooks
-                .Where(IsComponentBase)
+                .Where(x => IsComponentBase(x) && (string.IsNullOrWhiteSpace(x.Layout) || x.Layout == Layout))
-                .WhereIf(!string.IsNullOrWhiteSpace(Layout), x => x.Layout == Layout)
                 .ToList();
         }
 

framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Components/LayoutHook/LayoutHookViewComponent.cs

@@ -19,8 +19,7 @@ public class LayoutHookViewComponent : AbpViewComponent
     public virtual IViewComponentResult Invoke(string name, string? layout)
     {
         var hooks = Options.Hooks.GetOrDefault(name)?
-            .Where(IsViewComponent)
+            .Where(x => IsViewComponent(x) && (string.IsNullOrWhiteSpace(x.Layout) || x.Layout == layout))
-            .WhereIf(!string.IsNullOrWhiteSpace(layout), x => x.Layout == layout)
             .ToArray() ?? Array.Empty<LayoutHookInfo>();
 
         return View(

framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Components/LayoutHook/ViewComponentHelperLayoutHookExtensions.cs

@@ -9,7 +9,7 @@ public static class ViewComponentHelperLayoutHookExtensions
     public static Task<IHtmlContent> InvokeLayoutHookAsync(
         this IViewComponentHelper componentHelper,
         string name,
-        string? layout = null)
+        string layout)
     {
         return componentHelper.InvokeAsync(
             typeof(LayoutHookViewComponent),