Fix the QueriesDocument and the Queries UI

OrchardCore.sln

@@ -523,6 +523,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Email.Smtp", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Rules.Core", "src\OrchardCore\OrchardCore.Rules.Core\OrchardCore.Rules.Core.csproj", "{4BAA08A2-878C-4B96-86BF-5B3DB2B6C2C7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrchardCore.Queries.Core", "src\OrchardCore\OrchardCore.Queries.Core\OrchardCore.Queries.Core.csproj", "{61B358F2-702C-40AA-9DF7-7121248FE6DE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1383,6 +1385,10 @@ Global
 		{4BAA08A2-878C-4B96-86BF-5B3DB2B6C2C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4BAA08A2-878C-4B96-86BF-5B3DB2B6C2C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4BAA08A2-878C-4B96-86BF-5B3DB2B6C2C7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61B358F2-702C-40AA-9DF7-7121248FE6DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61B358F2-702C-40AA-9DF7-7121248FE6DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61B358F2-702C-40AA-9DF7-7121248FE6DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61B358F2-702C-40AA-9DF7-7121248FE6DE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1622,6 +1628,7 @@ Global
 		{C35AB37B-5A09-4896-BEEE-B126B7E7018A} = {A066395F-6F73-45DC-B5A6-B4E306110DCE}
 		{E8A1097D-A65A-4B17-A3A2-F50D79552732} = {A066395F-6F73-45DC-B5A6-B4E306110DCE}
 		{4BAA08A2-878C-4B96-86BF-5B3DB2B6C2C7} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
+		{61B358F2-702C-40AA-9DF7-7121248FE6DE} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {46A1D25A-78D1-4476-9CBF-25B75E296341}

src/OrchardCore.Modules/OrchardCore.Queries/Controllers/AdminController.cs

@@ -7,15 +7,20 @@
 using Microsoft.AspNetCore.Mvc.Localization;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Localization;
 using Microsoft.Extensions.Options;
 using OrchardCore.Admin;
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Notify;
 using OrchardCore.Navigation;
+using OrchardCore.Queries.Core;
+using OrchardCore.Queries.Indexes;
 using OrchardCore.Queries.ViewModels;
 using OrchardCore.Routing;
+using YesSql;
+using YesSql.Services;
 
 namespace OrchardCore.Queries.Controllers
 {
@@ -27,8 +32,9 @@ public class AdminController : Controller
         private readonly IAuthorizationService _authorizationService;
         private readonly PagerOptions _pagerOptions;
         private readonly INotifier _notifier;
+        private readonly IServiceProvider _serviceProvider;
+        private readonly ISession _session;
         private readonly IQueryManager _queryManager;
-        private readonly IEnumerable<IQuerySource> _querySources;
         private readonly IDisplayManager<Query> _displayManager;
         private readonly IUpdateModelAccessor _updateModelAccessor;
         private readonly IShapeFactory _shapeFactory;
@@ -37,22 +43,24 @@ public class AdminController : Controller
         protected readonly IHtmlLocalizer H;
 
         public AdminController(
+            ISession session,
+            IQueryManager queryManager,
             IDisplayManager<Query> displayManager,
             IAuthorizationService authorizationService,
             IOptions<PagerOptions> pagerOptions,
             IShapeFactory shapeFactory,
             IStringLocalizer<AdminController> stringLocalizer,
             IHtmlLocalizer<AdminController> htmlLocalizer,
             INotifier notifier,
-            IQueryManager queryManager,
-            IEnumerable<IQuerySource> querySources,
+            IServiceProvider serviceProvider,
             IUpdateModelAccessor updateModelAccessor)
         {
+            _session = session;
+            _queryManager = queryManager;
             _displayManager = displayManager;
             _authorizationService = authorizationService;
             _pagerOptions = pagerOptions.Value;
-            _queryManager = queryManager;
-            _querySources = querySources;
+            _serviceProvider = serviceProvider;
             _updateModelAccessor = updateModelAccessor;
             _shapeFactory = shapeFactory;
             _notifier = notifier;
@@ -69,41 +77,37 @@ public async Task<IActionResult> Index(ContentOptions options, PagerParameters p
 
             var pager = new Pager(pagerParameters, _pagerOptions.GetPageSize());
 
-            var queries = await _queryManager.ListQueriesAsync();
-            queries = queries.OrderBy(x => x.Name);
-
-            if (!string.IsNullOrWhiteSpace(options.Search))
-            {
-                queries = queries.Where(q => q.Name.Contains(options.Search, StringComparison.OrdinalIgnoreCase));
-            }
-
-            var results = queries
-                .Skip(pager.GetStartIndex())
-                .Take(pager.PageSize)
-                .ToList();
+            var query = _session.Query<Query, QueryIndex>();
 
             // Maintain previous route data when generating page links.
             var routeData = new RouteData();
 
             if (!string.IsNullOrEmpty(options.Search))
             {
                 routeData.Values.TryAdd(_optionsSearch, options.Search);
+
+                query = query.Where(x => x.Name != null && x.Name.Contains(options.Search));
             }
 
+            var skip = (pager.Page - 1) * pager.PageSize;
+
+            var count = await query.CountAsync();
+            var queries = await query.Skip(skip).Take(pager.PageSize).ListAsync();
+
             var model = new QueriesIndexViewModel
             {
                 Queries = [],
                 Options = options,
-                Pager = await _shapeFactory.PagerAsync(pager, queries.Count(), routeData),
-                QuerySourceNames = _querySources.Select(x => x.Name).ToList()
+                Pager = await _shapeFactory.PagerAsync(pager, count, routeData),
+                QuerySourceNames = _serviceProvider.GetServices<IQuerySource>().Select(x => x.Name).ToList()
             };
 
-            foreach (var query in results)
+            foreach (var iQuery in queries)
             {
                 model.Queries.Add(new QueryEntry
                 {
-                    Query = query,
-                    Shape = await _displayManager.BuildDisplayAsync(query, _updateModelAccessor.ModelUpdater, "SummaryAdmin")
+                    Query = iQuery,
+                    Shape = await _displayManager.BuildDisplayAsync(iQuery, _updateModelAccessor.ModelUpdater, "SummaryAdmin")
                 });
             }
 
@@ -115,7 +119,8 @@ public async Task<IActionResult> Index(ContentOptions options, PagerParameters p
             return View(model);
         }
 
-        [HttpPost, ActionName(nameof(Index))]
+        [HttpPost]
+        [ActionName(nameof(Index))]
         [FormValueRequired("submit.Filter")]
         public ActionResult IndexFilterPOST(QueriesIndexViewModel model)
             => RedirectToAction(nameof(Index), new RouteValueDictionary
@@ -130,7 +135,7 @@ public async Task<IActionResult> Create(string id)
                 return Forbid();
             }
 
-            var query = _querySources.FirstOrDefault(x => x.Name == id)?.Create();
+            var query = _serviceProvider.GetKeyedService<IQuerySource>(id)?.Create();
 
             if (query == null)
             {
@@ -146,15 +151,16 @@ public async Task<IActionResult> Create(string id)
             return View(model);
         }
 
-        [HttpPost, ActionName(nameof(Create))]
+        [HttpPost]
+        [ActionName(nameof(Create))]
         public async Task<IActionResult> CreatePost(QueriesCreateViewModel model)
         {
             if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageQueries))
             {
                 return Forbid();
             }
 
-            var query = _querySources.FirstOrDefault(x => x.Name == model.SourceName)?.Create();
+            var query = _serviceProvider.GetKeyedService<IQuerySource>(model.SourceName)?.Create();
 
             if (query == null)
             {
@@ -165,13 +171,14 @@ public async Task<IActionResult> CreatePost(QueriesCreateViewModel model)
 
             if (ModelState.IsValid)
             {
-                await _queryManager.SaveQueryAsync(query.Name, query);
+                await _queryManager.SaveQueryAsync(query);
 
                 await _notifier.SuccessAsync(H["Query created successfully."]);
+
                 return RedirectToAction(nameof(Index));
             }
 
-            // If we got this far, something failed, redisplay form
+            // If we got this far, something failed, redisplay form.
             model.Editor = editor;
 
             return View(model);
@@ -202,15 +209,21 @@ public async Task<IActionResult> Edit(string id)
             return View(model);
         }
 
-        [HttpPost, ActionName(nameof(Edit))]
+        [HttpPost]
+        [ActionName(nameof(Edit))]
         public async Task<IActionResult> EditPost(QueriesEditViewModel model)
         {
             if (!await _authorizationService.AuthorizeAsync(User, Permissions.ManageQueries))
             {
                 return Forbid();
             }
 
-            var query = await _queryManager.LoadQueryAsync(model.Name);
+            if (string.IsNullOrEmpty(model.Name))
+            {
+                return BadRequest();
+            }
+
+            var query = await _queryManager.GetQueryAsync(model.Name);
 
             if (query == null)
             {
@@ -221,15 +234,15 @@ public async Task<IActionResult> EditPost(QueriesEditViewModel model)
 
             if (ModelState.IsValid)
             {
-                await _queryManager.SaveQueryAsync(model.Name, query);
-
+                await _queryManager.SaveQueryAsync(query);
                 await _notifier.SuccessAsync(H["Query updated successfully."]);
+
                 return RedirectToAction(nameof(Index));
             }
 
             model.Editor = editor;
 
-            // If we got this far, something failed, redisplay form
+            // If we got this far, something failed, redisplay form.
             return View(model);
         }
 
@@ -241,21 +254,18 @@ public async Task<IActionResult> Delete(string id)
                 return Forbid();
             }
 
-            var query = await _queryManager.LoadQueryAsync(id);
-
-            if (query == null)
+            if (!await _queryManager.DeleteQueryAsync(id))
             {
                 return NotFound();
             }
 
-            await _queryManager.DeleteQueryAsync(id);
-
             await _notifier.SuccessAsync(H["Query deleted successfully."]);
 
             return RedirectToAction(nameof(Index));
         }
 
-        [HttpPost, ActionName(nameof(Index))]
+        [HttpPost]
+        [ActionName(nameof(Index))]
         [FormValueRequired("submit.BulkAction")]
         public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<string> itemIds)
         {
@@ -266,21 +276,16 @@ public async Task<ActionResult> IndexPost(ContentOptions options, IEnumerable<st
 
             if (itemIds?.Count() > 0)
             {
-                var queriesList = await _queryManager.ListQueriesAsync();
-                var checkedContentItems = queriesList.Where(x => itemIds.Contains(x.Name));
                 switch (options.BulkAction)
                 {
                     case ContentsBulkAction.None:
                         break;
                     case ContentsBulkAction.Remove:
-                        foreach (var item in checkedContentItems)
-                        {
-                            await _queryManager.DeleteQueryAsync(item.Name);
-                        }
+                        await _queryManager.DeleteQueryAsync(itemIds.ToArray());
                         await _notifier.SuccessAsync(H["Queries successfully removed."]);
                         break;
                     default:
-                        throw new ArgumentOutOfRangeException(options.BulkAction.ToString(), "Invalid bulk action.");
+                        return BadRequest();
                 }
             }
 

src/OrchardCore.Modules/OrchardCore.Queries/Controllers/QueryApiController.cs

@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using OrchardCore.Queries.Core;
 
 namespace OrchardCore.Queries.Controllers
 {
@@ -57,6 +58,7 @@ public async Task<IActionResult> Query(
                 : [];
 
             var result = await _queryManager.ExecuteQueryAsync(query, queryParameters);
+
             return new ObjectResult(result);
         }
     }

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

@@ -4,20 +4,21 @@
 using Microsoft.Extensions.Options;
 using OrchardCore.Deployment;
 using OrchardCore.Json;
+using OrchardCore.Queries.Core;
 
 namespace OrchardCore.Queries.Deployment
 {
     public class AllQueriesDeploymentSource : IDeploymentSource
     {
-        private readonly IQueryManager _queryManager;
         private readonly JsonSerializerOptions _jsonSerializerOptions;
+        private readonly IQueryManager _queryManager;
 
         public AllQueriesDeploymentSource(
             IQueryManager queryManager,
             IOptions<DocumentJsonSerializerOptions> jsonSerializerOptions)
         {
-            _queryManager = queryManager;
             _jsonSerializerOptions = jsonSerializerOptions.Value.SerializerOptions;
+            _queryManager = queryManager;
         }
 
         public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlanResult result)
@@ -29,7 +30,7 @@ public async Task ProcessDeploymentStepAsync(DeploymentStep step, DeploymentPlan
                 return;
             }
 
-            var queries = await _queryManager.ListQueriesAsync();
+            var queries = await _queryManager.ListAllAsync();
 
             result.Steps.Add(new JsonObject
             {

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

@@ -1,17 +1,21 @@
+using System;
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using System.Threading.Tasks;
 using OrchardCore.ContentManagement;
 using OrchardCore.Deployment;
+using OrchardCore.Queries.Core;
 
 namespace OrchardCore.Queries.Deployment
 {
     public class QueryBasedContentDeploymentSource : IDeploymentSource
     {
         private readonly IQueryManager _queryManager;
 
-        public QueryBasedContentDeploymentSource(IQueryManager queryManager)
+        public QueryBasedContentDeploymentSource(
+            IQueryManager queryManager,
+            IServiceProvider serviceProvider)
         {
             _queryManager = queryManager;
         }