Hero-admin: meerdere foto's tegelijk, slepen, niet-opgeslagen waarschuwing, begrijpelijke teksten, rustige wachtanimatie

- Meerdere bestanden kiezen of slepen (2 tegelijk, per bestand voortgang en reden bij falen, volgorde van kiezen), uploadlimiet standaard 100 per uur
- Volgorde ook met slepen (greepje, toetsenbord), pijltjes blijven
- Waarschuwing bij niet-opgeslagen wijzigingen (badge, beforeunload, bevestiging bij navigeren, vergelijking met laatst opgeslagen stand)
- Teksten zonder vakjargon, uitleg per onderdeel, formaten en limieten van de host (GET /hero/images/limits)
- Shimmer (CSS, reduced-motion) op foto's die nog verwerkt worden

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
2026-11-16 21:56:10 +01:00
co-authored by Claude Sonnet 5.5
parent 49302c3228
commit 9d647bb049
20 changed files with 900 additions and 98 deletions
@@ -66,3 +66,24 @@ export function ProcessingStatus({ hero }: { hero: HeroAdminDto }) {
</div>
);
}
/**
* The place of a photo that has no pictures yet: one calm shimmer (hidden from assistive technology) and a readable
* text. It lives in the row of the slide, so it stays mounted (and the animation keeps running) while the page asks the
* server again every few seconds, and it disappears when the photo is ready.
*/
export function PhotoPlaceholder({ failed, testId }: { failed: boolean; testId: string }) {
const { t } = useTranslation();
return (
<div
className={`flex h-20 w-28 flex-col items-center justify-center gap-1 rounded p-1 text-center text-xs ${failed ? 'bg-destructive/10 text-destructive' : 'hero-shimmer bg-muted'}`}
role="status"
aria-busy={!failed}
title={t('hero.slides.processingHint')}
data-testid={testId}
>
{failed ? null : <Spinner className="size-3.5" />}
<span>{failed ? t('hero.slides.failed') : t('hero.slides.processing')}</span>
</div>
);
}
@@ -0,0 +1,45 @@
import type { ReactNode } from 'react';
import { useSortable } from '@dnd-kit/sortable';
import { CSS } from '@dnd-kit/utilities';
import { GripVertical } from 'lucide-react';
import { useTranslation } from 'react-i18next';
interface SortableSlideProps {
/** The id of the form field of this slide (stable while the order changes). */
id: string;
index: number;
children: ReactNode;
}
/**
* One row of the image list that can be dragged by its handle (mouse, touch or keyboard: focus the handle, press Space,
* use the arrow keys, press Space again). The arrow buttons of the row stay as another way to change the order. While
* dragging, the row gets a frame and a shadow and the other rows make room, so it is clear where it will land.
*/
export function SortableSlide({ id, index, children }: SortableSlideProps) {
const { t } = useTranslation();
const { attributes, listeners, setNodeRef, setActivatorNodeRef, transform, transition, isDragging } = useSortable({ id });
return (
<li
ref={setNodeRef}
style={{ transform: CSS.Transform.toString(transform), transition, position: 'relative', zIndex: isDragging ? 10 : undefined }}
className={`flex flex-wrap items-start gap-3 rounded-md border bg-background p-3 ${isDragging ? 'shadow-lg ring-2 ring-primary' : ''}`}
data-testid={`hero-slide-${index}`}
data-dragging={isDragging ? 'true' : undefined}
>
<button
type="button"
ref={setActivatorNodeRef}
className="mt-1 cursor-grab touch-none rounded p-1 text-muted-foreground hover:bg-muted focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring active:cursor-grabbing"
aria-label={t('hero.slides.drag', { n: index + 1 })}
data-testid={`hero-slide-${index}-drag`}
{...attributes}
{...listeners}
>
<GripVertical className="size-5" aria-hidden="true" />
</button>
{children}
</li>
);
}
@@ -0,0 +1,37 @@
import { useBlocker } from '@tanstack/react-router';
import { useTranslation } from 'react-i18next';
import { Button } from '@/components/ui/button';
import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog';
/**
* Asks for confirmation before the administrator leaves the page through the menu or a link while the form holds changes
* that are not saved. (Closing the tab or reloading is covered by the browser warning in the page itself.)
*/
export function UnsavedChangesGuard({ dirty }: { dirty: boolean }) {
const { t } = useTranslation();
const blocker = useBlocker({
shouldBlockFn: () => dirty,
disabled: !dirty,
enableBeforeUnload: false,
withResolver: true,
});
return (
<Dialog open={blocker.status === 'blocked'} onOpenChange={(open) => { if (!open) blocker.reset?.(); }}>
<DialogContent data-testid="hero-leave-dialog">
<DialogHeader>
<DialogTitle>{t('hero.unsaved.leaveTitle')}</DialogTitle>
<DialogDescription>{t('hero.unsaved.leaveText')}</DialogDescription>
</DialogHeader>
<DialogFooter>
<Button type="button" onClick={() => blocker.reset?.()} data-testid="hero-leave-stay">
{t('hero.unsaved.stay')}
</Button>
<Button type="button" variant="outline" onClick={() => blocker.proceed?.()} data-testid="hero-leave-discard">
{t('hero.unsaved.discard')}
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
);
}
@@ -0,0 +1,54 @@
import { AlertCircle, Check, Clock } from 'lucide-react';
import { useTranslation } from 'react-i18next';
import { Button } from '@/components/ui/button';
import { Spinner } from './ProcessingStatus';
export interface UploadItem {
key: number;
name: string;
status: 'waiting' | 'uploading' | 'done' | 'failed';
/** Why it failed, in words for the administrator. */
message?: string;
}
/** The files of the last choice, one row each: waiting, busy (spinner), added, or failed with the reason. */
export function UploadProgress({ items, busy, onClose }: { items: UploadItem[]; busy: boolean; onClose: () => void }) {
const { t } = useTranslation();
if (items.length === 0) return null;
const finished = items.filter((i) => i.status === 'done' || i.status === 'failed').length;
const added = items.filter((i) => i.status === 'done').length;
return (
<div className="space-y-2 rounded-md border p-3" data-testid="hero-upload-list" aria-busy={busy}>
<p className="text-sm font-medium" role="status" data-testid="hero-upload-summary">
{busy ? t('hero.upload.progress', { done: finished, total: items.length }) : t('hero.upload.summary', { ok: added, total: items.length })}
</p>
<ul className="space-y-1 text-sm">
{items.map((item) => (
<li key={item.key} className="flex items-start gap-2" data-testid={`hero-upload-item-${item.key}`} data-status={item.status}>
<span className="mt-0.5 shrink-0">
{item.status === 'uploading' && <Spinner />}
{item.status === 'waiting' && <Clock className="size-4 text-muted-foreground" aria-hidden="true" />}
{item.status === 'done' && <Check className="size-4 text-green-600" aria-hidden="true" />}
{item.status === 'failed' && <AlertCircle className="size-4 text-destructive" aria-hidden="true" />}
</span>
<span className="min-w-0 flex-1 break-words">
<span className="font-medium">{item.name}</span>
{' – '}
{item.status === 'failed' ? (
<span className="text-destructive" role="alert" data-testid="hero-upload-error">{item.message}</span>
) : (
<span className="text-muted-foreground">{t(`hero.upload.${item.status}`)}</span>
)}
</span>
</li>
))}
</ul>
{!busy && (
<Button type="button" variant="outline" size="sm" onClick={onClose} data-testid="hero-upload-close">
{t('hero.upload.close')}
</Button>
)}
</div>
);
}
@@ -112,6 +112,10 @@ export const heroHandlers = [
return HttpResponse.json(hero);
}),
http.get(`${API_BASE}/api/v1/hero/images/limits`, () =>
HttpResponse.json({ formats: ['JPEG', 'PNG', 'GIF', 'BMP', 'TIFF', 'WebP', 'AVIF'], maxUploadBytes: 10 * 1024 * 1024, maxMegapixels: 64 }),
),
http.post(`${API_BASE}/api/v1/hero/images/:id/retry`, ({ params }) => {
retried.push(String(params.id));
return new HttpResponse(null, { status: 204 });
@@ -1,5 +1,5 @@
import { beforeEach, describe, expect, it } from 'vitest';
import { fireEvent, screen, waitFor } from '@testing-library/react';
import { fireEvent, screen, waitFor, within } from '@testing-library/react';
import userEvent from '@testing-library/user-event';
import { http, HttpResponse } from 'msw';
import { server } from '@/mocks/server';
@@ -142,9 +142,9 @@ describe('Hero page', () => {
});
it.each([
['javascript:alert(1)', 'hero-button-0-target-error', /Kies een #anker|Choose an #anchor/],
['//evil.example', 'hero-button-0-target-error', /Kies een #anker|Choose an #anchor/],
['http://example.com', 'hero-button-0-target-error', /Kies een #anker|Choose an #anchor/],
['javascript:alert(1)', 'hero-button-0-target-error', /Kies een onderdeel van de pagina|Choose a part of the page/],
['//evil.example', 'hero-button-0-target-error', /Kies een onderdeel van de pagina|Choose a part of the page/],
['http://example.com', 'hero-button-0-target-error', /Kies een onderdeel van de pagina|Choose a part of the page/],
])('rejects the button target %s', async (target, errorId, message) => {
await openPage();
await userEvent.type(screen.getByTestId('hero-title-input'), 'Titel');
@@ -407,3 +407,261 @@ describe('Upload problems', () => {
expect(await screen.findByTestId('hero-upload-error')).toHaveTextContent(/te veel uploads|Too many uploads/);
});
});
describe('Unsaved changes', () => {
beforeEach(() => {
resetMockHero();
});
const withSlides = () => setMockHero({ ...emptyHero(), id: 'h1', title: 'Titel', isLive: true, updatedAt: '2026-11-16T12:00:00Z', slides: [slide(1), slide(2)] });
it('shows a notice as soon as something changed, and removes it when the change is undone', async () => {
withSlides();
await openPage();
expect(screen.queryByTestId('hero-unsaved')).not.toBeInTheDocument();
const title = screen.getByTestId('hero-title-input');
await userEvent.type(title, 'X');
expect(await screen.findByTestId('hero-unsaved')).toHaveTextContent(/Niet-opgeslagen wijzigingen|Unsaved changes/);
await userEvent.type(title, '{backspace}');
await waitFor(() => expect(screen.queryByTestId('hero-unsaved')).not.toBeInTheDocument());
});
it('counts a reordered, removed, decorative or switched-off slide as a change', async () => {
withSlides();
await openPage();
await userEvent.click(screen.getByTestId('hero-slide-1-up'));
expect(await screen.findByTestId('hero-unsaved')).toBeInTheDocument();
await userEvent.click(screen.getByTestId('hero-slide-1-up'));
await waitFor(() => expect(screen.queryByTestId('hero-unsaved')).not.toBeInTheDocument());
await userEvent.click(screen.getByTestId('hero-slide-0-active'));
expect(await screen.findByTestId('hero-unsaved')).toBeInTheDocument();
});
it('is gone after a successful save, and comes back for the next change', async () => {
withSlides();
await openPage();
await userEvent.type(screen.getByTestId('hero-title-input'), '!');
expect(await screen.findByTestId('hero-unsaved')).toBeInTheDocument();
await userEvent.click(screen.getByTestId('hero-save'));
await waitFor(() => expect(getSavedHeroRequests()).toHaveLength(1));
await waitFor(() => expect(screen.queryByTestId('hero-unsaved')).not.toBeInTheDocument());
await userEvent.type(screen.getByTestId('hero-title-input'), '?');
expect(await screen.findByTestId('hero-unsaved')).toBeInTheDocument();
});
it('asks the browser to warn when the tab is closed, only while there are unsaved changes', async () => {
withSlides();
await openPage();
const clean = new Event('beforeunload', { cancelable: true });
window.dispatchEvent(clean);
expect(clean.defaultPrevented).toBe(false);
await userEvent.type(screen.getByTestId('hero-title-input'), 'X');
await screen.findByTestId('hero-unsaved');
const dirty = new Event('beforeunload', { cancelable: true });
window.dispatchEvent(dirty);
expect(dirty.defaultPrevented).toBe(true);
});
it('asks before leaving through the menu: stay keeps the page and the changes, discard leaves', async () => {
withSlides();
await openPage();
await userEvent.type(screen.getByTestId('hero-title-input'), 'X');
await screen.findByTestId('hero-unsaved');
await userEvent.click(screen.getByTestId('nav-dashboard'));
expect(await screen.findByTestId('hero-leave-dialog', {}, T)).toBeInTheDocument();
await userEvent.click(screen.getByTestId('hero-leave-stay'));
await waitFor(() => expect(screen.queryByTestId('hero-leave-dialog')).not.toBeInTheDocument());
expect(screen.getByTestId('hero-title-input')).toHaveValue('TitelX');
await userEvent.click(screen.getByTestId('nav-dashboard'));
await userEvent.click(await screen.findByTestId('hero-leave-discard', {}, T));
await waitFor(() => expect(screen.queryByTestId('hero-form')).not.toBeInTheDocument(), T);
});
it('leaves without a question when nothing changed', async () => {
withSlides();
await openPage();
await userEvent.click(screen.getByTestId('nav-dashboard'));
await waitFor(() => expect(screen.queryByTestId('hero-form')).not.toBeInTheDocument(), T);
expect(screen.queryByTestId('hero-leave-dialog')).not.toBeInTheDocument();
});
it('does not count photos that are still being prepared, and keeps the notice through the background refresh', async () => {
const waiting = { ...slide(1), image: { ...slide(1).image, variants: [], src: '', processing: true } };
setMockHero({ ...emptyHero(), id: 'h1', title: 'Titel', slides: [waiting] });
await openPage();
await screen.findByTestId('hero-slide-0-processing', {}, T);
expect(screen.queryByTestId('hero-unsaved')).not.toBeInTheDocument();
await userEvent.type(screen.getByTestId('hero-title-input'), 'X');
setMockHero({ ...emptyHero(), id: 'h1', title: 'Titel', slides: [slide(1)] });
await waitFor(() => expect(screen.queryByTestId('hero-slide-0-processing')).not.toBeInTheDocument(), { timeout: 12000 });
expect(screen.getByTestId('hero-unsaved')).toBeInTheDocument();
expect(screen.getByTestId('hero-title-input')).toHaveValue('TitelX');
}, 20000);
});
describe('Several photos at once', () => {
beforeEach(() => {
resetMockHero();
});
const jpg = (name: string) => new File(['x'], name, { type: 'image/jpeg' });
it('adds every chosen photo at the end of the list, in the order they were chosen', async () => {
await openPage();
await userEvent.upload(screen.getByTestId('hero-upload'), [jpg('a.jpg'), jpg('b.jpg'), jpg('c.jpg')]);
await waitFor(() => expect(screen.getAllByTestId(/^hero-slide-\d+$/)).toHaveLength(3), T);
expect(screen.getByTestId('hero-upload-summary')).toHaveTextContent(/3 van 3|3 of 3/);
expect(screen.getByTestId('hero-upload-item-0') ?? screen.getByTestId('hero-upload-list')).toBeInTheDocument();
});
it('goes on with the other photos when one is refused, and says why for that one', async () => {
await openPage();
const big = jpg('groot.jpg');
Object.defineProperty(big, 'size', { value: 11 * 1024 * 1024 });
const pdf = new File(['x'], 'brief.pdf', { type: 'application/pdf' });
// The file chooser would filter on type; here the files arrive as they do on a drop.
fireEvent.change(screen.getByTestId('hero-upload'), { target: { files: [jpg('a.jpg'), big, pdf, jpg('d.jpg')] } });
await waitFor(() => expect(screen.getAllByTestId(/^hero-slide-\d+$/)).toHaveLength(2), T);
const errors = screen.getAllByTestId('hero-upload-error');
expect(errors).toHaveLength(2);
expect(errors[0]).toHaveTextContent(/maximaal 10 MB|at most 10 MB/);
expect(errors[1]).toHaveTextContent(/geen afbeelding|not an image/);
expect(screen.getByTestId('hero-upload-summary')).toHaveTextContent(/2 van 4|2 of 4/);
});
it('never has more than two uploads running at the same time', async () => {
await openPage();
let running = 0;
let most = 0;
server.use(
http.post(`${API_BASE}/api/v1/hero/images`, async () => {
running += 1;
most = Math.max(most, running);
await new Promise((resolve) => setTimeout(resolve, 60));
running -= 1;
return HttpResponse.json(
{ id: crypto.randomUUID(), width: 1600, height: 1067, focus: { x: 0.5, y: 0.5, zoom: 1 }, wideFocus: null, tallFocus: null, src: '', variants: [], processing: true, failed: false },
{ status: 201 },
);
}),
);
await userEvent.upload(screen.getByTestId('hero-upload'), [jpg('1.jpg'), jpg('2.jpg'), jpg('3.jpg'), jpg('4.jpg'), jpg('5.jpg')]);
await waitFor(() => expect(screen.getAllByTestId(/^hero-slide-\d+$/)).toHaveLength(5), T);
expect(most).toBe(2);
});
it('accepts photos that are dropped on the list', async () => {
await openPage();
const section = screen.getByTestId('hero-slides-section');
fireEvent.drop(section, { dataTransfer: { types: ['Files'], files: [jpg('a.jpg'), jpg('b.jpg')] } });
await waitFor(() => expect(screen.getAllByTestId(/^hero-slide-\d+$/)).toHaveLength(2), T);
});
it('lists the formats and limits the host gives, in plain words', async () => {
await openPage();
const limits = await screen.findByTestId('hero-upload-limits', {}, T);
expect(limits).toHaveTextContent('JPEG, PNG, GIF, BMP, TIFF, WebP, AVIF');
expect(limits).toHaveTextContent(/10 MB/);
expect(limits).toHaveTextContent(/64 megapixel/);
});
});
describe('Order by dragging, wording and calm waiting', () => {
beforeEach(() => {
resetMockHero();
});
it('gives every row a handle with an understandable name, next to the arrows', async () => {
setMockHero({ ...emptyHero(), id: 'h1', title: 'T', slides: [slide(1), slide(2)] });
await openPage();
const handle = screen.getByTestId('hero-slide-1-drag');
expect(handle).toHaveAccessibleName(/Verplaats afbeelding 2|Move image 2/);
expect(screen.getByTestId('hero-slide-1-up')).toBeInTheDocument();
});
it('moves a row with the keyboard on the handle, and the new order goes live only on save', async () => {
setMockHero({ ...emptyHero(), id: 'h1', title: 'T', slides: [slide(1), slide(2)] });
await openPage();
// jsdom has no layout: give the rows a position so the sorting can see where they are.
const rects = new Map<Element, DOMRect>();
['hero-slide-0', 'hero-slide-1'].forEach((id, i) => {
const rect = { x: 0, y: i * 100, top: i * 100, bottom: i * 100 + 90, left: 0, right: 500, width: 500, height: 90, toJSON: () => ({}) } as DOMRect;
rects.set(screen.getByTestId(id), rect);
});
const original = Element.prototype.getBoundingClientRect;
Element.prototype.getBoundingClientRect = function (this: Element) {
return rects.get(this) ?? original.call(this);
};
try {
const handle = screen.getByTestId('hero-slide-1-drag');
handle.focus();
await userEvent.keyboard(' ');
await userEvent.keyboard('{ArrowUp}');
await userEvent.keyboard(' ');
await waitFor(() => expect(screen.getByTestId('hero-slide-0-alt')).toHaveValue('Foto 2'));
expect(getSavedHeroRequests()).toHaveLength(0);
expect(await screen.findByTestId('hero-unsaved')).toBeInTheDocument();
} finally {
Element.prototype.getBoundingClientRect = original;
}
});
it('speaks plain language: no alt text, decoration with an explanation, and a short guide per part', async () => {
setMockHero({ ...emptyHero(), id: 'h1', title: 'T', slides: [slide(1)] });
await openPage();
expect(screen.getByLabelText(/Beschrijving afbeelding 1$|Description of image 1$/)).toBeInTheDocument();
const row = within(screen.getByTestId('hero-slide-0'));
expect(row.getByText(/Alleen versiering|Decoration only/)).toBeInTheDocument();
expect(row.getByText(/niets toevoegt aan de inhoud|adds nothing to the content/)).toBeInTheDocument();
expect(screen.queryByText(/alt-tekst|alt text/i)).not.toBeInTheDocument();
const help = screen.getByTestId('hero-help');
expect(help).toHaveTextContent(/#contact/);
expect(help).toHaveTextContent(/\/privacy/);
expect(help).toHaveTextContent(/Planning|Schedule/);
});
it('keeps the waiting placeholder mounted through the background refresh, so its animation keeps running', async () => {
const waiting = { ...slide(1), image: { ...slide(1).image, variants: [], src: '', processing: true } };
setMockHero({ ...emptyHero(), id: 'h1', title: 'T', slides: [waiting, slide(2)] });
await openPage();
const before = await screen.findByTestId('hero-slide-0-processing', {}, T);
expect(before).toHaveClass('hero-shimmer');
expect(before).toHaveAttribute('role', 'status');
expect(before).toHaveAttribute('aria-busy', 'true');
// The server still has the photo in the works when the page asks again after 5 seconds.
setMockHero({ ...emptyHero(), id: 'h1', title: 'T', updatedAt: '2026-11-16T12:05:00Z', slides: [{ ...waiting }, slide(2)] });
await new Promise((resolve) => setTimeout(resolve, 6000));
expect(screen.getByTestId('hero-slide-0-processing')).toBe(before);
}, 20000);
});
+172 -41
View File
@@ -4,6 +4,8 @@ import { zodResolver } from '@hookform/resolvers/zod';
import { useTranslation } from 'react-i18next';
import { toast } from 'sonner';
import { ArrowDown, ArrowUp, Crosshair, ImagePlus, Trash2 } from 'lucide-react';
import { DndContext, KeyboardSensor, PointerSensor, closestCenter, useSensor, useSensors, type DragEndEvent } from '@dnd-kit/core';
import { SortableContext, sortableKeyboardCoordinates, verticalListSortingStrategy } from '@dnd-kit/sortable';
import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
@@ -12,10 +14,13 @@ import { FieldError } from '@/components/ui/FieldError';
import { FormErrorBanner } from '@/components/ui/FormErrorBanner';
import { NetworkError, ProblemDetailsError } from '@/lib/api-client';
import { FocusDialog } from '../components/FocusDialog';
import { ProcessingStatus, Spinner } from '../components/ProcessingStatus';
import { PhotoPlaceholder, ProcessingStatus } from '../components/ProcessingStatus';
import { SortableSlide } from '../components/SortableSlide';
import { UnsavedChangesGuard } from '../components/UnsavedChangesGuard';
import { UploadProgress, type UploadItem } from '../components/UploadProgress';
import { mediaUrl } from '../lib/media';
import { fromLocalInput, heroFormSchema, toLocalInput, type HeroFormData } from '../schemas/hero';
import { useHero, useSaveHero, useUploadHeroImage } from '../services/hooks';
import { useHero, useHeroUploadLimits, useSaveHero, useUploadHeroImage } from '../services/hooks';
import type { HeroAdminDto, HeroFocusRequest, HeroImageDto, HeroSaveRequest } from '../services/types';
const textareaClass =
@@ -106,6 +111,18 @@ export function HeroPage() {
)}
</div>
<p className="max-w-3xl text-sm text-muted-foreground">{t('hero.intro')}</p>
<details className="max-w-3xl rounded-md border p-3 text-sm" data-testid="hero-help">
<summary className="cursor-pointer font-medium">{t('hero.help.heading')}</summary>
<dl className="mt-3 space-y-2">
{(['title', 'tagline', 'lead', 'buttons', 'display', 'slides', 'focus', 'schedule'] as const).map((key) => (
<div key={key}>
<dt className="font-medium">{t(`hero.help.${key}.name`)}</dt>
<dd className="text-muted-foreground">{t(`hero.help.${key}.text`)}</dd>
</div>
))}
</dl>
<p className="mt-3 text-muted-foreground">{t('hero.help.save')}</p>
</details>
{isLoading && <p data-testid="hero-loading">{t('common.loading')}</p>}
{isError && (
@@ -125,7 +142,11 @@ function HeroEditor({ hero }: { hero: HeroAdminDto }) {
const save = useSaveHero();
const upload = useUploadHeroImage();
const [serverError, setServerError] = useState<string | null>(null);
const [uploadError, setUploadError] = useState<string | null>(null);
const [uploads, setUploads] = useState<UploadItem[]>([]);
const [uploading, setUploading] = useState(false);
const [draggingFiles, setDraggingFiles] = useState(false);
const nextUploadKey = useRef(0);
const limits = useHeroUploadLimits().data;
const [localImages, setLocalImages] = useState<Record<string, HeroImageDto>>({});
const [focusImageId, setFocusImageId] = useState<string | null>(null);
// Changed focus points are kept here until the hero is saved: they are sent with the save and dropped when the page is left.
@@ -137,6 +158,7 @@ function HeroEditor({ hero }: { hero: HeroAdminDto }) {
handleSubmit,
control,
formState: { errors, isDirty },
reset,
} = useForm<HeroFormData>({ resolver: zodResolver(heroFormSchema), mode: 'onTouched', defaultValues: toForm(hero) });
const slides = useFieldArray({ control, name: 'slides' });
const watchedSlides = useWatch({ control, name: 'slides' }) ?? [];
@@ -148,15 +170,23 @@ function HeroEditor({ hero }: { hero: HeroAdminDto }) {
return map;
}, [hero.slides, localImages]);
const hasPendingFocus = Object.keys(focusEdits).length > 0;
// A focus change counts as unsaved only while it differs from what is saved (applying the old point again is no change).
const samePoint = (a: unknown, b: unknown) => JSON.stringify(a ?? null) === JSON.stringify(b ?? null);
const hasPendingFocus = Object.entries(focusEdits).some(([imageId, edit]) => {
const saved = images[imageId];
return !saved || !samePoint(saved.focus, edit.focus) || !samePoint(saved.wideFocus, edit.wide) || !samePoint(saved.tallFocus, edit.tall);
});
// The form is compared with the last saved state (react-hook-form keeps it), so a change that is undone no longer counts.
// Photos still being prepared on the server and the background refresh are not changes of the administrator.
const hasUnsaved = isDirty || hasPendingFocus;
useEffect(() => {
if (!isDirty && !hasPendingFocus) return undefined;
if (!hasUnsaved) return undefined;
const warn = (event: BeforeUnloadEvent) => {
event.preventDefault();
};
window.addEventListener('beforeunload', warn);
return () => window.removeEventListener('beforeunload', warn);
}, [isDirty, hasPendingFocus]);
}, [hasUnsaved]);
// The image as the dialog shows it: the saved one with a not yet saved change of its focus applied.
const withPendingFocus = (image: HeroImageDto | null): HeroImageDto | null => {
@@ -164,32 +194,94 @@ function HeroEditor({ hero }: { hero: HeroAdminDto }) {
return image && edit ? { ...image, focus: edit.focus, wideFocus: edit.wide, tallFocus: edit.tall } : image;
};
const onUpload = async (files: FileList | null) => {
const file = files?.[0];
if (!file) return;
setUploadError(null);
// The host (and the proxy in front of it) refuse bigger files; say so without sending the whole file first.
if (file.size > MAX_UPLOAD_BYTES) {
setUploadError(t('hero.upload.tooLarge', { max: MAX_UPLOAD_BYTES / (1024 * 1024) }));
if (fileInput.current) fileInput.current.value = '';
return;
}
// Up to this many files go to the host at the same time; the variants are cut in the background, so an upload itself
// is quick, and two at a time keeps the memory use of a small server in check.
const UPLOAD_PARALLEL = 2;
const onFiles = async (chosen: FileList | File[] | null) => {
const files = Array.from(chosen ?? []);
if (files.length === 0 || uploading) return;
const maxBytes = limits?.maxUploadBytes ?? MAX_UPLOAD_BYTES;
const maxMb = Math.round(maxBytes / (1024 * 1024));
const items: UploadItem[] = files.map((file) => ({ key: nextUploadKey.current++, name: file.name, status: 'waiting' }));
setUploads(items);
setUploading(true);
const update = (i: number, patch: Partial<UploadItem>) =>
setUploads((current) => current.map((u) => (u.key === items[i].key ? { ...u, ...patch } : u)));
// The images are added to the list in the order they were chosen, whichever upload finishes first.
const results: (HeroImageDto | 'failed' | undefined)[] = new Array<HeroImageDto | 'failed' | undefined>(files.length).fill(undefined);
let flushed = 0;
let cursor = 0;
const flush = () => {
while (flushed < files.length && results[flushed] !== undefined) {
const result = results[flushed];
if (result && result !== 'failed') {
setLocalImages((current) => ({ ...current, [result.id]: result }));
slides.append({ id: null, imageId: result.id, alt: '', decorative: false, isActive: true }, { shouldFocus: false });
}
flushed += 1;
}
};
const worker = async () => {
while (cursor < files.length) {
const i = cursor++;
const file = files[i];
// Refuse what the host would refuse without sending the whole file first.
if (file.type !== '' && !file.type.startsWith('image/')) {
results[i] = 'failed';
update(i, { status: 'failed', message: t('hero.upload.notAnImage') });
} else if (file.size > maxBytes) {
results[i] = 'failed';
update(i, { status: 'failed', message: t('hero.upload.tooLarge', { max: maxMb }) });
} else {
update(i, { status: 'uploading' });
try {
const image = await upload.mutateAsync(file);
results[i] = image;
update(i, { status: 'done' });
} catch (error) {
results[i] = 'failed';
update(i, { status: 'failed', message: uploadMessage(error, t) });
}
}
flush();
}
};
try {
const image = await upload.mutateAsync(file);
setLocalImages((current) => ({ ...current, [image.id]: image }));
slides.append({ id: null, imageId: image.id, alt: '', decorative: false, isActive: true }, { shouldFocus: false });
} catch (error) {
setUploadError(uploadMessage(error, t));
await Promise.all(Array.from({ length: Math.min(UPLOAD_PARALLEL, files.length) }, () => worker()));
} finally {
setUploading(false);
if (fileInput.current) fileInput.current.value = '';
}
};
const sensors = useSensors(
useSensor(PointerSensor, { activationConstraint: { distance: 6 } }),
useSensor(KeyboardSensor, { coordinateGetter: sortableKeyboardCoordinates }),
);
// The order changes in the form only; it goes live when the hero is saved, like every other change.
const onDragEnd = (event: DragEndEvent) => {
const { active, over } = event;
if (!over || active.id === over.id) return;
const from = slides.fields.findIndex((f) => f.id === active.id);
const to = slides.fields.findIndex((f) => f.id === over.id);
if (from !== -1 && to !== -1) slides.move(from, to);
};
const isFileDrag = (event: React.DragEvent) => Array.from(event.dataTransfer?.types ?? []).includes('Files');
const onSubmit = async (values: HeroFormData) => {
setServerError(null);
try {
await save.mutateAsync(toRequest(values, focusEdits));
const savedHero = await save.mutateAsync(toRequest(values, focusEdits));
setFocusEdits({});
// What was just saved is the new starting point: nothing is unsaved any more.
reset(toForm(savedHero));
toast.success(t('hero.savedToast'));
} catch (error) {
setServerError(serverMessage(error, t('errors.generic'), t('errors.network')));
@@ -272,7 +364,24 @@ function HeroEditor({ hero }: { hero: HeroAdminDto }) {
<p className="text-xs text-muted-foreground">{t('hero.schedule.hint')}</p>
</section>
<section className="space-y-3">
<section
className={`space-y-3 rounded-md ${draggingFiles ? 'ring-2 ring-primary ring-offset-4' : ''}`}
onDragOver={(event) => {
if (!isFileDrag(event)) return;
event.preventDefault();
setDraggingFiles(true);
}}
onDragLeave={(event) => {
if (!event.currentTarget.contains(event.relatedTarget as Node | null)) setDraggingFiles(false);
}}
onDrop={(event) => {
if (!isFileDrag(event)) return;
event.preventDefault();
setDraggingFiles(false);
void onFiles(event.dataTransfer.files);
}}
data-testid="hero-slides-section"
>
<div className="flex flex-wrap items-center justify-between gap-2">
<h2 className="text-lg font-medium">{t('hero.slides.title')}</h2>
<div>
@@ -281,35 +390,42 @@ function HeroEditor({ hero }: { hero: HeroAdminDto }) {
id="hero-upload"
type="file"
accept="image/*"
multiple
className="sr-only"
aria-label={t('hero.slides.add')}
data-testid="hero-upload"
onChange={(event) => void onUpload(event.target.files)}
onChange={(event) => void onFiles(event.target.files)}
/>
<Button type="button" variant="outline" disabled={upload.isPending} onClick={() => fileInput.current?.click()} data-testid="hero-upload-button">
<Button type="button" variant="outline" disabled={uploading} onClick={() => fileInput.current?.click()} data-testid="hero-upload-button">
<ImagePlus className="mr-2 size-4" aria-hidden="true" />
{upload.isPending ? t('hero.slides.uploading') : t('hero.slides.add')}
{uploading ? t('hero.slides.uploading') : t('hero.slides.add')}
</Button>
</div>
</div>
<p className="text-xs text-muted-foreground">{t('hero.slides.hint')}</p>
{uploadError && <p className="text-sm text-destructive" role="alert" data-testid="hero-upload-error">{uploadError}</p>}
{limits && (
<p className="text-xs text-muted-foreground" data-testid="hero-upload-limits">
{t('hero.slides.limits', { formats: limits.formats.join(', '), size: Math.round(limits.maxUploadBytes / (1024 * 1024)), megapixels: limits.maxMegapixels })}
</p>
)}
<UploadProgress items={uploads} busy={uploading} onClose={() => setUploads([])} />
{slides.fields.length === 0 && <p className="text-sm text-muted-foreground" data-testid="hero-slides-empty">{t('hero.slides.empty')}</p>}
<DndContext
sensors={sensors}
collisionDetection={closestCenter}
onDragEnd={onDragEnd}
accessibility={{ screenReaderInstructions: { draggable: t('hero.slides.dragInstructions') } }}
>
<SortableContext items={slides.fields.map((f) => f.id)} strategy={verticalListSortingStrategy}>
<ol className="space-y-3" data-testid="hero-slides">
{slides.fields.map((field, index) => {
const image = images[field.imageId];
const decorative = watchedSlides[index]?.decorative ?? false;
return (
<li key={field.id} className="flex flex-wrap items-start gap-3 rounded-md border p-3" data-testid={`hero-slide-${index}`}>
<SortableSlide key={field.id} id={field.id} index={index}>
{image && image.variants.length === 0 ? (
<div
className={`flex h-20 w-28 flex-col items-center justify-center gap-1 rounded p-1 text-center text-xs ${image.failed ? 'bg-destructive/10 text-destructive' : 'bg-muted'}`}
title={t('hero.slides.processingHint')}
data-testid={`hero-slide-${index}-processing`}
>
{image.failed ? null : <Spinner />}
{image.failed ? t('hero.slides.failed') : t('hero.slides.processing')}
</div>
<PhotoPlaceholder failed={image.failed} testId={`hero-slide-${index}-processing`} />
) : image ? (
<img src={thumbnail(image)} alt="" className="h-20 w-28 rounded object-cover" />
) : (
@@ -317,7 +433,8 @@ function HeroEditor({ hero }: { hero: HeroAdminDto }) {
)}
<div className="min-w-[12rem] flex-1 space-y-2">
<Label htmlFor={`hero-slide-${index}-alt`}>{t('hero.slides.alt', { n: index + 1 })}</Label>
<Input id={`hero-slide-${index}-alt`} maxLength={300} disabled={decorative} data-testid={`hero-slide-${index}-alt`} {...register(`slides.${index}.alt` as const)} />
<Input id={`hero-slide-${index}-alt`} maxLength={300} disabled={decorative} aria-describedby={`hero-slide-${index}-alt-hint`} data-testid={`hero-slide-${index}-alt`} {...register(`slides.${index}.alt` as const)} />
<p id={`hero-slide-${index}-alt-hint`} className="text-xs text-muted-foreground">{t('hero.slides.altHint')}</p>
<FieldError message={err(heroErrors.slides?.[index]?.alt?.message)} testId={`hero-slide-${index}-alt-error`} />
{focusEdits[field.imageId] && (
<p className="text-xs font-medium" data-testid={`hero-slide-${index}-focus-pending`}>{t('hero.slides.focusPending')}</p>
@@ -325,7 +442,10 @@ function HeroEditor({ hero }: { hero: HeroAdminDto }) {
<div className="flex flex-wrap gap-4 text-sm">
<label className="flex items-center gap-2">
<input type="checkbox" className="size-4 rounded border-input" data-testid={`hero-slide-${index}-decorative`} {...register(`slides.${index}.decorative` as const)} />
{t('hero.slides.decorative')}
<span>
{t('hero.slides.decorative')}
<span className="block text-xs text-muted-foreground">{t('hero.slides.decorativeHint')}</span>
</span>
</label>
<label className="flex items-center gap-2">
<input type="checkbox" className="size-4 rounded border-input" data-testid={`hero-slide-${index}-active`} {...register(`slides.${index}.isActive` as const)} />
@@ -347,10 +467,12 @@ function HeroEditor({ hero }: { hero: HeroAdminDto }) {
<Trash2 className="size-4" aria-hidden="true" />
</Button>
</div>
</li>
</SortableSlide>
);
})}
</ol>
</SortableContext>
</DndContext>
{slides.fields.length > hero.maxPublishedSlides && (
<p className="text-xs text-muted-foreground" data-testid="hero-ceiling-note">
{t('hero.slides.ceiling', { max: hero.maxPublishedSlides })}
@@ -358,8 +480,17 @@ function HeroEditor({ hero }: { hero: HeroAdminDto }) {
)}
</section>
<div className="flex justify-end">
<Button type="submit" disabled={save.isPending} data-testid="hero-save">
<UnsavedChangesGuard dirty={hasUnsaved} />
<div className="sticky bottom-0 z-20 -mx-1 flex flex-wrap items-center justify-end gap-3 border-t bg-background/95 px-1 py-3 backdrop-blur">
<div role="status" aria-live="polite" className="min-h-5 flex-1 text-sm" data-testid="hero-unsaved-region">
{hasUnsaved && (
<span className="inline-flex items-center gap-2" data-testid="hero-unsaved">
<Badge variant="secondary">{t('hero.unsaved.badge')}</Badge>
<span className="text-muted-foreground">{t('hero.unsaved.text')}</span>
</span>
)}
</div>
<Button type="submit" disabled={save.isPending} className={hasUnsaved ? 'ring-2 ring-primary ring-offset-2' : undefined} data-testid="hero-save">
{save.isPending ? '…' : t('common.save')}
</Button>
</div>
+10 -1
View File
@@ -1,6 +1,6 @@
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { api } from '@/lib/api-client';
import type { HeroAdminDto, HeroImageDto, HeroSaveRequest } from './types';
import type { HeroAdminDto, HeroImageDto, HeroSaveRequest, HeroUploadLimits } from './types';
export const HERO_KEY = ['hero'];
@@ -49,3 +49,12 @@ export function useRetryHeroImage() {
onSuccess: () => queryClient.invalidateQueries({ queryKey: HERO_KEY }),
});
}
/** The formats and limits an upload has to meet on this host. */
export function useHeroUploadLimits() {
return useQuery<HeroUploadLimits, Error>({
queryKey: ['hero', 'upload-limits'],
queryFn: () => api.get<HeroUploadLimits>('/api/v1/hero/images/limits'),
staleTime: 10 * 60 * 1000,
});
}
@@ -91,3 +91,9 @@ export interface HeroFocusRequest {
wide: FocusDto | null;
tall: FocusDto | null;
}
export interface HeroUploadLimits {
formats: string[];
maxUploadBytes: number;
maxMegapixels: number;
}
+70 -14
View File
@@ -615,12 +615,12 @@
"title": "Hero",
"live": "Live",
"notLive": "Not live",
"intro": "The hero is the first thing visitors of the website see. Here you manage the texts, the buttons and the images; the website decides how they are shown. A change is visible within about a minute.",
"intro": "The hero is the first thing visitors of the website see: a large heading with one or more photos. Here you manage the texts, the buttons and the photos. A change is visible within about a minute.",
"savedToast": "Hero saved",
"fields": {
"title": "Title",
"titleHint": "A new line in this field is a line break in the title (at most 5 lines).",
"tagline": "Tagline (short label, optional)",
"tagline": "Short text above the title (optional)",
"lead": "Introduction (optional)",
"display": "Display"
},
@@ -630,7 +630,7 @@
},
"buttons": {
"title": "Buttons",
"hint": "At most two buttons. The target is an #anchor on the page, a /path on the site or an https:// address.",
"hint": "At most two buttons. As the target, choose a part of the page (for example #contact), a page of the site (for example /privacy) or a full web address (https://…).",
"label": "Button {{n}}: text",
"target": "Button {{n}}: target"
},
@@ -639,16 +639,16 @@
"active": "Hero is switched on",
"starts": "Visible from",
"ends": "Visible until",
"hint": "Outside the schedule, or switched off, the website shows its own default hero."
"hint": "Outside this period, or when the hero is switched off, the website keeps its standard hero."
},
"slides": {
"title": "Images",
"add": "Add image",
"uploading": "Uploading…",
"hint": "Upload a photo (JPEG, PNG, WebP and other common formats, at most 10 MB). Set where the subject is with the Focus button. The first image is the first one visitors see.",
"hint": "Choose several files at once or drag them into this box. New photos are added at the bottom of the list. Drag a photo by its handle, or use the arrows, to change the order; visitors see the first photo first. With the Focus button you show where the subject is.",
"empty": "No images yet.",
"alt": "Description of image {{n}} (alt text)",
"decorative": "Decorative (no description)",
"alt": "Description of image {{n}}",
"decorative": "Decoration only (no description needed)",
"active": "Show",
"up": "Move up",
"down": "Move down",
@@ -658,12 +658,17 @@
"focusPending": "Focus changed, not saved yet.",
"processing": "Processing…",
"processingHint": "The image is being prepared in the background; it appears on the website as soon as it is ready.",
"failed": "Failed"
"failed": "Failed",
"limits": "Allowed: {{formats}}. At most {{size}} MB per file and {{megapixels}} megapixels.",
"altHint": "Describes the photo for people who cannot see it and for search engines.",
"decorativeHint": "Choose this when the photo adds nothing to the content; a screen reader then skips it.",
"drag": "Move image {{n}}",
"dragInstructions": "Press space to pick up the image, use the arrow keys to move it and press space again to drop it. Escape cancels."
},
"processing": {
"count": "{{done}} of {{total}} photos processed",
"label": "Progress of processing the photos",
"explain": "The hero has been saved. The photos are prepared one by one in the background and go live as soon as they are ready. Until the first photo is ready the website keeps showing the baked hero. You do not have to keep this page open.",
"explain": "The hero has been saved. The photos are prepared one by one and go live as soon as they are ready. Until the first photo is ready the website keeps its standard hero. You do not have to keep this page open.",
"failed_one": "Processing {{count}} photo failed.",
"failed_other": "Processing {{count}} photos failed.",
"failedHint": "The server tried three times. Try again, or upload the photo once more (the same photo is the same image).",
@@ -671,7 +676,7 @@
},
"focus": {
"title": "Focus and crop",
"intro": "Click or drag on the photo to show where the subject is. The website crops the photo for landscape (wide) and portrait (tall) screens so that the subject stays in view.",
"intro": "Click or drag on the photo to show where the subject is. The website crops the photo for landscape and portrait screens so that the subject stays in view.",
"targetLegend": "For which display",
"target": {
"general": "General",
@@ -695,20 +700,71 @@
"titleRequired": "A title is required.",
"titleTooLong": "The title can have at most 200 characters.",
"titleTooManyLines": "The title can have at most 5 lines.",
"taglineTooLong": "The tagline can have at most 120 characters.",
"taglineTooLong": "The short text above the title can have at most 120 characters.",
"leadTooLong": "The introduction can have at most 600 characters.",
"buttonLabelTooLong": "The button text can have at most 50 characters.",
"buttonTargetTooLong": "The target can have at most 500 characters.",
"buttonIncomplete": "Fill in both the text and the target of the button, or leave both empty.",
"buttonTargetInvalid": "Choose an #anchor, a /path or an https:// address.",
"buttonTargetInvalid": "Choose a part of the page (for example #contact), a page of the site (for example /privacy) or a full web address (https://…).",
"altTooLong": "The description can have at most 300 characters.",
"altRequired": "Give a description or mark the image as decorative.",
"altRequired": "Give a description or choose ‘Decoration only’.",
"endAfterStart": "The end must be after the start."
},
"upload": {
"tooLarge": "The image is too large (at most {{max}} MB).",
"interrupted": "The upload was interrupted. Check the connection and try again.",
"busy": "Too many uploads in a row. Try again in a few minutes."
"busy": "Too many uploads in a row. Try again in a few minutes.",
"notAnImage": "This file is not an image.",
"progress": "Uploading: {{done}} of {{total}}",
"summary": "{{ok}} of {{total}} photos added",
"waiting": "waiting",
"uploading": "uploading…",
"done": "added",
"close": "Close"
},
"help": {
"heading": "Explanation of each part",
"save": "Changes only take effect after you save the hero.",
"title": {
"name": "Title",
"text": "The large heading. A new line in the field is a new line in the heading."
},
"tagline": {
"name": "Short text above the title",
"text": "A short label above or before the title. Can stay empty."
},
"lead": {
"name": "Introduction",
"text": "One or two sentences below the title. Can stay empty."
},
"buttons": {
"name": "Buttons",
"text": "At most two, each with a text and a target. As the target, choose a part of the page (for example #contact), a page of the site (for example /privacy) or a full web address (https://…)."
},
"display": {
"name": "Display",
"text": "‘Single’ shows one photo, ‘Slideshow’ switches between the photos."
},
"slides": {
"name": "Images",
"text": "Upload photos, describe what is in them and set the order (drag or use the arrows). ‘Show’ switches a photo on or off. Choose ‘Decoration only’ for a photo that adds nothing to the content."
},
"focus": {
"name": "Focus",
"text": "Show where the subject is in the photo, so a crop never cuts it off. For portrait screens, such as a phone, you can choose a separate point."
},
"schedule": {
"name": "Schedule",
"text": "The hero is only visible in the period from–until. Outside that period the website keeps its standard hero."
}
},
"unsaved": {
"badge": "Unsaved changes",
"text": "Save the hero to put them on the website.",
"leaveTitle": "Changes not saved",
"leaveText": "You have made changes that are not saved yet. If you leave this page they will be lost.",
"stay": "Stay",
"discard": "Discard changes"
}
}
}
+70 -14
View File
@@ -615,12 +615,12 @@
"title": "Hero",
"live": "Live",
"notLive": "Niet live",
"intro": "De hero is het eerste wat bezoekers van de website zien. Hier beheer je de teksten, de knoppen en de afbeeldingen; de website bepaalt zelf hoe ze worden getoond. Een wijziging is binnen ongeveer een minuut zichtbaar.",
"intro": "De hero is het eerste wat bezoekers van de website zien: een grote kop met een of meer foto’s. Hier beheer je de teksten, de knoppen en de foto’s. Een wijziging is binnen ongeveer een minuut zichtbaar.",
"savedToast": "Hero opgeslagen",
"fields": {
"title": "Titel",
"titleHint": "Een nieuwe regel in dit veld is een regelafbreking in de titel (maximaal 5 regels).",
"tagline": "Tagline (kort label, optioneel)",
"tagline": "Korte tekst boven de titel (optioneel)",
"lead": "Introductietekst (optioneel)",
"display": "Weergave"
},
@@ -630,7 +630,7 @@
},
"buttons": {
"title": "Knoppen",
"hint": "Maximaal twee knoppen. Het doel is een #anker op de pagina, een /pad op de site of een https://-adres.",
"hint": "Maximaal twee knoppen. Als doel kies je een onderdeel van de pagina (bijvoorbeeld #contact), een pagina van de site (bijvoorbeeld /privacy) of een volledig webadres (https://…).",
"label": "Knop {{n}}: tekst",
"target": "Knop {{n}}: doel"
},
@@ -639,16 +639,16 @@
"active": "Hero is aangezet",
"starts": "Zichtbaar vanaf",
"ends": "Zichtbaar tot",
"hint": "Buiten de planning, of uitgezet, toont de website zijn eigen standaard-hero."
"hint": "Buiten deze periode, of als de hero is uitgezet, blijft de standaard hero van de website staan."
},
"slides": {
"title": "Afbeeldingen",
"add": "Afbeelding toevoegen",
"uploading": "Bezig met uploaden…",
"hint": "Upload een foto (JPEG, PNG, WebP en andere gangbare formaten, maximaal 10 MB). Zet het onderwerp goed met de knop Focus. De eerste afbeelding is de eerste die bezoekers zien.",
"hint": "Kies meerdere bestanden tegelijk of sleep ze naar dit vak. Nieuwe foto’s komen onderaan de lijst. Sleep een foto aan het greepje, of gebruik de pijltjes, om de volgorde te wijzigen; de eerste foto zien bezoekers als eerste. Met de knop Focus geef je aan waar het onderwerp staat.",
"empty": "Nog geen afbeeldingen.",
"alt": "Beschrijving van afbeelding {{n}} (alt-tekst)",
"decorative": "Decoratief (geen beschrijving)",
"alt": "Beschrijving afbeelding {{n}}",
"decorative": "Alleen versiering (geen beschrijving nodig)",
"active": "Tonen",
"up": "Omhoog",
"down": "Omlaag",
@@ -658,12 +658,17 @@
"focusPending": "Focus gewijzigd, nog niet opgeslagen.",
"processing": "Wordt verwerkt…",
"processingHint": "De afbeelding wordt klaargezet op de achtergrond; hij verschijnt op de website zodra hij klaar is.",
"failed": "Mislukt"
"failed": "Mislukt",
"limits": "Toegestaan: {{formats}}. Maximaal {{size}} MB per bestand en {{megapixels}} megapixel.",
"altHint": "Beschrijft de foto voor mensen die hem niet kunnen zien en voor zoekmachines.",
"decorativeHint": "Kies dit als de foto niets toevoegt aan de inhoud; dan leest een schermlezer hem niet voor.",
"drag": "Verplaats afbeelding {{n}}",
"dragInstructions": "Druk op spatie om de afbeelding op te pakken, gebruik de pijltjestoetsen om hem te verplaatsen en druk nogmaals op spatie om hem neer te zetten. Escape annuleert."
},
"processing": {
"count": "{{done}} van {{total}} foto’s verwerkt",
"label": "Voortgang van het verwerken van de foto’s",
"explain": "De hero is al opgeslagen. De foto’s worden één voor één klaargezet op de achtergrond en gaan live zodra ze klaar zijn. Tot de eerste foto klaar is, toont de website de ingebakken hero. Je hoeft deze pagina niet open te houden.",
"explain": "De hero is al opgeslagen. De foto’s worden één voor één klaargezet en gaan live zodra ze klaar zijn. Tot de eerste foto klaar is, blijft de standaard hero van de website staan. Je hoeft deze pagina niet open te houden.",
"failed_one": "Het verwerken van {{count}} foto is mislukt.",
"failed_other": "Het verwerken van {{count}} foto’s is mislukt.",
"failedHint": "De server heeft het drie keer geprobeerd. Probeer het opnieuw, of upload de foto nog een keer (dezelfde foto is dezelfde afbeelding).",
@@ -671,7 +676,7 @@
},
"focus": {
"title": "Focus en uitsnede",
"intro": "Klik of sleep op de foto om aan te geven waar het onderwerp staat. De website snijdt de foto voor liggende (wide) en staande (tall) schermen zo uit dat het onderwerp in beeld blijft.",
"intro": "Klik of sleep op de foto om aan te geven waar het onderwerp staat. De website snijdt de foto voor liggende en staande schermen zo uit dat het onderwerp in beeld blijft.",
"targetLegend": "Voor welke weergave",
"target": {
"general": "Algemeen",
@@ -695,20 +700,71 @@
"titleRequired": "Een titel is verplicht.",
"titleTooLong": "De titel mag maximaal 200 tekens bevatten.",
"titleTooManyLines": "De titel mag maximaal 5 regels hebben.",
"taglineTooLong": "De tagline mag maximaal 120 tekens bevatten.",
"taglineTooLong": "De korte tekst boven de titel mag maximaal 120 tekens bevatten.",
"leadTooLong": "De introductietekst mag maximaal 600 tekens bevatten.",
"buttonLabelTooLong": "De knoptekst mag maximaal 50 tekens bevatten.",
"buttonTargetTooLong": "Het doel mag maximaal 500 tekens bevatten.",
"buttonIncomplete": "Vul zowel de tekst als het doel van de knop in, of laat beide leeg.",
"buttonTargetInvalid": "Kies een #anker, een /pad of een https://-adres.",
"buttonTargetInvalid": "Kies een onderdeel van de pagina (bijvoorbeeld #contact), een pagina van de site (bijvoorbeeld /privacy) of een volledig webadres (https://…).",
"altTooLong": "De beschrijving mag maximaal 300 tekens bevatten.",
"altRequired": "Geef een beschrijving of markeer de afbeelding als decoratief.",
"altRequired": "Geef een beschrijving of kies ‘Alleen versiering’.",
"endAfterStart": "Het einde moet na het begin liggen."
},
"upload": {
"tooLarge": "De afbeelding is te groot (maximaal {{max}} MB).",
"interrupted": "De upload is afgebroken. Controleer de verbinding en probeer het opnieuw.",
"busy": "Er zijn te veel uploads achter elkaar. Probeer het over een paar minuten opnieuw."
"busy": "Er zijn te veel uploads achter elkaar. Probeer het over een paar minuten opnieuw.",
"notAnImage": "Dit bestand is geen afbeelding.",
"progress": "Bezig met uploaden: {{done}} van {{total}}",
"summary": "{{ok}} van {{total}} foto’s toegevoegd",
"waiting": "wacht",
"uploading": "bezig…",
"done": "toegevoegd",
"close": "Sluiten"
},
"help": {
"heading": "Uitleg per onderdeel",
"save": "Wijzigingen gelden pas nadat je de hero opslaat.",
"title": {
"name": "Titel",
"text": "De grote kop. Een nieuwe regel in het veld is een nieuwe regel in de kop."
},
"tagline": {
"name": "Korte tekst boven de titel",
"text": "Een kort label dat boven of voor de titel staat. Mag leeg blijven."
},
"lead": {
"name": "Introductietekst",
"text": "Een of twee zinnen onder de titel. Mag leeg blijven."
},
"buttons": {
"name": "Knoppen",
"text": "Maximaal twee, elk met een tekst en een doel. Als doel kies je een onderdeel van de pagina (bijvoorbeeld #contact), een pagina van de site (bijvoorbeeld /privacy) of een volledig webadres (https://…)."
},
"display": {
"name": "Weergave",
"text": "‘Enkel’ toont één foto, ‘Diavoorstelling’ wisselt tussen de foto’s."
},
"slides": {
"name": "Afbeeldingen",
"text": "Upload foto’s, beschrijf wat erop staat en bepaal de volgorde (slepen of de pijltjes). Met ‘Tonen’ zet je een foto aan of uit. Kies ‘Alleen versiering’ voor een foto die niets toevoegt aan de inhoud."
},
"focus": {
"name": "Focus",
"text": "Geef aan waar het onderwerp op de foto staat, zodat een uitsnede er niets van afhakt. Voor staande schermen, zoals een telefoon, kun je een apart punt kiezen."
},
"schedule": {
"name": "Planning",
"text": "De hero is alleen zichtbaar in de periode van–tot. Buiten die periode blijft de standaard hero van de website staan."
}
},
"unsaved": {
"badge": "Niet-opgeslagen wijzigingen",
"text": "Sla de hero op om ze door te voeren op de website.",
"leaveTitle": "Wijzigingen niet opgeslagen",
"leaveText": "Je hebt wijzigingen gemaakt die nog niet zijn opgeslagen. Als je deze pagina verlaat, gaan ze verloren.",
"stay": "Blijven",
"discard": "Wijzigingen weggooien"
}
}
}
+29
View File
@@ -120,3 +120,32 @@
outline-offset: 2px;
}
}
/* A calm light band that sweeps over a photo that is still being prepared. Pure CSS, follows the text colour so it suits
the light and the dark theme, and stands still for people who asked for less motion. */
@keyframes hero-shimmer {
to {
transform: translateX(100%);
}
}
.hero-shimmer {
position: relative;
overflow: hidden;
}
.hero-shimmer::after {
content: '';
position: absolute;
inset: 0;
transform: translateX(-100%);
background: linear-gradient(90deg, transparent, color-mix(in oklab, currentColor 14%, transparent), transparent);
animation: hero-shimmer 1.8s ease-in-out infinite;
}
@media (prefers-reduced-motion: reduce) {
.hero-shimmer::after {
animation: none;
display: none;
}
}
+61
View File
@@ -947,6 +947,38 @@
],
"type": "object"
},
"HeroUploadLimitsDto": {
"properties": {
"formats": {
"items": {
"type": "string"
},
"type": "array"
},
"maxMegapixels": {
"format": "int32",
"pattern": "^-?(?:0|[1-9]\\d*)$",
"type": [
"integer",
"string"
]
},
"maxUploadBytes": {
"format": "int64",
"pattern": "^-?(?:0|[1-9]\\d*)$",
"type": [
"integer",
"string"
]
}
},
"required": [
"formats",
"maxUploadBytes",
"maxMegapixels"
],
"type": "object"
},
"HeroVariantDto": {
"properties": {
"height": {
@@ -3024,6 +3056,35 @@
]
}
},
"/api/v1/hero/images/limits": {
"get": {
"responses": {
"200": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/HeroUploadLimitsDto"
}
},
"text/json": {
"schema": {
"$ref": "#/components/schemas/HeroUploadLimitsDto"
}
},
"text/plain": {
"schema": {
"$ref": "#/components/schemas/HeroUploadLimitsDto"
}
}
},
"description": "OK"
}
},
"tags": [
"HeroImages"
]
}
},
"/api/v1/hero/images/{id}": {
"delete": {
"parameters": [
@@ -310,7 +310,7 @@ public static class ServiceCollectionExtensions
var key = string.IsNullOrEmpty(user) ? ClientPartitionKey.For(context) : "user:" + user;
return RateLimitPartition.GetFixedWindowLimiter(key, _ => new FixedWindowRateLimiterOptions
{
PermitLimit = settings.GetValue<int>("PermitLimit", 20),
PermitLimit = settings.GetValue<int>("PermitLimit", 100),
Window = TimeSpan.FromSeconds(settings.GetValue<int>("WindowSeconds", 3600)),
QueueLimit = 0
});
@@ -189,4 +189,17 @@ public class HeroFocusSaveTests
await act.Should().ThrowAsync<HeroImageNotFoundException>();
}
[Fact]
public void TheUploadLimits_ListTheFormatsTheHostAccepts_InPlainWords()
{
using var rig = new HeroTestRig();
var limits = HeroMapping.UploadLimits(rig.Status, rig.Media);
limits.Formats.Should().Contain(["JPEG", "PNG", "WebP"]).And.OnlyHaveUniqueItems();
limits.Formats.Should().BeEquivalentTo(rig.Status.AcceptedInput.Select(f => f == SlpModularCms.Core.Media.ImageFormat.Jpeg ? "JPEG" : f == SlpModularCms.Core.Media.ImageFormat.WebP ? "WebP" : f.ToString().ToUpperInvariant()));
limits.MaxUploadBytes.Should().Be(rig.Media.MaxUploadBytes);
limits.MaxMegapixels.Should().Be((int)(rig.Media.MaxPixels / 1_000_000));
}
}
@@ -67,7 +67,7 @@ public class HeroController(IHeroService service, IPublicHeroService publicServi
[ApiController]
[Route("hero/images")]
[Authorize(Policy = "AdminOnly")]
public class HeroImagesController(IHeroImageService service, IOptions<MediaOptions> media) : ControllerBase
public class HeroImagesController(IHeroImageService service, IOptions<MediaOptions> media, MediaStatus mediaStatus) : ControllerBase
{
/// <summary>The body limit leaves room for the multipart envelope around the file limit of <see cref="MediaOptions.MaxUploadBytes"/>.</summary>
private const long RequestLimit = 12 * 1024 * 1024;
@@ -95,6 +95,11 @@ public class HeroImagesController(IHeroImageService service, IOptions<MediaOptio
}
}
/// <summary>The formats and limits an upload has to meet on this host (what the validation uses).</summary>
[HttpGet("limits")]
[ProducesResponseType<HeroUploadLimitsDto>(StatusCodes.Status200OK)]
public ActionResult<HeroUploadLimitsDto> Limits() => HeroMapping.UploadLimits(mediaStatus, media.Value);
/// <summary>Lets the background renderer try an image it gave up on again.</summary>
[HttpPost("{id:guid}/retry")]
[ProducesResponseType(StatusCodes.Status204NoContent)]
@@ -259,3 +259,6 @@ public static class HeroText
return builder.ToString().Trim();
}
}
/// <summary>What an upload is allowed to be on this host, for the admin to show: derived from the same sources as the validation.</summary>
public record HeroUploadLimitsDto(IReadOnlyList<string> Formats, long MaxUploadBytes, int MaxMegapixels);
@@ -33,6 +33,20 @@ public static class HeroMapping
{
public const string Area = "hero";
/// <summary>The accepted upload formats (as the host allows them right now) and limits, in the words an administrator knows.</summary>
public static HeroUploadLimitsDto UploadLimits(MediaStatus status, MediaOptions limits)
=> new(
status.AcceptedInput.OrderBy(f => f).Select(DisplayName).ToList(),
limits.MaxUploadBytes,
(int)Math.Max(1, limits.MaxPixels / 1_000_000));
private static string DisplayName(ImageFormat format) => format switch
{
ImageFormat.Jpeg => "JPEG",
ImageFormat.WebP => "WebP",
_ => format.ToString().ToUpperInvariant(),
};
/// <summary>The set hash the image should have at its current focus.</summary>
public static string TargetSetHash(HeroImage image)
=> MediaPaths.SetHash(image.OriginalSha256, [("wide", image.FocusFor("wide")), ("tall", image.FocusFor("tall"))]);
+11 -11
View File
@@ -7,41 +7,41 @@
"tooManyLines": "The title can have at most {max} lines."
},
"tagline": {
"tooLong": "The tagline can have at most {max} characters."
"tooLong": "The short text above the title can have at most {max} characters."
},
"lead": {
"tooLong": "The introduction can have at most {max} characters."
},
"display": {
"invalid": "The display must be 'single' or 'slideshow'."
"invalid": "Choose ‘Single’ or ‘Slideshow’."
},
"button": {
"incomplete": "A button needs both a label and a target.",
"labelTooLong": "The button label can have at most {max} characters.",
"targetTooLong": "The button target can have at most {max} characters.",
"targetInvalid": "Choose an #anchor, a /path or an https:// address.",
"targetInvalid": "Choose a part of the page (for example #contact), a page of the site (for example /privacy) or a full web address (https://…).",
"tooMany": "At most {max} buttons are possible."
},
"schedule": {
"endAfterStart": "The end must be after the start."
},
"slide": {
"imageRequired": "Every slide needs an image.",
"imageUnknown": "An image of a slide does not exist (any more).",
"altRequired": "Give a description (alt text) or mark the image as decorative.",
"altTooLong": "The alt text can have at most {max} characters.",
"idUnknown": "A slide does not belong to this hero."
"imageRequired": "Every image in the list needs a photo.",
"imageUnknown": "An image in the list does not exist (any more).",
"altRequired": "Give a description or choose ‘Decoration only’.",
"altTooLong": "The description can have at most {max} characters.",
"idUnknown": "An image in the list does not belong to this hero."
},
"focus": {
"invalid": "The focus point must be between 0 and 1 and the zoom between 1 and {maxZoom}."
"invalid": "The point of the subject must be inside the photo and the zoom between 1 and {maxZoom}."
}
},
"image": {
"inUse": "This image is still used by a slide.",
"inUse": "This image is still used in the hero.",
"notFound": "This image does not exist.",
"rejected": {
"tooLarge": "The image is too large (at most {max} MB).",
"unsupportedFormat": "This file type is not supported. Choose a JPEG, PNG, WebP or another common image file.",
"unsupportedFormat": "This file type is not supported. The types that work are listed above the upload button.",
"corrupt": "The image could not be read or is damaged.",
"tooManyPixels": "The image has too many pixels. Choose a smaller image.",
"timeout": "Processing the image took too long. Try a smaller image.",
+11 -11
View File
@@ -7,41 +7,41 @@
"tooManyLines": "De titel mag maximaal {max} regels hebben."
},
"tagline": {
"tooLong": "De tagline mag maximaal {max} tekens bevatten."
"tooLong": "De korte tekst boven de titel mag maximaal {max} tekens bevatten."
},
"lead": {
"tooLong": "De introductietekst mag maximaal {max} tekens bevatten."
},
"display": {
"invalid": "De weergave moet 'enkel' of 'diavoorstelling' zijn."
"invalid": "Kies ‘Enkel’ of ‘Diavoorstelling’."
},
"button": {
"incomplete": "Een knop heeft zowel een tekst als een doel nodig.",
"labelTooLong": "De knoptekst mag maximaal {max} tekens bevatten.",
"targetTooLong": "Het doel van een knop mag maximaal {max} tekens bevatten.",
"targetInvalid": "Kies een #anker, een /pad of een https://-adres.",
"targetInvalid": "Kies een onderdeel van de pagina (bijvoorbeeld #contact), een pagina van de site (bijvoorbeeld /privacy) of een volledig webadres (https://…).",
"tooMany": "Er zijn maximaal {max} knoppen mogelijk."
},
"schedule": {
"endAfterStart": "Het einde moet na het begin liggen."
},
"slide": {
"imageRequired": "Elke slide heeft een afbeelding nodig.",
"imageUnknown": "Een afbeelding van een slide bestaat niet (meer).",
"altRequired": "Geef een beschrijving (alt-tekst) of markeer de afbeelding als decoratief.",
"altTooLong": "De alt-tekst mag maximaal {max} tekens bevatten.",
"idUnknown": "Een slide hoort niet bij deze hero."
"imageRequired": "Elke afbeelding in de lijst heeft een foto nodig.",
"imageUnknown": "Een afbeelding in de lijst bestaat niet (meer).",
"altRequired": "Geef een beschrijving of kies ‘Alleen versiering’.",
"altTooLong": "De beschrijving mag maximaal {max} tekens bevatten.",
"idUnknown": "Een afbeelding in de lijst hoort niet bij deze hero."
},
"focus": {
"invalid": "Het focuspunt moet tussen 0 en 1 liggen en de zoom tussen 1 en {maxZoom}."
"invalid": "Het punt van het onderwerp moet binnen de foto liggen en het inzoomen tussen 1 en {maxZoom}."
}
},
"image": {
"inUse": "Deze afbeelding wordt nog gebruikt door een slide.",
"inUse": "Deze afbeelding wordt nog gebruikt in de hero.",
"notFound": "Deze afbeelding bestaat niet.",
"rejected": {
"tooLarge": "De afbeelding is te groot (maximaal {max} MB).",
"unsupportedFormat": "Dit bestandstype wordt niet ondersteund. Kies een JPEG-, PNG-, WebP- of ander gangbaar afbeeldingsbestand.",
"unsupportedFormat": "Dit bestandstype wordt niet ondersteund. Boven de uploadknop staat welke typen kunnen.",
"corrupt": "De afbeelding kon niet worden gelezen of is beschadigd.",
"tooManyPixels": "De afbeelding heeft te veel pixels. Kies een kleinere afbeelding.",
"timeout": "Het verwerken van de afbeelding duurde te lang. Probeer een kleinere afbeelding.",