Hero: grote foto's in de achtergrond robuust en sneller, voortgang en opnieuw proberen; admin zonder inline script
- Een decode voor de hele set, per breedte eenmaal geschaald voor WebP en AVIF (6000x4000: 21,1 s -> 6,4 s per set) - Eigen limiet per set (Media:RenderSetTimeoutSeconds 600), harde limiet rond een foto, de renderer stopt nooit door een uitzondering, een mislukte foto wacht tot de volgende ronde en houdt de rij niet op - Logging per foto (start, per variant, einde, fout); voortgang per variant in de admin; nieuwe uitsnede na focuswijziging zichtbaar (oude afbeelding blijft, shimmer); knop Opnieuw proberen - Thema-script als /theme-init.js (CSP script-src 'self'), test en smoke-controle op inline scripts Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -23,6 +23,11 @@ export function ProcessingStatus({ hero }: { hero: HeroAdminDto }) {
|
||||
const done = total - waiting.length;
|
||||
const failed = waiting.filter((s) => s.image.failed);
|
||||
const working = waiting.length - failed.length;
|
||||
// The photo the server is busy with right now, and how far along it is (a photo that waits has no step yet).
|
||||
const busyIndex = waiting.findIndex((s) => s.image.renderTotal);
|
||||
const busy = busyIndex === -1 ? null : waiting[busyIndex].image;
|
||||
const fraction = busy && busy.renderTotal ? (busy.renderDone ?? 0) / busy.renderTotal : 0;
|
||||
const percent = total === 0 ? 0 : Math.min(100, ((done + fraction) / total) * 100);
|
||||
|
||||
return (
|
||||
<div className="space-y-3 rounded-md border bg-muted/40 p-4" data-testid="hero-processing">
|
||||
@@ -42,9 +47,26 @@ export function ProcessingStatus({ hero }: { hero: HeroAdminDto }) {
|
||||
className="h-2 w-full overflow-hidden rounded bg-muted"
|
||||
data-testid="hero-processing-bar"
|
||||
>
|
||||
<div className="h-full bg-primary transition-all" style={{ width: `${total === 0 ? 0 : (done / total) * 100}%` }} />
|
||||
<div className="h-full bg-primary transition-all" style={{ width: `${percent}%` }} />
|
||||
</div>
|
||||
{busy && (
|
||||
<p className="text-sm" data-testid="hero-processing-current">
|
||||
{t('hero.processing.current', { n: done + 1, total, step: busy.renderDone ?? 0, steps: busy.renderTotal })}
|
||||
</p>
|
||||
)}
|
||||
<p className="text-sm text-muted-foreground">{t('hero.processing.explain')}</p>
|
||||
<p className="text-sm text-muted-foreground">
|
||||
{t('hero.processing.stuck')}{' '}
|
||||
<button
|
||||
type="button"
|
||||
className="underline underline-offset-2 hover:text-foreground disabled:opacity-50"
|
||||
disabled={retry.isPending}
|
||||
onClick={() => waiting.forEach((s) => retry.mutate(s.imageId))}
|
||||
data-testid="hero-processing-retry-all"
|
||||
>
|
||||
{t('hero.processing.retry')}
|
||||
</button>
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
{failed.length > 0 && (
|
||||
@@ -72,7 +94,7 @@ export function ProcessingStatus({ hero }: { hero: HeroAdminDto }) {
|
||||
* 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 }) {
|
||||
export function PhotoPlaceholder({ failed, testId, step }: { failed: boolean; testId: string; step?: { done: number; total: number } | null }) {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<div
|
||||
@@ -84,6 +106,31 @@ export function PhotoPlaceholder({ failed, testId }: { failed: boolean; testId:
|
||||
>
|
||||
{failed ? null : <Spinner className="size-3.5" />}
|
||||
<span>{failed ? t('hero.slides.failed') : t('hero.slides.processing')}</span>
|
||||
{!failed && step ? <span className="tabular-nums opacity-80" data-testid={`${testId}-step`}>{step.done}/{step.total}</span> : null}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* The photo of a slide whose crop is being made again (a changed focus point): the old picture stays visible underneath,
|
||||
* with the same calm shimmer and a short text, so it is clear that the change is not on the website yet.
|
||||
*/
|
||||
export function RecutThumbnail({ src, failed, testId, step }: { src: string; failed: boolean; testId: string; step?: { done: number; total: number } | null }) {
|
||||
const { t } = useTranslation();
|
||||
return (
|
||||
<div
|
||||
className={`relative h-20 w-28 shrink-0 overflow-hidden rounded ${failed ? 'ring-2 ring-destructive' : 'hero-shimmer'}`}
|
||||
role="status"
|
||||
aria-busy={!failed}
|
||||
title={t('hero.slides.recutHint')}
|
||||
data-testid={testId}
|
||||
>
|
||||
<img src={src} alt="" className="h-full w-full object-cover" />
|
||||
<span className={`absolute inset-x-0 bottom-0 flex items-center justify-center gap-1 px-1 py-0.5 text-center text-[10px] leading-tight ${failed ? 'bg-destructive text-destructive-foreground' : 'bg-background/85 text-foreground'}`}>
|
||||
{failed ? null : <Spinner className="size-3" />}
|
||||
<span>{failed ? t('hero.slides.failed') : t('hero.slides.recut')}</span>
|
||||
{!failed && step ? <span className="tabular-nums opacity-80" data-testid={`${testId}-step`}>{step.done}/{step.total}</span> : null}
|
||||
</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user