Register Search Member Access Strategy in the search module not the s…

…earch providers (OrchardCMS#15035)
urbanit · Mar 18, 2024 · dc3b5f5 · dc3b5f5
1 parent 3dd5da5
commit dc3b5f5
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 43 deletions.
diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Search.Elasticsearch/Startup.cs
@@ -3,7 +3,6 @@
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using Elasticsearch.Net;
-using Fluid;
 using GraphQL;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
@@ -33,7 +32,6 @@
 using OrchardCore.Search.Elasticsearch.Drivers;
 using OrchardCore.Search.Elasticsearch.Services;
 using OrchardCore.Search.Lucene.Handler;
-using OrchardCore.Search.ViewModels;
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
 
@@ -105,13 +103,6 @@ public override void ConfigureServices(IServiceCollection services)
                 }
             });
 
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<SearchIndexViewModel>();
-                o.MemberAccessStrategy.Register<SearchFormViewModel>();
-                o.MemberAccessStrategy.Register<SearchResultsViewModel>();
-            });
-
             services.AddElasticServices();
             services.AddScoped<IPermissionProvider, Permissions>();
             services.AddScoped<INavigationProvider, AdminMenu>();

diff --git a/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Search.Lucene/Startup.cs
@@ -1,5 +1,4 @@
 using System;
-using Fluid;
 using Lucene.Net.Analysis.Standard;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
@@ -30,7 +29,6 @@
 using OrchardCore.Search.Lucene.Recipes;
 using OrchardCore.Search.Lucene.Services;
 using OrchardCore.Search.Lucene.Settings;
-using OrchardCore.Search.ViewModels;
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
 
@@ -47,13 +45,6 @@ public Startup(IOptions<AdminOptions> adminOptions)
 
         public override void ConfigureServices(IServiceCollection services)
         {
-            services.Configure<TemplateOptions>(o =>
-            {
-                o.MemberAccessStrategy.Register<SearchIndexViewModel>();
-                o.MemberAccessStrategy.Register<SearchFormViewModel>();
-                o.MemberAccessStrategy.Register<SearchResultsViewModel>();
-            });
-
             services.AddDataMigration<Migrations>();
             services.AddSingleton<LuceneIndexingState>();
             services.AddSingleton<LuceneIndexSettingsService>();
@@ -74,7 +65,7 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<IContentHandler, LuceneIndexingContentHandler>();
             services.AddLuceneQueries();
 
-            // LuceneQuerySource is registered for both the Queries module and local usage
+            // LuceneQuerySource is registered for both the Queries module and local usage.
             services.AddScoped<IQuerySource, LuceneQuerySource>();
             services.AddScoped<LuceneQuerySource>();
             services.AddRecipeExecutionStep<LuceneIndexStep>();

diff --git a/src/OrchardCore.Modules/OrchardCore.Search/Startup.cs b/src/OrchardCore.Modules/OrchardCore.Search/Startup.cs
@@ -1,4 +1,5 @@
 using System;
+using Fluid;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
@@ -16,6 +17,7 @@
 using OrchardCore.Search.Drivers;
 using OrchardCore.Search.Migrations;
 using OrchardCore.Search.Models;
+using OrchardCore.Search.ViewModels;
 using OrchardCore.Security.Permissions;
 using OrchardCore.Settings;
 
@@ -60,4 +62,18 @@ public override void ConfigureServices(IServiceCollection services)
             services.AddScoped<IDisplayDriver<DeploymentStep>, SearchSettingsDeploymentStepDriver>();
         }
     }
+
+    [RequireFeatures("OrchardCore.Liquid")]
+    public class LiquidStartup : StartupBase
+    {
+        public override void ConfigureServices(IServiceCollection services)
+        {
+            services.Configure<TemplateOptions>(o =>
+            {
+                o.MemberAccessStrategy.Register<SearchIndexViewModel>();
+                o.MemberAccessStrategy.Register<SearchFormViewModel>();
+                o.MemberAccessStrategy.Register<SearchResultsViewModel>();
+            });
+        }
+    }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.Search/Views/SearchSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Search/Views/SearchSettings.Edit.cshtml
@@ -17,6 +17,6 @@
 }
 else
 {
-    <div class="alert alert-warning">@T["You need to enable at least one search provider (Lucene, Elasticsearch)."]</div>
+    <div class="alert alert-warning">@T["You need to enable at least one search provider (Lucene, Elasticsearch, or Azure AI Search)."]</div>
 }
 
diff --git a/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/ServiceCollectionExtensions.cs b/src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/ServiceCollectionExtensions.cs
@@ -7,32 +7,31 @@
 using OrchardCore.Search.Elasticsearch.Core.Recipes;
 using OrchardCore.Search.Elasticsearch.Core.Services;
 
-namespace OrchardCore.Search.Elasticsearch
+namespace OrchardCore.Search.Elasticsearch;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    /// <summary>
+    /// Adds Elastic services.
+    /// </summary>
+    public static IServiceCollection AddElasticServices(this IServiceCollection services)
     {
-        /// <summary>
-        /// Adds Elastic services.
-        /// </summary>
-        public static IServiceCollection AddElasticServices(this IServiceCollection services)
-        {
-            services.AddSingleton<ElasticIndexSettingsService>();
-            services.AddSingleton<ElasticIndexManager>();
-            services.AddScoped<ElasticIndexingService>();
-            services.AddScoped<IModularTenantEvents, ElasticIndexInitializerService>();
-            services.AddScoped<IElasticSearchQueryService, ElasticSearchQueryService>();
-            services.AddScoped<IElasticQueryService, ElasticQueryService>();
-            services.AddScoped<IContentHandler, ElasticIndexingContentHandler>();
+        services.AddSingleton<ElasticIndexSettingsService>();
+        services.AddSingleton<ElasticIndexManager>();
+        services.AddScoped<ElasticIndexingService>();
+        services.AddScoped<IModularTenantEvents, ElasticIndexInitializerService>();
+        services.AddScoped<IElasticSearchQueryService, ElasticSearchQueryService>();
+        services.AddScoped<IElasticQueryService, ElasticQueryService>();
+        services.AddScoped<IContentHandler, ElasticIndexingContentHandler>();
 
-            // ElasticQuerySource is registered for both the Queries module and local usage
-            services.AddScoped<IQuerySource, ElasticQuerySource>();
-            services.AddScoped<ElasticQuerySource>();
-            services.AddRecipeExecutionStep<ElasticIndexStep>();
-            services.AddRecipeExecutionStep<ElasticSettingsStep>();
-            services.AddRecipeExecutionStep<ElasticIndexRebuildStep>();
-            services.AddRecipeExecutionStep<ElasticIndexResetStep>();
+        // ElasticQuerySource is registered for both the Queries module and local usage.
+        services.AddScoped<IQuerySource, ElasticQuerySource>();
+        services.AddScoped<ElasticQuerySource>();
+        services.AddRecipeExecutionStep<ElasticIndexStep>();
+        services.AddRecipeExecutionStep<ElasticSettingsStep>();
+        services.AddRecipeExecutionStep<ElasticIndexRebuildStep>();
+        services.AddRecipeExecutionStep<ElasticIndexResetStep>();
 
-            return services;
-        }
+        return services;
     }
 }