Minor search provider enhancement. Minor UI updates.

JSMR.Infrastructure/Common/Queries/SearchProvider.cs

@@ -89,13 +89,13 @@ public abstract class SearchProvider<TItem, TCriteria, TSortField, TBaseQuery> :
                 .Take(options.PageSize)
                 .ToArrayAsync(cancellationToken);
 
-            Dictionary<int, TItem> items = await GetItems(ids);
+            Dictionary<int, TItem> items = await GetItems(options.Criteria, ids);
 
             return [.. ids.Select(uniqueId => items[uniqueId])];
         }
         else
         {
-            IQueryable<TItem> selectQuery = GetSelectQuery(orderedQuery);
+            IQueryable<TItem> selectQuery = GetSelectQuery(options.Criteria, orderedQuery);
 
             return await selectQuery
                 .Skip((options.PageNumber - 1) * options.PageSize)
@@ -107,7 +107,7 @@ public abstract class SearchProvider<TItem, TCriteria, TSortField, TBaseQuery> :
     protected abstract Expression<Func<TBaseQuery, object?>> GetSortExpression(TSortField field);
     protected abstract IEnumerable<(Expression<Func<TBaseQuery, object>> Selector, SortDirection Dir)> GetDefaultSortChain();
     protected abstract IQueryable<int> GetSelectIdQuery(IOrderedQueryable<TBaseQuery> query);
-    protected abstract IQueryable<TItem> GetSelectQuery(IOrderedQueryable<TBaseQuery> query);
+    protected abstract IQueryable<TItem> GetSelectQuery(TCriteria criteria, IOrderedQueryable<TBaseQuery> query);
-    protected abstract Task<Dictionary<int, TItem>> GetItems(int[] ids);
+    protected abstract Task<Dictionary<int, TItem>> GetItems(TCriteria criteria, int[] ids);
     protected virtual Task PostLoadAsync(IList<TItem> items, CancellationToken cancellationToken) => Task.CompletedTask;
 }

JSMR.Infrastructure/Data/Repositories/Circles/CircleSearchProvider.cs

@@ -141,7 +141,7 @@ public class CircleSearchProvider(AppDbContext context) : SearchProvider<CircleS
         return query.Select(x => x.Circle.CircleId);
     }
 
-    protected override IQueryable<CircleSearchItem> GetSelectQuery(IOrderedQueryable<CircleQuery> query)
+    protected override IQueryable<CircleSearchItem> GetSelectQuery(CircleSearchCriteria criteria, IOrderedQueryable<CircleQuery> query)
     {
         // Join to VoiceWorks by LatestProductId to fill HasImage / SalesDate
         var selected =
@@ -213,7 +213,7 @@ public class CircleSearchProvider(AppDbContext context) : SearchProvider<CircleS
         return selected;
     }
 
-    protected override async Task<Dictionary<int, CircleSearchItem>> GetItems(int[] ids)
+    protected override async Task<Dictionary<int, CircleSearchItem>> GetItems(CircleSearchCriteria criteria, int[] ids)
     {
         // Join to VoiceWorks by LatestProductId to fill HasImage / SalesDate
         var selected =

JSMR.Infrastructure/Data/Repositories/Creators/CreatorSearchProvider.cs

@@ -57,7 +57,7 @@ public class CreatorSearchProvider(AppDbContext context) : SearchProvider<Creato
         yield return (x => x.Name, SortDirection.Ascending);
     }
 
-    protected override IOrderedQueryable<CreatorSearchItem> GetSelectQuery(IOrderedQueryable<CreatorSearchItem> query)
+    protected override IOrderedQueryable<CreatorSearchItem> GetSelectQuery(CreatorSearchCriteria criteria, IOrderedQueryable<CreatorSearchItem> query)
     {
         return query;
     }
@@ -67,7 +67,7 @@ public class CreatorSearchProvider(AppDbContext context) : SearchProvider<Creato
         throw new NotImplementedException();
     }
 
-    protected override Task<Dictionary<int, CreatorSearchItem>> GetItems(int[] ids)
+    protected override Task<Dictionary<int, CreatorSearchItem>> GetItems(CreatorSearchCriteria criteria, int[] ids)
     {
         return Task.FromResult(new Dictionary<int, CreatorSearchItem>());
     }

JSMR.Infrastructure/Data/Repositories/Tags/TagSearchProvider.cs

@@ -62,7 +62,7 @@ public class TagSearchProvider(AppDbContext context) : SearchProvider<TagSearchI
         yield return (x => x.Name, SortDirection.Ascending);
     }
 
-    protected override IOrderedQueryable<TagSearchItem> GetSelectQuery(IOrderedQueryable<TagSearchItem> query)
+    protected override IOrderedQueryable<TagSearchItem> GetSelectQuery(TagSearchCriteria criteria, IOrderedQueryable<TagSearchItem> query)
     {
         return query;
     }
@@ -72,7 +72,7 @@ public class TagSearchProvider(AppDbContext context) : SearchProvider<TagSearchI
         throw new NotImplementedException();
     }
 
-    protected override Task<Dictionary<int, TagSearchItem>> GetItems(int[] ids)
+    protected override Task<Dictionary<int, TagSearchItem>> GetItems(TagSearchCriteria criteria, int[] ids)
     {
         return Task.FromResult(new Dictionary<int, TagSearchItem>());
     }

JSMR.Infrastructure/Data/Repositories/VoiceWorks/VoiceWorkSearchProvider.cs

@@ -1,4 +1,5 @@
 using JSMR.Application.Common.Search;
+using JSMR.Application.Enums;
 using JSMR.Application.VoiceWorks.Queries.Search;
 using JSMR.Domain.Entities;
 using JSMR.Domain.Enums;
@@ -355,7 +356,7 @@ public class VoiceWorkSearchProvider(AppDbContext context, IVoiceWorkFullTextSea
         return query.Select(x => x.VoiceWork.VoiceWorkId);
     }
 
-    protected override IQueryable<VoiceWorkSearchResult> GetSelectQuery(IOrderedQueryable<VoiceWorkQuery> query)
+    protected override IQueryable<VoiceWorkSearchResult> GetSelectQuery(VoiceWorkSearchCriteria criteria, IOrderedQueryable<VoiceWorkQuery> query)
     {
         var result =
             from q in query
@@ -368,9 +369,9 @@ public class VoiceWorkSearchProvider(AppDbContext context, IVoiceWorkFullTextSea
                 VoiceWorkId = voiceWork.VoiceWorkId,
                 ProductId = voiceWork.ProductId,
                 OriginalProductId = voiceWork.OriginalProductId,
-                ProductName = englishVoiceWork != null ? englishVoiceWork.ProductName : voiceWork.ProductName,
+                ProductName = criteria.Locale == Locale.English && englishVoiceWork != null ? englishVoiceWork.ProductName : voiceWork.ProductName,
                 ProductUrl = "http://www.dlsite.com/maniax/" + productLinkPage + "/=/product_id/" + voiceWork.ProductId + ".html",
-                Description = englishVoiceWork != null ? englishVoiceWork.Description : voiceWork.Description,
+                Description = criteria.Locale == Locale.English && englishVoiceWork != null ? englishVoiceWork.Description : voiceWork.Description,
                 Favorite = voiceWork.Favorite,
                 HasImage = voiceWork.HasImage,
                 Maker = circle.Name,
@@ -390,7 +391,7 @@ public class VoiceWorkSearchProvider(AppDbContext context, IVoiceWorkFullTextSea
         return result;
     }
 
-    protected override async Task<Dictionary<int, VoiceWorkSearchResult>> GetItems(int[] ids)
+    protected override async Task<Dictionary<int, VoiceWorkSearchResult>> GetItems(VoiceWorkSearchCriteria criteria, int[] ids)
     {
         var result =
             from voiceWork in context.VoiceWorks.AsNoTracking()
@@ -405,9 +406,9 @@ public class VoiceWorkSearchProvider(AppDbContext context, IVoiceWorkFullTextSea
                 VoiceWorkId = voiceWork.VoiceWorkId,
                 ProductId = voiceWork.ProductId,
                 OriginalProductId = voiceWork.OriginalProductId,
-                ProductName = englishVoiceWork != null ? englishVoiceWork.ProductName : voiceWork.ProductName,
+                ProductName = criteria.Locale == Locale.English && englishVoiceWork != null ? englishVoiceWork.ProductName : voiceWork.ProductName,
                 ProductUrl = "http://www.dlsite.com/maniax/" + productLinkPage + "/=/product_id/" + voiceWork.ProductId + ".html",
-                Description = englishVoiceWork != null ? englishVoiceWork.Description : voiceWork.Description,
+                Description = criteria.Locale == Locale.English && englishVoiceWork != null ? englishVoiceWork.Description : voiceWork.Description,
                 Favorite = voiceWork.Favorite,
                 HasImage = voiceWork.HasImage,
                 Maker = circle.Name,

JSMR.UI.Blazor/Pages/VoiceWorks.razor

@@ -1,5 +1,8 @@
 @page "/voiceworks"
 @using JSMR.Application.Common.Search
+@using JSMR.Application.Creators.Queries.Search
+@using JSMR.Application.Enums
+@using JSMR.Application.Tags.Queries.Search
 @using JSMR.Application.VoiceWorks.Queries.Search
 @using JSMR.Domain.Enums
 @using JSMR.Domain.ValueObjects
@@ -13,16 +16,35 @@
 <h3>Voice Works</h3>
 
 <div class="search-filter-control-container">
-    <div class="search-filter-control-span-4">
+    @* <div class="search-filter-control-span-4">
         <JTextBox Label="Keywords" Value="@Keywords" ValueChanged="OnKeywordsChanged" Immediate="true" DebounceInterval="1500" />
+    </div> *@
+    <div class="search-filter-control-span-2">
+        <BitTextField Prefix="Keywords" Value="@Keywords" ValueChanged="OnKeywordsChanged" Immediate="true" DebounceTime="500" />
     </div>
-    <div class="search-filter-control-span-4">
+    <div class="search-filter-control-span-1">
-        <BitTextField Label="Keywords" Value="@Keywords" ValueChanged="OnKeywordsChanged" Immediate="true" DebounceTime="500" />
+        <BitDropdown Prefix="Languages"
+                     MultiSelect
+                     Items="Languages"
+                     Placeholder="Select..."
+                     TItem="BitDropdownItem<Language>"
+                     TValue="Language"
+                     Values="SupportedLanguages"
+                     ValuesChanged="OnSupportedLanguagesChanged" />
+    </div>
+    <div class="search-filter-control-span-1">
+        <BitDropdown Prefix="Locale"
+                     Items="Locales"
+                     Placeholder="Select..."
+                     TItem="BitDropdownItem<Locale>"
+                     TValue="Locale"
+                     Value="Locale"
+                     ValueChanged="OnLocaleChanged" />
     </div>
     <!-- Row 2 -->
     <div class="search-filter-control-span-1">
-        <BitDropdown Label="Sale Status"
+        <BitDropdown Prefix="Sale Status"
-                     Items="BasicItems"
+                     Items="SaleStatuses"
                      Placeholder="Select..."
                      TItem="BitDropdownItem<SaleStatus?>"
                      TValue="SaleStatus?"
@@ -30,7 +52,7 @@
                      ValueChanged="OnSaleStatusChanged" />
     </div>
     <div class="search-filter-control-span-1">
-        <BitDropdown Label="Circle Status"
+        <BitDropdown Prefix="Circles"
                      Items="CircleStatuses"
                      Placeholder="Select..."
                      TItem="BitDropdownItem<CircleStatus?>"
@@ -39,7 +61,7 @@
                      ValueChanged="OnCircleStatusChanged" />
     </div>
     <div class="search-filter-control-span-1">
-        <BitDropdown Label="Tag Status"
+        <BitDropdown Prefix="Tags"
                      Items="TagStatuses"
                      Placeholder="Select..."
                      TItem="BitDropdownItem<TagStatus?>"
@@ -48,7 +70,7 @@
                      ValueChanged="OnTagStatusChanged" />
     </div>
     <div class="search-filter-control-span-1">
-        <BitDropdown Label="Creator Status"
+        <BitDropdown Prefix="Creators"
                      Items="CreatorStatuses"
                      Placeholder="Select..."
                      TItem="BitDropdownItem<CreatorStatus?>"
@@ -58,30 +80,40 @@
     </div>
     <!-- Row 3 -->
     <div class="search-filter-control-span-2">
-        <BitDropdown Label="Creator Status 2"
+        <BitDropdown Prefix="Tags"
-                     Items="CreatorStatuses"
+                     Items="Tags"
+                     MultiSelect
+                     Virtualize
+                     ShowSearchBox
+                     AutoFocusSearchBox
+                     Chips
                      Placeholder="Select..."
-                     TItem="BitDropdownItem<CreatorStatus?>"
+                     TItem="BitDropdownItem<int>"
-                     TValue="CreatorStatus ?"
+                     TValue="int"
-                     Value="SelectedCreatorStatus"
+                     Values="SelectedTagIds"
-                     ValueChanged="OnCreatorStatusChanged" />
+                     ValuesChanged="OnTagIdsChanged" />
     </div>
     <div class="search-filter-control-span-1">
-        <BitCheckbox Label="Show Only Favorite Works" Value="ShowOnlyFavoriteWorks" ValueChanged="OnShowOnlyFavoriteWorksChanged" />
+        <BitCheckbox Label="Include All Tags" Value="IncludeAllTags" ValueChanged="OnIncludeAllTagsChanged" />
     </div>
     <div class="search-filter-control-span-1"></div>
     <!-- Row 4 -->
     <div class="search-filter-control-span-2">
-        <BitDropdown Label="Creator Status 2"
+        <BitDropdown Prefix="Creators"
-                     Items="CreatorStatuses"
+                     Items="Creators"
+                     MultiSelect
+                     Virtualize
+                     ShowSearchBox
+                     AutoFocusSearchBox
+                     Chips
                      Placeholder="Select..."
-                     TItem="BitDropdownItem<CreatorStatus?>"
+                     TItem="BitDropdownItem<int>"
-                     TValue="CreatorStatus ?"
+                     TValue="int"
-                     Value="SelectedCreatorStatus"
+                     Values="SelectedCreatorIds"
-                     ValueChanged="OnCreatorStatusChanged" />
+                     ValuesChanged="OnCreatorIdsChanged" />
     </div>
     <div class="search-filter-control-span-1">
-        <BitCheckbox Label="Show Only Favorite Works" Value="ShowOnlyFavoriteWorks" ValueChanged="OnShowOnlyFavoriteWorksChanged" />
+        <BitCheckbox Label="Include All Creators" Value="IncludeAllCreators" ValueChanged="OnIncludeAllCreatorsChanged" />
     </div>
     <div class="search-filter-control-span-1"></div>
     <!-- Row 5 -->
@@ -92,16 +124,6 @@
         <BitCheckbox Label="Show Only Invalid Works" Value="ShowOnlyInvalidWorks" ValueChanged="OnShowOnlyInvalidWorksChanged" />
     </div>
     <div class="search-filter-control-span-2"></div>
-    <div class="search-filter-control-span-1">
-        <BitDropdown Label="Supported Languages"
-                     MultiSelect
-                     Items="Languages"
-                     Placeholder="Select..."
-                     TItem="BitDropdownItem<Language>"
-                     TValue="Language"
-                     Values="SupportedLanguages"
-                     ValuesChanged="OnSupportedLanguagesChanged" />
-    </div>
     <div class="search-filter-control-span-1">
         <BitDropdown Label="Age Ratings"
                      MultiSelect
@@ -118,6 +140,9 @@
     <div class="search-filter-control-span-1">
         <BitDatePicker Label="Release Date End" ShowClearButton="true" Value="ReleaseDateEnd" ValueChanged="OnReleaseDateEndChanged" />
     </div>
+    @* <div class="search-filter-control-span-1">
+        <BitSlider Label="Downloads" Min="0" Max="100000" Value="MinDownloads" ValueChanged="OnMinDownloadsChanged" />
+    </div> *@
 </div>
 
 <JProductCollection Products="searchResults?.Items"></JProductCollection>
@@ -129,27 +154,32 @@
 
 @code {
     public string? Keywords { get; set; }
+    public Locale Locale { get; set; } = Locale.English;
     public SaleStatus? SelectedSaleStatus { get; set; }
     public CircleStatus? SelectedCircleStatus { get; set; }
     public TagStatus? SelectedTagStatus { get; set; }
     public CreatorStatus? SelectedCreatorStatus { get; set; }
+    public int[] SelectedTagIds { get; set; } = [];
+    public bool IncludeAllTags { get; set; }
+    public int[] SelectedCreatorIds { get; set; } = [];
+    public bool IncludeAllCreators { get; set; }
     public bool ShowOnlyFavoriteWorks { get; set; }
     public bool ShowOnlyInvalidWorks { get; set; }
     public IEnumerable<Language> SupportedLanguages { get; set; } = [];
     public IEnumerable<AgeRating> SelectedAgeRatings { get; set; } = [];
     public DateTimeOffset? ReleaseDateStart { get; set; }
     public DateTimeOffset? ReleaseDateEnd { get; set; }
+    public int MinDownloads { get; set; }
     public int PageNumber { get; set; } = 1;
     public int PageSize { get; set; } = 100;
 
-    IEnumerable<Tuple<SaleStatus?, string>> SaleStatuses =
+    List<BitDropdownItem<Locale>> Locales =
     [
-        new(SaleStatus.Available, "Available"),
+        new() { Text = "Japanese", Value = Locale.Japanese },
-        new(SaleStatus.Upcoming, "Upcoming"),
+        new() { Text = "English", Value = Locale.English }
-        new(null, "All")
     ];
 
-    List<BitDropdownItem<SaleStatus?>> BasicItems =
+    List<BitDropdownItem<SaleStatus?>> SaleStatuses =
     [
         new() { Text = "Available", Value = SaleStatus.Available },
         new() { Text = "Upcoming", Value = SaleStatus.Upcoming },
@@ -198,11 +228,55 @@
         new() { Text = "R18", Value = AgeRating.R18 }
     ];
 
+    List<BitDropdownItem<int>> Tags = [];
+    List<BitDropdownItem<int>> Creators = [];
+
     SearchResult<VoiceWorkSearchResult>? searchResults;
 
     protected override async Task OnInitializedAsync()
     {
         await UpdateDataAsync(true);
+        await GetTags();
+        await GetCreators();
+    }
+
+    private async Task GetTags()
+    {
+        SearchTagsRequest request = new(
+            Options: new()
+            {
+                PageNumber = 1,
+                PageSize = 99999
+            }
+        );
+
+        SearchTagsResponse? response = await Client.SearchAsync(request);
+
+        if (response is null)
+            return;
+
+        Tags = response.Results.Items
+            .OrderByDescending(x => x.Favorite)
+            .ThenBy(x => x.EnglishName ?? x.Name)
+            .Select(x => new BitDropdownItem<int>() { Text = x.EnglishName ?? x.Name, Value = x.TagId }).ToList();
+    }
+
+    private async Task GetCreators()
+    {
+        SearchCreatorsRequest request = new(
+            Options: new()
+            {
+                PageNumber = 1,
+                PageSize = 99999
+            }
+        );
+
+        SearchCreatorsResponse? response = await Client.SearchAsync(request);
+
+        if (response is null)
+            return;
+
+        Creators = response.Results.Items.Select(x => new BitDropdownItem<int>() { Text = x.Name, Value = x.CreatorId }).ToList();
     }
 
     private async Task UpdateDataAsync(bool resetPageNumber)
@@ -218,16 +292,22 @@
                 Criteria = new()
                 {
                     Keywords = Keywords,
+                    Locale = Locale,
                     SaleStatus = SelectedSaleStatus,
                     CircleStatus = SelectedCircleStatus,
                     TagStatus = SelectedTagStatus,
                     CreatorStatus = SelectedCreatorStatus,
+                    TagIds = [.. SelectedTagIds],
+                    IncludeAllTags = IncludeAllTags,
+                    CreatorIds = [.. SelectedCreatorIds],
+                    IncludeAllCreators = IncludeAllCreators,
                     ShowFavoriteVoiceWorks = ShowOnlyFavoriteWorks,
                     ShowInvalidVoiceWorks = ShowOnlyInvalidWorks,
                     SupportedLanguages = [.. SupportedLanguages],
                     AgeRatings = [.. SelectedAgeRatings],
                     ReleaseDateStart = ReleaseDateStart != null ? DateOnly.FromDateTime(ReleaseDateStart.Value.Date) : null,
-                    ReleaseDateEnd = ReleaseDateEnd != null ? DateOnly.FromDateTime(ReleaseDateEnd.Value.Date) : null
+                    ReleaseDateEnd = ReleaseDateEnd != null ? DateOnly.FromDateTime(ReleaseDateEnd.Value.Date) : null,
+                    //MinDownloads = MinDownloads
                 },
                 SortOptions =
                 [
@@ -249,6 +329,12 @@
         await UpdateDataAsync(true);
     }
 
+    public async Task OnLocaleChanged(Locale locale)
+    {
+        Locale = locale;
+        await UpdateDataAsync(true);
+    }
+
     public async Task OnSaleStatusChanged(SaleStatus? saleStatus)
     {
         SelectedSaleStatus = saleStatus;
@@ -273,6 +359,30 @@
         await UpdateDataAsync(true);
     }
 
+    public async Task OnTagIdsChanged(IEnumerable<int> tagIds)
+    {
+        SelectedTagIds = [..tagIds];
+        await UpdateDataAsync(true);
+    }
+
+    public async Task OnIncludeAllTagsChanged(bool includeAllTags)
+    {
+        IncludeAllTags = includeAllTags;
+        await UpdateDataAsync(true);
+    }
+
+    public async Task OnCreatorIdsChanged(IEnumerable<int> creatorIds)
+    {
+        SelectedCreatorIds = [..creatorIds];
+        await UpdateDataAsync(true);
+    }
+
+    public async Task OnIncludeAllCreatorsChanged(bool includeAllCreators)
+    {
+        IncludeAllCreators = includeAllCreators;
+        await UpdateDataAsync(true);
+    }
+
     public async Task OnSupportedLanguagesChanged(IEnumerable<Language> languages)
     {
         SupportedLanguages = languages;
@@ -309,6 +419,12 @@
         await UpdateDataAsync(true);
     }
 
+    public async Task OnMinDownloadsChanged(double minDownloads)
+    {
+        MinDownloads = (int)minDownloads;
+        await UpdateDataAsync(true);
+    }
+
     public async Task OnPageNumberChanged(int newPageNumber)
     {
         PageNumber = newPageNumber;

JSMR.UI.Blazor/wwwroot/css/app.css

@@ -132,6 +132,11 @@ code {
         align-items: center;
     }
 
+    .search-filter-control-container > .search-filter-control-span-1 {
+        display: flex;
+        align-items: center;
+    }
+
     .search-filter-control-container > .search-filter-control-span-2 {
         display: flex;
         align-items: center;

JSMR.UI.Blazor/wwwroot/css/bit-blazor.css

@@ -4,7 +4,7 @@
     border: 1px solid var(--input-border-color);
     background-color: var(--input-background-color);
     transition: background-color .2s,color .2s,border-color .2s,box-shadow .2s;
-    padding: .25rem .5rem;
+    /*padding: .25rem .5rem;*/
 }
 
 .bit-tfl-fgp {
@@ -25,6 +25,14 @@
 }
 
 /* DropDownList */
+.bit-drp {
+    font-family: var(--font-family);
+}
+
+.bit-drp-lbl {
+    font-weight: 500;
+}
+
 .bit-drp-cal {
     background-color: var(--input-background-color);
 }
@@ -39,3 +47,22 @@
     color: #ffffffde;
     background: rgba(100,181,246,.16);
 }
+
+.bit-drp-scn {
+    max-height: 200px !important;
+    padding: .5rem 0;
+}
+
+.bit-drp-itm,
+.bit-drp-mcn {
+    justify-content: flex-start; /* To get around Mud Blazor, until Mud Blazor is removed */
+    padding: .5rem 1rem;
+}
+
+.bit-drp-sch .bit-drp-tcn {
+    padding: 0;
+}
+
+.bit-drp-pre, .bit-drp-suf {
+    background: rgb(57, 79, 94);
+}