Compare commits
No commits in common. "a99980c47b08269e13a798eecf72072d092e6ba8" and "ea3c02cd6bdce7650ff1978e94740044cad72286" have entirely different histories.
a99980c47b
...
ea3c02cd6b
55 changed files with 551 additions and 3335 deletions
|
|
@ -13,7 +13,6 @@ services:
|
|||
CHOKIDAR_USEPOLLING: "true"
|
||||
LOG_LEVEL: "${LOG_LEVEL:-info}"
|
||||
init: true
|
||||
restart: unless-stopped
|
||||
logging:
|
||||
driver: json-file
|
||||
options:
|
||||
|
|
@ -54,7 +53,6 @@ services:
|
|||
NEXT_TELEMETRY_DISABLED: "1"
|
||||
LOG_LEVEL: "${LOG_LEVEL:-info}"
|
||||
init: true
|
||||
restart: unless-stopped
|
||||
logging:
|
||||
driver: json-file
|
||||
options:
|
||||
|
|
|
|||
|
|
@ -359,9 +359,8 @@ Response sketch:
|
|||
|
||||
### Circuit Structure
|
||||
|
||||
- `GET /projects/:projectId/circuit-sections/:sectionId/next-identifier`
|
||||
- `GET /circuit-sections/:sectionId/next-identifier`
|
||||
- preview next identifier for section (`prefix + maxSuffix + 1`)
|
||||
- returns 404 if the section does not belong to the given project
|
||||
|
||||
Circuit and device-row field updates, standalone insertions/deletions, single
|
||||
or bulk device-row moves, circuit reorders and explicit renumbering are
|
||||
|
|
|
|||
|
|
@ -476,28 +476,16 @@ Kopieren in ein Projekt erzeugt ein eigenständiges Projektgerät.
|
|||
und Verteilerkomponenten. Separate
|
||||
1:1-Tabellen halten Stromkreis- und Komponenten-Schutzgeräte. Die früheren
|
||||
flachen Stromkreis-Schutzfelder sind aus der Baseline entfernt.
|
||||
Ein triggergeführtes Register erzwingt eine normalisierte,
|
||||
Ein triggergeführtes Register erzwingt bereits eine normalisierte,
|
||||
stromkreislistenweite BMK-Eindeutigkeit über Stromkreise und
|
||||
Verteilerkomponenten. Der DB-Index normalisiert dabei nur über SQLites
|
||||
eingebautes `lower()` (rein ASCII), erkennt also z.B. `"Ä1"` und `"ä1"` nicht
|
||||
als denselben Wert. Die gemeinsame Prüfung
|
||||
`src/db/repositories/equipment-identifier-uniqueness.persistence.ts`
|
||||
schließt diese Lücke: Sie normalisiert mit JavaScripts Unicode-fähigem
|
||||
`toLowerCase()` gegen das vollständige Register der Stromkreisliste und wird
|
||||
von jedem Anlage-/Umbenennungspfad für Stromkreise und Verteilerkomponenten
|
||||
aufgerufen, auch dort, wo zuvor kein Vorab-Check existierte. Snapshot- und
|
||||
Transfer-Integration verwenden aktuell Snapshot-Schema 5. Persistente
|
||||
Insert/Delete/Update-Commands für veränderliche Verteilerkomponenten,
|
||||
Gruppen einschließlich befüllter Unterbäume sowie vollständige
|
||||
Gruppensortierung sind integriert. Der Editor zeigt die geschützte Struktur
|
||||
an und bearbeitet veränderliche Gruppen- und Fußkomponenten über dedizierte
|
||||
Command-Modale. Gruppenanlage, -umbenennung, -sortierung, explizite
|
||||
Neunummerierung, Same-Category-Stromkreiswechsel, geschütztes
|
||||
Unterbaumlöschen und Stromkreisschutz sind integriert.
|
||||
Migration `0006` ergänzt additiv Indizes auf `circuits.section_id` und
|
||||
`circuit_device_rows.circuit_id`, den beiden am häufigsten gefilterten
|
||||
Fremdschlüsselspalten sowie den Cascade-Delete-Pfaden von Abschnitten und
|
||||
Stromkreisen.
|
||||
Verteilerkomponenten. Snapshot- und Transfer-Integration verwenden aktuell
|
||||
Snapshot-Schema 5. Persistente Insert/Delete/Update-Commands für
|
||||
veränderliche Verteilerkomponenten, Gruppen einschließlich befüllter
|
||||
Unterbäume sowie vollständige Gruppensortierung sind integriert. Der Editor
|
||||
zeigt die geschützte Struktur an und bearbeitet veränderliche Gruppen- und
|
||||
Fußkomponenten über dedizierte Command-Modale. Gruppenanlage, -umbenennung,
|
||||
-sortierung, explizite Neunummerierung, Same-Category-Stromkreiswechsel,
|
||||
geschütztes Unterbaumlöschen und Stromkreisschutz sind integriert.
|
||||
|
||||
PostgreSQL ist bewusst nicht implementiert. Die Domainregeln und
|
||||
Transaktionsgrenzen sollen portabel bleiben; Schema und Betriebsmodell benötigen
|
||||
|
|
|
|||
|
|
@ -58,15 +58,6 @@ mit Laufzeit und Speicherverbrauch – nützlich, um Speicherlecks oder Hänger
|
|||
einem 502 über einen längeren Zeitraum nachzuvollziehen. Für die Detailsuche
|
||||
`LOG_LEVEL=debug` setzen; das protokolliert zusätzlich den Start jeder
|
||||
API-Anfrage und macht damit hängende (nie abgeschlossene) Requests sichtbar.
|
||||
Ein `close`-Ereignis ohne vorheriges `finish` wird als `request aborted before
|
||||
response finished` (`warn`) geloggt und zeigt damit vom Client oder einem
|
||||
vorgeschalteten Proxy abgebrochene Verbindungen.
|
||||
|
||||
Eine unbehandelte Exception oder Promise-Rejection wird geloggt und beendet
|
||||
den jeweiligen Prozess anschließend bewusst (`process.exit(1)`), statt in
|
||||
einem unbekannten Zustand weiterzulaufen. Beide Dienste laufen deshalb mit
|
||||
`restart: unless-stopped`, damit Docker sie danach automatisch neu startet;
|
||||
ohne diese Policy würde ein Crash den Dienst dauerhaft unerreichbar lassen.
|
||||
|
||||
## Voraussetzungen für ein späteres Produktionssetup
|
||||
|
||||
|
|
|
|||
|
|
@ -17,13 +17,13 @@ import {
|
|||
deleteDistributionBoard,
|
||||
disconnectProjectDeviceRows,
|
||||
exportProjectTransfer,
|
||||
getProject,
|
||||
getProjectDeviceSyncPreview,
|
||||
listCircuitLists,
|
||||
listDistributionBoards,
|
||||
listFloors,
|
||||
listGlobalDevices,
|
||||
listProjectDevices,
|
||||
listProjects,
|
||||
listRooms,
|
||||
importProjectTransfer,
|
||||
synchronizeProjectDeviceRows,
|
||||
|
|
@ -129,7 +129,7 @@ export default function ProjectDetailPage() {
|
|||
return;
|
||||
}
|
||||
Promise.all([
|
||||
getProject(projectId),
|
||||
listProjects(),
|
||||
listDistributionBoards(projectId),
|
||||
listCircuitLists(projectId),
|
||||
listFloors(projectId),
|
||||
|
|
@ -138,7 +138,7 @@ export default function ProjectDetailPage() {
|
|||
listGlobalDevices(),
|
||||
])
|
||||
.then(([
|
||||
currentProject,
|
||||
projects,
|
||||
distributionBoards,
|
||||
loadedCircuitLists,
|
||||
loadedFloors,
|
||||
|
|
@ -146,6 +146,7 @@ export default function ProjectDetailPage() {
|
|||
loadedProjectDevices,
|
||||
loadedGlobalDevices,
|
||||
]) => {
|
||||
const currentProject = projects.find((item) => item.id === projectId) ?? null;
|
||||
setProject(currentProject);
|
||||
setBoards(distributionBoards);
|
||||
setCircuitLists(loadedCircuitLists);
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
CREATE INDEX `circuit_device_rows_circuit_id_idx` ON `circuit_device_rows` (`circuit_id`);--> statement-breakpoint
|
||||
CREATE INDEX `circuits_section_id_idx` ON `circuits` (`section_id`);
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -43,13 +43,6 @@
|
|||
"when": 1785687503453,
|
||||
"tag": "0005_stale_gorilla_man",
|
||||
"breakpoints": true
|
||||
},
|
||||
{
|
||||
"idx": 6,
|
||||
"version": "6",
|
||||
"when": 1786043080323,
|
||||
"tag": "0006_damp_skrulls",
|
||||
"breakpoints": true
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -43,6 +43,12 @@ export interface CircuitDeviceRowPatchInput {
|
|||
overriddenFields?: string | null;
|
||||
}
|
||||
|
||||
export interface CircuitDeviceRowCreateInput extends CircuitDeviceRowUpdateInput {
|
||||
circuitId: string;
|
||||
linkedProjectDeviceId?: string;
|
||||
sortOrder: number;
|
||||
}
|
||||
|
||||
export function toCircuitDeviceRowUpdateValues(input: CircuitDeviceRowUpdateInput) {
|
||||
return {
|
||||
linkedProjectDeviceId: input.linkedProjectDeviceId ?? null,
|
||||
|
|
@ -99,3 +105,15 @@ export function toCircuitDeviceRowPatchValues(input: CircuitDeviceRowPatchInput)
|
|||
|
||||
return values;
|
||||
}
|
||||
|
||||
export function toCircuitDeviceRowCreateValues(
|
||||
id: string,
|
||||
input: CircuitDeviceRowCreateInput
|
||||
) {
|
||||
return {
|
||||
id,
|
||||
circuitId: input.circuitId,
|
||||
sortOrder: input.sortOrder,
|
||||
...toCircuitDeviceRowUpdateValues(input),
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { and, eq } from "drizzle-orm";
|
||||
import { and, eq, ne } from "drizzle-orm";
|
||||
import {
|
||||
assertCircuitUpdateProjectCommand,
|
||||
createCircuitUpdateProjectCommand,
|
||||
|
|
@ -21,7 +21,6 @@ import {
|
|||
import { executeProjectCommandTransactionWithAppliedForward } from "./project-command-transaction.persistence.js";
|
||||
import { resolveCircuitVoltage } from "./project-voltage.persistence.js";
|
||||
import { circuitDeviceRows } from "../schema/circuit-device-rows.js";
|
||||
import { assertEquipmentIdentifierAvailable } from "./equipment-identifier-uniqueness.persistence.js";
|
||||
|
||||
type CircuitRow = typeof circuits.$inferSelect;
|
||||
|
||||
|
|
@ -167,12 +166,20 @@ export class CircuitProjectCommandRepository
|
|||
) {
|
||||
return;
|
||||
}
|
||||
assertEquipmentIdentifierAvailable(
|
||||
database,
|
||||
circuit.circuitListId,
|
||||
equipmentIdentifier,
|
||||
circuit.id
|
||||
);
|
||||
const duplicate = database
|
||||
.select({ id: circuits.id })
|
||||
.from(circuits)
|
||||
.where(
|
||||
and(
|
||||
eq(circuits.circuitListId, circuit.circuitListId),
|
||||
eq(circuits.equipmentIdentifier, equipmentIdentifier),
|
||||
ne(circuits.id, circuit.id)
|
||||
)
|
||||
)
|
||||
.get();
|
||||
if (duplicate) {
|
||||
throw new Error("Duplicate equipmentIdentifier in circuit list.");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ import {
|
|||
} from "./circuit-device-row-structure.persistence.js";
|
||||
import { executeProjectCommandTransaction } from "./project-command-transaction.persistence.js";
|
||||
import { resolveCircuitVoltage } from "./project-voltage.persistence.js";
|
||||
import { assertEquipmentIdentifierAvailable } from "./equipment-identifier-uniqueness.persistence.js";
|
||||
|
||||
export class CircuitStructureProjectCommandRepository
|
||||
implements CircuitStructureProjectCommandStore
|
||||
|
|
@ -104,11 +103,24 @@ export class CircuitStructureProjectCommandRepository
|
|||
if (existingCircuit) {
|
||||
throw new Error("Circuit id already exists.");
|
||||
}
|
||||
assertEquipmentIdentifierAvailable(
|
||||
database,
|
||||
snapshot.circuitListId,
|
||||
const duplicateIdentifier = database
|
||||
.select({ id: circuits.id })
|
||||
.from(circuits)
|
||||
.where(
|
||||
and(
|
||||
eq(circuits.circuitListId, snapshot.circuitListId),
|
||||
eq(
|
||||
circuits.equipmentIdentifier,
|
||||
snapshot.equipmentIdentifier
|
||||
)
|
||||
)
|
||||
)
|
||||
.get();
|
||||
if (duplicateIdentifier) {
|
||||
throw new Error(
|
||||
"Duplicate equipmentIdentifier in circuit list."
|
||||
);
|
||||
}
|
||||
|
||||
if (snapshot.deviceRows.length > 0) {
|
||||
const rowIds = snapshot.deviceRows.map((row) => row.id);
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ import { circuitSections } from "../schema/circuit-sections.js";
|
|||
import { distributionBoardComponentProtectionDevices } from "../schema/distribution-board-component-protection-devices.js";
|
||||
import { distributionBoardComponents } from "../schema/distribution-board-components.js";
|
||||
import { executeProjectCommandTransaction } from "./project-command-transaction.persistence.js";
|
||||
import { assertEquipmentIdentifierAvailable } from "./equipment-identifier-uniqueness.persistence.js";
|
||||
|
||||
export class DistributionBoardComponentStructureProjectCommandRepository
|
||||
implements DistributionBoardComponentStructureProjectCommandStore
|
||||
|
|
@ -95,11 +94,6 @@ export class DistributionBoardComponentStructureProjectCommandRepository
|
|||
if (existing) {
|
||||
throw new Error("Distribution-board component id already exists.");
|
||||
}
|
||||
assertEquipmentIdentifierAvailable(
|
||||
database,
|
||||
snapshot.component.circuitListId,
|
||||
snapshot.component.equipmentIdentifier
|
||||
);
|
||||
database
|
||||
.insert(distributionBoardComponents)
|
||||
.values(snapshot.component)
|
||||
|
|
@ -193,17 +187,6 @@ export class DistributionBoardComponentStructureProjectCommandRepository
|
|||
"Distribution-board component changed before update."
|
||||
);
|
||||
}
|
||||
if (
|
||||
target.component.equipmentIdentifier !==
|
||||
expected.component.equipmentIdentifier
|
||||
) {
|
||||
assertEquipmentIdentifierAvailable(
|
||||
database,
|
||||
expected.component.circuitListId,
|
||||
target.component.equipmentIdentifier,
|
||||
expected.component.id
|
||||
);
|
||||
}
|
||||
database
|
||||
.update(distributionBoardComponents)
|
||||
.set(target.component)
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
import { eq } from "drizzle-orm";
|
||||
import type { AppDatabase } from "../database-context.js";
|
||||
import { circuitListEquipmentIdentifiers } from "../schema/circuit-list-equipment-identifiers.js";
|
||||
|
||||
export function normalizeEquipmentIdentifier(value: string): string {
|
||||
return value.trim().toLowerCase();
|
||||
}
|
||||
|
||||
/**
|
||||
* The DB-level normalized unique index uses SQLite's built-in lower(),
|
||||
* which only folds ASCII a-z and leaves German characters (Ä/Ö/Ü/ß/…)
|
||||
* untouched, so it alone would let e.g. "Ä1" and "ä1" coexist. This check
|
||||
* normalizes with JS's Unicode-aware toLowerCase() against every
|
||||
* identifier already registered for the circuit list (circuits and
|
||||
* distribution-board components share one BMK namespace via
|
||||
* circuit_list_equipment_identifiers), catching what the DB index cannot.
|
||||
*/
|
||||
export function assertEquipmentIdentifierAvailable(
|
||||
database: AppDatabase,
|
||||
circuitListId: string,
|
||||
equipmentIdentifier: string,
|
||||
excludeOwnerId?: string
|
||||
): void {
|
||||
const candidate = normalizeEquipmentIdentifier(equipmentIdentifier);
|
||||
const existing = database
|
||||
.select({
|
||||
ownerId: circuitListEquipmentIdentifiers.ownerId,
|
||||
equipmentIdentifier: circuitListEquipmentIdentifiers.equipmentIdentifier,
|
||||
})
|
||||
.from(circuitListEquipmentIdentifiers)
|
||||
.where(eq(circuitListEquipmentIdentifiers.circuitListId, circuitListId))
|
||||
.all();
|
||||
const duplicate = existing.some(
|
||||
(row) =>
|
||||
row.ownerId !== excludeOwnerId &&
|
||||
normalizeEquipmentIdentifier(row.equipmentIdentifier) === candidate
|
||||
);
|
||||
if (duplicate) {
|
||||
throw new Error("Duplicate equipmentIdentifier in circuit list.");
|
||||
}
|
||||
}
|
||||
|
|
@ -212,9 +212,7 @@ function replaceExternalState(
|
|||
if (target.roomMappings.length) {
|
||||
database.insert(externalRoomMappings).values(target.roomMappings).run();
|
||||
}
|
||||
if (target.objects.length) {
|
||||
database.insert(externalModelObjects).values(target.objects).run();
|
||||
}
|
||||
}
|
||||
|
||||
function decodeCanonicalBase64(value: string) {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ import {
|
|||
loadExpectedExternalObjectTransitions,
|
||||
snapshotsEqual,
|
||||
} from "./external-object-assignment.persistence.js";
|
||||
import { assertEquipmentIdentifierAvailable } from "./equipment-identifier-uniqueness.persistence.js";
|
||||
|
||||
export class ExternalObjectNewCircuitProjectCommandRepository
|
||||
implements ExternalObjectNewCircuitProjectCommandStore
|
||||
|
|
@ -91,11 +90,12 @@ export class ExternalObjectNewCircuitProjectCommandRepository
|
|||
.where(eq(circuits.id, circuit.id)).get()) {
|
||||
throw new Error("External circuit id already exists.");
|
||||
}
|
||||
assertEquipmentIdentifierAvailable(
|
||||
database,
|
||||
circuit.circuitListId,
|
||||
circuit.equipmentIdentifier
|
||||
);
|
||||
if (database.select({ id: circuits.id }).from(circuits).where(and(
|
||||
eq(circuits.circuitListId, circuit.circuitListId),
|
||||
eq(circuits.equipmentIdentifier, circuit.equipmentIdentifier)
|
||||
)).get()) {
|
||||
throw new Error("Duplicate equipmentIdentifier in circuit list.");
|
||||
}
|
||||
if (database.select({ id: circuitDeviceRows.id }).from(circuitDeviceRows)
|
||||
.where(eq(circuitDeviceRows.id, row.id)).get()) {
|
||||
throw new Error("External device-row id already exists.");
|
||||
|
|
|
|||
|
|
@ -1,11 +1,9 @@
|
|||
import { index, integer, real, sqliteTable, text } from "drizzle-orm/sqlite-core";
|
||||
import { integer, real, sqliteTable, text } from "drizzle-orm/sqlite-core";
|
||||
import { circuits } from "./circuits.js";
|
||||
import { projectDevices } from "./project-devices.js";
|
||||
import { rooms } from "./rooms.js";
|
||||
|
||||
export const circuitDeviceRows = sqliteTable(
|
||||
"circuit_device_rows",
|
||||
{
|
||||
export const circuitDeviceRows = sqliteTable("circuit_device_rows", {
|
||||
id: text("id").primaryKey(),
|
||||
circuitId: text("circuit_id")
|
||||
.notNull()
|
||||
|
|
@ -33,6 +31,5 @@ export const circuitDeviceRows = sqliteTable(
|
|||
cosPhi: real("cos_phi"),
|
||||
remark: text("remark"),
|
||||
overriddenFields: text("overridden_fields"),
|
||||
},
|
||||
(table) => [index("circuit_device_rows_circuit_id_idx").on(table.circuitId)]
|
||||
);
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { index, integer, real, sqliteTable, text, unique } from "drizzle-orm/sqlite-core";
|
||||
import { integer, real, sqliteTable, text, unique } from "drizzle-orm/sqlite-core";
|
||||
import { circuitLists } from "./circuit-lists.js";
|
||||
import { circuitSections } from "./circuit-sections.js";
|
||||
|
||||
|
|
@ -26,9 +26,6 @@ export const circuits = sqliteTable(
|
|||
isReserve: integer("is_reserve").notNull().default(0),
|
||||
remark: text("remark"),
|
||||
},
|
||||
(table) => [
|
||||
unique("circuits_list_equipment_identifier_unique").on(table.circuitListId, table.equipmentIdentifier),
|
||||
index("circuits_section_id_idx").on(table.sectionId),
|
||||
]
|
||||
(table) => [unique("circuits_list_equipment_identifier_unique").on(table.circuitListId, table.equipmentIdentifier)]
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -144,9 +144,6 @@ function assertCircuitDeviceRowUpdateFieldValue(
|
|||
if (typeof value !== "number" || !Number.isFinite(value) || value < 0) {
|
||||
throw new Error(`${field} must be a non-negative finite number.`);
|
||||
}
|
||||
if (field === "simultaneityFactor" && value > 1) {
|
||||
throw new Error("simultaneityFactor must not exceed 1.");
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (field === "cosPhi") {
|
||||
|
|
|
|||
|
|
@ -134,9 +134,6 @@ export function assertCircuitDeviceRowInsertProjectCommand(
|
|||
row.simultaneityFactor,
|
||||
"row.simultaneityFactor"
|
||||
);
|
||||
if (row.simultaneityFactor > 1) {
|
||||
throw new Error("row.simultaneityFactor must not exceed 1.");
|
||||
}
|
||||
if (row.cosPhi !== null) {
|
||||
assertFiniteNumber(row.cosPhi, "row.cosPhi");
|
||||
if (row.cosPhi <= 0) {
|
||||
|
|
|
|||
24
src/domain/models/circuit-device-row.model.ts
Normal file
24
src/domain/models/circuit-device-row.model.ts
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
export interface CircuitDeviceRow {
|
||||
id: string;
|
||||
circuitId: string;
|
||||
linkedProjectDeviceId?: string;
|
||||
sortOrder: number;
|
||||
name: string;
|
||||
displayName: string;
|
||||
phaseType?: string;
|
||||
connectionKind?: string;
|
||||
costGroup?: string;
|
||||
category?: string;
|
||||
level?: string;
|
||||
roomId?: string;
|
||||
roomNumberSnapshot?: string;
|
||||
roomNameSnapshot?: string;
|
||||
quantity: number;
|
||||
manualQuantity: number;
|
||||
powerPerUnit: number;
|
||||
simultaneityFactor: number;
|
||||
cosPhi?: number;
|
||||
remark?: string;
|
||||
overriddenFields?: string;
|
||||
}
|
||||
|
||||
|
|
@ -71,33 +71,15 @@ export function assertCircuitProtectionUpdateProjectCommand(
|
|||
if (target !== null) {
|
||||
assertCircuitProtectionSnapshot(target, circuitId);
|
||||
}
|
||||
if (circuitProtectionSnapshotsEqual(expected, target)) {
|
||||
if (JSON.stringify(expected) === JSON.stringify(target)) {
|
||||
throw new Error("Circuit protection update must change state.");
|
||||
}
|
||||
}
|
||||
|
||||
function circuitProtectionSnapshotsEqual(
|
||||
left: CircuitProtectionSnapshot | null,
|
||||
right: CircuitProtectionSnapshot | null
|
||||
): boolean {
|
||||
if (left === null || right === null) {
|
||||
return left === right;
|
||||
}
|
||||
return (
|
||||
left.circuitId === right.circuitId &&
|
||||
left.type === right.type &&
|
||||
left.ratedCurrentA === right.ratedCurrentA &&
|
||||
left.fuseUtilizationCategory === right.fuseUtilizationCategory &&
|
||||
left.tripCharacteristic === right.tripCharacteristic &&
|
||||
left.rcdType === right.rcdType &&
|
||||
left.ratedResidualCurrentMa === right.ratedResidualCurrentMa
|
||||
);
|
||||
}
|
||||
|
||||
export function assertCircuitProtectionSnapshot(
|
||||
value: unknown,
|
||||
circuitId: string
|
||||
): asserts value is CircuitProtectionSnapshot {
|
||||
) {
|
||||
if (
|
||||
!isPlainObject(value) ||
|
||||
Object.keys(value).length !== 7 ||
|
||||
|
|
|
|||
9
src/domain/models/circuit-section.model.ts
Normal file
9
src/domain/models/circuit-section.model.ts
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
export interface CircuitSection {
|
||||
id: string;
|
||||
circuitListId: string;
|
||||
key: string;
|
||||
displayName: string;
|
||||
prefix: string;
|
||||
sortOrder: number;
|
||||
}
|
||||
|
||||
19
src/domain/models/circuit.model.ts
Normal file
19
src/domain/models/circuit.model.ts
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
export interface Circuit {
|
||||
id: string;
|
||||
circuitListId: string;
|
||||
sectionId: string;
|
||||
equipmentIdentifier: string;
|
||||
displayName?: string;
|
||||
sortOrder: number;
|
||||
cableType?: string;
|
||||
cableCrossSection?: string;
|
||||
cableLength?: number;
|
||||
rcdAssignment?: string;
|
||||
terminalDesignation?: string;
|
||||
voltage?: number;
|
||||
controlRequirement?: string;
|
||||
status?: string;
|
||||
isReserve: boolean;
|
||||
remark?: string;
|
||||
}
|
||||
|
||||
|
|
@ -130,7 +130,7 @@ const circuitDeviceRowSchema = z.preprocess(
|
|||
quantity: finiteNumberSchema.nonnegative(),
|
||||
manualQuantity: finiteNumberSchema.nonnegative(),
|
||||
powerPerUnit: finiteNumberSchema.nonnegative(),
|
||||
simultaneityFactor: finiteNumberSchema.min(0).max(1),
|
||||
simultaneityFactor: finiteNumberSchema.nonnegative(),
|
||||
cosPhi: finiteNumberSchema.positive().nullable(),
|
||||
remark: nullableStringSchema,
|
||||
overriddenFields: nullableStringSchema,
|
||||
|
|
|
|||
|
|
@ -268,10 +268,6 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
const [editingCell, setEditingCell] = useState<EditingCell | null>(null);
|
||||
const [activeSectionId, setActiveSectionId] = useState<string | null>(null);
|
||||
const [isSaving, setIsSaving] = useState(false);
|
||||
// Synchronous re-entry guard: isSaving is React state and only reflects
|
||||
// reality after the next render, so a second click/drop fired within the
|
||||
// same tick could otherwise race past it and double-submit a command.
|
||||
const commandInFlightRef = useRef(false);
|
||||
const [componentEditorIntent, setComponentEditorIntent] =
|
||||
useState<StructureComponentEditorIntent | null>(null);
|
||||
const [circuitGroupEditorIntent, setCircuitGroupEditorIntent] =
|
||||
|
|
@ -727,27 +723,6 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
);
|
||||
}, [data]);
|
||||
|
||||
// Clears the sidebar's target selection once it no longer resolves to a
|
||||
// real section/circuit (e.g. deleted, moved or renumbered elsewhere)
|
||||
// instead of silently holding a stale id after a tree reload.
|
||||
useEffect(() => {
|
||||
if (!data) {
|
||||
return;
|
||||
}
|
||||
if (
|
||||
targetSectionId &&
|
||||
!data.sections.some((section) => section.id === targetSectionId)
|
||||
) {
|
||||
setTargetSectionId(null);
|
||||
}
|
||||
if (
|
||||
targetCircuitId &&
|
||||
!circuitOptions.some((option) => option.id === targetCircuitId)
|
||||
) {
|
||||
setTargetCircuitId(null);
|
||||
}
|
||||
}, [data, circuitOptions, targetSectionId, targetCircuitId]);
|
||||
|
||||
const allCircuits = useMemo(
|
||||
() => data?.sections.flatMap((section) => section.circuits) ?? [],
|
||||
[data]
|
||||
|
|
@ -1071,10 +1046,6 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
|
||||
// Runs a normal command. The server records it in project-wide history.
|
||||
async function runCommand(command: HistoryCommand) {
|
||||
if (commandInFlightRef.current) {
|
||||
return;
|
||||
}
|
||||
commandInFlightRef.current = true;
|
||||
try {
|
||||
setError(null);
|
||||
setIsSaving(true);
|
||||
|
|
@ -1085,7 +1056,6 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
await loadTree({ showLoading: false });
|
||||
setError(message);
|
||||
} finally {
|
||||
commandInFlightRef.current = false;
|
||||
setIsSaving(false);
|
||||
}
|
||||
}
|
||||
|
|
@ -1093,10 +1063,6 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
// Applies the next eligible project-wide history operation. Selection is only
|
||||
// a best-effort local hint; command eligibility and data changes stay server-owned.
|
||||
async function applyHistory(mode: "undo" | "redo") {
|
||||
if (commandInFlightRef.current) {
|
||||
return;
|
||||
}
|
||||
commandInFlightRef.current = true;
|
||||
try {
|
||||
setError(null);
|
||||
setHistoryBusy(true);
|
||||
|
|
@ -1122,7 +1088,6 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
await loadTree({ showLoading: false });
|
||||
setError(message);
|
||||
} finally {
|
||||
commandInFlightRef.current = false;
|
||||
setIsSaving(false);
|
||||
setHistoryBusy(false);
|
||||
}
|
||||
|
|
@ -1779,7 +1744,7 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
if (!section) {
|
||||
throw new Error("Bereich wurde nicht gefunden.");
|
||||
}
|
||||
const next = await getNextCircuitIdentifier(projectId, sectionId);
|
||||
const next = await getNextCircuitIdentifier(sectionId);
|
||||
const sortOrder =
|
||||
section.circuits.length > 0 ? Math.max(...section.circuits.map((circuit) => circuit.sortOrder)) + 10 : 10;
|
||||
const isDeviceField = deviceFieldKeys.has(key);
|
||||
|
|
@ -1968,7 +1933,7 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
await runCommand({
|
||||
label: "Stromkreis hinzufügen",
|
||||
redo: async () => {
|
||||
const next = await getNextCircuitIdentifier(projectId, sectionId);
|
||||
const next = await getNextCircuitIdentifier(sectionId);
|
||||
const sortOrder = getInsertionSortOrder(section.circuits, afterCircuitId);
|
||||
const circuit = createCircuitSnapshot({
|
||||
sectionId,
|
||||
|
|
@ -2162,7 +2127,7 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
if (!section) {
|
||||
throw new Error("Der Zielbereich ist ungültig.");
|
||||
}
|
||||
const next = await getNextCircuitIdentifier(projectId, sectionId);
|
||||
const next = await getNextCircuitIdentifier(sectionId);
|
||||
const sortOrder =
|
||||
section.circuits.length > 0 ? Math.max(...section.circuits.map((circuit) => circuit.sortOrder)) + 10 : 10;
|
||||
const circuit = createCircuitSnapshot(
|
||||
|
|
@ -2573,7 +2538,7 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
await runCommand({
|
||||
label: newCircuitLabel,
|
||||
redo: async () => {
|
||||
const next = await getNextCircuitIdentifier(projectId, intent.sectionId);
|
||||
const next = await getNextCircuitIdentifier(intent.sectionId);
|
||||
const sortOrder =
|
||||
intent.targetCircuitId && intent.placement
|
||||
? getAdjacentInsertionSortOrder(
|
||||
|
|
@ -3734,7 +3699,6 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
type="button"
|
||||
tabIndex={-1}
|
||||
disabled={
|
||||
isSaving ||
|
||||
!buildCircuitGroupReorderAssignments(
|
||||
data.sections,
|
||||
section.id,
|
||||
|
|
@ -3752,7 +3716,6 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
type="button"
|
||||
tabIndex={-1}
|
||||
disabled={
|
||||
isSaving ||
|
||||
!buildCircuitGroupReorderAssignments(
|
||||
data.sections,
|
||||
section.id,
|
||||
|
|
@ -3770,7 +3733,6 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
type="button"
|
||||
tabIndex={-1}
|
||||
disabled={
|
||||
isSaving ||
|
||||
hasActiveSortOrFilter ||
|
||||
!section.category ||
|
||||
!canRenumberCircuitGroups(
|
||||
|
|
@ -3796,7 +3758,6 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
<button
|
||||
type="button"
|
||||
tabIndex={-1}
|
||||
disabled={isSaving}
|
||||
title={
|
||||
canDeleteCircuitGroup(section)
|
||||
? "Leere Stromkreisgruppe entfernen"
|
||||
|
|
@ -3854,18 +3815,13 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
>
|
||||
Gruppen-FI hinzufügen
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
tabIndex={-1}
|
||||
disabled={isSaving}
|
||||
onClick={() => void handleAddReserveCircuit(section.id)}
|
||||
>
|
||||
<button type="button" tabIndex={-1} onClick={() => void handleAddReserveCircuit(section.id)}>
|
||||
Stromkreis hinzufügen
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
tabIndex={-1}
|
||||
disabled={hasActiveSortOrFilter || isSaving}
|
||||
disabled={hasActiveSortOrFilter}
|
||||
onClick={() => void handleRenumberSection(section.id)}
|
||||
title={hasActiveSortOrFilter ? "Vor der Neunummerierung Sortierung und Filter zurücksetzen." : undefined}
|
||||
>
|
||||
|
|
@ -4470,7 +4426,6 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
<button
|
||||
type="button"
|
||||
tabIndex={-1}
|
||||
disabled={isSaving}
|
||||
onClick={() => void handleAddManualDevice(row.circuit!, row.sectionId)}
|
||||
>
|
||||
Manuelles Gerät hinzufügen
|
||||
|
|
@ -4478,7 +4433,6 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
<button
|
||||
type="button"
|
||||
tabIndex={-1}
|
||||
disabled={isSaving}
|
||||
onClick={() => void handleDeleteCircuit(row.circuit!.id)}
|
||||
>
|
||||
Stromkreis löschen
|
||||
|
|
@ -4486,7 +4440,7 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
|||
</>
|
||||
) : null}
|
||||
{row.device ? (
|
||||
<button type="button" tabIndex={-1} disabled={isSaving} onClick={() => void handleDeleteDevice(row.device!.id)}>
|
||||
<button type="button" tabIndex={-1} onClick={() => void handleDeleteDevice(row.device!.id)}>
|
||||
Gerät löschen
|
||||
</button>
|
||||
) : null}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
"use client";
|
||||
|
||||
import React, { type FormEvent, type ReactNode, useEffect, useRef } from "react";
|
||||
import React, { type FormEvent, type ReactNode } from "react";
|
||||
|
||||
interface FormModalProps {
|
||||
children: ReactNode;
|
||||
|
|
@ -14,9 +14,6 @@ interface FormModalProps {
|
|||
title: string;
|
||||
}
|
||||
|
||||
const FOCUSABLE_SELECTOR =
|
||||
'a[href], button:not([disabled]), textarea:not([disabled]), input:not([disabled]), select:not([disabled]), [tabindex]:not([tabindex="-1"])';
|
||||
|
||||
export function FormModal({
|
||||
children,
|
||||
description,
|
||||
|
|
@ -28,56 +25,11 @@ export function FormModal({
|
|||
submitLabel,
|
||||
title,
|
||||
}: FormModalProps) {
|
||||
const dialogRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
// Focuses the dialog on open and returns focus to the element that
|
||||
// triggered it on close, so keyboard users never lose their place in the
|
||||
// grid behind the backdrop.
|
||||
useEffect(() => {
|
||||
const previouslyFocused = document.activeElement as HTMLElement | null;
|
||||
const firstFocusable =
|
||||
dialogRef.current?.querySelector<HTMLElement>(FOCUSABLE_SELECTOR);
|
||||
firstFocusable?.focus();
|
||||
return () => {
|
||||
previouslyFocused?.focus();
|
||||
};
|
||||
}, []);
|
||||
|
||||
function handleKeyDown(event: React.KeyboardEvent<HTMLDivElement>) {
|
||||
if (event.key === "Escape") {
|
||||
if (!isSaving) {
|
||||
event.stopPropagation();
|
||||
onClose();
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (event.key !== "Tab" || !dialogRef.current) {
|
||||
return;
|
||||
}
|
||||
const focusable = Array.from(
|
||||
dialogRef.current.querySelectorAll<HTMLElement>(FOCUSABLE_SELECTOR)
|
||||
);
|
||||
if (focusable.length === 0) {
|
||||
return;
|
||||
}
|
||||
const first = focusable[0];
|
||||
const last = focusable[focusable.length - 1];
|
||||
if (event.shiftKey && document.activeElement === first) {
|
||||
event.preventDefault();
|
||||
last.focus();
|
||||
} else if (!event.shiftKey && document.activeElement === last) {
|
||||
event.preventDefault();
|
||||
first.focus();
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<div
|
||||
aria-modal="true"
|
||||
className="modal fade show d-block"
|
||||
onKeyDown={handleKeyDown}
|
||||
ref={dialogRef}
|
||||
role="dialog"
|
||||
tabIndex={-1}
|
||||
>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ import {
|
|||
distributionBoardSupplyTypes,
|
||||
type DistributionBoardSupplyType,
|
||||
} from "../../shared/constants/distribution-board";
|
||||
import { FormModal } from "./form-modal";
|
||||
|
||||
export interface ProjectSettingsInput {
|
||||
name: string;
|
||||
|
|
@ -132,15 +131,34 @@ export function ProjectSettingsModal({
|
|||
}
|
||||
|
||||
return (
|
||||
<FormModal
|
||||
description="Stammdaten und elektrische Standardwerte des Projekts"
|
||||
isSaving={isSaving}
|
||||
onClose={onClose}
|
||||
onSubmit={handleSubmit}
|
||||
submitDisabled={!isValid}
|
||||
submitLabel="Einstellungen speichern"
|
||||
title="Projekteinstellungen"
|
||||
<>
|
||||
<div
|
||||
aria-labelledby="project-settings-title"
|
||||
aria-modal="true"
|
||||
className="modal fade show d-block"
|
||||
role="dialog"
|
||||
tabIndex={-1}
|
||||
>
|
||||
<div className="modal-dialog modal-lg modal-dialog-centered">
|
||||
<form className="modal-content" onSubmit={handleSubmit}>
|
||||
<div className="modal-header">
|
||||
<div>
|
||||
<h2 className="modal-title fs-5" id="project-settings-title">
|
||||
Projekteinstellungen
|
||||
</h2>
|
||||
<p className="text-secondary small mb-0">
|
||||
Stammdaten und elektrische Standardwerte des Projekts
|
||||
</p>
|
||||
</div>
|
||||
<button
|
||||
aria-label="Schließen"
|
||||
className="btn-close"
|
||||
disabled={isSaving}
|
||||
onClick={onClose}
|
||||
type="button"
|
||||
/>
|
||||
</div>
|
||||
<div className="modal-body">
|
||||
<div className="row g-3">
|
||||
<div className="col-12">
|
||||
<label className="form-label" htmlFor="project-name">
|
||||
|
|
@ -403,7 +421,29 @@ export function ProjectSettingsModal({
|
|||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</FormModal>
|
||||
</div>
|
||||
<div className="modal-footer">
|
||||
<button
|
||||
className="btn btn-outline-secondary"
|
||||
disabled={isSaving}
|
||||
onClick={onClose}
|
||||
type="button"
|
||||
>
|
||||
Abbrechen
|
||||
</button>
|
||||
<button
|
||||
className="btn btn-primary"
|
||||
disabled={isSaving || !isValid}
|
||||
type="submit"
|
||||
>
|
||||
{isSaving ? "Wird gespeichert …" : "Einstellungen speichern"}
|
||||
</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<div className="modal-backdrop fade show" />
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -688,9 +688,9 @@ export function deleteCircuitCommand(
|
|||
);
|
||||
}
|
||||
|
||||
export function getNextCircuitIdentifier(projectId: string, sectionId: string) {
|
||||
export function getNextCircuitIdentifier(sectionId: string) {
|
||||
return request<{ sectionId: string; nextIdentifier: string }>(
|
||||
`/api/projects/${projectId}/circuit-sections/${sectionId}/next-identifier`
|
||||
`/api/circuit-sections/${sectionId}/next-identifier`
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -396,16 +396,6 @@ export function parseNumeric(cellKey: CellKey, draft: string): number | undefine
|
|||
if (trimmed === "") {
|
||||
return undefined;
|
||||
}
|
||||
// A "." is ambiguous in German number entry: it could be a decimal point
|
||||
// (English convention) or a thousands separator (e.g. "1.500" meaning
|
||||
// one thousand five hundred). Silently guessing either way risks a wrong
|
||||
// value entering the power balance without any visible error, so "."
|
||||
// is rejected outright and "," is the only accepted decimal separator.
|
||||
if (trimmed.includes(".")) {
|
||||
throw new Error(
|
||||
`Ungültiger Zahlenwert in ${cellKey}: Dezimalstellen mit Komma eingeben.`
|
||||
);
|
||||
}
|
||||
const parsed = Number(trimmed.replace(",", "."));
|
||||
if (Number.isNaN(parsed)) {
|
||||
throw new Error(`Ungültiger Zahlenwert in ${cellKey}`);
|
||||
|
|
|
|||
|
|
@ -169,6 +169,13 @@ function makeVisibleGridRow(
|
|||
return { rowKey, rowType, sectionId, circuit, device, cells };
|
||||
}
|
||||
|
||||
export function buildVisibleGridRows(sections: readonly CircuitTreeSectionDto[]): VisibleGridRow[] {
|
||||
return buildVisibleGridRowsWithStructure(sections, {
|
||||
headerComponents: [],
|
||||
footerComponents: [],
|
||||
});
|
||||
}
|
||||
|
||||
export function buildVisibleGridRowsWithStructure(
|
||||
sections: readonly CircuitTreeSectionDto[],
|
||||
structure: {
|
||||
|
|
|
|||
|
|
@ -259,13 +259,7 @@ export function buildCircuitGroupRenumberPlan(
|
|||
targetGroupNumber,
|
||||
expectedPrefix,
|
||||
targetPrefix: formatGroupPrefix(category, targetGroupNumber),
|
||||
circuits: [...group.circuits]
|
||||
.sort(
|
||||
(left, right) =>
|
||||
left.sortOrder - right.sortOrder ||
|
||||
left.id.localeCompare(right.id)
|
||||
)
|
||||
.map((circuit) => {
|
||||
circuits: group.circuits.map((circuit) => {
|
||||
const circuitNumber = parseCircuitNumber(
|
||||
circuit.equipmentIdentifier,
|
||||
category,
|
||||
|
|
|
|||
|
|
@ -23,13 +23,9 @@ export function buildCircuitSectionRenumberAssignments(
|
|||
)
|
||||
)
|
||||
);
|
||||
const orderedCircuits = [...targetSection.circuits].sort(
|
||||
(left, right) =>
|
||||
left.sortOrder - right.sortOrder || left.id.localeCompare(right.id)
|
||||
);
|
||||
const assignments: CircuitSectionRenumberAssignment[] = [];
|
||||
let suffix = 1;
|
||||
for (const circuit of orderedCircuits) {
|
||||
for (const circuit of targetSection.circuits) {
|
||||
let targetEquipmentIdentifier = `${targetSection.prefix}${suffix}`;
|
||||
while (
|
||||
identifiersOutsideSection.has(targetEquipmentIdentifier)
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ export function buildCircuitStructureProjection(
|
|||
component,
|
||||
});
|
||||
}
|
||||
for (const circuit of ordered(section.circuits)) {
|
||||
for (const circuit of section.circuits) {
|
||||
rows.push({
|
||||
rowKey: `circuit-block:${circuit.id}`,
|
||||
rowType: "circuitBlock",
|
||||
|
|
|
|||
|
|
@ -47,24 +47,10 @@ const commandTypeLabels: Record<string, string> = {
|
|||
"circuit-group.delete-subtree": "Stromkreisgruppe vollständig entfernt",
|
||||
"circuit-group.restore-subtree": "Stromkreisgruppe vollständig wiederhergestellt",
|
||||
"project-floor.insert": "Geschoss angelegt",
|
||||
"project-floor.update": "Geschoss bearbeitet",
|
||||
"project-floor.delete": "Geschoss entfernt",
|
||||
"project-room.insert": "Raum angelegt",
|
||||
"project-room.update": "Raum bearbeitet",
|
||||
"project-room.delete": "Raum entfernt",
|
||||
"project.restore-state": "Projektstand wiederhergestellt",
|
||||
"circuit-protection.update": "Stromkreisschutz bearbeitet",
|
||||
"external-csv-configuration.update": "Revit-CSV-Konfiguration bearbeitet",
|
||||
"external-import.apply-initial": "Revit-Erstimport übernommen",
|
||||
"external-object.assign-to-new-circuit":
|
||||
"Externes Objekt in neuen Stromkreis übernommen",
|
||||
"external-object.unassign-and-delete-created-circuit":
|
||||
"Externes Objekt aus erzeugtem Stromkreis gelöst",
|
||||
"external-object.assign-to-new-row":
|
||||
"Externes Objekt in neue Gerätezeile übernommen",
|
||||
"external-object.unassign-and-delete-created-row":
|
||||
"Externes Objekt aus erzeugter Gerätezeile gelöst",
|
||||
"external-object.update-row-assignment": "Externe Objektzuordnung geändert",
|
||||
};
|
||||
|
||||
export function getProjectRevisionSourceLabel(
|
||||
|
|
|
|||
|
|
@ -7,13 +7,11 @@ export function registerNodeInstrumentation() {
|
|||
logger.info("web server starting", { pid: process.pid });
|
||||
|
||||
process.on("uncaughtException", (error) => {
|
||||
logger.error("uncaught exception, exiting", toErrorMeta(error));
|
||||
process.exit(1);
|
||||
logger.error("uncaught exception", toErrorMeta(error));
|
||||
});
|
||||
|
||||
process.on("unhandledRejection", (reason) => {
|
||||
logger.error("unhandled rejection, exiting", toErrorMeta(reason));
|
||||
process.exit(1);
|
||||
logger.error("unhandled rejection", toErrorMeta(reason));
|
||||
});
|
||||
|
||||
setInterval(() => {
|
||||
|
|
|
|||
|
|
@ -5,14 +5,10 @@ import { createLogger } from "./shared/logging/logger";
|
|||
const logger = createLogger("web:navigation");
|
||||
|
||||
export function proxy(request: NextRequest) {
|
||||
// The Docker healthcheck hits "/" every few seconds with no User-Agent
|
||||
// header; skip it so real navigation isn't drowned out in the logs.
|
||||
if (request.headers.get("user-agent")) {
|
||||
logger.info("page request", {
|
||||
method: request.method,
|
||||
path: request.nextUrl.pathname,
|
||||
});
|
||||
}
|
||||
return NextResponse.next();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,21 +1,10 @@
|
|||
import type { Request, Response } from "express";
|
||||
import { circuitNumberingService } from "../composition/circuit-numbering-service.js";
|
||||
import {
|
||||
circuitListRepository,
|
||||
circuitSectionRepository,
|
||||
} from "../composition/application-repositories.js";
|
||||
|
||||
export async function getNextCircuitIdentifier(req: Request, res: Response) {
|
||||
const { projectId, sectionId } = req.params;
|
||||
if (typeof projectId !== "string" || typeof sectionId !== "string") {
|
||||
return res.status(400).json({ error: "Invalid parameters" });
|
||||
}
|
||||
const section = await circuitSectionRepository.findById(sectionId);
|
||||
const list = section
|
||||
? await circuitListRepository.findById(projectId, section.circuitListId)
|
||||
: null;
|
||||
if (!section || !list) {
|
||||
return res.status(404).json({ error: "Section not found" });
|
||||
const { sectionId } = req.params;
|
||||
if (typeof sectionId !== "string") {
|
||||
return res.status(400).json({ error: "Invalid sectionId" });
|
||||
}
|
||||
try {
|
||||
const nextIdentifier =
|
||||
|
|
|
|||
|
|
@ -34,12 +34,11 @@ export async function updateGlobalDevice(req: Request, res: Response) {
|
|||
return res.status(400).json({ error: parsed.error.flatten() });
|
||||
}
|
||||
|
||||
const existing = await globalDeviceRepository.findById(globalDeviceId);
|
||||
if (!existing) {
|
||||
return res.status(404).json({ error: "Global device not found" });
|
||||
}
|
||||
await globalDeviceRepository.update(globalDeviceId, parsed.data);
|
||||
const row = await globalDeviceRepository.findById(globalDeviceId);
|
||||
if (!row) {
|
||||
return res.status(404).json({ error: "Global device not found" });
|
||||
}
|
||||
return res.json(row);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import express from "express";
|
||||
import { circuitRouter } from "./routes/circuit.routes.js";
|
||||
import { globalDeviceRouter } from "./routes/global-device.routes.js";
|
||||
import { projectDeviceRouter } from "./routes/project-device.routes.js";
|
||||
import { projectRouter } from "./routes/project.routes.js";
|
||||
|
|
@ -30,15 +31,6 @@ app.use((req, res, next) => {
|
|||
else if (res.statusCode >= 400) logger.warn("request completed", meta);
|
||||
else logger.info("request completed", meta);
|
||||
});
|
||||
res.on("close", () => {
|
||||
if (!res.writableEnded) {
|
||||
logger.warn("request aborted before response finished", {
|
||||
method: req.method,
|
||||
path: req.originalUrl,
|
||||
durationMs: Date.now() - startedAt,
|
||||
});
|
||||
}
|
||||
});
|
||||
next();
|
||||
});
|
||||
|
||||
|
|
@ -47,19 +39,18 @@ app.get("/health", (_req, res) => {
|
|||
});
|
||||
|
||||
app.use("/api/projects", projectRouter);
|
||||
app.use("/api", circuitRouter);
|
||||
app.use("/api/global-devices", globalDeviceRouter);
|
||||
app.use("/api/project-devices", projectDeviceRouter);
|
||||
|
||||
app.use(errorMiddleware);
|
||||
|
||||
process.on("uncaughtException", (error) => {
|
||||
logger.error("uncaught exception, exiting", toErrorMeta(error));
|
||||
process.exit(1);
|
||||
logger.error("uncaught exception", toErrorMeta(error));
|
||||
});
|
||||
|
||||
process.on("unhandledRejection", (reason) => {
|
||||
logger.error("unhandled rejection, exiting", toErrorMeta(reason));
|
||||
process.exit(1);
|
||||
logger.error("unhandled rejection", toErrorMeta(reason));
|
||||
});
|
||||
|
||||
process.on("SIGTERM", () => logger.info("received SIGTERM"));
|
||||
|
|
|
|||
9
src/server/routes/circuit.routes.ts
Normal file
9
src/server/routes/circuit.routes.ts
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
import { Router } from "express";
|
||||
import {
|
||||
getNextCircuitIdentifier,
|
||||
} from "../controllers/circuit.controller.js";
|
||||
|
||||
export const circuitRouter = Router();
|
||||
|
||||
circuitRouter.get("/circuit-sections/:sectionId/next-identifier", getNextCircuitIdentifier);
|
||||
|
||||
|
|
@ -16,7 +16,6 @@ import { listCircuitListsByProject } from "../controllers/circuit-list.controlle
|
|||
import { createFloor, deleteFloor, listFloorsByProject, updateFloor } from "../controllers/floor.controller.js";
|
||||
import { createRoom, deleteRoom, listRoomsByProject, updateRoom } from "../controllers/room.controller.js";
|
||||
import { getCircuitTree } from "../controllers/circuit-tree.controller.js";
|
||||
import { getNextCircuitIdentifier } from "../controllers/circuit.controller.js";
|
||||
import {
|
||||
getProjectHistory,
|
||||
listProjectRevisions,
|
||||
|
|
@ -96,10 +95,6 @@ projectRouter.delete(
|
|||
);
|
||||
projectRouter.get("/:projectId/circuit-lists", listCircuitListsByProject);
|
||||
projectRouter.get("/:projectId/circuit-lists/:circuitListId/tree", getCircuitTree);
|
||||
projectRouter.get(
|
||||
"/:projectId/circuit-sections/:sectionId/next-identifier",
|
||||
getNextCircuitIdentifier
|
||||
);
|
||||
projectRouter.get("/:projectId/floors", listFloorsByProject);
|
||||
projectRouter.post("/:projectId/floors", createFloor);
|
||||
projectRouter.put("/:projectId/floors/:floorId", updateFloor);
|
||||
|
|
|
|||
|
|
@ -47,19 +47,13 @@ export function createLogger(
|
|||
if (LEVEL_SEVERITY[level] > LEVEL_SEVERITY[threshold]) {
|
||||
return;
|
||||
}
|
||||
const timestamp = new Date().toISOString();
|
||||
let line: string;
|
||||
try {
|
||||
line = JSON.stringify({ timestamp, level, scope, message, ...meta });
|
||||
} catch {
|
||||
line = JSON.stringify({
|
||||
timestamp,
|
||||
const line = JSON.stringify({
|
||||
timestamp: new Date().toISOString(),
|
||||
level,
|
||||
scope,
|
||||
message,
|
||||
logError: "failed to serialize log metadata",
|
||||
...meta,
|
||||
});
|
||||
}
|
||||
if (level === "error" || level === "warn") {
|
||||
console.error(line);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1,10 +1,5 @@
|
|||
import { z } from "zod";
|
||||
|
||||
// Base64 length of the 18 MiB transport limit documented for CSV uploads
|
||||
// (18 * 1024 * 1024 bytes, evenly divisible by 3, so ceil(N/3)*4 with no
|
||||
// padding). Keep in sync with the controller's raw byte-length check.
|
||||
export const MAX_CSV_CONTENT_BASE64_LENGTH = 25_165_824;
|
||||
|
||||
export const updateExternalCsvConfigurationSchema = z
|
||||
.object({
|
||||
expectedRevision: z.number().int().nonnegative(),
|
||||
|
|
@ -15,7 +10,7 @@ export const updateExternalCsvConfigurationSchema = z
|
|||
export const previewExternalCsvSchema = z
|
||||
.object({
|
||||
fileName: z.string().trim().min(1).max(255),
|
||||
contentBase64: z.string().min(1).max(MAX_CSV_CONTENT_BASE64_LENGTH),
|
||||
contentBase64: z.string().min(1).max(24_000_000),
|
||||
})
|
||||
.strict();
|
||||
|
||||
|
|
@ -26,7 +21,7 @@ export const applyExternalInitialImportSchema = z.object({
|
|||
expectedConfigurationVersion: z.number().int().positive(),
|
||||
expectedSha256: z.string().regex(/^[a-f0-9]{64}$/),
|
||||
fileName: z.string().trim().min(1).max(255),
|
||||
contentBase64: z.string().min(1).max(MAX_CSV_CONTENT_BASE64_LENGTH),
|
||||
contentBase64: z.string().min(1).max(24_000_000),
|
||||
sourceName: z.string().trim().min(1).max(200),
|
||||
roomDecisions: z.array(z.object({
|
||||
sourceRoomKey: z.string().trim().min(1),
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
import { z } from "zod";
|
||||
|
||||
export const createGlobalDeviceSchema = z.object({
|
||||
name: z.string().min(1).max(200),
|
||||
displayName: z.string().min(1).max(200),
|
||||
category: z.string().max(100).optional(),
|
||||
name: z.string().min(1),
|
||||
displayName: z.string().min(1),
|
||||
category: z.string().optional(),
|
||||
quantity: z.number().min(0),
|
||||
installedPowerPerUnitKw: z.number().min(0),
|
||||
demandFactor: z.number().min(0).max(1),
|
||||
phaseCount: z.union([z.literal(1), z.literal(3)]),
|
||||
powerFactor: z.number().min(0).max(1).optional(),
|
||||
note: z.string().max(2000).optional(),
|
||||
note: z.string().optional(),
|
||||
}).strict();
|
||||
|
||||
export const updateGlobalDeviceSchema = createGlobalDeviceSchema;
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@ import { expectedProjectRevisionSchema } from "./project-command.schemas.js";
|
|||
import { circuitGroupCategories } from "../constants/circuit-group.js";
|
||||
|
||||
export const createProjectDeviceSchema = z.object({
|
||||
name: z.string().min(1).max(200),
|
||||
displayName: z.string().min(1).max(200),
|
||||
connectionKind: z.string().max(100).optional(),
|
||||
costGroup: z.string().max(100).optional(),
|
||||
name: z.string().min(1),
|
||||
displayName: z.string().min(1),
|
||||
connectionKind: z.string().optional(),
|
||||
costGroup: z.string().optional(),
|
||||
category: z.enum(circuitGroupCategories),
|
||||
quantity: z.number().min(0),
|
||||
powerPerUnit: z.number().min(0),
|
||||
simultaneityFactor: z.number().min(0).max(1),
|
||||
cosPhi: z.number().min(0).max(1).optional(),
|
||||
remark: z.string().max(2000).optional(),
|
||||
remark: z.string().optional(),
|
||||
}).strict();
|
||||
|
||||
export const updateProjectDeviceSchema = createProjectDeviceSchema;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ export const updateProjectSettingsSchema = z
|
|||
export const createDistributionBoardSchema = z
|
||||
.object({
|
||||
expectedRevision: expectedProjectRevisionSchema,
|
||||
name: z.string().trim().min(1).max(200),
|
||||
name: z.string().trim().min(1),
|
||||
floorId: z.string().trim().min(1).nullable(),
|
||||
supplyType: z.enum(distributionBoardSupplyTypes),
|
||||
})
|
||||
|
|
@ -67,7 +67,7 @@ export const deleteDistributionBoardSchema = z
|
|||
export const createFloorSchema = z
|
||||
.object({
|
||||
expectedRevision: expectedProjectRevisionSchema,
|
||||
name: z.string().trim().min(1).max(200),
|
||||
name: z.string().trim().min(1),
|
||||
})
|
||||
.strict();
|
||||
|
||||
|
|
@ -83,8 +83,8 @@ export const createRoomSchema = z
|
|||
.object({
|
||||
expectedRevision: expectedProjectRevisionSchema,
|
||||
floorId: z.string().trim().min(1).optional(),
|
||||
roomNumber: z.string().trim().min(1).max(50),
|
||||
roomName: z.string().trim().min(1).max(200),
|
||||
roomNumber: z.string().trim().min(1),
|
||||
roomName: z.string().trim().min(1),
|
||||
})
|
||||
.strict();
|
||||
|
||||
|
|
@ -92,8 +92,8 @@ export const updateRoomSchema = z
|
|||
.object({
|
||||
expectedRevision: expectedProjectRevisionSchema,
|
||||
floorId: z.string().trim().min(1).nullable(),
|
||||
roomNumber: z.string().trim().min(1).max(50),
|
||||
roomName: z.string().trim().min(1).max(200),
|
||||
roomNumber: z.string().trim().min(1),
|
||||
roomName: z.string().trim().min(1),
|
||||
})
|
||||
.strict();
|
||||
|
||||
|
|
|
|||
|
|
@ -187,25 +187,12 @@ describe("circuit grid model", () => {
|
|||
});
|
||||
|
||||
it("parses numeric drafts and rejects invalid values", () => {
|
||||
assert.equal(parseNumeric("quantity", " 1500 "), 1500);
|
||||
assert.equal(parseNumeric("quantity", " 2.5 "), 2.5);
|
||||
assert.equal(parseNumeric("powerPerUnit", " 1,25 "), 1.25);
|
||||
assert.equal(parseNumeric("quantity", ""), undefined);
|
||||
assert.throws(() => parseNumeric("quantity", "two"), /Ungültiger Zahlenwert/);
|
||||
});
|
||||
|
||||
it("rejects a dot instead of silently misreading it as a thousands separator", () => {
|
||||
// "1.500" typed with German thousands-separator intent (meaning 1500)
|
||||
// must never silently become 1.5 — it must fail loudly instead.
|
||||
assert.throws(
|
||||
() => parseNumeric("cableLength", "1.500"),
|
||||
/Dezimalstellen mit Komma eingeben/
|
||||
);
|
||||
assert.throws(
|
||||
() => parseNumeric("powerPerUnit", "2.5"),
|
||||
/Dezimalstellen mit Komma eingeben/
|
||||
);
|
||||
});
|
||||
|
||||
it("builds nullable circuit command patches from grid drafts", () => {
|
||||
assert.deepEqual(buildCircuitEditPatch("voltage", ""), {
|
||||
voltage: null,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
import assert from "node:assert/strict";
|
||||
import { describe, it } from "node:test";
|
||||
import {
|
||||
buildVisibleGridRows,
|
||||
buildVisibleGridRowsWithStructure,
|
||||
filterAndSortCircuitSections,
|
||||
getDistinctFilterValues,
|
||||
|
|
@ -100,7 +101,7 @@ describe("circuit grid projection", () => {
|
|||
];
|
||||
|
||||
const projectedSections = filterAndSortCircuitSections(emptySections, {}, null);
|
||||
const rows = buildVisibleGridRowsWithStructure(projectedSections, { headerComponents: [], footerComponents: [] });
|
||||
const rows = buildVisibleGridRows(projectedSections);
|
||||
|
||||
assert.equal(projectedSections.length, 2);
|
||||
assert.deepEqual(
|
||||
|
|
@ -149,7 +150,7 @@ describe("circuit grid projection", () => {
|
|||
});
|
||||
|
||||
it("builds the compact, grouped, reserve and placeholder row shapes", () => {
|
||||
const rows = buildVisibleGridRowsWithStructure(sections, { headerComponents: [], footerComponents: [] });
|
||||
const rows = buildVisibleGridRows(sections);
|
||||
|
||||
assert.deepEqual(rows.map((row) => row.rowType), [
|
||||
"section",
|
||||
|
|
@ -190,7 +191,7 @@ describe("circuit grid projection", () => {
|
|||
},
|
||||
})),
|
||||
}));
|
||||
const rows = buildVisibleGridRowsWithStructure(protectedSections, { headerComponents: [], footerComponents: [] });
|
||||
const rows = buildVisibleGridRows(protectedSections);
|
||||
const protectionValue = (rowType: string) =>
|
||||
rows
|
||||
.find((row) => row.rowType === rowType)
|
||||
|
|
|
|||
|
|
@ -580,43 +580,4 @@ describe("circuit structure project-command repository", () => {
|
|||
fixture.context.close();
|
||||
}
|
||||
});
|
||||
|
||||
it("rejects a BMK that differs from an existing one only by German umlaut casing", () => {
|
||||
const fixture = createTestDatabase();
|
||||
try {
|
||||
const store = new CircuitStructureProjectCommandRepository(
|
||||
fixture.context.db
|
||||
);
|
||||
store.execute({
|
||||
projectId: "project-1",
|
||||
expectedRevision: 0,
|
||||
source: "user",
|
||||
command: createCircuitInsertProjectCommand(
|
||||
createCircuitSnapshot(fixture, {
|
||||
id: "umlaut-original",
|
||||
equipmentIdentifier: "-1F9Ä",
|
||||
deviceRows: [],
|
||||
})
|
||||
),
|
||||
});
|
||||
assert.throws(
|
||||
() =>
|
||||
store.execute({
|
||||
projectId: "project-1",
|
||||
expectedRevision: 1,
|
||||
source: "user",
|
||||
command: createCircuitInsertProjectCommand(
|
||||
createCircuitSnapshot(fixture, {
|
||||
id: "umlaut-duplicate",
|
||||
equipmentIdentifier: "-1f9ä",
|
||||
deviceRows: [],
|
||||
})
|
||||
),
|
||||
}),
|
||||
/Duplicate equipmentIdentifier in circuit list\./
|
||||
);
|
||||
} finally {
|
||||
fixture.context.close();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,100 +0,0 @@
|
|||
import assert from "node:assert/strict";
|
||||
import { describe, it } from "node:test";
|
||||
import { getNextCircuitIdentifier } from "../src/server/controllers/circuit.controller.js";
|
||||
import {
|
||||
circuitListRepository,
|
||||
circuitSectionRepository,
|
||||
} from "../src/server/composition/application-repositories.js";
|
||||
import { circuitNumberingService } from "../src/server/composition/circuit-numbering-service.js";
|
||||
|
||||
function createMockResponse() {
|
||||
let statusCode = 200;
|
||||
let body: unknown;
|
||||
return {
|
||||
response: {
|
||||
status(code: number) {
|
||||
statusCode = code;
|
||||
return this;
|
||||
},
|
||||
json(value: unknown) {
|
||||
body = value;
|
||||
return this;
|
||||
},
|
||||
},
|
||||
getStatusCode: () => statusCode,
|
||||
getBody: () => body,
|
||||
};
|
||||
}
|
||||
|
||||
describe("circuit controller", () => {
|
||||
it("returns the next identifier when the section belongs to the project", async () => {
|
||||
const originals = {
|
||||
findSection: circuitSectionRepository.findById,
|
||||
findList: circuitListRepository.findById,
|
||||
getNextIdentifier: circuitNumberingService.getNextIdentifier,
|
||||
};
|
||||
circuitSectionRepository.findById = async () =>
|
||||
({ id: "section-1", circuitListId: "list-1", prefix: "-1F" }) as never;
|
||||
circuitListRepository.findById = async (projectId: string, circuitListId: string) =>
|
||||
projectId === "project-1" && circuitListId === "list-1"
|
||||
? ({ id: "list-1", projectId: "project-1" } as never)
|
||||
: null;
|
||||
circuitNumberingService.getNextIdentifier = async () => "-1F3";
|
||||
const mock = createMockResponse();
|
||||
try {
|
||||
await getNextCircuitIdentifier(
|
||||
{ params: { projectId: "project-1", sectionId: "section-1" } } as never,
|
||||
mock.response as never
|
||||
);
|
||||
} finally {
|
||||
circuitSectionRepository.findById = originals.findSection;
|
||||
circuitListRepository.findById = originals.findList;
|
||||
circuitNumberingService.getNextIdentifier = originals.getNextIdentifier;
|
||||
}
|
||||
assert.deepEqual(mock.getBody(), {
|
||||
sectionId: "section-1",
|
||||
nextIdentifier: "-1F3",
|
||||
});
|
||||
});
|
||||
|
||||
it("returns 404 instead of leaking numbering state for a section from another project", async () => {
|
||||
const originals = {
|
||||
findSection: circuitSectionRepository.findById,
|
||||
findList: circuitListRepository.findById,
|
||||
};
|
||||
circuitSectionRepository.findById = async () =>
|
||||
({ id: "section-1", circuitListId: "list-1", prefix: "-1F" }) as never;
|
||||
// The section exists, but its circuit list does not belong to the requesting project.
|
||||
circuitListRepository.findById = async () => null;
|
||||
const mock = createMockResponse();
|
||||
try {
|
||||
await getNextCircuitIdentifier(
|
||||
{ params: { projectId: "foreign-project", sectionId: "section-1" } } as never,
|
||||
mock.response as never
|
||||
);
|
||||
} finally {
|
||||
circuitSectionRepository.findById = originals.findSection;
|
||||
circuitListRepository.findById = originals.findList;
|
||||
}
|
||||
assert.equal(mock.getStatusCode(), 404);
|
||||
assert.deepEqual(mock.getBody(), { error: "Section not found" });
|
||||
});
|
||||
|
||||
it("returns 404 for a section that does not exist", async () => {
|
||||
const originals = {
|
||||
findSection: circuitSectionRepository.findById,
|
||||
};
|
||||
circuitSectionRepository.findById = async () => null;
|
||||
const mock = createMockResponse();
|
||||
try {
|
||||
await getNextCircuitIdentifier(
|
||||
{ params: { projectId: "project-1", sectionId: "missing" } } as never,
|
||||
mock.response as never
|
||||
);
|
||||
} finally {
|
||||
circuitSectionRepository.findById = originals.findSection;
|
||||
}
|
||||
assert.equal(mock.getStatusCode(), 404);
|
||||
assert.deepEqual(mock.getBody(), { error: "Section not found" });
|
||||
});
|
||||
});
|
||||
|
|
@ -580,7 +580,7 @@ describe("distribution-board component structure project command", () => {
|
|||
snapshot
|
||||
),
|
||||
}),
|
||||
/Duplicate equipmentIdentifier in circuit list\./
|
||||
/UNIQUE constraint failed/
|
||||
);
|
||||
assert.equal(
|
||||
context.db.select().from(projectRevisions).all().length,
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ import assert from "node:assert/strict";
|
|||
import { describe, it } from "node:test";
|
||||
import {
|
||||
applyExternalInitialImportSchema,
|
||||
MAX_CSV_CONTENT_BASE64_LENGTH,
|
||||
planExternalInitialImportSchema,
|
||||
previewExternalCsvSchema,
|
||||
updateExternalCsvConfigurationSchema,
|
||||
|
|
@ -75,7 +74,7 @@ describe("external CSV API contracts", () => {
|
|||
assert.equal(
|
||||
previewExternalCsvSchema.safeParse({
|
||||
fileName: "revit.csv",
|
||||
contentBase64: "a".repeat(MAX_CSV_CONTENT_BASE64_LENGTH + 1),
|
||||
contentBase64: "a".repeat(24_000_001),
|
||||
}).success,
|
||||
false
|
||||
);
|
||||
|
|
|
|||
|
|
@ -195,30 +195,6 @@ describe("external initial import project command", () => {
|
|||
}
|
||||
});
|
||||
|
||||
it("rejects a target state with zero classified objects before writing anything", () => {
|
||||
// assertPopulatedInitialState requires at least one object, so a CSV
|
||||
// that classified none must be rejected at command construction, not
|
||||
// reach the persistence layer's bulk insert.
|
||||
const { context, configuration } = createTestContext();
|
||||
try {
|
||||
const target: ExternalModelStateSnapshot = {
|
||||
...initialState(configuration),
|
||||
roomMappings: [],
|
||||
objects: [],
|
||||
};
|
||||
assert.throws(
|
||||
() =>
|
||||
createExternalInitialImportProjectCommand(
|
||||
createEmptyExternalModelState(),
|
||||
target
|
||||
),
|
||||
/at least one object/
|
||||
);
|
||||
} finally {
|
||||
context.close();
|
||||
}
|
||||
});
|
||||
|
||||
it("rejects changed state, checksum drift and row assignment", () => {
|
||||
const { context, configuration } = createTestContext();
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -209,13 +209,6 @@ describe("circuit device-row update project commands", () => {
|
|||
}),
|
||||
/non-negative/
|
||||
);
|
||||
assert.throws(
|
||||
() =>
|
||||
createCircuitDeviceRowUpdateProjectCommand("row-1", {
|
||||
simultaneityFactor: 1.5,
|
||||
}),
|
||||
/must not exceed 1/
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
|
|
@ -515,14 +508,6 @@ describe("circuit device-row structure project commands", () => {
|
|||
}),
|
||||
/must not be negative/
|
||||
);
|
||||
assert.throws(
|
||||
() =>
|
||||
createCircuitDeviceRowInsertProjectCommand({
|
||||
...row,
|
||||
simultaneityFactor: 1.5,
|
||||
}),
|
||||
/must not exceed 1/
|
||||
);
|
||||
assert.throws(
|
||||
() => createCircuitDeviceRowDeleteProjectCommand("", "circuit-1"),
|
||||
/rowId/
|
||||
|
|
|
|||
|
|
@ -191,32 +191,6 @@ describe("project version history presentation", () => {
|
|||
),
|
||||
"Stromkreisgruppe vollständig wiederhergestellt"
|
||||
);
|
||||
assert.equal(
|
||||
getProjectRevisionDescription(
|
||||
revision(16, { commandType: "circuit-protection.update" })
|
||||
),
|
||||
"Stromkreisschutz bearbeitet"
|
||||
);
|
||||
assert.equal(
|
||||
getProjectRevisionDescription(
|
||||
revision(17, { commandType: "project-floor.update" })
|
||||
),
|
||||
"Geschoss bearbeitet"
|
||||
);
|
||||
assert.equal(
|
||||
getProjectRevisionDescription(
|
||||
revision(18, { commandType: "project-room.update" })
|
||||
),
|
||||
"Raum bearbeitet"
|
||||
);
|
||||
assert.equal(
|
||||
getProjectRevisionDescription(
|
||||
revision(19, {
|
||||
commandType: "external-object.update-row-assignment",
|
||||
})
|
||||
),
|
||||
"Externe Objektzuordnung geändert"
|
||||
);
|
||||
assert.equal(getProjectSnapshotKindLabel("named"), "Benannt");
|
||||
assert.equal(
|
||||
getProjectSnapshotKindLabel("automatic"),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue