Minor search provider enhancement. Minor UI updates.

2025-11-23 17:14:22 -05:00
parent 8490b49354
commit 1f533c6ec1
8 changed files with 204 additions and 55 deletions
--- a/JSMR.UI.Blazor/Pages/VoiceWorks.razor
+++ b/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">
-        <BitTextField Label="Keywords" Value="@Keywords" ValueChanged="OnKeywordsChanged" Immediate="true" DebounceTime="500" />
+    <div class="search-filter-control-span-1">
+        <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"
-                     Items="BasicItems"
+        <BitDropdown Prefix="Sale Status"
+                     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"
-                     Items="CreatorStatuses"
+        <BitDropdown Prefix="Tags"
+                     Items="Tags"
+                     MultiSelect
+                     Virtualize
+                     ShowSearchBox
+                     AutoFocusSearchBox
+                     Chips
                     Placeholder="Select..."
-                     TItem="BitDropdownItem<CreatorStatus?>"
-                     TValue="CreatorStatus ?"
-                     Value="SelectedCreatorStatus"
-                     ValueChanged="OnCreatorStatusChanged" />
+                     TItem="BitDropdownItem<int>"
+                     TValue="int"
+                     Values="SelectedTagIds"
+                     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"
-                     Items="CreatorStatuses"
+        <BitDropdown Prefix="Creators"
+                     Items="Creators"
+                     MultiSelect
+                     Virtualize
+                     ShowSearchBox
+                     AutoFocusSearchBox
+                     Chips
                     Placeholder="Select..."
-                     TItem="BitDropdownItem<CreatorStatus?>"
-                     TValue="CreatorStatus ?"
-                     Value="SelectedCreatorStatus"
-                     ValueChanged="OnCreatorStatusChanged" />
+                     TItem="BitDropdownItem<int>"
+                     TValue="int"
+                     Values="SelectedCreatorIds"
+                     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(SaleStatus.Upcoming, "Upcoming"),
-        new(null, "All")
+        new() { Text = "Japanese", Value = Locale.Japanese },
+        new() { Text = "English", Value = Locale.English }
    ];

-    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;
--- a/JSMR.UI.Blazor/wwwroot/css/app.css
+++ b/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;
--- a/JSMR.UI.Blazor/wwwroot/css/bit-blazor.css
+++ b/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);
 }
@@ -38,4 +46,23 @@
 .bit-drp-sel:hover {
    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);
 }