From e2d353b54d69d11f43f7d02a7719cfe0c75f9024 Mon Sep 17 00:00:00 2001 From: Sluijsens Date: Tue, 17 Nov 2026 20:01:07 +0100 Subject: [PATCH] Mediabibliotheek: tegels als standaardweergave, schakelaar tegels/lijst met onthouden keuze Co-Authored-By: Claude Sonnet 5.5 --- .../assumptions-and-open-questions.md | 1 + .../media/components/PhotoSelectionList.tsx | 120 +++++++++++------- .../features/media/lib/layoutPreference.ts | 28 ++++ .../media/pages/MediaLibraryPage.test.tsx | 31 +++++ .../features/media/pages/MediaLibraryPage.tsx | 30 +++-- frontend/src/i18n/locales/en/translation.json | 5 + frontend/src/i18n/locales/nl/translation.json | 5 + 7 files changed, 165 insertions(+), 55 deletions(-) create mode 100644 frontend/src/features/media/lib/layoutPreference.ts diff --git a/aidlc-docs/features/media-library/assumptions-and-open-questions.md b/aidlc-docs/features/media-library/assumptions-and-open-questions.md index c9a185f..53b6c14 100644 --- a/aidlc-docs/features/media-library/assumptions-and-open-questions.md +++ b/aidlc-docs/features/media-library/assumptions-and-open-questions.md @@ -72,3 +72,4 @@ Kept while Bryan is away (2026-11-17): no questions to him, a most probable assu | 41 | **The picker has a single and a multiple mode** (Bryan, 2026-11-17). | `ImagePicker` takes `mode="single"` (default, radio group, used by the hero slides) or `mode="multiple"` (checkboxes, several photos, several files per upload, ready for the gallery). Both use the same upload checks. | n/a | `ImagePicker.tsx` | | 42 | **One progress pattern for upload, processing and a new crop** (Bryan, 2026-11-17, after seeing it on test). | A shared `ProcessingProgress` (text "Wordt verwerkt…", one 0-100% bar, the percentage, no spinner, no step counts) is used on every photo and for the batch. The batch bar covers upload and processing together; there are no byte counts from the upload, so a photo's percentage is staged: waiting 0, uploading 15, uploaded 30, then 30-100 from the server's processing steps. A new crop uses the full 0-100 from its steps. The counter "x van y verwerkt" stays per batch. | Real upload byte progress (needs XHR progress in the API client). | `features/media/components/ProcessingProgress.tsx`, `lib/photoProgress.ts`, `hero/components/ProcessingStatus.tsx` | | 43 | **"Slide toevoegen" replaces the per-slide library button** (Bryan, 2026-11-17, after seeing it on test; replaces assumption 36's per-slide button). | The per-slide "Kies uit bibliotheek" is gone. The existing add button is "Slide toevoegen" and opens the shared picker: choose a library photo or upload one on the spot (it also lands in the library, ML-17); one photo makes one NEW slide. A slide's photo cannot be changed or replaced: remove the slide and add another. Dropping files on the section still adds one slide per file (same upload as before). The crop per slide stays a goal (phase 2). | Keep a per-slide change button: Bryan said no. | `HeroPage.addSlideWithPhoto`, `LibraryPickerDialog` | +| 44 | **Tiles or list in the library** (Bryan, 2026-11-17). | The library and the trash show the photos as tiles (grid of thumbnails, selectable, same usage and links) by default, with a switch Tiles / List next to the filters. The choice is remembered in the browser (`localStorage`, guarded; it falls back to tiles). The clean-up dialog keeps its list. The picker already is a grid. | Remember the choice on the server per user: needs a user-settings store. | `PhotoSelectionList` (`layout`), `lib/layoutPreference.ts`, `MediaLibraryPage` | diff --git a/frontend/src/features/media/components/PhotoSelectionList.tsx b/frontend/src/features/media/components/PhotoSelectionList.tsx index 543e7a5..d53d795 100644 --- a/frontend/src/features/media/components/PhotoSelectionList.tsx +++ b/frontend/src/features/media/components/PhotoSelectionList.tsx @@ -1,6 +1,7 @@ import { useRef, type ReactNode } from 'react'; import { useTranslation } from 'react-i18next'; import { Checkbox } from '@/components/ui/checkbox'; +import { cn } from '@/lib/utils'; import { formatBytes } from '../lib/format'; import { BulkActionBar, type BulkActionBarProps } from './BulkActionBar'; import { usageLabel } from '../lib/usageLabel'; @@ -38,13 +39,15 @@ interface PhotoSelectionListProps { renderUse?: (use: PhotoUse, label: string) => ReactNode; /** The actions on the selection. They appear in the header of the list, above the photos, once something is selected. */ bulk?: Omit; + /** A list of rows (default) or a grid of tiles with big thumbnails. Everything works in both. */ + layout?: 'list' | 'tiles'; } /** * The photos with a checkbox each: click or Space to toggle, shift-click for a range, a "select all" box in the header * (with the in-between state), and a live announcement of the count. One component for the library and the clean-up. */ -export function PhotoSelectionList({ items, selection, onSelectionChange, isDisabled, renderUse, bulk }: PhotoSelectionListProps) { +export function PhotoSelectionList({ items, selection, onSelectionChange, isDisabled, renderUse, bulk, layout = 'list' }: PhotoSelectionListProps) { const { t, i18n } = useTranslation(); const anchor = useRef(null); const selectable = items.filter((item) => !isDisabled?.(item)); @@ -85,56 +88,79 @@ export function PhotoSelectionList({ items, selection, onSelectionChange, isDisa {t('media.bulk.selected', { count: selection.size })} -
    +
      {items.map((item) => { const disabled = isDisabled?.(item) ?? false; const labelId = `photo-${item.id}-label`; - return ( + const tiles = layout === 'tiles'; + const checkbox = ( + undefined} + onClick={(event) => onItemClick(item.id, event.currentTarget.checked, event.shiftKey)} + /> + ); + const thumbnail = item.thumbnailUrl ? ( + + ) : ( + + {t('media.list.noThumbnail')} + + ); + const details = ( +
      +

      + {item.name} +

      +

      + {dateFormat.format(new Date(item.createdAt))} · {formatBytes(item.bytes, i18n.language)} +

      +

      + {item.deletedAt ? ( + {t('media.trash.since', { date: dateFormat.format(new Date(item.deletedAt)) })} + ) : item.uses.length === 0 ? ( + + {item.unusedSince ? t('media.use.noneSince', { date: dateFormat.format(new Date(item.unusedSince)) }) : t('media.use.none')} + + ) : ( + + {item.uses.map((use, index) => { + const label = usageLabel(t, use); + return ( + + {index > 0 && '; '} + {renderUse ? renderUse(use, label) : label} + + ); + })} + + )} +

      +
      + ); + return tiles ? ( +
    • +
      {checkbox}
      + {thumbnail} +
      {details}
      +
    • + ) : (
    • - undefined} - onClick={(event) => onItemClick(item.id, event.currentTarget.checked, event.shiftKey)} - /> - {item.thumbnailUrl ? ( - - ) : ( - - {t('media.list.noThumbnail')} - - )} -
      -

      - {item.name} -

      -

      - {dateFormat.format(new Date(item.createdAt))} · {formatBytes(item.bytes, i18n.language)} -

      -

      - {item.deletedAt ? ( - {t('media.trash.since', { date: dateFormat.format(new Date(item.deletedAt)) })} - ) : item.uses.length === 0 ? ( - - {item.unusedSince ? t('media.use.noneSince', { date: dateFormat.format(new Date(item.unusedSince)) }) : t('media.use.none')} - - ) : ( - - {item.uses.map((use, index) => { - const label = usageLabel(t, use); - return ( - - {index > 0 && '; '} - {renderUse ? renderUse(use, label) : label} - - ); - })} - - )} -

      -
      + {checkbox} + {thumbnail} + {details}
    • ); })} diff --git a/frontend/src/features/media/lib/layoutPreference.ts b/frontend/src/features/media/lib/layoutPreference.ts new file mode 100644 index 0000000..831aa1a --- /dev/null +++ b/frontend/src/features/media/lib/layoutPreference.ts @@ -0,0 +1,28 @@ +import { useCallback, useState } from 'react'; + +export type PhotoLayout = 'tiles' | 'list'; + +const KEY = 'slp.media.layout'; + +/** The layout this user chose last (tiles by default). Browser storage may be blocked, so every access is guarded. */ +export function readLayout(): PhotoLayout { + try { + return window.localStorage.getItem(KEY) === 'list' ? 'list' : 'tiles'; + } catch { + return 'tiles'; + } +} + +/** The layout of the photos and a setter that remembers the choice per user (per browser). */ +export function useLayoutPreference(): [PhotoLayout, (layout: PhotoLayout) => void] { + const [layout, setLayoutState] = useState(readLayout); + const setLayout = useCallback((next: PhotoLayout) => { + setLayoutState(next); + try { + window.localStorage.setItem(KEY, next); + } catch { + // Blocked or full: the choice then only lasts for this visit. + } + }, []); + return [layout, setLayout]; +} diff --git a/frontend/src/features/media/pages/MediaLibraryPage.test.tsx b/frontend/src/features/media/pages/MediaLibraryPage.test.tsx index cf4378a..64662c0 100644 --- a/frontend/src/features/media/pages/MediaLibraryPage.test.tsx +++ b/frontend/src/features/media/pages/MediaLibraryPage.test.tsx @@ -23,6 +23,7 @@ function renderPage() { } beforeEach(async () => { + window.localStorage.removeItem('slp.media.layout'); await i18n.changeLanguage('nl'); }); @@ -289,6 +290,36 @@ describe('MediaLibraryPage', () => { expect(await screen.findByTestId('purge-partial')).toHaveTextContent('1 foto kon niet worden verwijderd'); }); + it('shows tiles by default, switches to a list, remembers the choice and keeps every function in both', async () => { + const first = renderPage(); + await screen.findByTestId('photo-selection-list'); + expect(screen.getByTestId('photo-items')).toHaveAttribute('data-layout', 'tiles'); + expect(screen.getByTestId('layout-tiles')).toHaveAttribute('aria-pressed', 'true'); + + // Selecting and the bulk bar work on tiles. + await userEvent.click(screen.getByRole('checkbox', { name: 'zomer.jpg' })); + expect(await screen.findByTestId('bulk-count')).toHaveTextContent('1 foto geselecteerd'); + + // The filter works on tiles. + await userEvent.click(screen.getByTestId('filter-unused')); + expect(within(screen.getByTestId('photo-items')).getAllByRole('listitem')).toHaveLength(1); + await userEvent.click(screen.getByTestId('filter-all')); + + await userEvent.click(screen.getByTestId('layout-list')); + expect(screen.getByTestId('photo-items')).toHaveAttribute('data-layout', 'list'); + expect(screen.getByTestId('layout-list')).toHaveAttribute('aria-pressed', 'true'); + expect(window.localStorage.getItem('slp.media.layout')).toBe('list'); + first.unmount(); + + // A later visit starts with the remembered layout, also in the trash view. + renderPage(); + await screen.findByTestId('photo-selection-list'); + expect(screen.getByTestId('photo-items')).toHaveAttribute('data-layout', 'list'); + await userEvent.click(screen.getByTestId('view-trash')); + await screen.findByTestId('trash-note'); + expect(screen.getByTestId('layout-list')).toBeInTheDocument(); + }); + it('shows an error when the library cannot be loaded', async () => { server.use(http.get('*/media-library/photos', () => new HttpResponse(null, { status: 500 }))); renderPage(); diff --git a/frontend/src/features/media/pages/MediaLibraryPage.tsx b/frontend/src/features/media/pages/MediaLibraryPage.tsx index 1727c5f..5bf5208 100644 --- a/frontend/src/features/media/pages/MediaLibraryPage.tsx +++ b/frontend/src/features/media/pages/MediaLibraryPage.tsx @@ -1,13 +1,14 @@ import { useMemo, useState, type ReactNode } from 'react'; import { Link } from '@tanstack/react-router'; import { useTranslation } from 'react-i18next'; -import { Eraser, RotateCcw, Trash2, XCircle } from 'lucide-react'; +import { Eraser, LayoutGrid, List, RotateCcw, Trash2, XCircle } from 'lucide-react'; import { Button } from '@/components/ui/button'; import { CleanupDialog } from '../components/CleanupDialog'; import { DeleteDialog } from '../components/DeleteDialog'; import { PurgeDialog } from '../components/PurgeDialog'; import { PhotoSelectionList, type PhotoUse } from '../components/PhotoSelectionList'; import { StorageMeter } from '../components/StorageMeter'; +import { useLayoutPreference } from '../lib/layoutPreference'; import { emptySelection, prune, type Selection } from '../lib/selection'; import { rememberHeroImagesTab, usageTarget } from '../lib/usageLabel'; import { toPhotoItem } from '../lib/toPhotoItem'; @@ -44,6 +45,7 @@ export function MediaLibraryPage() { const [deleting, setDeleting] = useState(false); const [purging, setPurging] = useState<'selected' | 'all' | null>(null); const [filter, setFilter] = useState('all'); + const [layout, setLayout] = useLayoutPreference(); const source = view === 'library' ? photos : trash; const items = useMemo( @@ -97,15 +99,27 @@ export function MediaLibraryPage() { ))} - {view === 'library' && ( -
      - {(['all', 'used', 'unused'] as const).map((value) => ( - + ))} +
      + ) : ( + + )} +
      + {([['tiles', LayoutGrid], ['list', List]] as const).map(([value, Icon]) => ( + ))}
      - )} + {view === 'trash' && (
      @@ -128,7 +142,7 @@ export function MediaLibraryPage() { {t('media.page.noModules')}

      )} - {source.data && setSelection(emptySelection) }} />} + {source.data && setSelection(emptySelection) }} />}