Merge branch 'main' into feature/user-management

This commit is contained in:
Julian Appel 2026-09-28 22:32:48 +02:00
commit 73579d1e79
22 changed files with 1141 additions and 54 deletions

View file

@ -1766,7 +1766,7 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
const currentDisplay =
mode === "replaceWithTypedChar" && cell.cellKey !== "phaseType"
? typedChar ?? ""
: String(visibleCell.value ?? "");
: String(visibleCell.editValue ?? visibleCell.value ?? "");
focusTokenRef.current += 1;
setEditingCell({
...cell,
@ -4077,7 +4077,9 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
key={row.rowKey}
className={`${
row.rowType === "circuitSummary"
? "summary-row"
? row.downstreamBoardLoad
? "feeder-circuit-row"
: "summary-row"
: row.rowType === "deviceRow"
? "device-row"
: row.rowType === "downstreamBoardLoad"
@ -4708,11 +4710,19 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
tabIndex={-1}
/>
<IconButton
disabled={isSaving}
disabled={
isSaving ||
(row.circuit.downstreamBoardLoads?.length ?? 0) > 0
}
icon={Trash2}
label="Stromkreis löschen"
onClick={() => void handleDeleteCircuit(row.circuit!.id)}
tabIndex={-1}
title={
(row.circuit.downstreamBoardLoads?.length ?? 0) > 0
? "Speist eine Unterverteilung – zuerst deren Einspeisung ändern"
: undefined
}
variant="danger"
/>
</>