feat(web): merge suggestion card redesign + subset merge selection #1006

Merged
chris merged 2 commits from feat/merge-card-redesign into main 2026-10-03 19:21:02 +02:00
Owner

Was sich ändert

A — Card

  • Überschrift nur noch Similar to X (Name des Bestandsmenschen), text-xl font-semibold statt Klein-Text; der lange Erklär-Satz entfällt komplett (nur Duplikat-/Ambiguitäts-Hinweise bleiben mit eigener Begründung).
  • Primärbutton heißt Merge all (Verhalten unverändert: alle Bilder, kein Subset-Feld im Body).
  • Chevron rechts am Button öffnet denselben Detail-Dialog wie ein Klick auf die Bildkacheln (aria-haspopup="dialog") statt direkt den Person-Picker.
  • Neues X-Icon oben rechts auf der Card (44×44, mobil erreichbar) ersetzt die alten Reject-/Disband-Footer-Buttons: Semantik unverändert (People-Cluster → disbanded, alle anderen → rejected), gleiche Test-IDs (candidate-disband / candidate-reject).

B — Ein Merge-Dialog für alles

  • Foto-Subset-Auswahl: Checkbox-Overlay je Kachel, Standard alle ausgewählt, sticky Kopfzeile N of M selected, Select all/Deselect all, Show more photos (24er-Schritte). Leere Auswahl sperrt alle finalen Aktionen mit Select at least one photo to continue.
  • Merge-Target ändern: bestehender In-Dialog-Picker (Choose a different person…) für Bestands- und Cluster-Cards.
  • Neue Person: New person instead… + Namensfeld, Button Create new person.
  • Alle finalen Dialog-Aktionen (accepted + existingInstanceId, Picker-Confirm und createNewInstance) senden das Subset.

C — API-Vertrag

  • ClassInstanceCandidateDecisionRequest: neu selectedOccurrenceRefs?: string[] | null, createNewInstance?: boolean existiert auf main bereits.
  • Gesendete Identität = die Id, die die API selbst in candidate.occurrenceRefs liefert: faceAnnotationId bei Face-Refs (type: "face_annotation") → sonst occurrenceId → occurrenceKey → mediaItemId. 1 Ref = 1 gerenderte Kachel = 1 Face-Vorkommen (mehrere Refs können dieselbe mediaItemId haben, daher ref- statt media-basiert).
  • null/abwesend = alle Bilder (Rückwärtskompatibilität), leeres Array wird nie gesendet (UI blockiert es). Card-Aktionen ohne Dialog senden das Feld nie.
  • Unbekanntes Feld wird toleriert: Spring Boot ignoriert unknown JSON-Properties (kein fail-on-unknown-properties konfiguriert), bis der Backend-Lane landet.

D — Copy

  • Stash away → Hide person (gleiche Aktion, gleiche Test-ID candidate-stash / merge-suggestion-stash).
  • Disband-Button entfällt → X oben auf der Card; StashDisbandSplit.svelte hatte keine Nutzer mehr und wurde entfernt. Merge-Suggestion-Card (Namenspaar) hat dasselbe X (merge-suggestion-disband bei unnamed Party, merge-suggestion-dismiss bei named×named) plus Hide person-Button.

E — Konflikt-/Ergebnis-Verhalten (finaler Backend-Vertrag)

  • 200 outcome: "applied" → normaler Erfolg, Vorschlag weg, kein Fehler.
  • 200 outcome: "all_faces_already_assigned" + state: "rejected" (Zero-Write-Stash) → stiller Erfolg: Vorschlag weg, kein Error, kein Notice.
  • 409 ProblemDetail code: "candidate_changed" → ausschließlich dieser Fall löst den Toleranz-Pfad aus: Card optimistisch entfernt, loadAll(), ruhiger, nach 6 s selbst verschwindender Notice This suggestion was outdated — list refreshed.
  • Jede andere 409 (kein Code oder anderer Code) sowie 400/500 bleiben sichtbare Fehler über describeApiError.

Geänderte Dateien

  • apps/web/src/lib/api/discovery.ts (Request-/Result-Typen inkl. outcome)
  • apps/web/src/lib/components/DomainSuggestionsCarousel.svelte (Card, Dialog, Auswahl, Konfliktbehandlung)
  • apps/web/src/lib/components/StashDisbandSplit.svelte (gelöscht, keine Nutzer mehr)
  • apps/web/tests/discovery-review.spec.ts (Erwartungen aktualisiert + neue Tests)

Testnachweis (apps/web)

  • npm run check → svelte-check found 0 errors and 22 warnings (Warnings vorab vorhanden)
  • npm run build → ok
  • npm run test:unit → 8 test files, 60 tests passed
  • npx playwright test (voller Suite, CI=1, --workers=4 --retries=0) → 725 passed, 23 skipped, 0 failed, davon tests/discovery-review.spec.ts 90 passed (desktop + mobile). Ein Zwischenlauf mit 9 Fails in unberührten Specs (accessibility/plants/albums/explore) war Fluke — alle 9 sofort grün mit --last-failed.
  • Neue bzw. erweiterte Tests: Subset-POST im Dialog, Merge all ohne Subset-Feld, candidate_changed-Notice ohne Rohfehler + nachweisbarer Listen-Reload, 409 ohne code bleibt sichtbarer Fehler (Card bleibt stehen), sichtbarer 400-Fehler, stiller all_faces_already_assigned-Erfolg, createNewInstance + Subset bei allen finalen Dialog-Aktionen.

CI

  • Push 88fa82e1: Run 3566 (Scope web) → success, Run 3567 (api/worker) korrekt skipped durch die Scope-Erkennung.
  • Zweiter Push 87f1edb2 (nur Konflikt-Vertrag) aktualisiert den PR.
## Was sich ändert **A — Card** - Überschrift nur noch `Similar to X` (Name des Bestandsmenschen), `text-xl font-semibold` statt Klein-Text; der lange Erklär-Satz entfällt komplett (nur Duplikat-/Ambiguitäts-Hinweise bleiben mit eigener Begründung). - Primärbutton heißt `Merge all` (Verhalten unverändert: alle Bilder, kein Subset-Feld im Body). - Chevron rechts am Button öffnet denselben Detail-Dialog wie ein Klick auf die Bildkacheln (`aria-haspopup="dialog"`) statt direkt den Person-Picker. - Neues X-Icon oben rechts auf der Card (44×44, mobil erreichbar) ersetzt die alten `Reject`-/`Disband`-Footer-Buttons: Semantik unverändert (People-Cluster → `disbanded`, alle anderen → `rejected`), gleiche Test-IDs (`candidate-disband` / `candidate-reject`). **B — Ein Merge-Dialog für alles** - Foto-Subset-Auswahl: Checkbox-Overlay je Kachel, Standard **alle ausgewählt**, sticky Kopfzeile `N of M selected`, `Select all`/`Deselect all`, `Show more photos` (24er-Schritte). Leere Auswahl sperrt alle finalen Aktionen mit `Select at least one photo to continue.` - Merge-Target ändern: bestehender In-Dialog-Picker (`Choose a different person…`) für Bestands- und Cluster-Cards. - Neue Person: `New person instead…` + Namensfeld, Button `Create new person`. - Alle finalen Dialog-Aktionen (`accepted` + `existingInstanceId`, Picker-Confirm und `createNewInstance`) senden das Subset. **C — API-Vertrag** - `ClassInstanceCandidateDecisionRequest`: neu `selectedOccurrenceRefs?: string[] | null`, `createNewInstance?: boolean` existiert auf main bereits. - Gesendete Identität = die Id, die die API selbst in `candidate.occurrenceRefs` liefert: `faceAnnotationId` bei Face-Refs (`type: "face_annotation"`) → sonst `occurrenceId` → `occurrenceKey` → `mediaItemId`. **1 Ref = 1 gerenderte Kachel = 1 Face-Vorkommen** (mehrere Refs können dieselbe `mediaItemId` haben, daher ref- statt media-basiert). - `null`/abwesend = alle Bilder (Rückwärtskompatibilität), leeres Array wird nie gesendet (UI blockiert es). Card-Aktionen ohne Dialog senden das Feld nie. - Unbekanntes Feld wird toleriert: Spring Boot ignoriert unknown JSON-Properties (kein `fail-on-unknown-properties` konfiguriert), bis der Backend-Lane landet. **D — Copy** - `Stash away` → `Hide person` (gleiche Aktion, gleiche Test-ID `candidate-stash` / `merge-suggestion-stash`). - Disband-Button entfällt → X oben auf der Card; `StashDisbandSplit.svelte` hatte keine Nutzer mehr und wurde entfernt. Merge-Suggestion-Card (Namenspaar) hat dasselbe X (`merge-suggestion-disband` bei unnamed Party, `merge-suggestion-dismiss` bei named×named) plus `Hide person`-Button. **E — Konflikt-/Ergebnis-Verhalten (finaler Backend-Vertrag)** - 200 `outcome: "applied"` → normaler Erfolg, Vorschlag weg, kein Fehler. - 200 `outcome: "all_faces_already_assigned"` + `state: "rejected"` (Zero-Write-Stash) → stiller Erfolg: Vorschlag weg, kein Error, kein Notice. - 409 ProblemDetail `code: "candidate_changed"` → **ausschließlich dieser Fall** löst den Toleranz-Pfad aus: Card optimistisch entfernt, `loadAll()`, ruhiger, nach 6 s selbst verschwindender Notice `This suggestion was outdated — list refreshed`. - Jede andere 409 (kein Code oder anderer Code) sowie 400/500 bleiben sichtbare Fehler über `describeApiError`. ## Geänderte Dateien - `apps/web/src/lib/api/discovery.ts` (Request-/Result-Typen inkl. `outcome`) - `apps/web/src/lib/components/DomainSuggestionsCarousel.svelte` (Card, Dialog, Auswahl, Konfliktbehandlung) - `apps/web/src/lib/components/StashDisbandSplit.svelte` (gelöscht, keine Nutzer mehr) - `apps/web/tests/discovery-review.spec.ts` (Erwartungen aktualisiert + neue Tests) ## Testnachweis (`apps/web`) - `npm run check` → `svelte-check found 0 errors and 22 warnings` (Warnings vorab vorhanden) - `npm run build` → ok - `npm run test:unit` → `8 test files, 60 tests passed` - `npx playwright test` (voller Suite, `CI=1`, `--workers=4 --retries=0`) → **725 passed, 23 skipped, 0 failed**, davon `tests/discovery-review.spec.ts` 90 passed (desktop + mobile). Ein Zwischenlauf mit 9 Fails in unberührten Specs (accessibility/plants/albums/explore) war Fluke — alle 9 sofort grün mit `--last-failed`. - Neue bzw. erweiterte Tests: Subset-POST im Dialog, `Merge all` ohne Subset-Feld, `candidate_changed`-Notice ohne Rohfehler + nachweisbarer Listen-Reload, **409 ohne `code` bleibt sichtbarer Fehler (Card bleibt stehen)**, sichtbarer 400-Fehler, stiller `all_faces_already_assigned`-Erfolg, `createNewInstance` + Subset bei allen finalen Dialog-Aktionen. ## CI - Push `88fa82e1`: Run 3566 (Scope `web`) → **success**, Run 3567 (api/worker) korrekt `skipped` durch die Scope-Erkennung. - Zweiter Push `87f1edb2` (nur Konflikt-Vertrag) aktualisiert den PR.
feat(web): merge suggestion card redesign + subset merge selection
All checks were successful
Wiki Sync / Sync wiki from docs (push) Has been skipped
Build and Deploy / Detect changed services and test scopes (push) Successful in 2s
Build and Deploy / Android unit tests and debug APK (push) Has been skipped
Build and Deploy / Build postgres image (push) Has been skipped
Build and Deploy / Smoke API and media worker (push) Has been skipped
Build and Deploy / Smoke web (push) Has been skipped
Build and Deploy / Smoke ML worker (push) Has been skipped
Build and Deploy / Smoke people worker (push) Has been skipped
Build and Deploy / Build plants worker image (push) Has been skipped
Build and Deploy / Build converter worker image (push) Has been skipped
Build and Deploy / Deploy postgres (push) Has been skipped
Build and Deploy / Build API image (push) Has been skipped
Build and Deploy / Build media worker image (push) Has been skipped
Build and Deploy / Build ML worker image (push) Has been skipped
Build and Deploy / Build people worker image (push) Has been skipped
Build and Deploy / Build web image (push) Has been skipped
Build and Deploy / Deploy API (push) Has been skipped
Build and Deploy / Deploy web (push) Has been skipped
Build and Deploy / Deploy media worker (push) Has been skipped
Build and Deploy / Deploy ML worker (push) Has been skipped
Build and Deploy / Deploy plants worker (push) Has been skipped
Build and Deploy / Deploy people worker (push) Has been skipped
Build and Deploy / Deploy converter worker (push) Has been skipped
Build and Deploy / Clean Docker build artifacts (push) Has been skipped
Build and Deploy / Run scoped PR tests (push) Successful in 3m57s
88fa82e143
Card (A): large "Similar to X" headline as the only headline copy,
primary button labelled "Merge all", chevron opens the same detail dialog
as the photo grid. The old Reject/Disband footer buttons are replaced by
an X icon at the top of the card (44px, mobile reachable, same handlers:
disband for people clusters, reject otherwise).

Dialog (B): one shared merge dialog now offers photo-subset selection
(all selected by default, per-photo checkboxes, select/deselect all,
"Show more photos"), changing the merge target (existing picker) and
creating a new person. Every final action in the dialog is limited to the
selected photos; "Select at least one photo to continue." blocks an empty
selection.

API (C): ClassInstanceCandidateDecisionRequest gains optional
selectedOccurrenceRefs (ids taken from candidate.occurrenceRefs:
faceAnnotationId -> occurrenceId -> occurrenceKey -> mediaItemId) and
createNewInstance. Dialog actions always send the subset; card actions
("Merge all", X, Hide person) never send it. Absent/null keeps meaning
"all", an empty array is never sent.

Copy (D): "Stash away" -> "Hide person"; StashDisbandSplit dropped (no
remaining usages).

Errors (E): 409 with code candidate_changed (or the legacy conflict
detail) optimistically removes the card, reloads the list and shows a
short "This suggestion was outdated — list refreshed" notice; outcome
all_faces_already_assigned stays a silent success; every other failure
stays visible.

Verified: npm run check (0 errors), npm run build, npm run test:unit
(60 passed), full Playwright suite 723 passed / 23 skipped.
fix(web): tolerate only 409 code candidate_changed
All checks were successful
Wiki Sync / Sync wiki from docs (push) Has been skipped
Build and Deploy / Detect changed services and test scopes (push) Successful in 3s
Build and Deploy / Android unit tests and debug APK (push) Has been skipped
Build and Deploy / Build postgres image (push) Has been skipped
Build and Deploy / Smoke API and media worker (push) Has been skipped
Build and Deploy / Smoke web (push) Has been skipped
Build and Deploy / Smoke ML worker (push) Has been skipped
Build and Deploy / Smoke people worker (push) Has been skipped
Build and Deploy / Build plants worker image (push) Has been skipped
Build and Deploy / Build converter worker image (push) Has been skipped
Build and Deploy / Deploy postgres (push) Has been skipped
Build and Deploy / Build API image (push) Has been skipped
Build and Deploy / Build media worker image (push) Has been skipped
Build and Deploy / Build ML worker image (push) Has been skipped
Build and Deploy / Build people worker image (push) Has been skipped
Build and Deploy / Build web image (push) Has been skipped
Build and Deploy / Deploy API (push) Has been skipped
Build and Deploy / Deploy web (push) Has been skipped
Build and Deploy / Deploy media worker (push) Has been skipped
Build and Deploy / Deploy ML worker (push) Has been skipped
Build and Deploy / Deploy plants worker (push) Has been skipped
Build and Deploy / Deploy people worker (push) Has been skipped
Build and Deploy / Deploy converter worker (push) Has been skipped
Build and Deploy / Clean Docker build artifacts (push) Has been skipped
Build and Deploy / Run scoped PR tests (push) Successful in 8m49s
87f1edb26e
Backend contract is final: 200 outcome "applied" = success, 200 outcome
"all_faces_already_assigned" + state "rejected" = silent zero-write stash,
and only the 409 ProblemDetail code "candidate_changed" is the race we
swallow (card away, list reload, quiet notice). Every other 409 — no code
or a different code — stays a visible error, so the legacy detail-text
fallback is dropped.

Verified: npm run check (0 errors), npm run build, npm run test:unit
(60 passed), full Playwright suite 725 passed / 23 skipped.
chris merged commit 55bac6437b into main 2026-10-03 19:21:02 +02:00
Sign in to join this conversation.
No reviewers
No labels
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
chris/memories!1006
No description provided.