sorting fixes (#297)

* sorting fixes

* use natural sort for add to schedule dialog

CHANGELOG.md

@@ -7,6 +7,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 - Include audio language metadata in all streaming modes
 
+### Changed
+- Use case-insensitive sorting for collections page and `Add to Collection` dialog
+- Use natural sorting for schedules page and `Add to Schedule` dialog
+
 ### Fixed
 - Fix flooding schedule items that have a fixed start time
 

ErsatzTV.Application/MediaCollections/Queries/GetPagedCollectionsHandler.cs

@@ -33,6 +33,7 @@ namespace ErsatzTV.Application.MediaCollections.Queries
             List<MediaCollectionViewModel> page = await dbContext.Collections.FromSqlRaw(
                     @"SELECT * FROM Collection
                     ORDER BY Name
+                    COLLATE NOCASE
                     LIMIT {0} OFFSET {1}",
                     request.PageSize,
                     request.PageNum * request.PageSize)

ErsatzTV/ErsatzTV.csproj

@@ -35,6 +35,7 @@
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
       <PackageReference Include="MudBlazor" Version="5.0.15" />
+      <PackageReference Include="NaturalSort.Extension" Version="3.1.0" />
       <PackageReference Include="PPioli.FluentValidation.Blazor" Version="5.0.0" />
       <PackageReference Include="Refit.HttpClientFactory" Version="6.0.38" />
       <PackageReference Include="Serilog" Version="2.10.0" />

ErsatzTV/Pages/Schedules.razor

@@ -4,6 +4,7 @@
 @using ErsatzTV.Application.ProgramSchedules.Queries
 @using ErsatzTV.Application.Configuration.Queries
 @using ErsatzTV.Application.Configuration.Commands
+@using NaturalSort.Extension
 @inject IDialogService _dialog
 @inject IMediator _mediator
 
@@ -135,7 +136,7 @@
         await _mediator.Send(new SaveConfigElementByKey(ConfigElementKey.SchedulesPageSize, state.PageSize.ToString()));
 
         List<ProgramScheduleViewModel> schedules = await _mediator.Send(new GetAllProgramSchedules());
-        IOrderedEnumerable<ProgramScheduleViewModel> sorted = schedules.OrderBy(s => s.Name);
+        IOrderedEnumerable<ProgramScheduleViewModel> sorted = schedules.OrderBy(s => s.Name, new NaturalSortComparer(StringComparison.CurrentCultureIgnoreCase));
 
         // TODO: properly page this data
         return new TableData<ProgramScheduleViewModel>

ErsatzTV/Shared/AddToCollectionDialog.razor

@@ -72,7 +72,7 @@
     protected override async Task OnParametersSetAsync()
     {
         _collections = await _mediator.Send(new GetAllCollections())
-            .Map(list => new[] { _newCollection }.Append(list).ToList());
+            .Map(list => new[] { _newCollection }.Append(list.OrderBy(vm => vm.Name, StringComparer.CurrentCultureIgnoreCase)).ToList());
 
         if (_memoryCache.TryGetValue("AddToCollectionDialog.SelectedCollectionId", out int id))
         {

ErsatzTV/Shared/AddToScheduleDialog.razor

@@ -1,5 +1,6 @@
 @using ErsatzTV.Application.ProgramSchedules
 @using ErsatzTV.Application.ProgramSchedules.Queries
+@using NaturalSort.Extension
 @inject IMediator _mediator
 
 <div @onkeydown="@OnKeyDown">
@@ -49,7 +50,8 @@
     private ProgramScheduleViewModel _selectedSchedule;
 
     protected override async Task OnParametersSetAsync() =>
-        _schedules = await _mediator.Send(new GetAllProgramSchedules());
+        _schedules = await _mediator.Send(new GetAllProgramSchedules())
+            .Map(list => list.OrderBy(vm => vm.Name, new NaturalSortComparer(StringComparison.CurrentCultureIgnoreCase)).ToList());
 
     private string FormatText() => $"Select the schedule to add the {EntityType} {EntityName}";