Add library author and project sorting (#18)

KSemenenko · KSemenenko · commit 7e892f0232dd · 2026-04-25T21:34:29.000+02:00
diff --git a/src/PrompterOne.Shared/Contracts/UiTestIds.Library.cs b/src/PrompterOne.Shared/Contracts/UiTestIds.Library.cs
@@ -28,7 +28,10 @@ public static class Library
         public const string SortDuration = "library-sort-duration";
         public const string SortName = "library-sort-name";
         public const string SortWpm = "library-sort-wpm";
+        public const string SortAuthor = "library-sort-author";
+        public const string SortProject = "library-sort-project";
         public const string ToneMetadataToggle = "library-tone-metadata-toggle";
+        public const string CardsGrid = "library-cards-grid";
 
         public static string BreadcrumbCurrent(string folderId) => $"library-breadcrumb-{folderId}";
 
diff --git a/src/PrompterOne.Shared/Library/Components/LibraryCardsGrid.razor b/src/PrompterOne.Shared/Library/Components/LibraryCardsGrid.razor
@@ -4,7 +4,7 @@
 @using PrompterOne.Shared.Localization
 @inject IStringLocalizer<SharedResource> Localizer
 
-<div class="dcards-grid">
+<div class="dcards-grid" data-test="@UiTestIds.Library.CardsGrid">
     @foreach (var card in Cards)
     {
         <LibraryScriptCard Card="@card"
diff --git a/src/PrompterOne.Shared/Library/Components/LibrarySortMode.cs b/src/PrompterOne.Shared/Library/Components/LibrarySortMode.cs
@@ -5,5 +5,7 @@ public enum LibrarySortMode
     Name,
     Date,
     Duration,
-    Wpm
+    Wpm,
+    Author,
+    Project
 }
diff --git a/src/PrompterOne.Shared/Library/Pages/LibraryPage.ViewState.cs b/src/PrompterOne.Shared/Library/Pages/LibraryPage.ViewState.cs
@@ -80,11 +80,30 @@ private IEnumerable<LibraryCardViewModel> SortCards(IEnumerable<LibraryCardViewM
             LibrarySortMode.Date => cards.OrderByDescending(card => card.UpdatedAt),
             LibrarySortMode.Duration => cards.OrderByDescending(card => card.Duration),
             LibrarySortMode.Wpm => cards.OrderByDescending(card => card.AverageWpm),
+            LibrarySortMode.Author => cards
+                .OrderBy(card => card.Author, StringComparer.OrdinalIgnoreCase)
+                .ThenBy(card => card.Title, StringComparer.OrdinalIgnoreCase),
+            LibrarySortMode.Project => cards
+                .OrderBy(card => ResolveProjectSortLabel(card), StringComparer.OrdinalIgnoreCase)
+                .ThenBy(card => card.Title, StringComparer.OrdinalIgnoreCase),
             _ => cards
                 .OrderBy(card => card.DisplayOrder)
                 .ThenBy(card => card.Title, StringComparer.OrdinalIgnoreCase)
         };
 
+    private string ResolveProjectSortLabel(LibraryCardViewModel card)
+    {
+        if (string.IsNullOrWhiteSpace(card.FolderId))
+        {
+            return string.Empty;
+        }
+
+        return _folders
+            .FirstOrDefault(folder => string.Equals(folder.Id, card.FolderId, StringComparison.Ordinal))
+            ?.Name
+            ?? string.Empty;
+    }
+
     private string? GetSortClass(LibrarySortMode sortMode) => _sortMode == sortMode ? "active" : null;
 
     private string ResolveSelectedFolderLabel()
diff --git a/src/PrompterOne.Shared/Library/Pages/LibraryPage.razor b/src/PrompterOne.Shared/Library/Pages/LibraryPage.razor
@@ -37,6 +37,14 @@
                         @onclick="() => SetSortMode(LibrarySortMode.Wpm)"
                         data-active="@(GetSortModeState(LibrarySortMode.Wpm))"
                         data-test="@UiTestIds.Library.SortWpm">@Text(UiTextKey.LibrarySortWpm)</button>
+                <button class="sort-btn @GetSortClass(LibrarySortMode.Author)"
+                        @onclick="() => SetSortMode(LibrarySortMode.Author)"
+                        data-active="@(GetSortModeState(LibrarySortMode.Author))"
+                        data-test="@UiTestIds.Library.SortAuthor">@Text(UiTextKey.LibrarySortAuthor)</button>
+                <button class="sort-btn @GetSortClass(LibrarySortMode.Project)"
+                        @onclick="() => SetSortMode(LibrarySortMode.Project)"
+                        data-active="@(GetSortModeState(LibrarySortMode.Project))"
+                        data-test="@UiTestIds.Library.SortProject">@Text(UiTextKey.LibrarySortProject)</button>
                 <button class="sort-btn tone-toggle @(_showToneMetadata ? "active" : null)"
                         type="button"
                         aria-pressed="@(_showToneMetadata ? "true" : "false")"
diff --git a/src/PrompterOne.Shared/Localization/SharedResource.de.resx b/src/PrompterOne.Shared/Localization/SharedResource.de.resx
@@ -105,6 +105,12 @@
   <data name="LibrarySortWpm" xml:space="preserve">
     <value>WPM</value>
   </data>
+  <data name="LibrarySortAuthor" xml:space="preserve">
+    <value>Autor</value>
+  </data>
+  <data name="LibrarySortProject" xml:space="preserve">
+    <value>Projekt</value>
+  </data>
   <data name="LibraryToneMetadata" xml:space="preserve">
     <value>Ton</value>
   </data>
diff --git a/src/PrompterOne.Shared/Localization/SharedResource.es.resx b/src/PrompterOne.Shared/Localization/SharedResource.es.resx
@@ -105,6 +105,12 @@
   <data name="LibrarySortWpm" xml:space="preserve">
     <value>PPM</value>
   </data>
+  <data name="LibrarySortAuthor" xml:space="preserve">
+    <value>Autor</value>
+  </data>
+  <data name="LibrarySortProject" xml:space="preserve">
+    <value>Proyecto</value>
+  </data>
   <data name="LibraryToneMetadata" xml:space="preserve">
     <value>Tono</value>
   </data>
diff --git a/src/PrompterOne.Shared/Localization/SharedResource.fr.resx b/src/PrompterOne.Shared/Localization/SharedResource.fr.resx
@@ -105,6 +105,12 @@
   <data name="LibrarySortWpm" xml:space="preserve">
     <value>MPM</value>
   </data>
+  <data name="LibrarySortAuthor" xml:space="preserve">
+    <value>Auteur</value>
+  </data>
+  <data name="LibrarySortProject" xml:space="preserve">
+    <value>Projet</value>
+  </data>
   <data name="LibraryToneMetadata" xml:space="preserve">
     <value>Ton</value>
   </data>
diff --git a/src/PrompterOne.Shared/Localization/SharedResource.it.resx b/src/PrompterOne.Shared/Localization/SharedResource.it.resx
@@ -105,6 +105,12 @@
   <data name="LibrarySortWpm" xml:space="preserve">
     <value>PPM</value>
   </data>
+  <data name="LibrarySortAuthor" xml:space="preserve">
+    <value>Autore</value>
+  </data>
+  <data name="LibrarySortProject" xml:space="preserve">
+    <value>Progetto</value>
+  </data>
   <data name="LibraryToneMetadata" xml:space="preserve">
     <value>Tono</value>
   </data>
diff --git a/src/PrompterOne.Shared/Localization/SharedResource.pt.resx b/src/PrompterOne.Shared/Localization/SharedResource.pt.resx
@@ -105,6 +105,12 @@
   <data name="LibrarySortWpm" xml:space="preserve">
     <value>PPM</value>
   </data>
+  <data name="LibrarySortAuthor" xml:space="preserve">
+    <value>Autor</value>
+  </data>
+  <data name="LibrarySortProject" xml:space="preserve">
+    <value>Projeto</value>
+  </data>
   <data name="LibraryToneMetadata" xml:space="preserve">
     <value>Tom</value>
   </data>
diff --git a/src/PrompterOne.Shared/Localization/SharedResource.resx b/src/PrompterOne.Shared/Localization/SharedResource.resx
@@ -105,6 +105,12 @@
   <data name="LibrarySortWpm" xml:space="preserve">
     <value>WPM</value>
   </data>
+  <data name="LibrarySortAuthor" xml:space="preserve">
+    <value>Author</value>
+  </data>
+  <data name="LibrarySortProject" xml:space="preserve">
+    <value>Project</value>
+  </data>
   <data name="LibraryToneMetadata" xml:space="preserve">
     <value>Tone</value>
   </data>
diff --git a/src/PrompterOne.Shared/Localization/SharedResource.uk.resx b/src/PrompterOne.Shared/Localization/SharedResource.uk.resx
@@ -105,6 +105,12 @@
   <data name="LibrarySortWpm" xml:space="preserve">
     <value>WPM</value>
   </data>
+  <data name="LibrarySortAuthor" xml:space="preserve">
+    <value>Автор</value>
+  </data>
+  <data name="LibrarySortProject" xml:space="preserve">
+    <value>Проєкт</value>
+  </data>
   <data name="LibraryToneMetadata" xml:space="preserve">
     <value>Тон</value>
   </data>
diff --git a/src/PrompterOne.Shared/Localization/UiTextKey.cs b/src/PrompterOne.Shared/Localization/UiTextKey.cs
@@ -40,6 +40,8 @@ public enum UiTextKey
     LibrarySortDate,
     LibrarySortDuration,
     LibrarySortWpm,
+    LibrarySortAuthor,
+    LibrarySortProject,
     LibraryToneMetadata,
     LibraryCreateFolderTitle,
     LibraryCreateFolderDescription,
diff --git a/tests/PrompterOne.Web.Tests/Library/LibraryFolderInteractionTests.cs b/tests/PrompterOne.Web.Tests/Library/LibraryFolderInteractionTests.cs
@@ -132,6 +132,30 @@ public void LibraryPage_CardPlaybackActionsUseClearModeLabels()
         });
     }
 
+    [Test]
+    public void LibraryPage_ProjectSortOrdersCardsByFolderName_AndPersistsSelection()
+    {
+        var cut = Render<LibraryPage>();
+
+        cut.WaitForAssertion(() => Assert.Contains(AppTestData.Scripts.DemoTitle, cut.Markup));
+
+        cut.FindByTestId(UiTestIds.Library.SortProject).Click();
+
+        cut.WaitForAssertion(() =>
+        {
+            Assert.Equal(ActiveStateValue, cut.FindByTestId(UiTestIds.Library.SortProject).GetAttribute("data-active"));
+            Assert.Equal(AppTestData.Scripts.LearnWpmBoundaryTitle, ResolveFirstCardTitle(cut));
+        });
+
+        cut = Render<LibraryPage>();
+
+        cut.WaitForAssertion(() =>
+        {
+            Assert.Equal(ActiveStateValue, cut.FindByTestId(UiTestIds.Library.SortProject).GetAttribute("data-active"));
+            Assert.Equal(AppTestData.Scripts.LearnWpmBoundaryTitle, ResolveFirstCardTitle(cut));
+        });
+    }
+
     [Test]
     public async Task LibraryPage_CancelsFolderOverlay_WithoutCreatingFolder()
     {
@@ -284,4 +308,9 @@ public async Task LibraryPage_RestoresPersistedFolderSelectionAfterReload()
             Assert.Equal(ActiveStateValue, cut.FindByTestId(UiTestIds.Library.SortDate).GetAttribute("data-active"));
         });
     }
+
+    private static string ResolveFirstCardTitle(IRenderedComponent<LibraryPage> cut) =>
+        cut.Find($"[data-test='{UiTestIds.Library.CardsGrid}'] article.dcard:not(.dcard-create) .dcard-title")
+            .TextContent
+            .Trim();
 }
diff --git a/tests/PrompterOne.Web.UITests.Shell/Library/LibraryScreenFlowTests.cs b/tests/PrompterOne.Web.UITests.Shell/Library/LibraryScreenFlowTests.cs
@@ -278,6 +278,36 @@ await Expect(page.GetByTestId(UiTestIds.Library.ToneMetadataToggle)).ToHaveAttri
             await Expect(page.GetByTestId(UiTestIds.Library.CardTone(BrowserTestConstants.Scripts.DemoId))).ToHaveCountAsync(0);
         });
 
+    [Test]
+    public Task LibraryScreen_ProjectSortPersistsAcrossReloads() =>
+        RunPageAsync(async page =>
+        {
+            await ShellRouteDriver.OpenLibraryAsync(page);
+
+            var firstCardTitle = page
+                .Locator($"[data-test='{UiTestIds.Library.CardsGrid}'] article.dcard:not(.dcard-create) .dcard-title")
+                .First;
+
+            await UiInteractionDriver.ClickAndContinueAsync(page.GetByTestId(UiTestIds.Library.SortProject));
+
+            await Expect(page.GetByTestId(UiTestIds.Library.SortProject)).ToHaveAttributeAsync(
+                BrowserTestConstants.State.ActiveAttribute,
+                BrowserTestConstants.State.ActiveValue);
+            await Expect(firstCardTitle).ToHaveTextAsync(BrowserTestConstants.Scripts.HugeDraftTitle);
+
+            await BrowserRouteDriver.ReloadPageAsync(
+                page,
+                BrowserTestConstants.Routes.Library,
+                UiTestIds.Library.Page,
+                "library-project-sort-reload");
+            await Expect(page.GetByTestId(UiTestIds.Library.SortProject)).ToHaveAttributeAsync(
+                BrowserTestConstants.State.ActiveAttribute,
+                BrowserTestConstants.State.ActiveValue);
+            await Expect(firstCardTitle).ToHaveTextAsync(BrowserTestConstants.Scripts.HugeDraftTitle);
+            await Expect(page.GetByTestId(UiTestIds.Library.SortDuration)).ToBeVisibleAsync();
+            await Expect(page.GetByTestId(UiTestIds.Library.SortWpm)).ToBeVisibleAsync();
+        });
+
     [Test]
     public Task LibraryScreen_RootBreadcrumb_RendersSingleAllScriptsLabel() =>
         RunPageAsync(async page =>

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`@using PrompterOne.Shared.Localization`
`5`	`5`	`@inject IStringLocalizer<SharedResource> Localizer`
`6`	`6`
`7`		`-<div class="dcards-grid">`
	`7`	`+<div class="dcards-grid" data-test="@UiTestIds.Library.CardsGrid">`
`8`	`8`	`@foreach (var card in Cards)`
`9`	`9`	`{`
`10`	`10`	`<LibraryScriptCard Card="@card"`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,7 @@ public enum LibrarySortMode`
`5`	`5`	`Name,`
`6`	`6`	`Date,`
`7`	`7`	`Duration,`
`8`		`- Wpm`
	`8`	`+ Wpm,`
	`9`	`+ Author,`
	`10`	`+ Project`
`9`	`11`	`}`