Phase 4 abgeschlossen: Personalakten, Dokumente, Beteiligte, Verknüpfungen
Die Dokumentebene aus docs/13 ist gebaut, additiv: Document, DocumentSection und DocumentSectionVersion neben Case, CaseSection und CaseEntry. Ein Dokument hängt an einer Fallakte, an einer Personalakte oder an nichts, höchstens an einem - gesichert durch eine CHECK-Bedingung. Es gibt kein DELETE; eine Zurücknahme lässt einen Grabstein stehen, der auch für den Admin zu ist. Eine neue Dokumentart ist damit ein Datensatz, kein Deployment. Im Seed stehen vier: vermerk, vorfallsbericht, sonderarbeitsvertrag (mehrseitiger Vertragstext mit Platzhaltern und Unterschriftenzeilen) und bussgeld. Zwei Umbenennungen, beide von Hand migriert, damit die vorhandenen Zeilen und Zählerstände stehen bleiben: - CaseTemplate -> DocumentTemplate, plus uses[] und layout - CaseCounter -> NumberSeries, ein Nummernkreis je Präfix für Aktenzeichen und Dokumentnummern Die Regeln für Abschnitte stehen jetzt einmal in lib/sections/render.ts und gelten für Fallakten und Dokumente gleichermaßen. Die Frage aus docs/13, ob CaseSection langfristig in die Dokumentebene wandert, ist damit verneint und begründet. Rückverweise auf der Personalakte laufen durch visibleCaseWhere, die Zahl daneben entsteht aus dem gefilterten Ergebnis. Auch die Rollengruppe verschwindet mit, sonst verriete "Betroffener" ohne Eintrag die Ermittlung. Die eigene Personalakte ist keine Ausnahme von der Freigabestufe. Vier neue Rechte: document.create, .edit, .finalize, .retract. Das letzte steht bei den zurückgehaltenen, es greift in Geschriebenes ein. 91 Tests im Web-Paket, 15 in der Datenbank, 28 e2e. Größte Route 118 kB gegen das Budget von 120 kB - die Luft wird knapp.
This commit is contained in:
Harlekin
@@ -38,7 +38,7 @@ export function CaseActions({
|
||||
setError(null)
|
||||
startTransition(async () => {
|
||||
const result = await action()
|
||||
if (!result.ok) setError(result.error ?? de.case.errors.default!)
|
||||
if (!result.ok) setError(result.error ?? de.actionErrors.default!)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,152 @@
|
||||
'use client'
|
||||
|
||||
import { useState, useTransition } from 'react'
|
||||
import Link from 'next/link'
|
||||
import { de } from '@/lib/i18n/de'
|
||||
import { LINK_KINDS } from '@/lib/cases/terms'
|
||||
import { linkCasesAction, unlinkCasesAction } from '../actions'
|
||||
import { classificationEdgeStyle } from '@/components/StampMark'
|
||||
|
||||
type Verknuepfung = {
|
||||
kind: string
|
||||
direction: 'in' | 'out'
|
||||
other: { id: string; caseNumber: string; title: string; status: string; classification: number }
|
||||
}
|
||||
|
||||
/**
|
||||
* Verknüpfungen zwischen Akten.
|
||||
*
|
||||
* Lösen ohne Bestätigungsdialog: eine Verknüpfung ist umkehrbar, sie lässt
|
||||
* sich in zwei Klicks neu ziehen. Siehe docs/09-performance-und-ux.md.
|
||||
*/
|
||||
export function CaseLinks({
|
||||
caseNumber,
|
||||
links,
|
||||
canEdit,
|
||||
}: {
|
||||
caseNumber: string
|
||||
links: Verknuepfung[]
|
||||
canEdit: boolean
|
||||
}) {
|
||||
const [open, setOpen] = useState(false)
|
||||
const [target, setTarget] = useState('')
|
||||
const [kind, setKind] = useState<string>('RELATED')
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [pending, startTransition] = useTransition()
|
||||
|
||||
return (
|
||||
<div>
|
||||
{links.length === 0 ? (
|
||||
<p className="text-text-dim">{de.link.empty}</p>
|
||||
) : (
|
||||
<ul className="border-t border-line">
|
||||
{links.map((link) => (
|
||||
<li
|
||||
key={`${link.direction}:${link.kind}:${link.other.id}`}
|
||||
className="flex flex-wrap items-baseline gap-x-4 gap-y-1 border-b border-line py-2 pl-3"
|
||||
style={classificationEdgeStyle(link.other.classification)}
|
||||
>
|
||||
<span className="font-condensed text-2xs text-text-dim">
|
||||
{(link.direction === 'in' ? de.link.incoming : de.link.kinds)[link.kind] ??
|
||||
link.kind}
|
||||
</span>
|
||||
<Link
|
||||
href={`/faelle/${link.other.caseNumber}`}
|
||||
prefetch
|
||||
className="font-mono text-xs text-text-dim"
|
||||
>
|
||||
{link.other.caseNumber}
|
||||
</Link>
|
||||
<span className="grow text-sm">{link.other.title}</span>
|
||||
{canEdit ? (
|
||||
<button
|
||||
type="button"
|
||||
disabled={pending}
|
||||
onClick={() =>
|
||||
startTransition(async () => {
|
||||
const result = await unlinkCasesAction({
|
||||
fromCaseNumber: caseNumber,
|
||||
toCaseNumber: link.other.caseNumber,
|
||||
kind: link.kind,
|
||||
})
|
||||
if (!result.ok) setError(result.error)
|
||||
})
|
||||
}
|
||||
className="font-condensed text-2xs text-text-dim"
|
||||
>
|
||||
{de.link.remove}
|
||||
</button>
|
||||
) : null}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
|
||||
{error ? <p className="mt-2 font-condensed text-2xs text-stamp-4">{error}</p> : null}
|
||||
|
||||
{canEdit ? (
|
||||
open ? (
|
||||
<div className="mt-4 flex flex-wrap items-center gap-2">
|
||||
<select
|
||||
value={kind}
|
||||
onChange={(event) => setKind(event.target.value)}
|
||||
aria-label={de.link.kind}
|
||||
className="border border-line bg-raised px-2 py-1 text-2xs"
|
||||
>
|
||||
{LINK_KINDS.map((value) => (
|
||||
<option key={value} value={value}>
|
||||
{de.link.kinds[value] ?? value}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
<input
|
||||
value={target}
|
||||
onChange={(event) => setTarget(event.target.value)}
|
||||
placeholder={de.link.target}
|
||||
aria-label={de.link.target}
|
||||
className="border border-line bg-raised px-2 py-1 font-mono text-2xs"
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
disabled={pending || target.trim() === ''}
|
||||
onClick={() =>
|
||||
startTransition(async () => {
|
||||
setError(null)
|
||||
const result = await linkCasesAction({
|
||||
fromCaseNumber: caseNumber,
|
||||
toCaseNumber: target.trim(),
|
||||
kind,
|
||||
})
|
||||
if (result.ok) {
|
||||
setTarget('')
|
||||
setOpen(false)
|
||||
} else {
|
||||
setError(result.error)
|
||||
}
|
||||
})
|
||||
}
|
||||
className="border border-line bg-raised px-3 py-1 font-condensed text-2xs text-accent disabled:text-text-dim"
|
||||
>
|
||||
{de.link.add}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setOpen(false)}
|
||||
className="font-condensed text-2xs text-text-dim"
|
||||
>
|
||||
{de.common.cancel}
|
||||
</button>
|
||||
</div>
|
||||
) : (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setOpen(true)}
|
||||
className="mt-4 border border-line bg-raised px-3 py-1 font-condensed text-2xs text-accent"
|
||||
>
|
||||
{de.link.add}
|
||||
</button>
|
||||
)
|
||||
) : null}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -39,7 +39,7 @@ export function EntryActions({
|
||||
setMode('idle')
|
||||
setReason('')
|
||||
} else {
|
||||
setError(result.error ?? de.case.errors.default!)
|
||||
setError(result.error ?? de.actionErrors.default!)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -0,0 +1,180 @@
|
||||
'use client'
|
||||
|
||||
import { useState, useTransition } from 'react'
|
||||
import Link from 'next/link'
|
||||
import { de } from '@/lib/i18n/de'
|
||||
import { PARTICIPANT_ROLES } from '@/lib/cases/terms'
|
||||
import { addParticipantAction, removeParticipantAction } from '../actions'
|
||||
|
||||
type Beteiligter = {
|
||||
id: string
|
||||
role: string
|
||||
userId: string | null
|
||||
displayName: string | null
|
||||
personnelFileId: string | null
|
||||
}
|
||||
|
||||
/**
|
||||
* Beteiligte einer Akte.
|
||||
*
|
||||
* Der Hinweis über dem Formular ist wichtig und steht deshalb dort und nicht
|
||||
* in einer Hilfeseite: wer hier eingetragen wird, liest die Akte unabhängig
|
||||
* von seiner Freigabestufe.
|
||||
*/
|
||||
export function Participants({
|
||||
caseNumber,
|
||||
participants,
|
||||
canEdit,
|
||||
members,
|
||||
files,
|
||||
}: {
|
||||
caseNumber: string
|
||||
participants: Beteiligter[]
|
||||
canEdit: boolean
|
||||
members: { id: string; displayName: string }[]
|
||||
files: { id: string; displayName: string }[]
|
||||
}) {
|
||||
const [open, setOpen] = useState(false)
|
||||
const [role, setRole] = useState<string>('INVESTIGATOR')
|
||||
const [target, setTarget] = useState('')
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [pending, startTransition] = useTransition()
|
||||
|
||||
function add() {
|
||||
if (!target) return
|
||||
setError(null)
|
||||
const [art, id] = target.split(':')
|
||||
startTransition(async () => {
|
||||
const result = await addParticipantAction({
|
||||
caseNumber,
|
||||
role,
|
||||
...(art === 'user' ? { userId: id } : { personnelFileId: id }),
|
||||
})
|
||||
if (result.ok) {
|
||||
setTarget('')
|
||||
setOpen(false)
|
||||
} else {
|
||||
setError(result.error)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
return (
|
||||
<div>
|
||||
{participants.length === 0 ? (
|
||||
<p className="text-text-dim">{de.participant.empty}</p>
|
||||
) : (
|
||||
<ul className="border-t border-line">
|
||||
{participants.map((person) => (
|
||||
<li
|
||||
key={person.id}
|
||||
className="flex flex-wrap items-baseline gap-x-4 gap-y-1 border-b border-line py-2"
|
||||
>
|
||||
<span className="font-condensed text-2xs text-text-dim">
|
||||
{de.participant.roles[person.role] ?? person.role}
|
||||
</span>
|
||||
<span className="grow text-sm">
|
||||
{person.personnelFileId ? (
|
||||
<Link href={`/personalakten/${person.personnelFileId}`}>
|
||||
{person.displayName ?? de.common.unknown}
|
||||
</Link>
|
||||
) : (
|
||||
(person.displayName ?? de.common.unknown)
|
||||
)}
|
||||
</span>
|
||||
{canEdit ? (
|
||||
<button
|
||||
type="button"
|
||||
disabled={pending}
|
||||
onClick={() =>
|
||||
startTransition(async () => {
|
||||
const result = await removeParticipantAction({
|
||||
caseNumber,
|
||||
participantId: person.id,
|
||||
})
|
||||
if (!result.ok) setError(result.error)
|
||||
})
|
||||
}
|
||||
className="font-condensed text-2xs text-text-dim"
|
||||
>
|
||||
{de.participant.remove}
|
||||
</button>
|
||||
) : null}
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
)}
|
||||
|
||||
{error ? <p className="mt-2 font-condensed text-2xs text-stamp-4">{error}</p> : null}
|
||||
|
||||
{canEdit ? (
|
||||
open ? (
|
||||
<div className="mt-4 border border-line p-3">
|
||||
<p className="max-w-(--container-measure) text-2xs text-text-dim">
|
||||
{de.participant.hint}
|
||||
</p>
|
||||
<div className="mt-3 flex flex-wrap items-center gap-2">
|
||||
<select
|
||||
value={role}
|
||||
onChange={(event) => setRole(event.target.value)}
|
||||
aria-label={de.participant.role}
|
||||
className="border border-line bg-raised px-2 py-1 text-2xs"
|
||||
>
|
||||
{PARTICIPANT_ROLES.map((value) => (
|
||||
<option key={value} value={value}>
|
||||
{de.participant.roles[value] ?? value}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
<select
|
||||
value={target}
|
||||
onChange={(event) => setTarget(event.target.value)}
|
||||
aria-label={de.participant.person}
|
||||
className="border border-line bg-raised px-2 py-1 text-2xs"
|
||||
>
|
||||
<option value="">—</option>
|
||||
<optgroup label={de.participant.pickUser}>
|
||||
{members.map((member) => (
|
||||
<option key={member.id} value={`user:${member.id}`}>
|
||||
{member.displayName}
|
||||
</option>
|
||||
))}
|
||||
</optgroup>
|
||||
<optgroup label={de.participant.pickPersonnel}>
|
||||
{files.map((file) => (
|
||||
<option key={file.id} value={`file:${file.id}`}>
|
||||
{file.displayName}
|
||||
</option>
|
||||
))}
|
||||
</optgroup>
|
||||
</select>
|
||||
<button
|
||||
type="button"
|
||||
disabled={pending || !target}
|
||||
onClick={add}
|
||||
className="border border-line bg-raised px-3 py-1 font-condensed text-2xs text-accent disabled:text-text-dim"
|
||||
>
|
||||
{de.participant.add}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setOpen(false)}
|
||||
className="font-condensed text-2xs text-text-dim"
|
||||
>
|
||||
{de.common.cancel}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setOpen(true)}
|
||||
className="mt-4 border border-line bg-raised px-3 py-1 font-condensed text-2xs text-accent"
|
||||
>
|
||||
{de.participant.add}
|
||||
</button>
|
||||
)
|
||||
) : null}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -1,210 +0,0 @@
|
||||
'use client'
|
||||
|
||||
import { useEffect, useRef, useState, useTransition } from 'react'
|
||||
import { de } from '@/lib/i18n/de'
|
||||
import { saveSectionAction } from './sectionActions'
|
||||
|
||||
type Props = {
|
||||
caseNumber: string
|
||||
fieldKey: string
|
||||
label: string
|
||||
type: string
|
||||
options?: string[]
|
||||
help?: string
|
||||
requiredToClose?: boolean
|
||||
initialValue: unknown
|
||||
initialVersion: number
|
||||
readOnly: boolean
|
||||
}
|
||||
|
||||
const AUTOSAVE_MS = 2000
|
||||
|
||||
/**
|
||||
* Ein Abschnitt zum Bearbeiten.
|
||||
*
|
||||
* Entwürfe werden alle zwei Sekunden **lokal** gesichert, damit ein
|
||||
* versehentlicher Tab-Wechsel keinen Text kostet. Gespeichert wird erst auf
|
||||
* Knopfdruck: ein Abschnitt ist der Sachstand der Akte, nicht ein Chatbeitrag.
|
||||
* Siehe docs/09-performance-und-ux.md.
|
||||
*
|
||||
* Beim Speichern geht die geladene Version mit. Weicht sie ab, gibt es kein
|
||||
* stilles Überschreiben, sondern beide Fassungen nebeneinander.
|
||||
*/
|
||||
export function SectionEditor(props: Props) {
|
||||
const speicherSchluessel = `afis:abschnitt:${props.caseNumber}:${props.fieldKey}`
|
||||
const [value, setValue] = useState(() => normalise(props.initialValue, props.type))
|
||||
const [version, setVersion] = useState(props.initialVersion)
|
||||
const [conflict, setConflict] = useState<{ value: unknown; version: number } | null>(null)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [saved, setSaved] = useState(false)
|
||||
const [draftKept, setDraftKept] = useState(false)
|
||||
const [pending, startTransition] = useTransition()
|
||||
const timer = useRef<ReturnType<typeof setTimeout> | null>(null)
|
||||
|
||||
// Entwurf aus dem letzten Besuch übernehmen, falls er neuer ist.
|
||||
useEffect(() => {
|
||||
try {
|
||||
const stored = localStorage.getItem(speicherSchluessel)
|
||||
if (stored !== null && stored !== normalise(props.initialValue, props.type)) {
|
||||
setValue(stored)
|
||||
setDraftKept(true)
|
||||
}
|
||||
} catch {
|
||||
// Privates Fenster oder gesperrter Speicher: dann eben ohne Entwurf.
|
||||
}
|
||||
}, [speicherSchluessel, props.initialValue, props.type])
|
||||
|
||||
function change(next: string) {
|
||||
setValue(next)
|
||||
setSaved(false)
|
||||
if (timer.current) clearTimeout(timer.current)
|
||||
timer.current = setTimeout(() => {
|
||||
try {
|
||||
localStorage.setItem(speicherSchluessel, next)
|
||||
setDraftKept(true)
|
||||
} catch {
|
||||
// still ignorieren, der Entwurf ist eine Bequemlichkeit
|
||||
}
|
||||
}, AUTOSAVE_MS)
|
||||
}
|
||||
|
||||
function submit(override?: unknown, baseVersion = version) {
|
||||
setError(null)
|
||||
startTransition(async () => {
|
||||
const result = await saveSectionAction({
|
||||
caseNumber: props.caseNumber,
|
||||
fieldKey: props.fieldKey,
|
||||
value: override ?? parse(value, props.type),
|
||||
baseVersion,
|
||||
})
|
||||
|
||||
if (result.ok) {
|
||||
setVersion(result.version)
|
||||
setConflict(null)
|
||||
setSaved(true)
|
||||
setDraftKept(false)
|
||||
try {
|
||||
localStorage.removeItem(speicherSchluessel)
|
||||
} catch {
|
||||
// egal
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if (result.conflict) setConflict(result.current)
|
||||
else setError(result.error)
|
||||
})
|
||||
}
|
||||
|
||||
if (props.readOnly) {
|
||||
return (
|
||||
<p className="mt-1 max-w-(--container-measure) text-sm whitespace-pre-wrap">
|
||||
{String(value || '—')}
|
||||
</p>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="mt-1.5">
|
||||
{props.type === 'select' ? (
|
||||
<select
|
||||
value={value}
|
||||
onChange={(event) => change(event.target.value)}
|
||||
className="border border-line bg-raised px-3 py-2 text-sm"
|
||||
>
|
||||
<option value="">—</option>
|
||||
{props.options?.map((option) => (
|
||||
<option key={option} value={option}>
|
||||
{option}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
) : props.type === 'longtext' ? (
|
||||
<textarea
|
||||
value={value}
|
||||
onChange={(event) => change(event.target.value)}
|
||||
rows={6}
|
||||
className="block w-full max-w-(--container-measure) border border-line bg-raised px-3 py-2 text-sm"
|
||||
/>
|
||||
) : (
|
||||
<input
|
||||
type={props.type === 'date' ? 'date' : props.type === 'number' ? 'number' : 'text'}
|
||||
value={value}
|
||||
onChange={(event) => change(event.target.value)}
|
||||
className="block w-full max-w-(--container-measure) border border-line bg-raised px-3 py-2 text-sm"
|
||||
/>
|
||||
)}
|
||||
|
||||
<div className="mt-2 flex flex-wrap items-center gap-3 text-2xs">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => submit()}
|
||||
disabled={pending}
|
||||
className="border border-line bg-raised px-3 py-1 font-condensed text-accent disabled:text-text-dim"
|
||||
>
|
||||
{pending ? de.section.saving : de.section.save}
|
||||
</button>
|
||||
{version > 0 ? (
|
||||
<span className="font-mono text-text-dim">{de.section.version(version)}</span>
|
||||
) : null}
|
||||
{saved ? <span className="font-condensed text-text-dim">{de.section.saved}</span> : null}
|
||||
{draftKept && !saved ? (
|
||||
<span className="font-condensed text-text-dim">{de.section.draftKept}</span>
|
||||
) : null}
|
||||
{error ? <span className="font-condensed text-stamp-4">{error}</span> : null}
|
||||
</div>
|
||||
|
||||
{conflict ? (
|
||||
<div className="mt-3 border border-stamp-4 p-3">
|
||||
<p className="font-condensed text-2xs text-stamp-4">{de.section.conflict}</p>
|
||||
<div className="mt-3 grid gap-4 md:grid-cols-2">
|
||||
<div>
|
||||
<p className="font-condensed text-2xs text-text-dim">{de.section.mine}</p>
|
||||
<p className="mt-1 border-l-(length:--spacing-edge) border-steel pl-3 text-sm whitespace-pre-wrap">
|
||||
{value}
|
||||
</p>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => submit(parse(value, props.type), conflict.version)}
|
||||
className="mt-2 font-condensed text-2xs text-accent"
|
||||
>
|
||||
{de.section.takeMine}
|
||||
</button>
|
||||
</div>
|
||||
<div>
|
||||
<p className="font-condensed text-2xs text-text-dim">{de.section.theirs}</p>
|
||||
<p className="mt-1 border-l-(length:--spacing-edge) border-line pl-3 text-sm whitespace-pre-wrap">
|
||||
{String(conflict.value ?? '')}
|
||||
</p>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
setValue(normalise(conflict.value, props.type))
|
||||
setVersion(conflict.version)
|
||||
setConflict(null)
|
||||
}}
|
||||
className="mt-2 font-condensed text-2xs text-accent"
|
||||
>
|
||||
{de.section.takeTheirs}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
) : null}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
function normalise(value: unknown, _type: string): string {
|
||||
if (value === null || value === undefined) return ''
|
||||
if (Array.isArray(value)) return value.join(', ')
|
||||
return String(value)
|
||||
}
|
||||
|
||||
function parse(value: string, type: string): unknown {
|
||||
if (type === 'number') return value === '' ? null : Number(value)
|
||||
if (type === 'multiselect' || type === 'checklist') {
|
||||
return value.split(',').map((part) => part.trim()).filter(Boolean)
|
||||
}
|
||||
return value === '' ? null : value
|
||||
}
|
||||
@@ -1,114 +0,0 @@
|
||||
import { de } from '@/lib/i18n/de'
|
||||
import { fillPlaceholders, isInputField } from '@/lib/templates/fields'
|
||||
import { RedactedText } from '@/components/Redacted'
|
||||
import { SectionEditor } from './SectionEditor'
|
||||
import type { RenderedSection } from '@/lib/cases/sectionService'
|
||||
|
||||
/**
|
||||
* Abschnitte einer Fallakte: der aktuelle Sachstand, aus der Vorlage erzeugt.
|
||||
*
|
||||
* Feste Textbausteine der Vorlage werden gerendert, nicht bearbeitet — ihre
|
||||
* Platzhalter ziehen die Werte der Eingabefelder. Damit trägt dieselbe
|
||||
* Darstellung ein Formular und einen Vertragstext.
|
||||
*/
|
||||
export function Sections({
|
||||
caseNumber,
|
||||
sections,
|
||||
canEdit,
|
||||
}: {
|
||||
caseNumber: string
|
||||
sections: RenderedSection[]
|
||||
canEdit: boolean
|
||||
}) {
|
||||
if (sections.length === 0) {
|
||||
return <p className="text-text-dim">{de.section.empty}</p>
|
||||
}
|
||||
|
||||
const werte = Object.fromEntries(
|
||||
sections.filter((s) => s.visible).map((s) => [s.fieldKey, s.value]),
|
||||
)
|
||||
|
||||
return (
|
||||
<dl className="space-y-8">
|
||||
{sections.map((section) => {
|
||||
const field = section.field
|
||||
|
||||
// Feste Bausteine der Vorlage.
|
||||
if (!isInputField(field)) {
|
||||
if (field.type === 'pagebreak') return <hr key={field.key} className="border-line" />
|
||||
if (field.type === 'signature') {
|
||||
return (
|
||||
<div key={field.key} className="pt-8">
|
||||
<div className="w-64 border-t border-line" />
|
||||
<p className="mt-1 text-2xs text-text-dim">{field.label}</p>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
const text = fillPlaceholders(field.text ?? '', werte)
|
||||
return field.type === 'heading' ? (
|
||||
<h3 key={field.key} className="font-condensed">
|
||||
{text || field.label}
|
||||
</h3>
|
||||
) : (
|
||||
<p key={field.key} className="max-w-(--container-measure) text-sm whitespace-pre-wrap">
|
||||
{text}
|
||||
</p>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<div key={field.key}>
|
||||
<dt className="flex flex-wrap items-baseline gap-x-3">
|
||||
<span className="font-condensed text-xs text-text-dim">{field.label}</span>
|
||||
{field.requiredToClose ? (
|
||||
<span className="font-condensed text-2xs text-stamp-3">
|
||||
{de.section.requiredToClose}
|
||||
</span>
|
||||
) : null}
|
||||
</dt>
|
||||
<dd>
|
||||
{!section.visible ? (
|
||||
// Serverseitig ersetzt: der echte Wert ist gar nicht erst hier.
|
||||
<p className="mt-1.5 flex items-center gap-2">
|
||||
<span className="redaction inline-block h-[1.1rem] w-40" aria-hidden />
|
||||
<span className="font-mono text-2xs text-text-dim">
|
||||
{de.section.lockedField(section.value.requiredLevel)}
|
||||
</span>
|
||||
</p>
|
||||
) : section.segments ? (
|
||||
<div className="mt-1.5">
|
||||
<RedactedText segments={section.segments} />
|
||||
{canEdit ? (
|
||||
<SectionEditor
|
||||
caseNumber={caseNumber}
|
||||
fieldKey={field.key}
|
||||
label={field.label}
|
||||
type={field.type}
|
||||
options={field.options}
|
||||
requiredToClose={field.requiredToClose}
|
||||
initialValue={section.value}
|
||||
initialVersion={section.version}
|
||||
readOnly={false}
|
||||
/>
|
||||
) : null}
|
||||
</div>
|
||||
) : (
|
||||
<SectionEditor
|
||||
caseNumber={caseNumber}
|
||||
fieldKey={field.key}
|
||||
label={field.label}
|
||||
type={field.type}
|
||||
options={field.options}
|
||||
requiredToClose={field.requiredToClose}
|
||||
initialValue={section.value}
|
||||
initialVersion={section.version}
|
||||
readOnly={!canEdit}
|
||||
/>
|
||||
)}
|
||||
</dd>
|
||||
</div>
|
||||
)
|
||||
})}
|
||||
</dl>
|
||||
)
|
||||
}
|
||||
@@ -10,11 +10,20 @@ import { de } from '@/lib/i18n/de'
|
||||
import { StampMark, classificationEdgeStyle } from '@/components/StampMark'
|
||||
import { SkeletonLine } from '@/components/Skeleton'
|
||||
import { EntryComposer } from './EntryComposer'
|
||||
import { Sections } from './Sections'
|
||||
import { Sections } from '@/components/sections/Sections'
|
||||
import { saveSectionAction } from './sectionActions'
|
||||
import { loadSections } from '@/lib/cases/sectionService'
|
||||
import { canEditCase } from '@/lib/access/caseWrite'
|
||||
import { CaseActions } from './CaseActions'
|
||||
import { EntryActions } from './EntryActions'
|
||||
import { Participants } from './Participants'
|
||||
import { CaseLinks } from './CaseLinks'
|
||||
import { listParticipants } from '@/lib/cases/participants'
|
||||
import { listLinks } from '@/lib/cases/links'
|
||||
import { listDocuments, listTemplatesFor } from '@/lib/documents/service'
|
||||
import { visiblePersonnelWhere } from '@/lib/access/personnelFilter'
|
||||
import { DocumentList } from '@/components/documents/DocumentList'
|
||||
import { NewDocument } from '@/components/documents/NewDocument'
|
||||
import { allowedTargets, type CaseStatusName } from '@/lib/cases/lifecycle'
|
||||
import { evaluateEntryEdit, canRetract } from '@/lib/cases/entryPolicy'
|
||||
import Link from 'next/link'
|
||||
@@ -132,6 +141,87 @@ async function Timeline({
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* Beteiligte, Verknüpfungen und Dokumente hängen in einer gemeinsamen
|
||||
* Suspense-Grenze: drei kleine Abfragen, die zusammen einen Block ergeben.
|
||||
* Getrennt zu streamen liesse den Kasten dreimal springen.
|
||||
*/
|
||||
async function Relations({
|
||||
akte,
|
||||
permissions,
|
||||
canEdit,
|
||||
}: {
|
||||
akte: { id: string; caseNumber: string; classification: number }
|
||||
permissions: EffectivePermissions
|
||||
canEdit: boolean
|
||||
}) {
|
||||
const [participants, links, documents, templates, levels, members, files] = await Promise.all([
|
||||
listParticipants(permissions, akte.id),
|
||||
listLinks(permissions, akte.id),
|
||||
listDocuments(permissions, { caseId: akte.id }),
|
||||
canEdit ? listTemplatesFor('CASE_DOCUMENT') : Promise.resolve([]),
|
||||
db.clearanceLevelConfig.findMany({ orderBy: { level: 'asc' } }),
|
||||
canEdit
|
||||
? db.user.findMany({
|
||||
orderBy: { displayName: 'asc' },
|
||||
take: 200,
|
||||
select: { id: true, displayName: true },
|
||||
})
|
||||
: Promise.resolve([]),
|
||||
// Nur Personalakten, die der Eintragende sehen darf, und nur, wenn er sie
|
||||
// überhaupt lesen darf: sonst verriete die Auswahlliste ihre Existenz.
|
||||
canEdit && (permissions.isAdmin || permissions.permissions.has('personnel.read'))
|
||||
? db.personnelFile.findMany({
|
||||
where: visiblePersonnelWhere(permissions),
|
||||
orderBy: { displayName: 'asc' },
|
||||
take: 200,
|
||||
select: { id: true, displayName: true },
|
||||
})
|
||||
: Promise.resolve([]),
|
||||
])
|
||||
|
||||
const levelName = new Map(levels.map((l) => [l.level, l.name]))
|
||||
|
||||
return (
|
||||
<div className="grid gap-10 md:grid-cols-2">
|
||||
<section>
|
||||
<h2 className="font-condensed">{de.participant.heading}</h2>
|
||||
<div className="mt-4">
|
||||
<Participants
|
||||
caseNumber={akte.caseNumber}
|
||||
participants={participants}
|
||||
canEdit={canEdit}
|
||||
members={members}
|
||||
files={files}
|
||||
/>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section>
|
||||
<h2 className="font-condensed">{de.link.heading}</h2>
|
||||
<div className="mt-4">
|
||||
<CaseLinks caseNumber={akte.caseNumber} links={links} canEdit={canEdit} />
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section className="md:col-span-2">
|
||||
<h2 className="font-condensed">{de.document.heading}</h2>
|
||||
<div className="mt-4 space-y-4">
|
||||
<DocumentList documents={documents} levelName={levelName} />
|
||||
{canEdit ? (
|
||||
<NewDocument
|
||||
templates={templates}
|
||||
levels={levels.filter((l) => l.level <= permissions.clearanceLevel)}
|
||||
defaultLevel={Math.min(akte.classification, permissions.clearanceLevel)}
|
||||
caseNumber={akte.caseNumber}
|
||||
/>
|
||||
) : null}
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
async function SectionBlock({
|
||||
caseId,
|
||||
caseNumber,
|
||||
@@ -146,7 +236,14 @@ async function SectionBlock({
|
||||
canEdit: boolean
|
||||
}) {
|
||||
const sections = await loadSections(permissions, caseId, templateId)
|
||||
return <Sections caseNumber={caseNumber} sections={sections} canEdit={canEdit} />
|
||||
return (
|
||||
<Sections
|
||||
scope={`fall:${caseNumber}`}
|
||||
save={saveSectionAction.bind(null, caseNumber)}
|
||||
sections={sections}
|
||||
canEdit={canEdit}
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
export default async function CasePage({
|
||||
@@ -236,7 +333,30 @@ export default async function CasePage({
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<nav className="mt-10 flex gap-4 border-b border-line pb-2 font-condensed text-xs">
|
||||
<div className="mt-12">
|
||||
<Suspense
|
||||
fallback={
|
||||
<div className="grid gap-10 md:grid-cols-2">
|
||||
<div className="space-y-3">
|
||||
<SkeletonLine width="8rem" />
|
||||
<SkeletonLine width="70%" />
|
||||
</div>
|
||||
<div className="space-y-3">
|
||||
<SkeletonLine width="9rem" />
|
||||
<SkeletonLine width="65%" />
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
<Relations
|
||||
akte={akte}
|
||||
permissions={user.permissions}
|
||||
canEdit={canEditCase(user.permissions, akte).ok}
|
||||
/>
|
||||
</Suspense>
|
||||
</div>
|
||||
|
||||
<nav className="mt-12 flex gap-4 border-b border-line pb-2 font-condensed text-xs">
|
||||
<span className="text-text-dim">{de.case.timeline}</span>
|
||||
<Link href={`/faelle/${akte.caseNumber}/aenderungen`}>{de.case.changes}</Link>
|
||||
</nav>
|
||||
|
||||
@@ -3,32 +3,30 @@
|
||||
import { revalidatePath } from 'next/cache'
|
||||
import { z } from 'zod'
|
||||
import { requireUser } from '@/lib/auth/current'
|
||||
import { AccessError } from '@/lib/cases/service'
|
||||
import { ConflictError, saveSection } from '@/lib/cases/sectionService'
|
||||
import { AccessError, ConflictError } from '@/lib/errors'
|
||||
import { saveSection } from '@/lib/cases/sectionService'
|
||||
import { de } from '@/lib/i18n/de'
|
||||
import type { SaveSectionResult } from '@/components/sections/types'
|
||||
|
||||
const schema = z.object({
|
||||
caseNumber: z.string().min(1),
|
||||
fieldKey: z.string().min(1),
|
||||
value: z.unknown(),
|
||||
baseVersion: z.coerce.number().int().min(0),
|
||||
minClearance: z.coerce.number().int().min(0).max(5).optional(),
|
||||
})
|
||||
|
||||
export type SaveSectionResult =
|
||||
| { ok: true; version: number }
|
||||
/** Kein stilles Überschreiben: die fremde Fassung kommt mit zurück. */
|
||||
| { ok: false; conflict: true; current: { value: unknown; version: number } }
|
||||
| { ok: false; conflict: false; error: string }
|
||||
|
||||
export async function saveSectionAction(input: unknown): Promise<SaveSectionResult> {
|
||||
/** Die Akte kommt gebunden herein, siehe `saveSectionAction.bind`. */
|
||||
export async function saveSectionAction(
|
||||
caseNumber: string,
|
||||
input: unknown,
|
||||
): Promise<SaveSectionResult> {
|
||||
const user = await requireUser()
|
||||
const parsed = schema.safeParse(input)
|
||||
if (!parsed.success) return { ok: false, conflict: false, error: de.case.errors.default! }
|
||||
if (!parsed.success) return { ok: false, conflict: false, error: de.actionErrors.default! }
|
||||
|
||||
try {
|
||||
const { version } = await saveSection(user.permissions, parsed.data)
|
||||
revalidatePath(`/faelle/${parsed.data.caseNumber}`)
|
||||
const { version } = await saveSection(user.permissions, { caseNumber, ...parsed.data })
|
||||
revalidatePath(`/faelle/${caseNumber}`)
|
||||
return { ok: true, version }
|
||||
} catch (error) {
|
||||
if (error instanceof ConflictError) {
|
||||
@@ -39,9 +37,13 @@ export async function saveSectionAction(input: unknown): Promise<SaveSectionResu
|
||||
}
|
||||
}
|
||||
if (error instanceof AccessError) {
|
||||
return { ok: false, conflict: false, error: de.case.errors[error.code] ?? de.case.errors.default! }
|
||||
return {
|
||||
ok: false,
|
||||
conflict: false,
|
||||
error: de.actionErrors[error.code] ?? de.actionErrors.default!,
|
||||
}
|
||||
}
|
||||
console.error('[abschnitt] unerwartet', error)
|
||||
return { ok: false, conflict: false, error: de.case.errors.default! }
|
||||
return { ok: false, conflict: false, error: de.actionErrors.default! }
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user