Hero-admin: schakelaar Actief, destructieve knoppen rood, slide-kopjes, juiste voorvertoning in het focusvenster, status per foto
- Schakelaar (role=switch) Actief / Niet actief bij de knoppen, gedimde rij; 'Verberg voor schermlezers'; veld 'Beschrijving' binnen een groep 'Slide N'
- Alle foto's zonder complete set tonen 'Wordt verwerkt' (voortgang bij de foto die bezig is, 'in de wachtrij' bij de rest); totaal bovenaan telt ook nog niet opgeslagen foto's
- Per foto 'Verwerking afgerond' (zelfde weergave voor een hergebruikte foto), foto direct bruikbaar; niet-opgeslagen foto's worden zelf ververst (GET /hero/images/{id}), ook in een achtergrondtab
- Focusvenster toont de hele foto (full-preview in elke set, achtergrond-aanvulling voor oude sets) in plaats van de uitgesneden wide-variant (vervorming)
- Prullenbak en 'Wijzigingen weggooien' in de destructieve stijl
- upload-respons: reused (intern)
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
import { useEffect, useMemo, useRef, useState } from 'react';
|
||||
import { useQueries } from '@tanstack/react-query';
|
||||
import { useFieldArray, useForm, useWatch } from 'react-hook-form';
|
||||
import { zodResolver } from '@hookform/resolvers/zod';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
@@ -14,13 +15,14 @@ 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 { PhotoPlaceholder, ProcessingStatus, RecutThumbnail } from '../components/ProcessingStatus';
|
||||
import { DoneStatus, PhotoPlaceholder, ProcessingStatus, RecutThumbnail } from '../components/ProcessingStatus';
|
||||
import { SlideSwitch } from '../components/SlideSwitch';
|
||||
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, useHeroUploadLimits, useSaveHero, useUploadHeroImage } from '../services/hooks';
|
||||
import { heroImageQuery, useHero, useHeroUploadLimits, useSaveHero, useUploadHeroImage } from '../services/hooks';
|
||||
import type { HeroAdminDto, HeroFocusRequest, HeroImageDto, HeroSaveRequest } from '../services/types';
|
||||
|
||||
const textareaClass =
|
||||
@@ -131,7 +133,6 @@ export function HeroPage() {
|
||||
<Button variant="outline" onClick={() => void refetch()}>{t('common.retry')}</Button>
|
||||
</div>
|
||||
)}
|
||||
{hero && <ProcessingStatus hero={hero} />}
|
||||
{hero && <HeroEditor key={hero.id ?? 'new'} hero={hero} />}
|
||||
</div>
|
||||
);
|
||||
@@ -155,6 +156,7 @@ function HeroEditor({ hero }: { hero: HeroAdminDto }) {
|
||||
|
||||
const {
|
||||
register,
|
||||
setValue,
|
||||
handleSubmit,
|
||||
control,
|
||||
formState: { errors, isDirty },
|
||||
@@ -164,11 +166,48 @@ function HeroEditor({ hero }: { hero: HeroAdminDto }) {
|
||||
const watchedSlides = useWatch({ control, name: 'slides' }) ?? [];
|
||||
|
||||
// The images of the saved hero (always current: a change of focus refreshes them) plus the ones uploaded in this session.
|
||||
// Photos uploaded here and not saved yet are not in the saved hero: they are asked for one by one until they are ready,
|
||||
// so a photo that is finished never stays "processing" because nothing refreshed it.
|
||||
const unsavedIds = useMemo(
|
||||
() => Object.keys(localImages).filter((id) => !hero.slides.some((s) => s.imageId === id)),
|
||||
[hero.slides, localImages],
|
||||
);
|
||||
const polled = useQueries({
|
||||
queries: unsavedIds.map((id) => heroImageQuery(id)),
|
||||
combine: (results) => results.map((r) => r.data),
|
||||
});
|
||||
const images = useMemo(() => {
|
||||
const map: Record<string, HeroImageDto> = { ...localImages };
|
||||
for (const image of polled) if (image) map[image.id] = image;
|
||||
for (const s of hero.slides) map[s.imageId] = s.image;
|
||||
return map;
|
||||
}, [hero.slides, localImages]);
|
||||
}, [hero.slides, localImages, polled]);
|
||||
|
||||
// Per photo: when its processing is done it shows "Processing finished" for a few seconds, and can be worked on at once.
|
||||
// A photo that was ready at once (the same photo was already in the CMS) shows the same note, without a placeholder.
|
||||
const [justDone, setJustDone] = useState<Record<string, true>>({});
|
||||
const wasProcessing = useRef<Record<string, boolean>>({});
|
||||
const markDone = (imageId: string) => {
|
||||
setJustDone((current) => ({ ...current, [imageId]: true }));
|
||||
window.setTimeout(() => {
|
||||
setJustDone((current) => {
|
||||
const { [imageId]: _removed, ...rest } = current;
|
||||
return rest;
|
||||
});
|
||||
}, 4500);
|
||||
};
|
||||
useEffect(() => {
|
||||
for (const field of slides.fields) {
|
||||
const image = images[field.imageId];
|
||||
if (!image) continue;
|
||||
if (image.processing) {
|
||||
wasProcessing.current[image.id] = true;
|
||||
} else if (wasProcessing.current[image.id]) {
|
||||
wasProcessing.current[image.id] = false;
|
||||
markDone(image.id);
|
||||
}
|
||||
}
|
||||
}, [images, slides.fields]);
|
||||
|
||||
// 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);
|
||||
@@ -219,6 +258,8 @@ function HeroEditor({ hero }: { hero: HeroAdminDto }) {
|
||||
const result = results[flushed];
|
||||
if (result && result !== 'failed') {
|
||||
setLocalImages((current) => ({ ...current, [result.id]: result }));
|
||||
// Ready at once (the same photo was already in the CMS): the same note as after a photo that took a while.
|
||||
if (!result.processing) markDone(result.id);
|
||||
slides.append({ id: null, imageId: result.id, alt: '', decorative: false, isActive: true }, { shouldFocus: false });
|
||||
}
|
||||
flushed += 1;
|
||||
@@ -293,6 +334,7 @@ function HeroEditor({ hero }: { hero: HeroAdminDto }) {
|
||||
|
||||
return (
|
||||
<form onSubmit={handleSubmit(onSubmit)} className="space-y-8" noValidate data-testid="hero-form">
|
||||
<ProcessingStatus images={slides.fields.map((f) => images[f.imageId]).filter((image): image is HeroImageDto => image !== undefined)} />
|
||||
<FormErrorBanner error={serverError !== null ? { message: serverError } : null} onDismiss={() => setServerError(null)} />
|
||||
|
||||
<section className="space-y-4">
|
||||
@@ -423,7 +465,8 @@ function HeroEditor({ hero }: { hero: HeroAdminDto }) {
|
||||
const image = images[field.imageId];
|
||||
const decorative = watchedSlides[index]?.decorative ?? false;
|
||||
return (
|
||||
<SortableSlide key={field.id} id={field.id} index={index}>
|
||||
<SortableSlide key={field.id} id={field.id} index={index} dimmed={!(watchedSlides[index]?.isActive ?? true)}>
|
||||
<div className="flex shrink-0 flex-col gap-1">
|
||||
{image && image.variants.length === 0 ? (
|
||||
<PhotoPlaceholder failed={image.failed} testId={`hero-slide-${index}-processing`} step={image.renderTotal ? { done: image.renderDone ?? 0, total: image.renderTotal } : null} />
|
||||
) : image?.processing ? (
|
||||
@@ -433,29 +476,31 @@ function HeroEditor({ hero }: { hero: HeroAdminDto }) {
|
||||
) : (
|
||||
<div className="flex h-20 w-28 items-center justify-center rounded bg-muted text-xs">?</div>
|
||||
)}
|
||||
<div className="min-w-[12rem] flex-1 space-y-2">
|
||||
<Label htmlFor={`hero-slide-${index}-alt`}>{t('hero.slides.alt', { n: index + 1 })}</Label>
|
||||
<DoneStatus done={Boolean(image && justDone[image.id] && !image.processing)} slideNumber={index + 1} testId={`hero-slide-${index}-done`} />
|
||||
</div>
|
||||
<div className="min-w-[12rem] flex-1 space-y-2" role="group" aria-labelledby={`hero-slide-title-${field.id}`}>
|
||||
<h3 id={`hero-slide-title-${field.id}`} className="text-xs font-medium uppercase tracking-wide text-muted-foreground" data-testid={`hero-slide-${index}-title`}>
|
||||
{t('hero.slides.number', { n: index + 1 })}
|
||||
</h3>
|
||||
<Label htmlFor={`hero-slide-${index}-alt`}>{t('hero.slides.alt')}</Label>
|
||||
<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>
|
||||
)}
|
||||
<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)} />
|
||||
<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)} />
|
||||
{t('hero.slides.active')}
|
||||
</label>
|
||||
</div>
|
||||
<label className="flex items-center gap-2 text-sm">
|
||||
<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')}
|
||||
</label>
|
||||
</div>
|
||||
<div className="flex gap-1">
|
||||
<div className="flex flex-wrap items-center gap-1">
|
||||
<SlideSwitch
|
||||
checked={watchedSlides[index]?.isActive ?? true}
|
||||
onChange={(value) => setValue(`slides.${index}.isActive` as const, value, { shouldDirty: true })}
|
||||
testId={`hero-slide-${index}-active`}
|
||||
slideNumber={index + 1}
|
||||
/>
|
||||
<Button type="button" variant="outline" size="icon" aria-label={t('hero.slides.up')} disabled={index === 0} onClick={() => slides.move(index, index - 1)} data-testid={`hero-slide-${index}-up`}>
|
||||
<ArrowUp className="size-4" aria-hidden="true" />
|
||||
</Button>
|
||||
@@ -465,7 +510,7 @@ function HeroEditor({ hero }: { hero: HeroAdminDto }) {
|
||||
<Button type="button" variant={focusEdits[field.imageId] ? 'default' : 'outline'} size="icon" aria-label={t('hero.slides.focus')} disabled={!image || image.variants.length === 0} onClick={() => setFocusImageId(field.imageId)} data-testid={`hero-slide-${index}-focus`}>
|
||||
<Crosshair className="size-4" aria-hidden="true" />
|
||||
</Button>
|
||||
<Button type="button" variant="outline" size="icon" aria-label={t('hero.slides.remove')} onClick={() => slides.remove(index)} data-testid={`hero-slide-${index}-remove`}>
|
||||
<Button type="button" variant="destructive" size="icon" aria-label={t('hero.slides.remove')} title={t('hero.slides.remove')} onClick={() => slides.remove(index)} data-testid={`hero-slide-${index}-remove`}>
|
||||
<Trash2 className="size-4" aria-hidden="true" />
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user