From 3c3448dee0f3dc19c7f1304a791db057b534f185 Mon Sep 17 00:00:00 2001
From: Maxime Adler <madler@sqli.com>
Date: Thu, 15 May 2025 12:35:50 +0200
Subject: [PATCH] Order dropdown content (#49)

---
 .../Pages/Games/Filter/AdvancedGameFilter.razor               | 2 +-
 .../Shared/Components/Select/Models/SelectParams.cs           | 2 ++
 .../GameIdeas.BlazorApp/Shared/Components/Select/Select.razor | 4 ++--
 .../Shared/Components/SelectSearch/SelectSearch.razor.cs      | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor
index 37c3ae6..d0863d8 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Pages/Games/Filter/AdvancedGameFilter.razor
@@ -27,7 +27,7 @@
     <SelectSearch TItem="int" Placeholder="@ResourcesKey.ReleaseDate" GetLabel="@(p => p.ToString())"
                   @bind-Values=GameFilter.ReleaseYears @bind-Values:after=HandleValueChanged Theme="Theme" Items="Categories?.ReleaseYears" />
 
-    <SelectSearch TItem="int" Placeholder="@ResourcesKey.StorageSize" GetLabel="@GetStorageSpaceLabel"
+    <SelectSearch TItem="int" Placeholder="@ResourcesKey.StorageSize" GetLabel="@GetStorageSpaceLabel" OrderBy="@(item => item.ToString())"
                   @bind-Values=GameFilter.StorageSpaceIds @bind-Values:after=HandleValueChanged Theme="Theme" Items="@(Categories?.StorageSpaces?.Select(stor => stor.Id).ToList())" />
 
     <span class="title">@ResourcesKey.LastAdd</span>
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Models/SelectParams.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Models/SelectParams.cs
index 24b788a..39bf705 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Models/SelectParams.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Models/SelectParams.cs
@@ -4,8 +4,10 @@ public class SelectParams<TItem, THeader>
 {
     public List<TItem> Items { get; set; } = [];
     public Func<TItem, string> GetItemLabel { get; set; } = _ => string.Empty;
+    public Func<TItem, string>? GetItemOrder { get; set; }
     public List<THeader> Headers { get; set; } = [];
     public Func<THeader, string> GetHeaderLabel { get; set; } = _ => string.Empty;
+    public Func<THeader, string>? GetHeaderOrder { get; set; }
     public Func<string, TItem>? AddItem { get; set; }
 
 }
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Select.razor b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Select.razor
index 1ab6f65..87519ff 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Select.razor
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/Select/Select.razor
@@ -27,7 +27,7 @@
 
                 @if (Params.Headers != null)
                 {
-                    @foreach (var header in (HeaderValues ?? []).UnionBy(Params.Headers, Params.GetHeaderLabel))
+                    @foreach (var header in (HeaderValues ?? []).UnionBy(Params.Headers, Params.GetHeaderLabel).OrderBy(Params.GetHeaderOrder ?? Params.GetHeaderLabel))
                     {
                         <SelectRow IsSelected=@(HeaderValues?.Contains(header))
                                    Label="@Params.GetHeaderLabel(header)" Theme=Theme
@@ -42,7 +42,7 @@
 
                 @if (Params.Items != null)
                 {
-                    @foreach (var item in (Values ?? []).UnionBy(Params.Items, Params.GetItemLabel))
+                    @foreach (var item in (Values ?? []).UnionBy(Params.Items, Params.GetItemLabel).OrderBy(Params.GetItemOrder ?? Params.GetItemLabel))
                     {
                         <SelectRow IsSelected=@(Values?.Contains(item))
                                    Label="@Params.GetItemLabel(item)" Theme=Theme
diff --git a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectSearch/SelectSearch.razor.cs b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectSearch/SelectSearch.razor.cs
index 466d708..6726893 100644
--- a/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectSearch/SelectSearch.razor.cs
+++ b/src/GameIdeas/Client/GameIdeas.BlazorApp/Shared/Components/SelectSearch/SelectSearch.razor.cs
@@ -10,6 +10,7 @@ public partial class SelectSearch<TItem>
     [Parameter] public SelectTheme Theme { get; set; }
     [Parameter] public List<TItem> Items { get; set; } = [];
     [Parameter] public Func<TItem, string> GetLabel { get; set; } = _ => string.Empty;
+    [Parameter] public Func<TItem, string>? OrderBy { get; set; } = _ => string.Empty;
     [Parameter] public List<TItem> Values { get; set; } = [];
     [Parameter] public EventCallback<List<TItem>> ValuesChanged { get; set; }
     [Parameter] public string Placeholder { get; set; } = string.Empty;
@@ -27,6 +28,7 @@ public partial class SelectSearch<TItem>
         {
             Items = Items,
             GetItemLabel = GetLabel,
+            GetItemOrder = OrderBy,
             AddItem = AddItem
         };