marcel
49d8ab78b4
Some checks failed
CI / Unit & Component Tests (push) Successful in 7m35s
CI / OCR Service Tests (push) Successful in 36s
CI / Backend Unit Tests (push) Failing after 12m42s
CI / fail2ban Regex (push) Successful in 1m50s
CI / Semgrep Security Scan (push) Successful in 37s
CI / Compose Bucket Idempotency (push) Successful in 1m18s
Closes #850 ## Summary On `/zeitstrahl`, a curated event that has letters linked to it now renders as a contained event card — the event is the card header (accent glyph, title, `{date} · {kuratiert|abgeleitet}` subtitle, count, and a curator edit link), with its linked letters listed inside (first 5, then a keyboard-operable show-more/less toggle). Letters in a year *other* than the event's band get a lighter cross-year `✉ title` card. Every other letter stays a plain, alternating, density-folding chronological letter. There is **no grouping control** — clustering is automatic and always on. The meta-line drops its `Gruppierung: Datum` segment. This supersedes #827: it keeps that branch's event-card clustering and the computed `linkedEventId`, and drops the toggle, the Thema mode, and the "Weitere Briefe" drawer. ## What changed **Backend** - `TimelineEntryDTO` gains a nullable `linkedEventId` (UUID; not `@Schema(REQUIRED)`). - `TimelineService.resolveLetterEventLinks` resolves each letter's curated event in one batched pass over the events it already loads — no per-letter query, no new column, no Flyway migration. - Regenerated the single `linkedEventId?` field in `api.ts`. **Frontend** - New `eventClustering.ts` (`buildEventLookup`, `splitYearLetters`, `CLUSTER_PREVIEW=5`) — filter-then-cluster: a letter clusters only if its `linkedEventId` is set AND present in the lookup, otherwise it stays loose. - New `EventCluster.svelte` — the contained event card (same-year event header + edit link, or cross-year ✉ text header; first-5 + show-more). - `LetterCard.svelte` gains `compact` + `variant='event'` (the `.lcard.ev` in-card letter). - `YearBand.svelte` rebuilt to render event clusters inline; loose letters keep the alternating layout and density strip, and the strip counts **only** loose letters (no duplication). - `TimelineView.svelte` builds the event lookup once and threads it + `canWrite` to each band. - `+page.svelte` drops the grouping meta segment; the unused `timeline_grouping_date` key removed from de/en/es. - New `timeline_bucket_show_more`/`_less` keys in all locales. - REQ-010 `{@html}` grep gate over `lib/timeline/`. ## Tests (real runs) - Backend `TimelineServiceTest`: **30 passed** (incl. the 2 new `linkedEventId` tests); `DerivedEventsAssemblyTest`: 17 passed; backend main sources compile. - Frontend client sweep (`LetterCard`, `EventCluster`, `YearBand`, `TimelineView`, `zeitstrahl/page`): **81 passed** (5 files). - Frontend server sweep (`eventClustering`, `messages`, `timeline-no-raw-html`): **18 passed** (3 files). - `svelte-check`: no new errors in the touched files (pre-existing baseline noise elsewhere unchanged). RTM: thirteen `REQ-001..013` rows added for #850 (feature `inline-event-clustering`), Status Done. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Marcel <marcel@familienarchiv> Reviewed-on: #851
70 lines
2.8 KiB
Svelte
70 lines
2.8 KiB
Svelte
<script lang="ts">
|
|
import * as m from '$lib/paraglide/messages.js';
|
|
import GlyphLabel from './GlyphLabel.svelte';
|
|
import { getAccentConfig, canEditEvent } from './eventCardConfig';
|
|
import { timelineDateLabel } from './dateLabel';
|
|
import type { components } from '$lib/generated/api';
|
|
|
|
type TimelineEntryDTO = components['schemas']['TimelineEntryDTO'];
|
|
|
|
/**
|
|
* The shared header for a curated or derived timeline event — the accent glyph circle, the title,
|
|
* and the `{date} · {kuratiert|abgeleitet}` subtitle, plus a curator edit pencil gated by the
|
|
* single canEditEvent() contract. Rendered by EventPill (inside the floating axis pill) and by
|
|
* EventCluster (as a same-year event-card header), so the glyph/title/subtitle markup and the
|
|
* security-relevant edit gate live in one place (#850 finding #5). It renders three sibling nodes
|
|
* (glyph circle, text block, optional edit pencil) into the parent's flex row — the parent owns
|
|
* the wrapper (pill vs card header). An optional letter `count` appends a screen-reader-labeled
|
|
* "· {count}" for the event-card case.
|
|
*/
|
|
let {
|
|
entry,
|
|
canWrite = false,
|
|
count = undefined
|
|
}: { entry: TimelineEntryDTO; canWrite?: boolean; count?: number } = $props();
|
|
|
|
const config = $derived(getAccentConfig(entry));
|
|
const dateLabel = $derived(timelineDateLabel(entry.eventDate, entry.precision, entry.eventDateEnd));
|
|
// Provenance reads off entry.derived: a derived life-event is "abgeleitet", a curated event
|
|
// "kuratiert"; the date is an optional prefix so an undated event still reads the provenance.
|
|
const provenance = $derived(
|
|
entry.derived ? m.timeline_provenance_derived() : m.timeline_provenance_curated()
|
|
);
|
|
const subtitle = $derived(dateLabel ? `${dateLabel} · ${provenance}` : provenance);
|
|
const canEdit = $derived(canEditEvent(entry, canWrite));
|
|
</script>
|
|
|
|
<span
|
|
class="flex h-7 w-7 shrink-0 items-center justify-center rounded-full {config.accent === 'curated'
|
|
? 'bg-brand-mint text-brand-navy'
|
|
: 'bg-brand-navy text-brand-mint'}"
|
|
>
|
|
<GlyphLabel glyph={config.glyph} label={config.label} />
|
|
</span>
|
|
<span class="min-w-0 text-left">
|
|
{#if entry.title}
|
|
<span class="block font-serif text-sm font-bold whitespace-pre-line text-brand-navy"
|
|
>{entry.title}</span
|
|
>
|
|
{/if}
|
|
<span class="block font-sans text-xs text-ink-3">
|
|
{subtitle}
|
|
{#if count !== undefined}
|
|
<span data-testid="event-count">
|
|
<span aria-hidden="true">· {count}</span>
|
|
<span class="sr-only">{m.timeline_cluster_letter_count({ count })}</span>
|
|
</span>
|
|
{/if}
|
|
</span>
|
|
</span>
|
|
{#if canEdit}
|
|
<a
|
|
data-testid="event-edit"
|
|
href="/zeitstrahl/events/{entry.eventId}/edit"
|
|
class="ml-auto rounded-sm px-1 font-sans text-xs text-ink-3 hover:text-brand-navy focus:outline-none focus-visible:ring-2 focus-visible:ring-brand-navy"
|
|
>
|
|
<span aria-hidden="true">✎</span>
|
|
<span class="sr-only">{m.btn_edit()}</span>
|
|
</a>
|
|
{/if}
|