@acorex-platform/module-workplacesafety-management-client 0.0.30 → 0.0.33

package/fesm2022/acorex-platform-module-workplacesafety-management-client-contracts.mjs

@@ -1,3 +1,5 @@
+import { createRandomUuid } from '@acorex-platform/framework-shared/core';
+
 //#region ----   GHS symbol options   ----
 /** Asset base path for GHS pictograms (served from demo app assets). */
 const GHS_IMAGE_BASE = '/assets/workplacesafety-management/ghs';
@@ -113,13 +115,6 @@ const AXMWorkplaceSafetyManagementPermissionKeys = {
             Update: AXPSafetyRiskPermissionKeys.MaintainSafety,
             Delete: AXPSafetyRiskPermissionKeys.MaintainSafety,
         },
-        HazardRiskPpeRule: {
-            Management: AXPSafetyRiskPermissionKeys.MaintainSafety,
-            View: AXPSafetyRiskPermissionKeys.MaintainSafety,
-            Create: AXPSafetyRiskPermissionKeys.MaintainSafety,
-            Update: AXPSafetyRiskPermissionKeys.MaintainSafety,
-            Delete: AXPSafetyRiskPermissionKeys.MaintainSafety,
-        },
         ControlHierarchyLevels: {
             Management: AXPSafetyRiskPermissionKeys.Setup,
         },
@@ -237,13 +232,6 @@ const RootConfig = {
             titlePlural: `@${config.i18n}:hazard-risks.entities.hazard-risk.plural`,
             icon: 'fa-light fa-shield-exclamation',
         },
-        hazardRiskPpeRule: {
-            name: 'HazardRiskPpeRule',
-            source: `${config.module}.HazardRiskPpeRule`,
-            title: `@${config.i18n}:hazard-risk-ppe-rules.entities.hazard-risk-ppe-rule.title`,
-            titlePlural: `@${config.i18n}:hazard-risk-ppe-rules.entities.hazard-risk-ppe-rule.plural`,
-            icon: 'fa-light fa-user-helmet-safety',
-        },
         controlHierarchyLevels: {
             name: 'ControlHierarchyLevels',
             source: `${config.module}.ControlHierarchyLevels`,
@@ -414,7 +402,7 @@ const WORKPLACE_SAFETY_SECTION_TYPE_ENTITY_BY_CODE = {
     HazardRisk: `${moduleName}.${RootConfig.entities.hazardRisk.name}`,
     Ppe: `${moduleName}.${RootConfig.entities.ppeItem.name}`,
     PpeHazards: `${moduleName}.${RootConfig.entities.hazardPpeRule.name}`,
-    HazardRiskPpe: `${moduleName}.${RootConfig.entities.hazardRiskPpeRule.name}`,
+    HazardRiskPpe: undefined,
     Control: `${moduleName}.${RootConfig.entities.controlMeasure.name}`,
     HierarchyLevel: `${moduleName}.${RootConfig.entities.controlHierarchyLevels.name}`,
     RiskMatrix: 'RiskManagement.RiskMatrixCell',
@@ -529,897 +517,845 @@ const WORKPLACE_SAFETY_SECTION_TYPE_ENTITY_EXPRESSION = buildSectionTypeEntityEx
 const WORKPLACE_SAFETY_SECTION_TYPE_ENTITY_EXPRESSION_SIBLING = buildSectionTypeEntityExpressionWithSnapshotFallback('sectionType.id', 'sectionType.itemEntityName');
 //#endregion
 
-//#region ----   Imports   ----
-/** Declarative section-type dependencies resolved from prior sections in plan order. */
-const WORKPLACE_SAFETY_SECTION_TYPE_DEPENDENCIES = {
-    HazardRisk: {
-        kind: 'parentFilter',
-        parentSectionTypeKey: 'Hazard',
-        filterField: 'hazardId',
-    },
-    PpeHazards: {
-        kind: 'parentFilter',
-        parentSectionTypeKey: 'Hazard',
-        filterField: 'hazardId',
-    },
-    HazardRiskPpe: {
-        kind: 'parentFilter',
-        parentSectionTypeKey: 'HazardRisk',
-        filterField: 'hazardRiskId',
-    },
-    RiskMatrix: {
-        kind: 'derivedFromParent',
-        parentSectionTypeKey: 'HazardRisk',
-        resolveField: 'riskMatrixId',
-        filterField: 'id',
-    },
-    Control: {
-        kind: 'derivedFromParent',
-        parentSectionTypeKey: 'HazardRisk',
-        resolveField: 'controlMeasureIds',
-        filterField: 'id',
-    },
-};
-/** Section types cleared when upstream hazard selections change. */
-const WORKPLACE_SAFETY_DOWNSTREAM_FROM_HAZARD = [
-    'HazardRisk',
-    'PpeHazards',
-    'HazardRiskPpe',
-    'RiskMatrix',
-    'Control',
-];
-/** Section types cleared when upstream hazard-risk selections change. */
-const WORKPLACE_SAFETY_DOWNSTREAM_FROM_HAZARD_RISK = [
-    'HazardRiskPpe',
-    'RiskMatrix',
-    'Control',
-];
-//#endregion
-//#region ----   Lookup helpers   ----
-const PARENT_HAZARD_IDS_CONTEXT_KEY = 'parentHazardIds';
-const PARENT_HAZARD_RISK_IDS_CONTEXT_KEY = 'parentHazardRiskIds';
-/** Expose paths when a section type is selected (shared by entity repeater and builder dialog). */
-const WORKPLACE_SAFETY_SECTION_TYPE_LOOKUP_EXPOSE = [
-    { source: 'id', target: 'sectionType.id' },
-    { source: 'title', target: 'sectionType.title' },
-    { source: 'code', target: 'sectionType.code' },
-    { source: 'description', target: 'sectionType.description' },
-    { source: 'isRepeatable', target: 'sectionType.isRepeatable' },
-];
-/** Auto-fill section description when section type is selected. */
-const WORKPLACE_SAFETY_SECTION_TYPE_DESCRIPTION_SYNC_TRIGGERS = [
-    {
-        event: "{{ events.context('sectionTypeId') }}",
-        action: "{{ const items = widget.output('selectedItems'); const selectedDescription = Array.isArray(items) ? items[0]?.description : undefined; const d = selectedDescription || context.eval('sectionType.description') || ''; context.set('sectionTypeDescription', d); const descriptionWidget = widget.find('sectionTypeDescription'); if (descriptionWidget) { descriptionWidget.setValue(d); } }}",
-    },
-    {
-        event: "{{ events.context('sectionType.description') }}",
-        action: "{{ const d = context.eval('sectionType.description') || ''; context.set('sectionTypeDescription', d); const descriptionWidget = widget.find('sectionTypeDescription'); if (descriptionWidget) { descriptionWidget.setValue(d); } }}",
-    },
-];
-/** Auto-fill section title when section type is selected. */
-const WORKPLACE_SAFETY_SECTION_TYPE_TITLE_SYNC_TRIGGERS = [
-    {
-        event: "{{ events.context('sectionTypeId') }}",
-        action: "{{ const items = widget.output('selectedItems'); const selectedTitle = Array.isArray(items) ? items[0]?.title : undefined; const t = selectedTitle || context.eval('sectionType.title') || ''; if (t) { context.set('title', t); const titleWidget = widget.find('title'); if (titleWidget) { titleWidget.setValue(t); } } }}",
-    },
-    {
-        event: "{{ events.context('sectionType.title') }}",
-        action: "{{ const t = context.eval('sectionType.title') || ''; if (t) { context.set('title', t); const titleWidget = widget.find('title'); if (titleWidget) { titleWidget.setValue(t); } } }}",
-    },
-];
-/** Shared lookup widget options for section type pickers (builder dialog and entity forms). */
-const WORKPLACE_SAFETY_SECTION_TYPE_LOOKUP_WIDGET_OPTIONS = {
-    look: 'select',
-    allowSearch: true,
-    textField: 'code',
-    textTemplate: '{code} — {description}',
-    valueField: 'id',
-    columns: ['code', 'title', 'description'],
-    expose: WORKPLACE_SAFETY_SECTION_TYPE_LOOKUP_EXPOSE,
-    triggers: [
-        ...WORKPLACE_SAFETY_SECTION_TYPE_TITLE_SYNC_TRIGGERS,
-        ...WORKPLACE_SAFETY_SECTION_TYPE_DESCRIPTION_SYNC_TRIGGERS,
-    ],
-};
-//#endregion
-//#region ----   Resolver API   ----
-function getSectionTypeDependency(sectionTypeKey) {
-    if (!sectionTypeKey) {
-        return undefined;
+/**
+ * Shared helpers for Safety Plan Section type identity (repeatable vs one-off).
+ * Leaf module — imports only other contract leaves (no client/server layers).
+ */
+//#region ---- Helpers ----
+function resolveRefId$1(raw) {
+    if (typeof raw === 'string' && raw.trim().length > 0) {
+        return raw.trim();
     }
-    return WORKPLACE_SAFETY_SECTION_TYPE_DEPENDENCIES[sectionTypeKey];
-}
-function sectionTypeKeyFromSection(section) {
-    const sectionTypeId = section.sectionTypeId || section.sectionType?.id;
-    const key = resolveSectionTypeKey(sectionTypeId, section.sectionType);
-    return key;
-}
-function collectSectionItemIds(section, sectionTypeKey) {
-    if (!section?.items?.length || sectionTypeKeyFromSection(section) !== sectionTypeKey) {
-        return [];
+    if (typeof raw === 'number' && Number.isFinite(raw)) {
+        return String(raw);
     }
-    const ids = new Set();
-    for (const item of section.items) {
-        for (const id of item.itemIds ?? []) {
-            if (typeof id === 'string' && id.length > 0) {
-                ids.add(id);
-            }
+    if (raw && typeof raw === 'object') {
+        const id = raw.id;
+        if (typeof id === 'string' && id.trim().length > 0) {
+            return id.trim();
         }
     }
-    return [...ids];
-}
-/** Collects item IDs from sections up to `sectionIndex` whose type matches `parentSectionTypeKey`. */
-function resolveParentItemIds(sections, sectionIndex, parentSectionTypeKey) {
-    const ids = new Set();
-    const lastIndex = Math.min(sectionIndex, sections.length - 1);
-    for (let index = 0; index <= lastIndex; index += 1) {
-        collectSectionItemIds(sections[index], parentSectionTypeKey).forEach((id) => ids.add(id));
-    }
-    return [...ids];
-}
-/** Collects hazard IDs from earlier sections and Hazard rows in the current section. */
-function resolveParentHazardIds(sections, sectionIndex, parentSectionTypeKey = 'Hazard') {
-    return resolveParentItemIds(sections, sectionIndex, parentSectionTypeKey);
-}
-/** Collects hazard-risk IDs from prior HazardRisk sections up to `sectionIndex`. */
-function resolveParentHazardRiskIds(sections, sectionIndex) {
-    return resolveParentItemIds(sections, sectionIndex, 'HazardRisk');
-}
-function parentItemSignature(sections, sectionIndex, parentSectionTypeKey) {
-    return resolveParentItemIds(sections, sectionIndex, parentSectionTypeKey).sort().join('|');
+    return '';
 }
-function shouldClearSectionOnParentChange(section, sectionIndex, changeIndex, parentTypeKey, downstreamTypes) {
-    if (sectionIndex < changeIndex) {
+/**
+ * True when this section type may appear more than once in a Safety Plan.
+ * Checks (in order): snapshot flag, explicit allow-list, built-in section type meta.
+ */
+function isSafetyPlanSectionTypeRepeatable(sectionTypeId, options) {
+    const id = resolveRefId$1(sectionTypeId);
+    if (!id) {
         return false;
     }
-    const sectionKey = sectionTypeKeyFromSection(section);
-    if (!sectionKey || !downstreamTypes.includes(sectionKey)) {
-        return false;
+    if (options?.sectionType?.isRepeatable === true) {
+        return true;
     }
-    if (sectionIndex === changeIndex && sectionKey === parentTypeKey) {
-        return false;
+    const allowList = new Set((options?.repeatableSectionTypeIds ?? []).map((entry) => resolveRefId$1(entry)).filter(Boolean));
+    if (allowList.has(id)) {
+        return true;
     }
-    return section.items.some((item) => (item.itemIds?.length ?? 0) > 0);
+    return WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_BY_ID[id]?.isRepeatable === true;
 }
-function clearSectionItems(section) {
-    return {
-        ...section,
-        items: section.items.map((item) => ({ ...item, itemIds: [], items: [] })),
-    };
+/** Built-in section type ids that are always treated as repeatable. */
+function collectBuiltInRepeatableSectionTypeIds() {
+    return Object.entries(WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_BY_ID)
+        .filter(([, meta]) => meta.isRepeatable === true)
+        .map(([id]) => id);
 }
-/**
- * When upstream hazard or hazard-risk selections change, clears item rows in later dependent sections.
- */
-function clearDependentItemsOnParentChange(previous, next) {
-    if (!next.sections.length) {
-        return next;
+//#endregion
+
+//#region ----   Imports   ----
+//#endregion
+//#region ----   Display helpers   ----
+/** Coerces a stored string or locale map into a single display string. */
+function asSafetyPlanDisplayText(value) {
+    if (typeof value === 'string') {
+        return value.trim();
     }
-    let changeIndex = next.sections.length;
-    let hazardChanged = false;
-    let hazardRiskChanged = false;
-    for (let index = 0; index < next.sections.length; index += 1) {
-        const prevHazardSig = parentItemSignature(previous.sections, index, 'Hazard');
-        const nextHazardSig = parentItemSignature(next.sections, index, 'Hazard');
-        if (prevHazardSig !== nextHazardSig) {
-            changeIndex = Math.min(changeIndex, index);
-            hazardChanged = true;
+    if (value && typeof value === 'object' && !Array.isArray(value)) {
+        const rec = value;
+        for (const locale of ['en-US', 'en-AU', 'en', 'fa-IR']) {
+            const part = rec[locale];
+            if (typeof part === 'string' && part.trim()) {
+                return part.trim();
+            }
         }
-        const prevRiskSig = parentItemSignature(previous.sections, index, 'HazardRisk');
-        const nextRiskSig = parentItemSignature(next.sections, index, 'HazardRisk');
-        if (prevRiskSig !== nextRiskSig) {
-            changeIndex = Math.min(changeIndex, index);
-            hazardRiskChanged = true;
+        for (const part of Object.values(rec)) {
+            if (typeof part === 'string' && part.trim()) {
+                return part.trim();
+            }
         }
     }
-    if (changeIndex === next.sections.length) {
-        return next;
-    }
+    return '';
+}
+function buildSectionTypeRelationSnapshot(sectionTypeId, snapshot) {
+    const title = asSafetyPlanDisplayText(snapshot?.title);
+    const code = asSafetyPlanDisplayText(snapshot?.code);
+    const description = asSafetyPlanDisplayText(snapshot?.description);
     return {
-        sections: next.sections.map((section, sectionIndex) => {
-            const clearFromHazard = hazardChanged &&
-                shouldClearSectionOnParentChange(section, sectionIndex, changeIndex, 'Hazard', WORKPLACE_SAFETY_DOWNSTREAM_FROM_HAZARD);
-            const clearFromHazardRisk = hazardRiskChanged &&
-                shouldClearSectionOnParentChange(section, sectionIndex, changeIndex, 'HazardRisk', WORKPLACE_SAFETY_DOWNSTREAM_FROM_HAZARD_RISK);
-            if (!clearFromHazard && !clearFromHazardRisk) {
-                return section;
-            }
-            return clearSectionItems(section);
-        }),
+        id: sectionTypeId,
+        ...(title ? { title } : {}),
+        ...(code ? { code } : {}),
+        ...(description ? { description } : {}),
+        ...(snapshot?.isRepeatable === true ? { isRepeatable: true } : {}),
     };
 }
-function extractRiskMatrixIdsFromHazardRisks(records) {
-    const ids = new Set();
-    for (const record of records) {
-        const id = record['riskMatrixId'];
-        if (typeof id === 'string' && id.length > 0) {
-            ids.add(id);
-        }
+function resolveSectionTypeTitle(sectionTypeId, sectionType) {
+    const title = asSafetyPlanDisplayText(sectionType?.title);
+    if (title) {
+        return title;
     }
-    return [...ids];
+    const code = asSafetyPlanDisplayText(sectionType?.code);
+    if (code) {
+        return code;
+    }
+    const builtIn = WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_BY_ID[sectionTypeId]?.sectionTypeKey;
+    if (builtIn) {
+        return builtIn;
+    }
+    return sectionTypeId;
 }
-function extractControlMeasureIdsFromHazardRisks(records) {
-    const ids = new Set();
-    for (const record of records) {
-        const rows = record['controlMeasureIds'];
-        if (!Array.isArray(rows)) {
-            continue;
-        }
-        for (const row of rows) {
-            if (!row || typeof row !== 'object') {
-                continue;
-            }
-            const entry = row;
-            const controlMeasure = entry['controlMeasure'];
-            const id = (typeof entry['controlMeasureId'] === 'string' && entry['controlMeasureId']) ||
-                (typeof controlMeasure?.['id'] === 'string' && controlMeasure['id']) ||
-                undefined;
-            if (id) {
-                ids.add(id);
-            }
-        }
+/**
+ * Title persisted on SafetyPlanSection. Never stores a bare UUID — the UI translate
+ * pipe treats unknown keys as empty, which made seeded section headers blank.
+ */
+function resolveSafetyPlanSectionPersistedTitle(sectionTitle, sectionTypeId, snapshot) {
+    const explicit = asSafetyPlanDisplayText(sectionTitle);
+    if (explicit && explicit !== sectionTypeId) {
+        return explicit;
     }
-    return [...ids];
+    const fromType = resolveSectionTypeTitle(sectionTypeId, snapshot);
+    if (fromType && fromType !== sectionTypeId) {
+        return fromType;
+    }
+    return 'Section';
 }
-function buildInFilter(field, values) {
-    const unique = [...new Set(values.filter((id) => id.length > 0))];
-    if (!unique.length) {
-        return null;
+//#endregion
+//#region ----   Ref helpers   ----
+/** True when a type-section row is marked as the plan-type default template. */
+function isSafetyPlanTypeSectionDefault(row) {
+    const value = row?.isDefault;
+    return value === true || value === 1 || value === 'true';
+}
+/** Extracts a stable entity id from a raw lookup / context value. */
+function resolveEntityRefId(raw) {
+    if (typeof raw === 'string' && raw.trim().length > 0) {
+        return raw.trim();
     }
-    return {
-        field,
-        operator: { type: 'in' },
-        value: unique,
-    };
+    if (typeof raw === 'number' && Number.isFinite(raw)) {
+        return String(raw);
+    }
+    if (raw && typeof raw === 'object') {
+        const id = raw.id;
+        if (typeof id === 'string' && id.trim().length > 0) {
+            return id.trim();
+        }
+    }
+    return null;
 }
-/** Filter that matches no records when parent context exists but derived IDs are empty. */
-function buildEmptyResultFilter(field) {
+function resolveSectionTypeId(typeRow) {
+    if (!typeRow) {
+        return '';
+    }
+    return (resolveEntityRefId(typeRow.sectionTypeId) ??
+        resolveEntityRefId(typeRow.sectionType) ??
+        resolveEntityRefId(typeRow.sectionType?.id) ??
+        '');
+}
+//#endregion
+//#region ----   Build from type sections   ----
+let structureIdSeq = 0;
+function nextStructureId(prefix) {
+    structureIdSeq += 1;
+    const rand = createRandomUuid();
+    return prefix ? `${prefix}-${rand}` : rand;
+}
+/**
+ * Builds an empty editable section structure from SafetyPlanTypeSection rows for one plan type.
+ *
+ * Uses `isDefault` rows when present; otherwise falls back to all active rows for that type
+ * (so a mis-flagged template still produces a structure). One plan section per `sectionTypeIds`
+ * entry, titled from the Section Type, ordered by type-section `sortOrder` then repeater order.
+ */
+function buildSectionStructureFromTypeSections(typeSections, options) {
+    const createId = options?.createId ?? (() => nextStructureId(''));
+    const active = typeSections
+        .filter((row) => row && row.isArchived !== true)
+        .slice()
+        .sort((a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0) || String(a.title ?? '').localeCompare(String(b.title ?? '')));
+    const defaults = active.filter((row) => isSafetyPlanTypeSectionDefault(row));
+    const sourceRows = defaults.length > 0 ? defaults : active;
+    const sections = [];
+    const seenSourceTypePairs = new Set();
+    let sortOrder = 1;
+    for (const typeSection of sourceRows) {
+        const typeRows = Array.isArray(typeSection.sectionTypeIds) ? typeSection.sectionTypeIds : [];
+        if (!typeRows.length) {
+            continue;
+        }
+        for (const typeRow of typeRows) {
+            const sectionTypeId = resolveSectionTypeId(typeRow);
+            if (!sectionTypeId) {
+                continue;
+            }
+            // One plan section per (type-section source, section type) — prevents
+            // accidental double expansion when the same type is listed twice.
+            const sourceId = typeof typeSection.id === 'string' ? typeSection.id : '';
+            const pairKey = sourceId ? `${sourceId}|${sectionTypeId}` : sectionTypeId;
+            if (seenSourceTypePairs.has(pairKey)) {
+                continue;
+            }
+            seenSourceTypePairs.add(pairKey);
+            const sectionType = buildSectionTypeRelationSnapshot(sectionTypeId, typeRow.sectionType);
+            const sectionId = createId();
+            sections.push({
+                id: sectionId,
+                sectionTypeId,
+                sectionType,
+                title: resolveSafetyPlanSectionPersistedTitle(undefined, sectionTypeId, sectionType),
+                description: asSafetyPlanDisplayText(sectionType.description),
+                sourceSafetyPlanTypeSectionId: typeSection.id,
+                sortOrder: sortOrder++,
+                required: isSafetyPlanTypeSectionDefault(typeSection) || defaults.length === 0,
+                items: [
+                    {
+                        id: `${sectionId}__item_1`,
+                        itemIds: [],
+                        items: [],
+                    },
+                ],
+            });
+        }
+    }
+    return { sections };
+}
+/**
+ * Removes accidental ghost rows from double materialization of the same type-section
+ * source. Distinct sections of the same type are kept. Reassigns contiguous 1-based
+ * `sortOrder` to preserve display order.
+ */
+function dedupeSafetyPlanSectionStructure(structure, _options) {
+    const sections = Array.isArray(structure?.sections)
+        ? structure.sections
+        : [];
+    const seenSourceTypePairs = new Set();
+    const deduped = [];
+    for (const section of sections) {
+        const sectionTypeId = resolveEntityRefId(section.sectionTypeId) ?? String(section.sectionTypeId ?? '').trim();
+        if (!sectionTypeId) {
+            continue;
+        }
+        const sourceId = String(section.sourceSafetyPlanTypeSectionId ?? '').trim();
+        const sourcePairKey = sourceId ? `${sourceId}|${sectionTypeId}` : '';
+        // Same type-section source + section type must never appear twice (double materialization).
+        if (sourcePairKey && seenSourceTypePairs.has(sourcePairKey)) {
+            continue;
+        }
+        if (sourcePairKey) {
+            seenSourceTypePairs.add(sourcePairKey);
+        }
+        deduped.push(section);
+    }
     return {
-        field,
-        operator: { type: 'in' },
-        value: ['00000000-0000-0000-0000-000000000000'],
+        ...structure,
+        sections: deduped.map((section, index) => ({
+            ...section,
+            sortOrder: index + 1,
+        })),
     };
 }
-function resolveSafetyPlanSectionItemFilter(sectionTypeId, parentHazardIds, parentHazardRiskIds = []) {
-    const sectionTypeKey = resolveSectionTypeKey(sectionTypeId);
-    const dependency = getSectionTypeDependency(sectionTypeKey);
-    if (!dependency || dependency.kind !== 'parentFilter') {
-        return null;
+function collectAllowedSectionTypeIds(typeSections) {
+    const ids = new Set();
+    for (const typeSection of typeSections) {
+        if (typeSection.isArchived === true) {
+            continue;
+        }
+        for (const row of typeSection.sectionTypeIds ?? []) {
+            const id = resolveSectionTypeId(row);
+            if (id) {
+                ids.add(id);
+            }
+        }
     }
-    const parentIds = dependency.parentSectionTypeKey === 'Hazard' ? parentHazardIds : parentHazardRiskIds;
-    if (!parentIds.length) {
-        return null;
+    return [...ids];
+}
+function collectRequiredSourceTypeSectionIds(typeSections) {
+    return typeSections
+        .filter((row) => row.isArchived !== true && isSafetyPlanTypeSectionDefault(row))
+        .map((row) => row.id)
+        .filter((id) => typeof id === 'string' && id.length > 0);
+}
+/**
+ * Validates that a plan-type section template does not list the same
+ * non-repeatable section type more than once (across rows and within a single row's repeater).
+ */
+function validateSafetyPlanTypeSectionTemplate(typeSections, repeatableSectionTypeIds = []) {
+    const seen = new Map();
+    const issues = [];
+    for (const typeSection of typeSections) {
+        if (typeSection.isArchived === true) {
+            continue;
+        }
+        for (const row of typeSection.sectionTypeIds ?? []) {
+            const sectionTypeId = resolveSectionTypeId(row);
+            if (!sectionTypeId ||
+                isSafetyPlanSectionTypeRepeatable(sectionTypeId, {
+                    repeatableSectionTypeIds,
+                    sectionType: row.sectionType,
+                })) {
+                continue;
+            }
+            const sectionTypeTitle = resolveSafetyPlanSectionPersistedTitle(undefined, sectionTypeId, row.sectionType);
+            if (seen.has(sectionTypeId)) {
+                issues.push({
+                    code: 'INVALID_TYPE_SECTION_TEMPLATE',
+                    messageKey: '@workplacesafety-management:safety-plans.messages.section-structure.invalid-type-template-duplicate',
+                    details: {
+                        sectionTypeId,
+                        sectionTypeTitle,
+                        sourceSafetyPlanTypeSectionId: typeSection.id,
+                        previousSourceSafetyPlanTypeSectionId: seen.get(sectionTypeId)?.sourceSafetyPlanTypeSectionId,
+                    },
+                });
+                continue;
+            }
+            seen.set(sectionTypeId, {
+                title: sectionTypeTitle,
+                sourceSafetyPlanTypeSectionId: typeSection.id,
+            });
+        }
     }
-    return buildInFilter(dependency.filterField, parentIds);
+    return issues;
 }
-async function resolveSafetyPlanSectionItemFilterAsync(sectionTypeId, sections, sectionIndex, loadHazardRisks) {
-    const sectionTypeKey = resolveSectionTypeKey(sectionTypeId);
-    const dependency = getSectionTypeDependency(sectionTypeKey);
-    if (!dependency) {
-        return null;
+//#endregion
+//#region ----   Validation   ----
+function validateSafetyPlanSectionStructure(structure, context) {
+    const sections = Array.isArray(structure?.sections) ? structure.sections : [];
+    const issues = [];
+    const presentSourceIds = new Set(sections
+        .map((s) => s.sourceSafetyPlanTypeSectionId)
+        .filter((id) => typeof id === 'string' && id.length > 0));
+    for (const requiredSourceId of context.requiredSourceTypeSectionIds) {
+        if (!presentSourceIds.has(requiredSourceId)) {
+            issues.push({
+                code: 'REQUIRED_SECTION_MISSING',
+                messageKey: '@workplacesafety-management:safety-plans.messages.section-structure.required-section-missing',
+                details: { sourceSafetyPlanTypeSectionId: requiredSourceId },
+            });
+        }
     }
-    if (dependency.kind === 'parentFilter') {
-        const parentIds = resolveParentItemIds(sections, sectionIndex, dependency.parentSectionTypeKey);
-        if (!parentIds.length) {
-            return null;
+    const allowed = new Set(context.allowedSectionTypeIds);
+    const sortOrders = [];
+    for (const section of sections) {
+        const sectionTypeId = resolveEntityRefId(section.sectionTypeId) ??
+            String(section.sectionTypeId ?? '').trim();
+        if (!sectionTypeId) {
+            continue;
+        }
+        const sectionType = section
+            .sectionType;
+        const sectionTypeTitle = resolveSafetyPlanSectionPersistedTitle(undefined, sectionTypeId, sectionType);
+        if (allowed.size > 0 && !allowed.has(sectionTypeId)) {
+            issues.push({
+                code: 'SECTION_TYPE_NOT_ALLOWED',
+                messageKey: '@workplacesafety-management:safety-plans.messages.section-structure.section-type-not-allowed',
+                details: { sectionTypeId, sectionTypeTitle, sectionId: section.id },
+            });
+        }
+        const sortOrder = section.sortOrder;
+        if (typeof sortOrder === 'number' && Number.isFinite(sortOrder)) {
+            sortOrders.push(sortOrder);
         }
-        return buildInFilter(dependency.filterField, parentIds);
     }
-    const parentIds = resolveParentItemIds(sections, sectionIndex, dependency.parentSectionTypeKey);
-    if (!parentIds.length) {
-        return null;
+    if (sortOrders.length !== sections.length) {
+        issues.push({
+            code: 'INVALID_SORT_ORDER',
+            messageKey: '@workplacesafety-management:safety-plans.messages.section-structure.invalid-sort-order',
+        });
     }
-    const records = await loadHazardRisks(parentIds);
-    const derivedIds = dependency.resolveField === 'riskMatrixId'
-        ? extractRiskMatrixIdsFromHazardRisks(records)
-        : extractControlMeasureIdsFromHazardRisks(records);
-    if (!derivedIds.length) {
-        return buildEmptyResultFilter(dependency.filterField);
+    else {
+        const unique = new Set(sortOrders);
+        if (unique.size !== sortOrders.length) {
+            issues.push({
+                code: 'INVALID_SORT_ORDER',
+                messageKey: '@workplacesafety-management:safety-plans.messages.section-structure.invalid-sort-order',
+                details: { reason: 'duplicate' },
+            });
+        }
     }
-    return buildInFilter(dependency.filterField, derivedIds);
+    return issues;
 }
-const defaultItemIdsPlaceholderKey = '@workplacesafety-management:safety-plan-sections.entities.safety-plan-section.fields.item-ids.placeholder';
-/** Clears item selection when section type changes in item dialog context. */
-const WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_CLEAR_ON_SECTION_TYPE_TRIGGERS = [
-    {
-        event: "{{ events.context('sectionType.id') }}",
-        action: "{{ widget.setValue([]); context.set('items', []); }}",
+function toBuilderValueFromStructure(structure) {
+    return {
+        sections: structure.sections.map((section) => ({
+            id: section.id,
+            sectionTypeId: section.sectionTypeId,
+            sectionType: section.sectionType,
+            title: section.title,
+            description: section.description ?? '',
+            safetyPlanId: section.safetyPlanId,
+            code: section.code,
+            sourceSafetyPlanTypeSectionId: section.sourceSafetyPlanTypeSectionId,
+            sortOrder: section.sortOrder,
+            required: section.required,
+            items: section.items.map((item) => ({
+                id: item.id,
+                itemIds: [...(item.itemIds ?? [])],
+                items: item.items ? [...item.items] : [],
+            })),
+        })),
+    };
+}
+//#endregion
+
+//#region ----   Imports   ----
+/** Declarative section-type dependencies resolved from prior sections in plan order. */
+const WORKPLACE_SAFETY_SECTION_TYPE_DEPENDENCIES = {
+    HazardRisk: {
+        kind: 'parentFilter',
+        parentSectionTypeKey: 'Hazard',
+        filterField: 'hazardId',
+    },
+    PpeHazards: {
+        kind: 'parentFilter',
+        parentSectionTypeKey: 'Hazard',
+        filterField: 'hazardId',
+    },
+    HazardRiskPpe: {
+        kind: 'parentFilter',
+        parentSectionTypeKey: 'HazardRisk',
+        filterField: 'hazardRiskId',
     },
+    RiskMatrix: {
+        kind: 'derivedFromParent',
+        parentSectionTypeKey: 'HazardRisk',
+        resolveField: 'riskMatrixId',
+        filterField: 'id',
+    },
+};
+/** Section types cleared when upstream hazard selections change. */
+const WORKPLACE_SAFETY_DOWNSTREAM_FROM_HAZARD = [
+    'HazardRisk',
+    'PpeHazards',
+    'HazardRiskPpe',
+    'RiskMatrix',
+];
+/** Section types cleared when upstream hazard-risk selections change. */
+const WORKPLACE_SAFETY_DOWNSTREAM_FROM_HAZARD_RISK = [
+    'HazardRiskPpe',
+    'RiskMatrix',
+];
+//#endregion
+//#region ----   Lookup helpers   ----
+const PARENT_HAZARD_IDS_CONTEXT_KEY = 'parentHazardIds';
+const PARENT_HAZARD_RISK_IDS_CONTEXT_KEY = 'parentHazardRiskIds';
+/** Expose paths when a section type is selected (shared by entity repeater and builder dialog). */
+const WORKPLACE_SAFETY_SECTION_TYPE_LOOKUP_EXPOSE = [
+    { source: 'id', target: 'sectionType.id' },
+    { source: 'title', target: 'sectionType.title' },
+    { source: 'code', target: 'sectionType.code' },
+    { source: 'description', target: 'sectionType.description' },
+    { source: 'isRepeatable', target: 'sectionType.isRepeatable' },
+];
+/** Auto-fill section description when section type is selected. */
+const WORKPLACE_SAFETY_SECTION_TYPE_DESCRIPTION_SYNC_TRIGGERS = [
     {
         event: "{{ events.context('sectionTypeId') }}",
-        action: "{{ widget.setValue([]); context.set('items', []); }}",
+        action: "{{ const items = widget.output('selectedItems'); const selectedDescription = Array.isArray(items) ? items[0]?.description : undefined; const d = selectedDescription || context.eval('sectionType.description') || ''; context.set('sectionTypeDescription', d); const descriptionWidget = widget.find('sectionTypeDescription'); if (descriptionWidget) { descriptionWidget.setValue(d); } }}",
     },
-];
-/**
- * Reloads lookup data after section type is resolved (`sectionType.id`, `itemEntityName`).
- */
-const WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_REFRESH_ON_SECTION_TYPE_EXPOSE_TRIGGERS = [
     {
-        event: "{{ events.context('sectionType.id') }}",
-        action: '{{ widget.refresh(); }}',
+        event: "{{ events.context('sectionType.description') }}",
+        action: "{{ const d = context.eval('sectionType.description') || ''; context.set('sectionTypeDescription', d); const descriptionWidget = widget.find('sectionTypeDescription'); if (descriptionWidget) { descriptionWidget.setValue(d); } }}",
     },
+];
+/** Auto-fill section title when section type is selected. */
+const WORKPLACE_SAFETY_SECTION_TYPE_TITLE_SYNC_TRIGGERS = [
     {
-        event: "{{ events.context('sectionType.itemEntityName') }}",
-        action: '{{ widget.refresh(); }}',
+        event: "{{ events.context('sectionTypeId') }}",
+        action: "{{ const items = widget.output('selectedItems'); const selectedTitle = Array.isArray(items) ? items[0]?.title : undefined; const t = selectedTitle || context.eval('sectionType.title') || ''; if (t) { context.set('title', t); const titleWidget = widget.find('title'); if (titleWidget) { titleWidget.setValue(t); } } }}",
     },
     {
-        event: "{{ events.context('sectionTypeId') }}",
-        action: '{{ widget.refresh(); }}',
+        event: "{{ events.context('sectionType.title') }}",
+        action: "{{ const t = context.eval('sectionType.title') || ''; if (t) { context.set('title', t); const titleWidget = widget.find('title'); if (titleWidget) { titleWidget.setValue(t); } } }}",
     },
 ];
-const WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_SECTION_TYPE_TRIGGERS = [
-    ...WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_CLEAR_ON_SECTION_TYPE_TRIGGERS,
-    ...WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_REFRESH_ON_SECTION_TYPE_EXPOSE_TRIGGERS,
-];
-function isPpeRuleSectionType(sectionTypeId) {
-    return (sectionTypeId === WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.ppeHazards ||
-        sectionTypeId === WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.hazardRiskPpe);
-}
-function buildSectionTypeItemTextFieldExpression(sectionTypeIdPath) {
-    const ppeHazardsId = WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.ppeHazards;
-    const hazardRiskPpeId = WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.hazardRiskPpe;
-    return `{{ [ '${ppeHazardsId}', '${hazardRiskPpeId}' ].includes(context.eval('${sectionTypeIdPath}')) ? 'ppeItem.title' : 'title' }}`;
-}
-function buildSectionTypeItemColumnsExpression(sectionTypeIdPath) {
-    const ppeHazardsId = WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.ppeHazards;
-    const hazardRiskPpeId = WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.hazardRiskPpe;
-    return `{{ [ '${ppeHazardsId}', '${hazardRiskPpeId}' ].includes(context.eval('${sectionTypeIdPath}')) ? ['code', 'ppeItem.title', 'requirementType'] : ['code', 'title'] }}`;
-}
-function buildSectionTypeDependentParentFilter(sectionTypeIdPath, parentIdsContextKey, parentSectionTypeKey) {
-    const dependentSectionTypeIds = Object.entries(WORKPLACE_SAFETY_SECTION_TYPE_DEPENDENCIES)
-        .filter(([, config]) => config.kind === 'parentFilter' && config.parentSectionTypeKey === parentSectionTypeKey)
-        .map(([key]) => {
-        const id = Object.entries(WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_BY_ID).find(([, meta]) => meta.sectionTypeKey === key)?.[0];
-        return id ? `'${id}'` : undefined;
-    })
-        .filter((id) => Boolean(id))
-        .join(',');
-    return {
-        field: parentSectionTypeKey === 'Hazard' ? 'hazardId' : 'hazardRiskId',
-        operator: { type: 'in' },
-        value: `{{ [${dependentSectionTypeIds}].includes(context.eval('${sectionTypeIdPath}')) ? ((context.eval('${parentIdsContextKey}') || []).length ? context.eval('${parentIdsContextKey}') : undefined) : undefined }}`,
-    };
-}
-function buildSectionTypeDependentHazardFilter(sectionTypeIdPath, parentHazardIdsContextKey) {
-    return buildSectionTypeDependentParentFilter(sectionTypeIdPath, parentHazardIdsContextKey, 'Hazard');
-}
-const sectionItemLookupExpose = [
-    { source: 'id', target: 'items.{id}' },
-    { source: 'title', target: 'items.{title}' },
-    { source: 'code', target: 'items.{code}' },
-    { source: 'ppeItem.id', target: 'items.{id}' },
-    { source: 'ppeItem.title', target: 'items.{title}' },
-    { source: 'ppeItem.code', target: 'items.{code}' },
-];
-/** Shared item lookup options for builder item dialog (`sectionType.*` in dialog context). */
-function buildSafetyPlanSectionItemLookupOptions(entityExpression, options) {
-    const sectionTypeIdPath = options?.sectionTypeIdPath ?? 'sectionType.id';
-    const lookup = {
-        entity: entityExpression,
-        look: 'lookup',
-        multiple: true,
-        allowSearch: true,
-        textField: buildSectionTypeItemTextFieldExpression(sectionTypeIdPath),
-        columns: buildSectionTypeItemColumnsExpression(sectionTypeIdPath),
-        placeholder: options?.defaultPlaceholderKey ?? defaultItemIdsPlaceholderKey,
-        expose: sectionItemLookupExpose,
-        triggers: WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_SECTION_TYPE_TRIGGERS,
-    };
-    const filters = [];
-    if (options?.parentHazardIdsContextKey) {
-        filters.push(buildSectionTypeDependentHazardFilter(sectionTypeIdPath, options.parentHazardIdsContextKey));
-    }
-    if (options?.parentHazardRiskIdsContextKey) {
-        filters.push(buildSectionTypeDependentParentFilter(sectionTypeIdPath, options.parentHazardRiskIdsContextKey, 'HazardRisk'));
-    }
-    if (filters.length === 1) {
-        lookup['filter'] = filters[0];
-    }
-    else if (filters.length > 1) {
-        lookup['filter'] = { logic: 'and', filters };
+/** Shared lookup widget options for section type pickers (builder dialog and entity forms). */
+const WORKPLACE_SAFETY_SECTION_TYPE_LOOKUP_WIDGET_OPTIONS = {
+    look: 'select',
+    allowSearch: true,
+    textField: 'code',
+    textTemplate: '{code} — {description}',
+    valueField: 'id',
+    columns: ['code', 'title', 'description'],
+    expose: WORKPLACE_SAFETY_SECTION_TYPE_LOOKUP_EXPOSE,
+    triggers: [
+        ...WORKPLACE_SAFETY_SECTION_TYPE_TITLE_SYNC_TRIGGERS,
+        ...WORKPLACE_SAFETY_SECTION_TYPE_DESCRIPTION_SYNC_TRIGGERS,
+    ],
+};
+//#endregion
+//#region ----   Resolver API   ----
+function getSectionTypeDependency(sectionTypeKey) {
+    if (!sectionTypeKey) {
+        return undefined;
     }
-    return lookup;
+    return WORKPLACE_SAFETY_SECTION_TYPE_DEPENDENCIES[sectionTypeKey];
 }
-/** Lookup options with entity data-selector popup UI (`look: 'lookup'`). */
-function buildSafetyPlanSectionItemSelectorOptions(entityExpression, options) {
-    return {
-        ...buildSafetyPlanSectionItemLookupOptions(entityExpression, options),
-        look: 'lookup',
-    };
+function sectionTypeKeyFromSection(section) {
+    const sectionTypeId = section.sectionTypeId || section.sectionType?.id;
+    const key = resolveSectionTypeKey(sectionTypeId, section.sectionType);
+    return key;
 }
-function resolveSafetyPlanSectionItemColumns(sectionTypeId) {
-    if (sectionTypeId === WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.ppeHazards) {
-        return ['code', 'ppeItem.title', 'requirementType'];
-    }
-    if (sectionTypeId === WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.hazardRiskPpe) {
-        return ['code', 'hazardRisk.title', 'ppeItem.title', 'requirementType'];
-    }
-    if (sectionTypeId === WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.riskMatrix) {
-        return ['code', 'title'];
+function collectSectionItemIds(section, sectionTypeKey) {
+    if (!section?.items?.length || sectionTypeKeyFromSection(section) !== sectionTypeKey) {
+        return [];
     }
-    return ['code', 'title'];
-}
-function resolveSafetyPlanSectionItemEntityKey(sectionTypeId, sectionType) {
-    return resolveSectionItemEntityName(sectionTypeId, sectionType);
-}
-function mapSafetyPlanSectionSelectedItems(sectionTypeId, selectedItems) {
-    const isPpeHazards = sectionTypeId === WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.ppeHazards;
-    const isHazardRiskPpe = sectionTypeId === WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.hazardRiskPpe;
-    return selectedItems
-        .map((item) => {
-        if (isPpeHazards || isHazardRiskPpe) {
-            const ppeItem = item['ppeItem'];
-            const id = String(ppeItem?.['id'] ?? item['id'] ?? '');
-            return {
-                id,
-                title: typeof ppeItem?.['title'] === 'string' ? ppeItem['title'] : undefined,
-                code: typeof ppeItem?.['code'] === 'string' ? ppeItem['code'] : undefined,
-            };
+    const ids = new Set();
+    for (const item of section.items) {
+        for (const id of item.itemIds ?? []) {
+            if (typeof id === 'string' && id.length > 0) {
+                ids.add(id);
+            }
         }
-        return {
-            id: String(item['id'] ?? ''),
-            title: typeof item['title'] === 'string' ? item['title'] : undefined,
-            code: typeof item['code'] === 'string' ? item['code'] : undefined,
-        };
-    })
-        .filter((item) => item.id.length > 0);
+    }
+    return [...ids];
 }
-function dedupeSafetyPlanSectionItemSelection(item) {
-    const seen = new Set();
-    const itemIds = [];
-    const items = [];
-    for (let index = 0; index < (item.itemIds?.length ?? 0); index += 1) {
-        const id = item.itemIds?.[index];
-        if (typeof id !== 'string' || !id || seen.has(id)) {
-            continue;
-        }
-        seen.add(id);
-        itemIds.push(id);
-        const snapshot = item.items?.[index];
-        items.push(snapshot?.id === id ? snapshot : { id });
+/** Collects item IDs from sections up to `sectionIndex` whose type matches `parentSectionTypeKey`. */
+function resolveParentItemIds(sections, sectionIndex, parentSectionTypeKey) {
+    const ids = new Set();
+    const lastIndex = Math.min(sectionIndex, sections.length - 1);
+    for (let index = 0; index <= lastIndex; index += 1) {
+        collectSectionItemIds(sections[index], parentSectionTypeKey).forEach((id) => ids.add(id));
     }
-    return { ...item, itemIds, items };
+    return [...ids];
 }
-function isPpeRuleSectionTypeId(sectionTypeId) {
-    return isPpeRuleSectionType(sectionTypeId);
+/** Collects hazard IDs from earlier sections and Hazard rows in the current section. */
+function resolveParentHazardIds(sections, sectionIndex, parentSectionTypeKey = 'Hazard') {
+    return resolveParentItemIds(sections, sectionIndex, parentSectionTypeKey);
 }
-//#endregion
-
-/** Component key for the safety plan Sections page tab. Register via AXP_PAGE_COMPONENT_PROVIDER. */
-const SAFETY_PLAN_SECTIONS_PAGE_COMPONENT_KEY = 'safety-plan-sections-page';
-
-//#region ----   Safety plan section builder value types   ----
-//#endregion
-
-/**
- * Shared helpers for Safety Plan Section uniqueness (section type per plan).
- * Leaf module — imports only other contract leaves (no client/server layers).
- */
-//#region ---- Constants ----
-const SAFETY_PLAN_SECTION_DUPLICATE_SECTION_TYPE_MESSAGE_KEY = '@workplacesafety-management:safety-plan-sections.messages.duplicate-section-type';
-/** Stable API / middleware error code for duplicate section type in a plan. */
-const SAFETY_PLAN_SECTION_DUPLICATE_SECTION_TYPE_CODE = 'SAFETY_PLAN_SECTION_DUPLICATE_SECTION_TYPE';
-//#endregion
-//#region ---- Helpers ----
-function resolveRefId$1(raw) {
-    if (typeof raw === 'string' && raw.trim().length > 0) {
-        return raw.trim();
-    }
-    if (typeof raw === 'number' && Number.isFinite(raw)) {
-        return String(raw);
-    }
-    if (raw && typeof raw === 'object') {
-        const id = raw.id;
-        if (typeof id === 'string' && id.trim().length > 0) {
-            return id.trim();
-        }
-    }
-    return '';
+/** Collects hazard-risk IDs from prior HazardRisk sections up to `sectionIndex`. */
+function resolveParentHazardRiskIds(sections, sectionIndex) {
+    return resolveParentItemIds(sections, sectionIndex, 'HazardRisk');
 }
-/** Resolves the section type id from a plan section identity or nested snapshot. */
-function resolveSafetyPlanSectionTypeId(section) {
-    return resolveRefId$1(section.sectionTypeId) || resolveRefId$1(section.sectionType);
+function parentItemSignature(sections, sectionIndex, parentSectionTypeKey) {
+    return resolveParentItemIds(sections, sectionIndex, parentSectionTypeKey).sort().join('|');
 }
-/**
- * True when this section type may appear more than once in a Safety Plan.
- * Checks (in order): snapshot flag, explicit allow-list, built-in section type meta.
- */
-function isSafetyPlanSectionTypeRepeatable(sectionTypeId, options) {
-    const id = resolveRefId$1(sectionTypeId);
-    if (!id) {
+function shouldClearSectionOnParentChange(section, sectionIndex, changeIndex, parentTypeKey, downstreamTypes) {
+    if (sectionIndex < changeIndex) {
         return false;
     }
-    if (options?.sectionType?.isRepeatable === true) {
-        return true;
+    const sectionKey = sectionTypeKeyFromSection(section);
+    if (!sectionKey || !downstreamTypes.includes(sectionKey)) {
+        return false;
     }
-    const allowList = new Set((options?.repeatableSectionTypeIds ?? []).map((entry) => resolveRefId$1(entry)).filter(Boolean));
-    if (allowList.has(id)) {
-        return true;
+    if (sectionIndex === changeIndex && sectionKey === parentTypeKey) {
+        return false;
     }
-    return WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_BY_ID[id]?.isRepeatable === true;
-}
-/** Built-in section type ids that are always treated as repeatable. */
-function collectBuiltInRepeatableSectionTypeIds() {
-    return Object.entries(WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_BY_ID)
-        .filter(([, meta]) => meta.isRepeatable === true)
-        .map(([id]) => id);
+    return section.items.some((item) => (item.itemIds?.length ?? 0) > 0);
+}
+function clearSectionItems(section) {
+    return {
+        ...section,
+        items: section.items.map((item) => ({ ...item, itemIds: [], items: [] })),
+    };
 }
-//#endregion
-//#region ---- Validation ----
 /**
- * Returns the first duplicate non-repeatable `sectionTypeId` in the list, or `null`
- * when all non-repeatable types are unique. Empty / missing section type ids are ignored.
- * Repeatable section types are allowed to appear more than once.
+ * When upstream hazard or hazard-risk selections change, clears item rows in later dependent sections.
  */
-function findDuplicateSafetyPlanSectionTypeId(sections, options) {
-    const excludeId = options?.excludeSectionId?.trim() || '';
-    const seen = new Set();
-    for (const section of sections) {
-        const id = resolveRefId$1(section.id);
-        if (excludeId && id === excludeId) {
-            continue;
-        }
-        const sectionTypeId = resolveSafetyPlanSectionTypeId(section);
-        if (!sectionTypeId ||
-            isSafetyPlanSectionTypeRepeatable(sectionTypeId, {
-                repeatableSectionTypeIds: options?.repeatableSectionTypeIds,
-                sectionType: section.sectionType,
-            })) {
-            continue;
+function clearDependentItemsOnParentChange(previous, next) {
+    if (!next.sections.length) {
+        return next;
+    }
+    let changeIndex = next.sections.length;
+    let hazardChanged = false;
+    let hazardRiskChanged = false;
+    for (let index = 0; index < next.sections.length; index += 1) {
+        const prevHazardSig = parentItemSignature(previous.sections, index, 'Hazard');
+        const nextHazardSig = parentItemSignature(next.sections, index, 'Hazard');
+        if (prevHazardSig !== nextHazardSig) {
+            changeIndex = Math.min(changeIndex, index);
+            hazardChanged = true;
         }
-        if (seen.has(sectionTypeId)) {
-            return sectionTypeId;
+        const prevRiskSig = parentItemSignature(previous.sections, index, 'HazardRisk');
+        const nextRiskSig = parentItemSignature(next.sections, index, 'HazardRisk');
+        if (prevRiskSig !== nextRiskSig) {
+            changeIndex = Math.min(changeIndex, index);
+            hazardRiskChanged = true;
         }
-        seen.add(sectionTypeId);
     }
-    return null;
-}
-/**
- * True when `sectionTypeId` already appears on another section in the collection
- * and the type is not repeatable.
- */
-function safetyPlanSectionTypeAlreadyExists(sections, sectionTypeId, options) {
-    const target = resolveRefId$1(sectionTypeId);
-    if (!target) {
-        return false;
-    }
-    if (isSafetyPlanSectionTypeRepeatable(target, {
-        repeatableSectionTypeIds: options?.repeatableSectionTypeIds,
-        sectionType: options?.sectionType,
-    })) {
-        return false;
+    if (changeIndex === next.sections.length) {
+        return next;
     }
-    const excludeId = options?.excludeSectionId?.trim() || '';
-    return sections.some((section) => {
-        const id = resolveRefId$1(section.id);
-        if (excludeId && id === excludeId) {
-            return false;
-        }
-        return resolveSafetyPlanSectionTypeId(section) === target;
-    });
+    return {
+        sections: next.sections.map((section, sectionIndex) => {
+            const clearFromHazard = hazardChanged &&
+                shouldClearSectionOnParentChange(section, sectionIndex, changeIndex, 'Hazard', WORKPLACE_SAFETY_DOWNSTREAM_FROM_HAZARD);
+            const clearFromHazardRisk = hazardRiskChanged &&
+                shouldClearSectionOnParentChange(section, sectionIndex, changeIndex, 'HazardRisk', WORKPLACE_SAFETY_DOWNSTREAM_FROM_HAZARD_RISK);
+            if (!clearFromHazard && !clearFromHazardRisk) {
+                return section;
+            }
+            return clearSectionItems(section);
+        }),
+    };
 }
-//#endregion
-
-//#region ----   Imports   ----
-function resolveSectionTypeTitle(sectionTypeId, sectionType) {
-    if (typeof sectionType?.title === 'string' && sectionType.title.trim()) {
-        return sectionType.title.trim();
+function extractRiskMatrixIdsFromHazardRisks(records) {
+    const ids = new Set();
+    for (const record of records) {
+        const id = record['riskMatrixId'];
+        if (typeof id === 'string' && id.length > 0) {
+            ids.add(id);
+        }
     }
-    if (typeof sectionType?.code === 'string' && sectionType.code.trim()) {
-        return sectionType.code.trim();
+    return [...ids];
+}
+function buildInFilter(field, values) {
+    const unique = [...new Set(values.filter((id) => id.length > 0))];
+    if (!unique.length) {
+        return null;
     }
-    return sectionTypeId;
+    return {
+        field,
+        operator: { type: 'in' },
+        value: unique,
+    };
 }
-/** True when a type-section row is marked as the plan-type default template. */
-function isSafetyPlanTypeSectionDefault(row) {
-    const value = row?.isDefault;
-    return value === true || value === 1 || value === 'true';
+/** Filter that matches no records when parent context exists but derived IDs are empty. */
+function buildEmptyResultFilter(field) {
+    return {
+        field,
+        operator: { type: 'in' },
+        value: ['00000000-0000-0000-0000-000000000000'],
+    };
 }
-/** Extracts a stable entity id from a raw lookup / context value. */
-function resolveEntityRefId(raw) {
-    if (typeof raw === 'string' && raw.trim().length > 0) {
-        return raw.trim();
+function resolveSafetyPlanSectionItemFilter(sectionTypeId, parentHazardIds, parentHazardRiskIds = []) {
+    const sectionTypeKey = resolveSectionTypeKey(sectionTypeId);
+    const dependency = getSectionTypeDependency(sectionTypeKey);
+    if (!dependency || dependency.kind !== 'parentFilter') {
+        return null;
     }
-    if (typeof raw === 'number' && Number.isFinite(raw)) {
-        return String(raw);
+    const parentIds = dependency.parentSectionTypeKey === 'Hazard' ? parentHazardIds : parentHazardRiskIds;
+    if (!parentIds.length) {
+        return null;
     }
-    if (raw && typeof raw === 'object') {
-        const id = raw.id;
-        if (typeof id === 'string' && id.trim().length > 0) {
-            return id.trim();
+    return buildInFilter(dependency.filterField, parentIds);
+}
+async function resolveSafetyPlanSectionItemFilterAsync(sectionTypeId, sections, sectionIndex, loadHazardRisks) {
+    const sectionTypeKey = resolveSectionTypeKey(sectionTypeId);
+    const dependency = getSectionTypeDependency(sectionTypeKey);
+    if (!dependency) {
+        return null;
+    }
+    if (dependency.kind === 'parentFilter') {
+        const parentIds = resolveParentItemIds(sections, sectionIndex, dependency.parentSectionTypeKey);
+        if (!parentIds.length) {
+            return null;
         }
+        return buildInFilter(dependency.filterField, parentIds);
     }
-    return null;
-}
-function resolveSectionTypeId(typeRow) {
-    if (!typeRow) {
-        return '';
+    const parentIds = resolveParentItemIds(sections, sectionIndex, dependency.parentSectionTypeKey);
+    if (!parentIds.length) {
+        return null;
     }
-    return (resolveEntityRefId(typeRow.sectionTypeId) ??
-        resolveEntityRefId(typeRow.sectionType) ??
-        resolveEntityRefId(typeRow.sectionType?.id) ??
-        '');
-}
-//#endregion
-//#region ----   Build from type sections   ----
-let structureIdSeq = 0;
-function nextStructureId(prefix) {
-    structureIdSeq += 1;
-    const rand = typeof crypto !== 'undefined' && 'randomUUID' in crypto
-        ? crypto.randomUUID()
-        : `00000000-0000-4000-8000-${String(structureIdSeq).padStart(12, '0')}`;
-    return prefix ? `${prefix}-${rand}` : rand;
+    const records = await loadHazardRisks(parentIds);
+    const derivedIds = extractRiskMatrixIdsFromHazardRisks(records);
+    if (!derivedIds.length) {
+        return buildEmptyResultFilter(dependency.filterField);
+    }
+    return buildInFilter(dependency.filterField, derivedIds);
 }
+const defaultItemIdsPlaceholderKey = '@workplacesafety-management:safety-plan-sections.entities.safety-plan-section.fields.item-ids.placeholder';
+/** Clears item selection when section type changes in item dialog context. */
+const WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_CLEAR_ON_SECTION_TYPE_TRIGGERS = [
+    {
+        event: "{{ events.context('sectionType.id') }}",
+        action: "{{ widget.setValue([]); context.set('items', []); }}",
+    },
+    {
+        event: "{{ events.context('sectionTypeId') }}",
+        action: "{{ widget.setValue([]); context.set('items', []); }}",
+    },
+];
 /**
- * Builds an empty editable section structure from SafetyPlanTypeSection rows for one plan type.
- *
- * Uses `isDefault` rows when present; otherwise falls back to all active rows for that type
- * (so a mis-flagged template still produces a structure). One plan section per `sectionTypeIds`
- * entry, titled from the Section Type, ordered by type-section `sortOrder` then repeater order.
+ * Reloads lookup data after section type is resolved (`sectionType.id`, `itemEntityName`).
  */
-function buildSectionStructureFromTypeSections(typeSections, options) {
-    const createId = options?.createId ?? (() => nextStructureId(''));
-    const active = typeSections
-        .filter((row) => row && row.isArchived !== true)
-        .slice()
-        .sort((a, b) => (a.sortOrder ?? 0) - (b.sortOrder ?? 0) || String(a.title ?? '').localeCompare(String(b.title ?? '')));
-    const defaults = active.filter((row) => isSafetyPlanTypeSectionDefault(row));
-    const sourceRows = defaults.length > 0 ? defaults : active;
-    const sections = [];
-    const seenSourceTypePairs = new Set();
-    let sortOrder = 1;
-    for (const typeSection of sourceRows) {
-        const typeRows = Array.isArray(typeSection.sectionTypeIds) ? typeSection.sectionTypeIds : [];
-        if (!typeRows.length) {
-            continue;
-        }
-        for (const typeRow of typeRows) {
-            const sectionTypeId = resolveSectionTypeId(typeRow);
-            if (!sectionTypeId) {
-                continue;
-            }
-            // One plan section per (type-section source, section type) — prevents
-            // accidental double expansion when the same type is listed twice.
-            const sourceId = typeof typeSection.id === 'string' ? typeSection.id : '';
-            const pairKey = sourceId ? `${sourceId}|${sectionTypeId}` : sectionTypeId;
-            if (seenSourceTypePairs.has(pairKey)) {
-                continue;
-            }
-            seenSourceTypePairs.add(pairKey);
-            const sectionType = typeRow.sectionType
-                ? { id: sectionTypeId, title: typeRow.sectionType.title, code: typeRow.sectionType.code }
-                : { id: sectionTypeId };
-            const sectionId = createId();
-            sections.push({
-                id: sectionId,
-                sectionTypeId,
-                sectionType,
-                title: resolveSectionTypeTitle(sectionTypeId, sectionType),
-                description: '',
-                sourceSafetyPlanTypeSectionId: typeSection.id,
-                sortOrder: sortOrder++,
-                required: isSafetyPlanTypeSectionDefault(typeSection) || defaults.length === 0,
-                items: [
-                    {
-                        id: `${sectionId}__item_1`,
-                        itemIds: [],
-                        items: [],
-                    },
-                ],
-            });
-        }
-    }
-    return { sections };
+const WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_REFRESH_ON_SECTION_TYPE_EXPOSE_TRIGGERS = [
+    {
+        event: "{{ events.context('sectionType.id') }}",
+        action: '{{ widget.refresh(); }}',
+    },
+    {
+        event: "{{ events.context('sectionType.itemEntityName') }}",
+        action: '{{ widget.refresh(); }}',
+    },
+    {
+        event: "{{ events.context('sectionTypeId') }}",
+        action: '{{ widget.refresh(); }}',
+    },
+];
+const WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_SECTION_TYPE_TRIGGERS = [
+    ...WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_CLEAR_ON_SECTION_TYPE_TRIGGERS,
+    ...WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_REFRESH_ON_SECTION_TYPE_EXPOSE_TRIGGERS,
+];
+function isPpeRuleSectionType(sectionTypeId) {
+    return (sectionTypeId === WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.ppeHazards ||
+        sectionTypeId === WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.hazardRiskPpe);
+}
+function buildSectionTypeItemTextFieldExpression(sectionTypeIdPath) {
+    const ppeHazardsId = WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.ppeHazards;
+    const hazardRiskPpeId = WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.hazardRiskPpe;
+    return `{{ [ '${ppeHazardsId}', '${hazardRiskPpeId}' ].includes(context.eval('${sectionTypeIdPath}')) ? 'ppeItem.title' : 'title' }}`;
+}
+function buildSectionTypeItemColumnsExpression(sectionTypeIdPath) {
+    const ppeHazardsId = WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.ppeHazards;
+    const hazardRiskPpeId = WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.hazardRiskPpe;
+    const riskMatrixId = WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.riskMatrix;
+    return `{{ context.eval('${sectionTypeIdPath}') === '${riskMatrixId}' ? ['code', 'title', 'matrix'] : [ '${ppeHazardsId}', '${hazardRiskPpeId}' ].includes(context.eval('${sectionTypeIdPath}')) ? ['code', 'ppeItem.title', 'requirementType'] : ['code', 'title'] }}`;
+}
+function buildSectionTypeDependentParentFilter(sectionTypeIdPath, parentIdsContextKey, parentSectionTypeKey) {
+    const dependentSectionTypeIds = Object.entries(WORKPLACE_SAFETY_SECTION_TYPE_DEPENDENCIES)
+        .filter(([, config]) => config.kind === 'parentFilter' && config.parentSectionTypeKey === parentSectionTypeKey)
+        .map(([key]) => {
+        const id = Object.entries(WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_BY_ID).find(([, meta]) => meta.sectionTypeKey === key)?.[0];
+        return id ? `'${id}'` : undefined;
+    })
+        .filter((id) => Boolean(id))
+        .join(',');
+    return {
+        field: parentSectionTypeKey === 'Hazard' ? 'hazardId' : 'hazardRiskId',
+        operator: { type: 'in' },
+        value: `{{ [${dependentSectionTypeIds}].includes(context.eval('${sectionTypeIdPath}')) ? ((context.eval('${parentIdsContextKey}') || []).length ? context.eval('${parentIdsContextKey}') : undefined) : undefined }}`,
+    };
+}
+function buildSectionTypeDependentHazardFilter(sectionTypeIdPath, parentHazardIdsContextKey) {
+    return buildSectionTypeDependentParentFilter(sectionTypeIdPath, parentHazardIdsContextKey, 'Hazard');
 }
-/**
- * Removes accidental duplicate plan sections.
- * Non-repeatable section types are kept once (first wins); repeatable types may appear more than once.
- * Reassigns contiguous 1-based `sortOrder` to preserve display order.
- */
-function dedupeSafetyPlanSectionStructure(structure, options) {
-    const sections = Array.isArray(structure?.sections)
-        ? structure.sections
-        : [];
-    const seenSectionTypeIds = new Set();
-    const seenSourceTypePairs = new Set();
-    const deduped = [];
-    for (const section of sections) {
-        const sectionTypeId = resolveEntityRefId(section.sectionTypeId) ?? String(section.sectionTypeId ?? '').trim();
-        if (!sectionTypeId) {
-            continue;
-        }
-        const sourceId = String(section.sourceSafetyPlanTypeSectionId ?? '').trim();
-        const sourcePairKey = sourceId ? `${sourceId}|${sectionTypeId}` : '';
-        // Same type-section source + section type must never appear twice (double materialization).
-        if (sourcePairKey && seenSourceTypePairs.has(sourcePairKey)) {
-            continue;
-        }
-        const sectionType = section.sectionType;
-        const isRepeatable = isSafetyPlanSectionTypeRepeatable(sectionTypeId, {
-            repeatableSectionTypeIds: options?.repeatableSectionTypeIds,
-            sectionType,
-        });
-        if (!isRepeatable && seenSectionTypeIds.has(sectionTypeId)) {
-            continue;
-        }
-        if (sourcePairKey) {
-            seenSourceTypePairs.add(sourcePairKey);
-        }
-        seenSectionTypeIds.add(sectionTypeId);
-        deduped.push(section);
+const sectionItemLookupExpose = [
+    { source: 'id', target: 'items.{id}' },
+    { source: 'title', target: 'items.{title}' },
+    { source: 'code', target: 'items.{code}' },
+    { source: 'ppeItem.id', target: 'items.{id}' },
+    { source: 'ppeItem.title', target: 'items.{title}' },
+    { source: 'ppeItem.code', target: 'items.{code}' },
+];
+/** Shared item lookup options for builder item dialog (`sectionType.*` in dialog context). */
+function buildSafetyPlanSectionItemLookupOptions(entityExpression, options) {
+    const sectionTypeIdPath = options?.sectionTypeIdPath ?? 'sectionType.id';
+    const lookup = {
+        entity: entityExpression,
+        look: 'lookup',
+        multiple: true,
+        allowSearch: true,
+        textField: buildSectionTypeItemTextFieldExpression(sectionTypeIdPath),
+        columns: buildSectionTypeItemColumnsExpression(sectionTypeIdPath),
+        placeholder: options?.defaultPlaceholderKey ?? defaultItemIdsPlaceholderKey,
+        expose: sectionItemLookupExpose,
+        triggers: WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_SECTION_TYPE_TRIGGERS,
+    };
+    const filters = [];
+    if (options?.parentHazardIdsContextKey) {
+        filters.push(buildSectionTypeDependentHazardFilter(sectionTypeIdPath, options.parentHazardIdsContextKey));
+    }
+    if (options?.parentHazardRiskIdsContextKey) {
+        filters.push(buildSectionTypeDependentParentFilter(sectionTypeIdPath, options.parentHazardRiskIdsContextKey, 'HazardRisk'));
+    }
+    if (filters.length === 1) {
+        lookup['filter'] = filters[0];
+    }
+    else if (filters.length > 1) {
+        lookup['filter'] = { logic: 'and', filters };
     }
+    return lookup;
+}
+/** Lookup options with entity data-selector popup UI (`look: 'lookup'`). */
+function buildSafetyPlanSectionItemSelectorOptions(entityExpression, options) {
     return {
-        ...structure,
-        sections: deduped.map((section, index) => ({
-            ...section,
-            sortOrder: index + 1,
-        })),
+        ...buildSafetyPlanSectionItemLookupOptions(entityExpression, options),
+        look: 'lookup',
     };
 }
-function collectAllowedSectionTypeIds(typeSections) {
-    const ids = new Set();
-    for (const typeSection of typeSections) {
-        if (typeSection.isArchived === true) {
-            continue;
-        }
-        for (const row of typeSection.sectionTypeIds ?? []) {
-            const id = resolveSectionTypeId(row);
-            if (id) {
-                ids.add(id);
-            }
-        }
+function resolveSafetyPlanSectionItemColumns(sectionTypeId) {
+    if (sectionTypeId === WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.ppeHazards) {
+        return ['code', 'ppeItem.title', 'requirementType'];
     }
-    return [...ids];
+    if (sectionTypeId === WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.hazardRiskPpe) {
+        return ['code', 'hazardRisk.title', 'ppeItem.title', 'requirementType'];
+    }
+    if (sectionTypeId === WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.riskMatrix) {
+        return [
+            'code',
+            'title',
+            'matrix',
+            { name: 'likelihoodIds', visible: false },
+            { name: 'severityIds', visible: false },
+            { name: 'likelihoodId', visible: false },
+            { name: 'severityId', visible: false },
+            { name: 'matrixOrientation', visible: false },
+        ];
+    }
+    return ['code', 'title'];
 }
-function collectRequiredSourceTypeSectionIds(typeSections) {
-    return typeSections
-        .filter((row) => row.isArchived !== true && isSafetyPlanTypeSectionDefault(row))
-        .map((row) => row.id)
-        .filter((id) => typeof id === 'string' && id.length > 0);
+function resolveSafetyPlanSectionItemEntityKey(sectionTypeId, sectionType) {
+    return resolveSectionItemEntityName(sectionTypeId, sectionType);
 }
-/**
- * Validates that a plan-type section template does not list the same
- * non-repeatable section type more than once (across rows and within a single row's repeater).
- */
-function validateSafetyPlanTypeSectionTemplate(typeSections, repeatableSectionTypeIds = []) {
-    const seen = new Map();
-    const issues = [];
-    for (const typeSection of typeSections) {
-        if (typeSection.isArchived === true) {
-            continue;
-        }
-        for (const row of typeSection.sectionTypeIds ?? []) {
-            const sectionTypeId = resolveSectionTypeId(row);
-            if (!sectionTypeId ||
-                isSafetyPlanSectionTypeRepeatable(sectionTypeId, {
-                    repeatableSectionTypeIds,
-                    sectionType: row.sectionType,
-                })) {
-                continue;
-            }
-            const sectionTypeTitle = resolveSectionTypeTitle(sectionTypeId, row.sectionType);
-            if (seen.has(sectionTypeId)) {
-                issues.push({
-                    code: 'INVALID_TYPE_SECTION_TEMPLATE',
-                    messageKey: '@workplacesafety-management:safety-plans.messages.section-structure.invalid-type-template-duplicate',
-                    details: {
-                        sectionTypeId,
-                        sectionTypeTitle,
-                        sourceSafetyPlanTypeSectionId: typeSection.id,
-                        previousSourceSafetyPlanTypeSectionId: seen.get(sectionTypeId)?.sourceSafetyPlanTypeSectionId,
-                    },
-                });
-                continue;
-            }
-            seen.set(sectionTypeId, {
-                title: sectionTypeTitle,
-                sourceSafetyPlanTypeSectionId: typeSection.id,
-            });
+function mapSafetyPlanSectionSelectedItems(sectionTypeId, selectedItems) {
+    const isPpeHazards = sectionTypeId === WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.ppeHazards;
+    const isHazardRiskPpe = sectionTypeId === WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS.hazardRiskPpe;
+    return selectedItems
+        .map((item) => {
+        if (isPpeHazards || isHazardRiskPpe) {
+            const ppeItem = item['ppeItem'];
+            const id = String(ppeItem?.['id'] ?? item['id'] ?? '');
+            return {
+                id,
+                title: asSafetyPlanDisplayText(ppeItem?.['title']) || undefined,
+                code: asSafetyPlanDisplayText(ppeItem?.['code']) || undefined,
+            };
         }
-    }
-    return issues;
+        return {
+            id: String(item['id'] ?? ''),
+            title: asSafetyPlanDisplayText(item['title']) || undefined,
+            code: asSafetyPlanDisplayText(item['code']) || undefined,
+        };
+    })
+        .filter((item) => item.id.length > 0);
 }
-//#endregion
-//#region ----   Validation   ----
-function validateSafetyPlanSectionStructure(structure, context) {
-    const sections = Array.isArray(structure?.sections) ? structure.sections : [];
-    const issues = [];
-    const presentSourceIds = new Set(sections
-        .map((s) => s.sourceSafetyPlanTypeSectionId)
-        .filter((id) => typeof id === 'string' && id.length > 0));
-    for (const requiredSourceId of context.requiredSourceTypeSectionIds) {
-        if (!presentSourceIds.has(requiredSourceId)) {
-            issues.push({
-                code: 'REQUIRED_SECTION_MISSING',
-                messageKey: '@workplacesafety-management:safety-plans.messages.section-structure.required-section-missing',
-                details: { sourceSafetyPlanTypeSectionId: requiredSourceId },
-            });
-        }
-    }
-    const allowed = new Set(context.allowedSectionTypeIds);
-    const seenSectionTypeIds = new Set();
-    const sortOrders = [];
-    for (const section of sections) {
-        const sectionTypeId = resolveEntityRefId(section.sectionTypeId) ??
-            String(section.sectionTypeId ?? '').trim();
-        if (!sectionTypeId) {
+function dedupeSafetyPlanSectionItemSelection(item) {
+    const seen = new Set();
+    const itemIds = [];
+    const items = [];
+    for (let index = 0; index < (item.itemIds?.length ?? 0); index += 1) {
+        const id = item.itemIds?.[index];
+        if (typeof id !== 'string' || !id || seen.has(id)) {
             continue;
         }
-        const sectionType = section
-            .sectionType;
-        const sectionTypeTitle = resolveSectionTypeTitle(sectionTypeId, sectionType);
-        if (allowed.size > 0 && !allowed.has(sectionTypeId)) {
-            issues.push({
-                code: 'SECTION_TYPE_NOT_ALLOWED',
-                messageKey: '@workplacesafety-management:safety-plans.messages.section-structure.section-type-not-allowed',
-                details: { sectionTypeId, sectionTypeTitle, sectionId: section.id },
-            });
-        }
-        const isRepeatable = isSafetyPlanSectionTypeRepeatable(sectionTypeId, {
-            repeatableSectionTypeIds: context.repeatableSectionTypeIds,
-            sectionType,
-        });
-        if (!isRepeatable && seenSectionTypeIds.has(sectionTypeId)) {
-            issues.push({
-                code: 'DUPLICATE_NON_REPEATABLE_SECTION',
-                messageKey: '@workplacesafety-management:safety-plans.messages.section-structure.duplicate-non-repeatable',
-                details: { sectionTypeId, sectionTypeTitle, sectionId: section.id },
-            });
-        }
-        seenSectionTypeIds.add(sectionTypeId);
-        const sortOrder = section.sortOrder;
-        if (typeof sortOrder === 'number' && Number.isFinite(sortOrder)) {
-            sortOrders.push(sortOrder);
-        }
-    }
-    if (sortOrders.length !== sections.length) {
-        issues.push({
-            code: 'INVALID_SORT_ORDER',
-            messageKey: '@workplacesafety-management:safety-plans.messages.section-structure.invalid-sort-order',
+        seen.add(id);
+        itemIds.push(id);
+        const snapshot = item.items?.find((entry) => entry?.id === id) ??
+            (item.items?.[index]?.id === id || !item.items?.[index]?.id ? item.items?.[index] : undefined);
+        items.push({
+            id,
+            title: asSafetyPlanDisplayText(snapshot?.title) || undefined,
+            code: asSafetyPlanDisplayText(snapshot?.code) || undefined,
         });
     }
-    else {
-        const unique = new Set(sortOrders);
-        if (unique.size !== sortOrders.length) {
-            issues.push({
-                code: 'INVALID_SORT_ORDER',
-                messageKey: '@workplacesafety-management:safety-plans.messages.section-structure.invalid-sort-order',
-                details: { reason: 'duplicate' },
-            });
-        }
-    }
-    return issues;
+    return { ...item, itemIds, items };
 }
-function toBuilderValueFromStructure(structure) {
-    return {
-        sections: structure.sections.map((section) => ({
-            id: section.id,
-            sectionTypeId: section.sectionTypeId,
-            sectionType: section.sectionType,
-            title: section.title,
-            description: section.description ?? '',
-            safetyPlanId: section.safetyPlanId,
-            code: section.code,
-            sourceSafetyPlanTypeSectionId: section.sourceSafetyPlanTypeSectionId,
-            sortOrder: section.sortOrder,
-            required: section.required,
-            items: section.items.map((item) => ({
-                id: item.id,
-                itemIds: [...(item.itemIds ?? [])],
-                items: item.items ? [...item.items] : [],
-            })),
-        })),
-    };
+function isPpeRuleSectionTypeId(sectionTypeId) {
+    return isPpeRuleSectionType(sectionTypeId);
 }
 //#endregion
 
+/** Component key for the safety plan Sections page tab. Register via AXP_PAGE_COMPONENT_PROVIDER. */
+const SAFETY_PLAN_SECTIONS_PAGE_COMPONENT_KEY = 'safety-plan-sections-page';
+
+//#region ----   Safety plan section builder value types   ----
+//#endregion
+
 //#region ----   Imports   ----
 //#endregion
 //#region ----   Local helpers   ----
 function nextId() {
-    return typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function'
-        ? crypto.randomUUID()
-        : `tmp-${Date.now()}-${Math.random().toString(16).slice(2)}`;
+    return createRandomUuid();
 }
 function resolveRefId(value) {
     if (typeof value === 'string') {
@@ -1607,9 +1543,6 @@ var AXMHazardRegisterContextType;
 //#region ----   Imports   ----
 //#endregion
 
-//#region ----   Imports   ----
-//#endregion
-
 //#endregion
 
 //#region ----   Imports   ----
@@ -1642,5 +1575,5 @@ var AXMHazardRegisterContextType;
  * Generated bundle index. Do not edit.
  */
 
-export { AXMHazardPpeRuleRequirementType, AXMHazardRegisterContextType, AXMWorkplaceSafetyManagementCommandKeys, AXMWorkplaceSafetyManagementMenuKeys, AXMWorkplaceSafetyManagementPermissionKeys, AXPSafetyRiskPermissionKeys, PARENT_HAZARD_IDS_CONTEXT_KEY, PARENT_HAZARD_RISK_IDS_CONTEXT_KEY, RISK_MANAGEMENT_HAZARD_CATALOG_SCOPE, RISK_MANAGEMENT_RISK_MATRIX_CELL_ENTITY, RISK_MANAGEMENT_RISK_RATING_ENTITY, RootConfig, SAFETY_PLAN_SECTIONS_PAGE_COMPONENT_KEY, SAFETY_PLAN_SECTION_DUPLICATE_SECTION_TYPE_CODE, SAFETY_PLAN_SECTION_DUPLICATE_SECTION_TYPE_MESSAGE_KEY, WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_BY_ID, WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS, WORKPLACE_SAFETY_BUILT_IN_WORK_STEP_TYPE_IDS, WORKPLACE_SAFETY_DOWNSTREAM_FROM_HAZARD, WORKPLACE_SAFETY_DOWNSTREAM_FROM_HAZARD_RISK, WORKPLACE_SAFETY_GHS_SYMBOL_OPTIONS, WORKPLACE_SAFETY_HAZARD_PPE_RULE_REQUIREMENT_TYPE_OPTIONS, WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_CLEAR_ON_SECTION_TYPE_TRIGGERS, WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_REFRESH_ON_SECTION_TYPE_EXPOSE_TRIGGERS, WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_SECTION_TYPE_TRIGGERS, WORKPLACE_SAFETY_SECTION_TYPE_DEPENDENCIES, WORKPLACE_SAFETY_SECTION_TYPE_DESCRIPTION_SYNC_TRIGGERS, WORKPLACE_SAFETY_SECTION_TYPE_ENTITY_BY_CODE, WORKPLACE_SAFETY_SECTION_TYPE_ENTITY_EXPRESSION, WORKPLACE_SAFETY_SECTION_TYPE_ENTITY_EXPRESSION_SIBLING, WORKPLACE_SAFETY_SECTION_TYPE_ENTITY_FALLBACK, WORKPLACE_SAFETY_SECTION_TYPE_LOOKUP_EXPOSE, WORKPLACE_SAFETY_SECTION_TYPE_LOOKUP_WIDGET_OPTIONS, WORKPLACE_SAFETY_SECTION_TYPE_TITLE_SYNC_TRIGGERS, WORKPLACE_SAFETY_TEMPLATE_TYPE_OPTIONS, buildSafetyPlanSectionItemLookupOptions, buildSafetyPlanSectionItemSelectorOptions, buildSectionStructureFromTypeSections, buildWorkStepContentFromType, clearDependentItemsOnParentChange, collectAllowedSectionTypeIds, collectBuiltInRepeatableSectionTypeIds, collectRequiredSourceTypeSectionIds, createEmptyStepTableCell, createEmptyStepTableRow, dedupeSafetyPlanSectionItemSelection, dedupeSafetyPlanSectionStructure, enrichSectionTypeSnapshot, extractControlMeasureIdsFromHazardRisks, extractRiskMatrixIdsFromHazardRisks, findDuplicateSafetyPlanSectionTypeId, getSectionTypeDependency, isPpeRuleSectionTypeId, isSafetyPlanSectionTypeRepeatable, isSafetyPlanTypeSectionDefault, isStepTableColumnMultiLookup, isStepTableSectionType, mapSafetyPlanSectionSelectedItems, normalizeStepTableColumns, normalizeStepTableRows, resolveEntityRefId, resolveParentHazardIds, resolveParentHazardRiskIds, resolveParentItemIds, resolveSafetyPlanSectionItemColumns, resolveSafetyPlanSectionItemEntityKey, resolveSafetyPlanSectionItemFilter, resolveSafetyPlanSectionItemFilterAsync, resolveSafetyPlanSectionTypeId, resolveSectionItemEntityName, resolveSectionTypeKey, resolveStepTableColumnLookupEntity, safetyPlanSectionTypeAlreadyExists, sectionTypeKeyFromSection, sortStepTableColumns, stepTableColumnKey, stepTableColumnTitle, toBuilderValueFromStructure, toWorkStepBuilderPayload, validateSafetyPlanSectionStructure, validateSafetyPlanTypeSectionTemplate };
+export { AXMHazardPpeRuleRequirementType, AXMHazardRegisterContextType, AXMWorkplaceSafetyManagementCommandKeys, AXMWorkplaceSafetyManagementMenuKeys, AXMWorkplaceSafetyManagementPermissionKeys, AXPSafetyRiskPermissionKeys, PARENT_HAZARD_IDS_CONTEXT_KEY, PARENT_HAZARD_RISK_IDS_CONTEXT_KEY, RISK_MANAGEMENT_HAZARD_CATALOG_SCOPE, RISK_MANAGEMENT_RISK_MATRIX_CELL_ENTITY, RISK_MANAGEMENT_RISK_RATING_ENTITY, RootConfig, SAFETY_PLAN_SECTIONS_PAGE_COMPONENT_KEY, WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_BY_ID, WORKPLACE_SAFETY_BUILT_IN_SECTION_TYPE_IDS, WORKPLACE_SAFETY_BUILT_IN_WORK_STEP_TYPE_IDS, WORKPLACE_SAFETY_DOWNSTREAM_FROM_HAZARD, WORKPLACE_SAFETY_DOWNSTREAM_FROM_HAZARD_RISK, WORKPLACE_SAFETY_GHS_SYMBOL_OPTIONS, WORKPLACE_SAFETY_HAZARD_PPE_RULE_REQUIREMENT_TYPE_OPTIONS, WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_CLEAR_ON_SECTION_TYPE_TRIGGERS, WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_REFRESH_ON_SECTION_TYPE_EXPOSE_TRIGGERS, WORKPLACE_SAFETY_SECTION_ITEM_LOOKUP_SECTION_TYPE_TRIGGERS, WORKPLACE_SAFETY_SECTION_TYPE_DEPENDENCIES, WORKPLACE_SAFETY_SECTION_TYPE_DESCRIPTION_SYNC_TRIGGERS, WORKPLACE_SAFETY_SECTION_TYPE_ENTITY_BY_CODE, WORKPLACE_SAFETY_SECTION_TYPE_ENTITY_EXPRESSION, WORKPLACE_SAFETY_SECTION_TYPE_ENTITY_EXPRESSION_SIBLING, WORKPLACE_SAFETY_SECTION_TYPE_ENTITY_FALLBACK, WORKPLACE_SAFETY_SECTION_TYPE_LOOKUP_EXPOSE, WORKPLACE_SAFETY_SECTION_TYPE_LOOKUP_WIDGET_OPTIONS, WORKPLACE_SAFETY_SECTION_TYPE_TITLE_SYNC_TRIGGERS, WORKPLACE_SAFETY_TEMPLATE_TYPE_OPTIONS, asSafetyPlanDisplayText, buildSafetyPlanSectionItemLookupOptions, buildSafetyPlanSectionItemSelectorOptions, buildSectionStructureFromTypeSections, buildSectionTypeRelationSnapshot, buildWorkStepContentFromType, clearDependentItemsOnParentChange, collectAllowedSectionTypeIds, collectBuiltInRepeatableSectionTypeIds, collectRequiredSourceTypeSectionIds, createEmptyStepTableCell, createEmptyStepTableRow, dedupeSafetyPlanSectionItemSelection, dedupeSafetyPlanSectionStructure, enrichSectionTypeSnapshot, extractRiskMatrixIdsFromHazardRisks, getSectionTypeDependency, isPpeRuleSectionTypeId, isSafetyPlanSectionTypeRepeatable, isSafetyPlanTypeSectionDefault, isStepTableColumnMultiLookup, isStepTableSectionType, mapSafetyPlanSectionSelectedItems, normalizeStepTableColumns, normalizeStepTableRows, resolveEntityRefId, resolveParentHazardIds, resolveParentHazardRiskIds, resolveParentItemIds, resolveSafetyPlanSectionItemColumns, resolveSafetyPlanSectionItemEntityKey, resolveSafetyPlanSectionItemFilter, resolveSafetyPlanSectionItemFilterAsync, resolveSafetyPlanSectionPersistedTitle, resolveSectionItemEntityName, resolveSectionTypeKey, resolveStepTableColumnLookupEntity, sectionTypeKeyFromSection, sortStepTableColumns, stepTableColumnKey, stepTableColumnTitle, toBuilderValueFromStructure, toWorkStepBuilderPayload, validateSafetyPlanSectionStructure, validateSafetyPlanTypeSectionTemplate };
 //# sourceMappingURL=acorex-platform-module-workplacesafety-management-client-contracts.mjs.map