fix(web/m7-365): align /library/history with albums-page conventions

Code-quality review flagged convention drift from sibling library
pages. Aligning so the history page matches the same shape:

- queryStore + $derived($queryStore) pattern (single subscription
  point) instead of $query.X everywhere.
- h1 uses font-display text-2xl font-medium per FabledSword design
  system (weights 400/500 only — font-semibold drifted to 600).
- h2 uses font-medium + z-10 for sticky-header layering.
- InfiniteScrollSentinel uses its `enabled` prop (which exists; the
  earlier spec note claiming otherwise was wrong) so the observer
  isn't recreated on every fetch cycle.
- Loading more… / End of history footers added to match albums.
- onRetry passes query.refetch by reference, not wrapped.
- Dropped redundant `as HistoryEvent[]` cast.

Also fixed test case 4 which trivially passed regardless of the
conditional gate's correctness — now queries the sentinel's actual
DOM root (div[aria-hidden="true"].h-px) and asserts presence/absence.
Added a positive twin test for hasNextPage=true.
This commit is contained in:
2026-05-04 06:57:24 -04:00
parent ecf4ed86f5
commit cd0b9c97e1
2 changed files with 35 additions and 19 deletions
+23 -15
View File
@@ -1,35 +1,35 @@
<script lang="ts"> <script lang="ts">
import { createHistoryQuery, type HistoryEvent } from '$lib/api/history';
import { groupByDay } from '$lib/utils/dayGroup';
import { pageTitle } from '$lib/branding'; import { pageTitle } from '$lib/branding';
import { createHistoryQuery } from '$lib/api/history';
import { groupByDay } from '$lib/utils/dayGroup';
import HistoryRow from '$lib/components/HistoryRow.svelte'; import HistoryRow from '$lib/components/HistoryRow.svelte';
import InfiniteScrollSentinel from '$lib/components/InfiniteScrollSentinel.svelte'; import InfiniteScrollSentinel from '$lib/components/InfiniteScrollSentinel.svelte';
import LibrarySkeleton from '$lib/components/LibrarySkeleton.svelte'; import LibrarySkeleton from '$lib/components/LibrarySkeleton.svelte';
import ApiErrorBanner from '$lib/components/ApiErrorBanner.svelte'; import ApiErrorBanner from '$lib/components/ApiErrorBanner.svelte';
const query = createHistoryQuery(); const queryStore = createHistoryQuery();
const query = $derived($queryStore);
const flatEvents = $derived( const flatEvents = $derived(query.data?.pages?.flatMap((p) => p.events) ?? []);
($query.data?.pages ?? []).flatMap((p) => p.events) as HistoryEvent[]
);
const grouped = $derived(groupByDay(flatEvents, new Date())); const grouped = $derived(groupByDay(flatEvents, new Date()));
</script> </script>
<svelte:head><title>{pageTitle('Library · History')}</title></svelte:head> <svelte:head><title>{pageTitle('Library · History')}</title></svelte:head>
<div class="space-y-6"> <div class="space-y-4">
<h1 class="text-2xl font-semibold">History</h1> <header>
<h1 class="font-display text-2xl font-medium text-text-primary">History</h1>
</header>
{#if $query.isPending} {#if query.isPending}
<LibrarySkeleton variant="list" count={12} /> <LibrarySkeleton variant="list" count={12} />
{:else if $query.isError} {:else if query.isError}
<ApiErrorBanner error={$query.error} onRetry={() => $query.refetch()} /> <ApiErrorBanner error={query.error} onRetry={query.refetch} />
{:else if flatEvents.length === 0} {:else if flatEvents.length === 0}
<p class="p-8 text-center text-text-secondary">No listening history yet.</p> <p class="p-8 text-center text-text-secondary">No listening history yet.</p>
{:else} {:else}
{#each grouped as group (group.label)} {#each grouped as group (group.label)}
<section> <section>
<h2 class="sticky top-0 mb-2 bg-background py-1 text-lg font-semibold text-text-secondary"> <h2 class="sticky top-0 z-10 mb-2 bg-background py-1 text-lg font-medium text-text-secondary">
{group.label} {group.label}
</h2> </h2>
<div class="divide-y divide-border"> <div class="divide-y divide-border">
@@ -40,8 +40,16 @@
</section> </section>
{/each} {/each}
{#if $query.hasNextPage && !$query.isFetchingNextPage} {#if query.hasNextPage}
<InfiniteScrollSentinel onIntersect={() => $query.fetchNextPage()} /> <InfiniteScrollSentinel
enabled={!query.isFetchingNextPage}
onIntersect={() => query.fetchNextPage()}
/>
{#if query.isFetchingNextPage}
<p class="py-2 text-center text-sm text-text-secondary">Loading more…</p>
{/if}
{:else if flatEvents.length > 0}
<p class="py-2 text-center text-sm text-text-secondary">End of history</p>
{/if} {/if}
{/if} {/if}
</div> </div>
+12 -4
View File
@@ -108,10 +108,18 @@ describe('library/history page', () => {
mockData = { pages: [{ events: [mkEvent('a', new Date())], has_more: false }] }; mockData = { pages: [{ events: [mkEvent('a', new Date())], has_more: false }] };
mockHasNextPage = false; mockHasNextPage = false;
const { container } = render(HistoryPage); const { container } = render(HistoryPage);
// Sentinel renders an empty <div ref> — assert by absence of the call. // InfiniteScrollSentinel renders <div aria-hidden="true" class="h-px">.
// (We can't easily query for the sentinel itself in the DOM since it has // When hasNextPage is false, no such div should be in the DOM.
// no aria role; instead, verify the page renders the song without error.) expect(container.querySelector('div[aria-hidden="true"].h-px')).toBeNull();
// Confirm the page rendered the row so we know we hit the success branch.
expect(screen.getByText('Song a')).toBeInTheDocument(); expect(screen.getByText('Song a')).toBeInTheDocument();
expect(container).toBeTruthy(); });
it('renders the InfiniteScrollSentinel when hasNextPage is true', () => {
mockData = { pages: [{ events: [mkEvent('a', new Date())], has_more: true }] };
mockHasNextPage = true;
mockIsFetchingNextPage = false;
const { container } = render(HistoryPage);
expect(container.querySelector('div[aria-hidden="true"].h-px')).not.toBeNull();
}); });
}); });