Content list owner filter

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

@@ -4,6 +4,7 @@
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Localization;
 using Microsoft.AspNetCore.Mvc.Rendering;
@@ -24,6 +25,9 @@
 using OrchardCore.Navigation;
 using OrchardCore.Routing;
 using OrchardCore.Security.Permissions;
+using OrchardCore.Users;
+using OrchardCore.Users.Indexes;
+using OrchardCore.Users.Models;
 using YesSql;
 using YesSql.Filters.Query;
 using YesSql.Services;
@@ -37,6 +41,7 @@ public class AdminController : Controller, IUpdateModel
         private readonly IContentItemDisplayManager _contentItemDisplayManager;
         private readonly IContentDefinitionManager _contentDefinitionManager;
         private readonly IDisplayManager<ContentOptionsViewModel> _contentOptionsDisplayManager;
+        private readonly UserManager<IUser> _userManager;
         private readonly ISession _session;
         private readonly INotifier _notifier;
 
@@ -49,6 +54,7 @@ public class AdminController : Controller, IUpdateModel
             IContentItemDisplayManager contentItemDisplayManager,
             IContentDefinitionManager contentDefinitionManager,
             IDisplayManager<ContentOptionsViewModel> contentOptionsDisplayManager,
+            UserManager<IUser> userManager,
             ISession session,
             INotifier notifier,
             IHtmlLocalizer<AdminController> htmlLocalizer,
@@ -59,6 +65,7 @@ public class AdminController : Controller, IUpdateModel
             _contentItemDisplayManager = contentItemDisplayManager;
             _contentDefinitionManager = contentDefinitionManager;
             _contentOptionsDisplayManager = contentOptionsDisplayManager;
+            _userManager = userManager;
             _session = session;
             _notifier = notifier;
 
@@ -643,6 +650,42 @@ public async Task<IActionResult> Unpublish(string contentItemId, string returnUr
                 : RedirectToAction(nameof(List));
         }
 
+        public async Task<IActionResult> OwnerFilterUserSearch(string searchTerm, string selectedOwnerUserName, int page = 1)
+        {
+            var pageSize = 50;
+
+            var query = _session.Query<User, UserIndex>();
+
+            if (!string.IsNullOrEmpty(searchTerm))
+            {
+                query.Where(x => x.NormalizedUserName.Contains(_userManager.NormalizeName(searchTerm)));
+            }
+
+            var users = await query
+                .OrderBy(u => u.NormalizedUserName)
+                .Skip((page - 1) * pageSize)
+                .Take(pageSize)
+                .ListAsync();
+
+            var hasMoreResults = false;
+
+            // only check if we have more results if the current page had a full page of results
+            if (users.Count() == pageSize)
+            {
+                var totalUsersCount = await query.CountAsync();
+                hasMoreResults = page * pageSize < totalUsersCount;
+            }
+
+            var results = users.Select(u => new SelectListItem()
+            {
+                Text = u.UserName,
+                Value = u.UserName,
+                Selected = _userManager.NormalizeName(u.UserName) == _userManager.NormalizeName(selectedOwnerUserName)
+            });
+
+            return new ObjectResult(new { results, hasMoreResults });
+        }
+
         private async Task<IActionResult> CreatePOST(
             string id,
             string returnUrl,

src/OrchardCore.Modules/OrchardCore.Contents/Drivers/ContentOptionsDisplayDriver.cs

@@ -22,7 +22,8 @@ public override IDisplayResult Display(ContentOptionsViewModel model)
                 View("ContentsAdminFilters_Thumbnail__ContentType", model).Location("Thumbnail", "Content:20"),
                 View("ContentsAdminFilters_Thumbnail__Stereotype", model).Location("Thumbnail", "Content:30"),
                 View("ContentsAdminFilters_Thumbnail__Status", model).Location("Thumbnail", "Content:40"),
-                View("ContentsAdminFilters_Thumbnail__Sort", model).Location("Thumbnail", "Content:50")
+                View("ContentsAdminFilters_Thumbnail__Owner", model).Location("Thumbnail", "Content:50"),
+                View("ContentsAdminFilters_Thumbnail__Sort", model).Location("Thumbnail", "Content:60")
             );
         }
 
@@ -65,6 +66,7 @@ private static void BuildContentOptionsViewModel(ContentOptionsViewModel m, Cont
             m.OrderBy = model.OrderBy;
             m.SelectedContentType = model.SelectedContentType;
             m.FilterResult = model.FilterResult;
+            m.SelectedOwnerUserName = model.SelectedOwnerUserName;
         }
     }
 }

src/OrchardCore.Modules/OrchardCore.Contents/OrchardCore.Contents.csproj

@@ -39,6 +39,7 @@
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Settings.Core\OrchardCore.Settings.Core.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Sitemaps.Abstractions\OrchardCore.Sitemaps.Abstractions.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Users.Abstractions\OrchardCore.Users.Abstractions.csproj" />
+    <ProjectReference Include="..\..\OrchardCore\OrchardCore.Users.Core\OrchardCore.Users.Core.csproj" />
     <ProjectReference Include="..\..\OrchardCore\OrchardCore.Workflows.Abstractions\OrchardCore.Workflows.Abstractions.csproj" />
   </ItemGroup>
 

src/OrchardCore.Modules/OrchardCore.Contents/Services/DefaultContentsAdminListFilterProvider.cs

@@ -5,12 +5,15 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.DependencyInjection;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata;
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.ContentManagement.Records;
 using OrchardCore.Contents.ViewModels;
+using OrchardCore.Users;
+using OrchardCore.Users.Models;
 using YesSql;
 using YesSql.Filters.Query;
 using YesSql.Services;
@@ -249,6 +252,39 @@ public void Build(QueryEngineBuilder<ContentItem> builder)
                         return query;
                     })
                 )
+                .WithNamedTerm("owner", builder => builder
+                    .OneCondition(async (userName, query, ctx) =>
+                    {
+                        if (!string.IsNullOrEmpty(userName))
+                        {
+                            var context = (ContentQueryContext)ctx;
+                            var userManager = context.ServiceProvider.GetRequiredService<UserManager<IUser>>();
+                            var user = await userManager.FindByNameAsync(userName) as User;
+                            var userId = user?.UserId;
+
+                            query.With<ContentItemIndex>(x => x.Owner == userId);
+                        }
+
+                        return query;
+                    })
+                    .MapTo<ContentOptionsViewModel>((userName, model) =>
+                    {
+                        if (!string.IsNullOrEmpty(userName))
+                        {
+                            model.SelectedOwnerUserName = userName;
+                        }
+                    })
+                    .MapFrom<ContentOptionsViewModel>((model) =>
+                    {
+                        if (!string.IsNullOrEmpty(model.SelectedOwnerUserName))
+                        {
+                            return (true, model.SelectedOwnerUserName);
+                        }
+
+                        return (false, string.Empty);
+                    })
+                    .AlwaysRun()
+                )
                 .WithDefaultTerm(ContentsAdminListFilterOptions.DefaultTermName, builder => builder
                     .ManyCondition(
                         (val, query) => query.With<ContentItemIndex>(x => x.DisplayText.Contains(val)),

src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminList.cshtml

@@ -60,10 +60,10 @@
         var selectedItems = $("#selected-items");
         var itemsCheckboxes = $(":checkbox[name='itemIds']");
 
-    @* This applies to all filter selectpickers on page. Add .nosubmit to not submit *@
-            $('.selectpicker:not(.nosubmit)').on('changed.bs.select', function (e, clickedIndex, isSelected, previousValue) {
-                $("[name='submit.Filter']").click();
-            });
+        @* This applies to all filter selectpickers on page. Add .nosubmit to not submit *@
+        $('.selectpicker:not(.nosubmit),.ajax-selectpicker:not(.nosubmit)').on('changed.bs.select', function (e, clickedIndex, isSelected, previousValue) {
+            $("[name='submit.Filter']").click();
+        });
 
         $(".dropdown-menu .dropdown-item").filter(function () {
             return $(this).data("action");

src/OrchardCore.Modules/OrchardCore.Contents/Views/ContentsAdminListFilters.cshtml

@@ -1,12 +1,47 @@
 @model ContentOptionsViewModel
 @{
-    var formActionWithoutTypeName = Url.RouteUrl(new { area = "OrchardCore.Contents", controller = "Admin", action = "List", contentTypeId = "" });
+    var ownerFilterUserSearchUrl = Url.RouteUrl(new { area = "OrchardCore.Contents", controller = "Admin", action = "OwnerFilterUserSearch" });
 }
 <div class="btn-group filter">
     @if (Model.ContentTypeOptions.Count > 0)
     {
         <select asp-for="SelectedContentType" asp-items="Model.ContentTypeOptions" class="selectpicker contenttypes-selectpicker show-tick me-2" data-header="@T["Filter by content type"]" data-selected-text-format="static" data-width="fit" data-dropdown-align-right="auto" title="@T["Content Type"]" data-style="btn-sm" data-live-search="true"></select>
     }
     <select asp-for="ContentsStatus" asp-items="@Model.ContentStatuses" class="selectpicker contentstatuses-selectpicker show-tick me-2" data-header="@T["Filter by status"]" data-selected-text-format="static" data-width="fit" data-dropdown-align-right="auto" title="@T["Show"]" data-style="btn-sm"></select>
+    <select asp-for="SelectedOwnerUserName" class="ajax-selectpicker contentowners-selectpicker show-tick me-2" data-header="@T["Filter by owner"]" data-selected-text-format="static" data-width="fit" data-dropdown-align-right="auto" title="@T["Owner"]" data-style="btn-sm" data-live-search="true"></select>
     <select asp-for="OrderBy" asp-items="@Model.ContentSorts" class="selectpicker contentsorts-selectpicker show-tick" data-header="@T["Sort by"]" data-width="fit" data-selected-text-format="static" data-dropdown-align-right="true" title="@T["Sort"]" data-style="btn-sm"></select>
 </div>
+
+<script at="Foot">
+    $(function () {
+        var selectedOwnerUserName = '@Model.SelectedOwnerUserName';
+
+        // bootstrap-select has an issue with hammering the server, so we use flags to only make a request 
+        // if something changes that would warrant another request
+        var previousPage;
+        var previousSearchTerm;
+
+        $('#@Html.IdFor(m => m.SelectedOwnerUserName)').selectpicker({
+            source: {
+                pageSize: 50,
+                data: function (callback, page) {
+                    if (previousPage !== page) {
+                        previousPage = page;
+
+                        $.ajax('@ownerFilterUserSearchUrl', { data: { page, selectedOwnerUserName } })
+                            .then((response) => callback(response.results, response.hasMoreResults));
+                    }
+                },
+                search: function (callback, page, searchTerm) {
+                    if (previousPage !== page || previousSearchTerm !== searchTerm) {
+                        previousPage = page;
+                        previousSearchTerm = searchTerm;
+
+                        $.ajax('@ownerFilterUserSearchUrl', { data: { page, searchTerm, selectedOwnerUserName } })
+                            .then((response) => callback(response.results, response.hasMoreResults));
+                    }                    
+                }
+            }
+        });
+    })
+</script>

src/OrchardCore.Modules/OrchardCore.Contents/Views/Items/ContentsAdminFilters-Owner.Thumbnail.cshtml

@@ -0,0 +1,13 @@
+@model ShapeViewModel<ContentOptionsViewModel>
+@{
+    var term = Model.Value.FilterResult.FirstOrDefault(x => x.TermName == "owner");
+}
+
+<h4 class="card-title">@T["Owner"]</h4>
+<pre class="mb-3">@(term?.ToString() ?? "owner:...")</pre>
+<p>@T["Filters on the owner of a content item."]</p>
+<div class="d-block text-end">
+    <span>
+        <i class="fa-solid fa-sm fa-minus text-primary" aria-hidden="true"></i>
+    </span>
+</div>

src/OrchardCore/OrchardCore.Contents.Core/ViewModels/ContentOptionsViewModel.cs

@@ -22,6 +22,8 @@ public ContentOptionsViewModel()
 
         public string SelectedContentType { get; set; }
 
+        public string SelectedOwnerUserName { get; set; }
+
         public bool CanCreateSelectedContentType { get; set; }
 
         public ContentsOrder OrderBy { get; set; }