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:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user