Fixing Queried Content Items query validation

src/OrchardCore.Modules/OrchardCore.Queries/Deployment/QueryBasedContentDeploymentSource.cs

@@ -26,7 +26,7 @@ protected override async Task ProcessAsync(QueryBasedContentDeploymentStep step,
             return;
         }
 
-        if (!query.CanReturnContentItems || !query.ReturnContentItems)
+        if (!query.ReturnContentItems)
         {
             return;
         }

src/OrchardCore.Modules/OrchardCore.Queries/Deployment/QueryBasedContentDeploymentStepDriver.cs

@@ -52,7 +52,7 @@ await context.Updater.TryUpdateModelAsync(queryBasedContentViewModel, Prefix,
 
         var query = await _queryManager.GetQueryAsync(queryBasedContentViewModel.QueryName);
 
-        if (!query.CanReturnContentItems || !query.ReturnContentItems)
+        if (!query.ReturnContentItems)
         {
             context.Updater.ModelState.AddModelError(Prefix, nameof(step.QueryName), S["Your Query is not returning content items."]);
         }

src/OrchardCore.Modules/OrchardCore.Queries/Sql/SqlQueryHandler.cs

@@ -29,8 +29,6 @@ private static Task UpdateQueryAsync(DataQueryContextBase context)
             context.Query.Put(metadata);
         };
 
-        context.Query.CanReturnContentItems = true;
-
         return Task.CompletedTask;
     }
 }

src/OrchardCore.Modules/OrchardCore.Search.Lucene/Services/LuceneQueryHandler.cs

@@ -43,8 +43,6 @@ private static Task UpdateQueryAsync(DataQueryContextBase context)
             context.Query.Put(metadata);
         }
 
-        context.Query.CanReturnContentItems = true;
-
         return Task.CompletedTask;
     }
 }

src/OrchardCore/OrchardCore.Queries.Abstractions/Models/Query.cs

@@ -1,4 +1,3 @@
-using System.Text.Json.Serialization;
 using OrchardCore.Entities;
 
 namespace OrchardCore.Queries;
@@ -24,8 +23,5 @@ public class Query : Entity
     /// </summary>
     public string Schema { get; set; }
 
-    [JsonIgnore]
-    public bool CanReturnContentItems { get; set; }
-
     public bool ReturnContentItems { get; set; }
 }

src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticsearchQueryHandler.cs

@@ -43,8 +43,6 @@ private static Task UpdateQueryAsync(DataQueryContextBase context)
             context.Query.Put(metadata);
         }
 
-        context.Query.CanReturnContentItems = true;
-
         return Task.CompletedTask;
     }
 }