@acorex-platform/module-workplacesafety-management-client 0.0.38 → 0.0.46

package/fesm2022/{acorex-platform-module-workplacesafety-management-client-index-gbDgxqrV.mjs → acorex-platform-module-workplacesafety-management-client-index-CInaiEjw.mjs}

@@ -2,7 +2,7 @@ import { AXPDataGenerator, AXPContextStore } from '@acorex-platform/framework-cl
 import { AXPEntityDataSelectorService, AXPEntityDefinitionRegistryService, AXPEntityService } from '@acorex-platform/framework-client/layout/entity';
 import { AXPCommandService } from '@acorex-platform/framework-client/runtime';
 import { AXPPageLayoutBaseComponent, AXPPageLayoutBase } from '@acorex-platform/framework-client/layout/views';
-import { resolveSectionTypeKey, asSafetyPlanDisplayText, resolveEntityRefId, clearDependentItemsOnParentChange, enrichSectionTypeSnapshot, isStepTableSectionType, WORKPLACE_SAFETY_SECTION_TYPE_LOOKUP_WIDGET_OPTIONS, RootConfig, normalizeStepTableColumns, resolveSafetyPlanSectionItemFilterAsync, resolveSafetyPlanSectionItemEntityKey, resolveSafetyPlanSectionItemColumns, mapSafetyPlanSectionSelectedItems, dedupeSafetyPlanSectionItemSelection, sortStepTableColumns, stepTableColumnKey, resolveStepTableColumnLookupEntity, isStepTableColumnMultiLookup, stepTableColumnTitle, normalizeStepTableRows, dedupeSafetyPlanSectionStructure, resolveSectionItemEntityName, collectBuiltInRepeatableSectionTypeIds, pickSafetyPlanTypeSectionsForStructure, buildSectionStructureFromTypeSections, toBuilderValueFromStructure, SAFETY_PLAN_SECTIONS_PAGE_COMPONENT_KEY } from '@acorex-platform/module-workplacesafety-management-client/contracts';
+import { resolveSectionTypeKey, asSafetyPlanDisplayText, resolveEntityRefId, clearDependentItemsOnParentChange, enrichSectionTypeSnapshot, isActivitySectionType, WORKPLACE_SAFETY_SECTION_TYPE_LOOKUP_WIDGET_OPTIONS, RootConfig, resolveSafetyPlanSectionItemFilterAsync, resolveSafetyPlanSectionItemEntityKey, resolveSafetyPlanSectionItemColumns, mapSafetyPlanSectionSelectedItems, dedupeSafetyPlanSectionItemSelection, mapSafetyPlanActivityItemsToSectionSnapshots, dedupeSafetyPlanSectionStructure, resolveSectionItemEntityName, collectBuiltInRepeatableSectionTypeIds, pickSafetyPlanTypeSectionsForStructure, buildSectionStructureFromTypeSections, toBuilderValueFromStructure, SAFETY_PLAN_SECTIONS_PAGE_COMPONENT_KEY } from '@acorex-platform/module-workplacesafety-management-client/contracts';
 import * as i0 from '@angular/core';
 import { inject, Injectable, input, output, viewChild, signal, computed, effect, untracked, ChangeDetectionStrategy, Component } from '@angular/core';
 import { isEqual, cloneDeep } from 'lodash';
@@ -20,13 +20,13 @@ import { AXPLayoutBuilderService } from '@acorex-platform/framework-client/layou
 import { AXPWidgetPropertyViewerService, AXPStandardSectionItemsBuilderComponent } from '@acorex-platform/framework-client/layout/components';
 import * as i3 from '@angular/common';
 import { CommonModule, AsyncPipe } from '@angular/common';
-import { n as normalizeSafetyPlanSectionBuilderValue, s as summarizeStepTableRow, a as safetyPlanSectionsToBuilderValue, h as hydrateStepTableSectionsWithWorkSteps } from './acorex-platform-module-workplacesafety-management-client-safety-plan-section-builder.types-LaN1NIgc.mjs';
-import { P as PPE_ITEM_VIEWER_WIDGET_NAME } from './acorex-platform-module-workplacesafety-management-client-acorex-platform-module-workplacesafety-management-client-Ds0Fkspp.mjs';
+import { n as normalizeSafetyPlanSectionBuilderValue, s as safetyPlanSectionsToBuilderValue } from './acorex-platform-module-workplacesafety-management-client-safety-plan-section-builder.types-C0SEJsVM.mjs';
+import { P as PPE_ITEM_VIEWER_WIDGET_NAME } from './acorex-platform-module-workplacesafety-management-client-acorex-platform-module-workplacesafety-management-client-C3a08xjg.mjs';
 import { AXP_BEHAVIOR_PROPERTY_GROUP } from '@acorex-platform/framework-client/layout/widgets';
 import { createBooleanProperty } from '@acorex-platform/framework-shared/widget-core';
-import { SAFETY_PLAN_SECTIONS_SAVE_COMMAND } from './acorex-platform-module-workplacesafety-management-client-save-safety-plan-sections.command-CLj3y_JD.mjs';
-export { AXMSaveSafetyPlanSectionsCommand } from './acorex-platform-module-workplacesafety-management-client-save-safety-plan-sections.command-CLj3y_JD.mjs';
-import { A as AXMSafetyPlanPreviewService } from './acorex-platform-module-workplacesafety-management-client-safety-plan-preview.service-DJP41MuL.mjs';
+import { SAFETY_PLAN_SECTIONS_SAVE_COMMAND } from './acorex-platform-module-workplacesafety-management-client-save-safety-plan-sections.command-D0aRQHWk.mjs';
+export { AXMSaveSafetyPlanSectionsCommand } from './acorex-platform-module-workplacesafety-management-client-save-safety-plan-sections.command-D0aRQHWk.mjs';
+import { A as AXMSafetyPlanPreviewService, h as hydrateSafetyPlanActivitySectionsForPreview } from './acorex-platform-module-workplacesafety-management-client-hydrate-safety-plan-activity-sections-TrVl3-T6.mjs';
 import { resolveEntityRowDisplayText } from '@acorex-platform/framework-client/common';
 
 //#region ----- Imports -----
@@ -249,6 +249,7 @@ class AXMSafetyPlanSectionBuilderComponent {
         this.entityDataSelector = inject(AXPEntityDataSelectorService);
         this.entityRegistry = inject(AXPEntityDefinitionRegistryService);
         this.entityService = inject(AXPEntityService);
+        this.commandService = inject(AXPCommandService);
         this.widgetOptionsService = inject(AXMSafetyPlanSectionWidgetOptionsService);
         //#endregion
         //#region ----- State Signals -----
@@ -382,17 +383,15 @@ class AXMSafetyPlanSectionBuilderComponent {
         if (!dialogValue)
             return null;
         const sectionTypeChanged = previousSectionTypeId !== dialogValue.sectionTypeId;
-        const isStepTable = isStepTableSectionType(dialogValue.sectionTypeId, dialogValue.sectionType);
-        const keepWorkStep = isStepTable && !sectionTypeChanged
+        const isActivity = isActivitySectionType(dialogValue.sectionTypeId, dialogValue.sectionType);
+        const keepSafetyPlanActivity = isActivity && !sectionTypeChanged
             ? {
-                workStepTypeId: section['workStepTypeId'],
-                workStepType: section['workStepType'],
-                columns: section['columns'],
+                safetyPlanActivityId: section['safetyPlanActivityId'],
+                safetyPlanActivity: section['safetyPlanActivity'],
             }
             : {
-                workStepTypeId: undefined,
-                workStepType: undefined,
-                columns: [],
+                safetyPlanActivityId: undefined,
+                safetyPlanActivity: undefined,
             };
         return {
             ...section,
@@ -400,7 +399,7 @@ class AXMSafetyPlanSectionBuilderComponent {
             sectionType: dialogValue.sectionType,
             title: dialogValue.title,
             description: dialogValue.description ?? '',
-            ...keepWorkStep,
+            ...keepSafetyPlanActivity,
             ...(sectionTypeChanged ? { items: [] } : {}),
         };
     }
@@ -499,43 +498,29 @@ class AXMSafetyPlanSectionBuilderComponent {
         if (!section || !this.sectionContextFromBuilderSection(section)) {
             return null;
         }
-        let sectionContext = this.sectionContextFromBuilderSection(section);
-        if (isStepTableSectionType(sectionContext.sectionTypeId, sectionContext.sectionType)) {
-            if (!sectionContext.workStepTypeId || sectionContext.columns.length === 0) {
-                const assigned = await this.ensureStepTableWorkStep(sectionId);
-                if (!assigned) {
-                    return null;
-                }
-                const updatedSection = this.builderValue().sections.find((entry) => entry.id === sectionId);
-                const nextContext = updatedSection ? this.sectionContextFromBuilderSection(updatedSection) : null;
-                if (!nextContext?.workStepTypeId || nextContext.columns.length === 0) {
-                    return null;
-                }
-                sectionContext = nextContext;
-            }
-            const currentSection = this.builderValue().sections.find((entry) => entry.id === sectionId) ?? section;
-            const sectionTitle = String(currentSection['title'] ?? '').trim();
-            const sectionTypeTitle = String(sectionContext.sectionType?.title ?? '').trim();
-            const applyTitleToSection = (currentSection.items?.length ?? 0) === 0 ||
-                !sectionTitle ||
-                sectionTitle === sectionTypeTitle ||
-                sectionTitle === sectionContext.sectionTypeId;
-            const row = await this.promptStepTableRowForm('create', sectionContext, {
-                title: applyTitleToSection
-                    ? sectionTitle && sectionTitle !== sectionTypeTitle
-                        ? sectionTitle
-                        : String(sectionContext.workStepType?.title ?? '').trim()
-                    : '',
-            }, { requireTitle: true, applyTitleToSection });
-            if (!row) {
+        const sectionContext = this.sectionContextFromBuilderSection(section);
+        if (isActivitySectionType(sectionContext.sectionTypeId, sectionContext.sectionType)) {
+            const picked = await this.promptActivityPicker();
+            if (!picked) {
                 return null;
             }
-            if (applyTitleToSection && row.title?.trim()) {
-                this.patchSectionTitle(sectionId, row.title.trim());
-            }
+            // Section stays named after the section type ("Activity"); item carries the catalog title.
+            const sectionTypeTitle = String(sectionContext.sectionType?.title ?? '').trim() ||
+                (await this.translationService.translateAsync('@workplacesafety-management:safety-plan-sections.entities.safety-plan-section.fields.activity.title')) ||
+                'Activity';
+            this.patchSectionTitle(sectionId, sectionTypeTitle);
+            const currentSection = this.builderValue().sections.find((entry) => entry.id === sectionId) ?? section;
             const itemCount = this.builderValue().sections.find((entry) => entry.id === sectionId)?.items.length ??
                 currentSection.items.length;
-            return [this.toBuilderItemFromStepTableRow(row, itemCount)];
+            const activityTitle = String(picked.title ?? '').trim() || 'Activity';
+            return [
+                this.toBuilderItemFromActivityRow({
+                    title: activityTitle,
+                    code: picked.code,
+                    description: picked.description,
+                    sections: picked.sections,
+                }, itemCount, picked.id),
+            ];
         }
         const existingIds = this.collectEntityIdsFromBuilderItems(section.items);
         const dialogValue = await this.openItemDataSelector('create', undefined, sectionId, value, section, true);
@@ -554,30 +539,22 @@ class AXMSafetyPlanSectionBuilderComponent {
             return null;
         }
         const sectionContext = this.sectionContextFromBuilderSection(section);
-        if (isStepTableSectionType(sectionContext.sectionTypeId, sectionContext.sectionType)) {
-            const existing = item['stepTableRow'];
-            if (!existing || sectionContext.columns.length === 0) {
+        if (isActivitySectionType(sectionContext.sectionTypeId, sectionContext.sectionType)) {
+            const activityId = String(item.id ?? item['entityId'] ?? '').trim();
+            if (!activityId) {
                 return null;
             }
-            const seed = {
-                ...this.cellsToDialogValue(existing.cells ?? [], sectionContext.columns),
-                title: String(existing.title ?? item['title'] ?? '').trim(),
-            };
-            const isPrimaryRow = (item.order ?? 0) === 0;
-            const row = await this.promptStepTableRowForm('edit', sectionContext, seed, {
-                requireTitle: true,
-                applyTitleToSection: isPrimaryRow,
-            });
-            if (!row) {
+            const edited = await this.openSafetyPlanActivityEditor(activityId);
+            if (!edited) {
                 return null;
             }
-            if (isPrimaryRow && row.title?.trim()) {
-                this.patchSectionTitle(sectionId, row.title.trim());
-            }
-            return this.toBuilderItemFromStepTableRow({
-                ...row,
-                code: existing.code,
-            }, item.order ?? 0, String(item.id));
+            const activityTitle = String(edited.title ?? '').trim() || 'Activity';
+            return this.toBuilderItemFromActivityRow({
+                title: activityTitle,
+                code: edited.code,
+                description: edited.description,
+                sections: edited.sections,
+            }, item.order ?? 0, edited.id);
         }
         if (!this.allowEditItem()) {
             return null;
@@ -602,46 +579,17 @@ class AXMSafetyPlanSectionBuilderComponent {
         const replacement = selected.find((entry) => !otherIds.has(entry.id)) ?? selected[0];
         return this.toBuilderItemFromEntity(sectionId, replacement, item.order ?? 0);
     }
-    async toastWorkStepRequired() {
+    async toastActivityRequired() {
         this.toastService.show({
             color: 'warning',
             title: await this.translationService.translateAsync('@general:messages.generic.error.title'),
-            content: await this.translationService.translateAsync('@workplacesafety-management:safety-plan-sections.messages.work-step-required.message'),
+            content: await this.translationService.translateAsync('@workplacesafety-management:safety-plan-sections.messages.activity-required.message'),
         });
     }
-    /** Prompts for Work Step and patches the Step Table section before rows can be added. */
-    async ensureStepTableWorkStep(sectionId) {
-        const picked = await this.promptWorkStepPicker();
-        if (!picked) {
-            return false;
-        }
-        const current = this.fromBuilderValue(this.builderValue());
-        const next = {
-            sections: current.sections.map((section) => {
-                if (section.id !== sectionId) {
-                    return section;
-                }
-                return {
-                    ...section,
-                    workStepTypeId: picked.id,
-                    workStepType: { id: picked.id, title: picked.title, code: picked.code },
-                    columns: picked.columns,
-                };
-            }),
-        };
-        this.builderValue.set(this.toBuilderValue(next));
-        this.valueChange.emit(next);
-        return true;
-    }
-    patchSectionTitle(sectionId, title) {
-        const trimmed = title.trim();
-        if (!trimmed) {
-            return;
-        }
-        this.pendingSectionTitles.set(sectionId, trimmed);
-    }
-    async promptWorkStepPicker() {
-        const title = (await this.translationService.translateAsync('@workplacesafety-management:safety-plan-sections.entities.safety-plan-section.fields.work-step.title')) || 'Work Step';
+    /** Prompts for Activity catalog selection (used by Activity section add/edit). */
+    async promptActivityPicker() {
+        const title = (await this.translationService.translateAsync('@workplacesafety-management:safety-plan-sections.entities.safety-plan-section.fields.activity.title')) || 'Activity';
+        const activityEntity = `${RootConfig.module.name}.${RootConfig.entities.safetyPlanActivity.name}`;
         const result = await this.layoutBuilder
             .create()
             .dialog((dialog) => {
@@ -649,31 +597,32 @@ class AXMSafetyPlanSectionBuilderComponent {
                 .setTitle(title)
                 .setSize('md')
                 .setCloseButton(true)
-                .setContext({ workStepTypeId: '' })
+                .setContext({ safetyPlanActivityId: '' })
                 .content((layout) => {
                 layout.mode('edit');
                 layout.dynamicForm({
                     groups: [
                         {
-                            name: 'work-step',
-                            title: '@workplacesafety-management:safety-plan-sections.entities.safety-plan-section.fields.work-step.title',
+                            name: 'activity',
+                            title: '@workplacesafety-management:safety-plan-sections.entities.safety-plan-section.fields.activity.title',
                             parameters: [
                                 {
-                                    path: 'workStepTypeId',
-                                    title: '@workplacesafety-management:safety-plan-sections.entities.safety-plan-section.fields.work-step.title',
+                                    path: 'safetyPlanActivityId',
+                                    title: '@workplacesafety-management:safety-plan-sections.entities.safety-plan-section.fields.activity.title',
                                     widget: {
-                                        path: 'workStepTypeId',
+                                        path: 'safetyPlanActivityId',
                                         type: AXPWidgetsCatalog.lookup,
                                         options: {
-                                            entity: `${RootConfig.module.name}.${RootConfig.entities.workStepType.name}`,
+                                            entity: activityEntity,
                                             look: 'select',
                                             textField: 'title',
                                             valueField: 'id',
                                             columns: ['code', 'title'],
+                                            allowCreate: 'quick',
                                             expose: [
-                                                { source: 'id', target: 'workStepType.id' },
-                                                { source: 'title', target: 'workStepType.title' },
-                                                { source: 'code', target: 'workStepType.code' },
+                                                { source: 'id', target: 'safetyPlanActivity.id' },
+                                                { source: 'title', target: 'safetyPlanActivity.title' },
+                                                { source: 'code', target: 'safetyPlanActivity.code' },
                                             ],
                                         },
                                     },
@@ -691,31 +640,38 @@ class AXMSafetyPlanSectionBuilderComponent {
                     return { success: false };
                 }
                 const context = dialogRef.context();
-                const workStepTypeId = String(context.workStepTypeId ?? '').trim();
-                if (!workStepTypeId) {
+                const safetyPlanActivityId = String(context.safetyPlanActivityId ?? '').trim();
+                if (!safetyPlanActivityId) {
                     return { success: false };
                 }
                 return {
                     success: true,
                     kind: 'object',
                     value: {
-                        workStepTypeId,
-                        workStepType: context.workStepType,
+                        safetyPlanActivityId,
+                        safetyPlanActivity: context.safetyPlanActivity,
                     },
                 };
             });
         })
             .show();
-        if (!result?.success || !result.value?.workStepTypeId) {
+        if (!result?.success || !result.value?.safetyPlanActivityId) {
             return null;
         }
-        const loaded = await this.loadWorkStepType(result.value.workStepTypeId);
+        const loaded = await this.loadSafetyPlanActivity(result.value.safetyPlanActivityId);
         if (!loaded) {
-            await this.toastWorkStepRequired();
+            await this.toastActivityRequired();
             return null;
         }
         return loaded;
     }
+    patchSectionTitle(sectionId, title) {
+        const trimmed = title.trim();
+        if (!trimmed) {
+            return;
+        }
+        this.pendingSectionTitles.set(sectionId, trimmed);
+    }
     sectionContextFromBuilderSection(section) {
         const sectionTypeId = String(section['sectionTypeId'] ?? '').trim();
         if (!sectionTypeId) {
@@ -724,9 +680,8 @@ class AXMSafetyPlanSectionBuilderComponent {
         return {
             sectionTypeId,
             sectionType: enrichSectionTypeSnapshot(sectionTypeId, section['sectionType']),
-            workStepTypeId: typeof section['workStepTypeId'] === 'string' ? section['workStepTypeId'].trim() : undefined,
-            workStepType: section['workStepType'],
-            columns: normalizeStepTableColumns(section['columns']),
+            safetyPlanActivityId: typeof section['safetyPlanActivityId'] === 'string' ? section['safetyPlanActivityId'].trim() : undefined,
+            safetyPlanActivity: section['safetyPlanActivity'],
         };
     }
     //#endregion
@@ -805,13 +760,14 @@ class AXMSafetyPlanSectionBuilderComponent {
     //#endregion
     //#region ----- Builder value mapping -----
     mapItemToView(item) {
-        const stepTableRow = item['stepTableRow'];
-        if (stepTableRow) {
-            const code = String(stepTableRow.code ?? '').trim();
+        const activityRow = item['activityRow'];
+        if (activityRow) {
+            const code = String(activityRow.code ?? '').trim();
+            const description = String(activityRow.description ?? item['description'] ?? '').trim();
             return {
-                icon: 'fa-light fa-table-rows',
-                title: String(stepTableRow.title ?? item['title'] ?? '').trim() || 'Row',
-                name: code || undefined,
+                icon: 'fa-light fa-list-check',
+                title: String(activityRow.title ?? item['title'] ?? '').trim() || 'Row',
+                name: description || code || undefined,
                 badges: [],
             };
         }
@@ -842,9 +798,8 @@ class AXMSafetyPlanSectionBuilderComponent {
                 sourceSafetyPlanTypeSectionId: section.sourceSafetyPlanTypeSectionId,
                 sortOrder: section.sortOrder ?? sectionIndex + 1,
                 required: section.required === true,
-                workStepTypeId: section.workStepTypeId,
-                workStepType: section.workStepType,
-                columns: normalizeStepTableColumns(section.columns),
+                safetyPlanActivityId: section.safetyPlanActivityId,
+                safetyPlanActivity: section.safetyPlanActivity,
                 widgetOptions: section.widgetOptions,
                 items: this.expandSectionItemsToBuilderRows(section.id, section.items, section),
             })),
@@ -865,9 +820,8 @@ class AXMSafetyPlanSectionBuilderComponent {
                     : undefined,
                 sortOrder: typeof section['sortOrder'] === 'number' ? section['sortOrder'] : sectionIndex + 1,
                 required: section['required'] === true,
-                workStepTypeId: typeof section['workStepTypeId'] === 'string' ? section['workStepTypeId'] : undefined,
-                workStepType: section['workStepType'],
-                columns: normalizeStepTableColumns(section['columns']),
+                safetyPlanActivityId: typeof section['safetyPlanActivityId'] === 'string' ? section['safetyPlanActivityId'] : undefined,
+                safetyPlanActivity: section['safetyPlanActivity'],
                 widgetOptions: section['widgetOptions'] && typeof section['widgetOptions'] === 'object' && !Array.isArray(section['widgetOptions'])
                     ? { ...section['widgetOptions'] }
                     : undefined,
@@ -876,15 +830,13 @@ class AXMSafetyPlanSectionBuilderComponent {
         });
     }
     expandSectionItemsToBuilderRows(sectionId, items, section) {
-        if (isStepTableSectionType(section.sectionTypeId, section.sectionType) ||
-            items.some((item) => item.stepTableRow)) {
-            const columns = normalizeStepTableColumns(section.columns);
+        if (isActivitySectionType(section.sectionTypeId, section.sectionType) ||
+            items.some((item) => item.activityRow)) {
             return items
-                .filter((item) => item.stepTableRow)
-                .map((item, order) => this.toBuilderItemFromStepTableRow({
-                ...item.stepTableRow,
-                title: item.stepTableRow.title ||
-                    summarizeStepTableRow(item.stepTableRow.cells ?? [], columns),
+                .filter((item) => item.activityRow)
+                .map((item, order) => this.toBuilderItemFromActivityRow({
+                ...item.activityRow,
+                title: item.activityRow.title || item.items?.[0]?.title || 'Row',
             }, order, item.id));
         }
         const linked = this.flattenLinkedEntities(items);
@@ -894,26 +846,23 @@ class AXMSafetyPlanSectionBuilderComponent {
         const ordered = [...items].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
         const sectionTypeId = String(section['sectionTypeId'] ?? '');
         const sectionType = section['sectionType'];
-        if (isStepTableSectionType(sectionTypeId, sectionType) || ordered.some((item) => item['stepTableRow'])) {
-            const columns = normalizeStepTableColumns(section['columns']);
+        if (isActivitySectionType(sectionTypeId, sectionType) || ordered.some((item) => item['activityRow'])) {
             const stepItems = [];
             ordered.forEach((item, index) => {
-                const stepTableRow = item['stepTableRow'];
-                if (!stepTableRow) {
+                const activityRow = item['activityRow'];
+                if (!activityRow) {
                     return;
                 }
                 const stepId = typeof item.id === 'string' && item.id && !String(item.id).includes('__entity_')
                     ? String(item.id)
                     : AXPDataGenerator.uuid();
-                const title = stepTableRow.title?.trim() ||
-                    summarizeStepTableRow(stepTableRow.cells ?? [], columns) ||
-                    'Row';
+                const title = activityRow.title?.trim() || 'Row';
                 stepItems.push({
                     id: stepId,
                     itemIds: [stepId],
-                    items: [{ id: stepId, title, code: stepTableRow.code }],
-                    stepTableRow: {
-                        ...stepTableRow,
+                    items: [{ id: stepId, title, code: activityRow.code }],
+                    activityRow: {
+                        ...activityRow,
                         title,
                         sortOrder: index + 1,
                     },
@@ -1022,12 +971,13 @@ class AXMSafetyPlanSectionBuilderComponent {
             name: code,
         };
     }
-    toBuilderItemFromStepTableRow(row, order, id) {
+    toBuilderItemFromActivityRow(row, order, id) {
         const stepId = typeof id === 'string' && id.trim() && !id.includes('__item_') && !id.includes('__entity_')
             ? id.trim()
             : AXPDataGenerator.uuid();
         const title = String(row.title ?? '').trim() || 'Row';
         const code = String(row.code ?? '').trim();
+        const description = String(row.description ?? '').trim();
         return {
             id: stepId,
             order,
@@ -1036,227 +986,42 @@ class AXMSafetyPlanSectionBuilderComponent {
             items: [{ id: stepId, title, code: code || undefined }],
             title,
             name: code,
-            stepTableRow: {
+            description: description || undefined,
+            activityRow: {
                 ...row,
                 title,
+                description: description || undefined,
                 sortOrder: order + 1,
             },
         };
     }
-    //#endregion
-    //#region ----- Step Table row dialog -----
-    async promptStepTableRowForm(mode, sectionContext, seed, options) {
-        const columns = sortStepTableColumns(sectionContext.columns);
-        const requireTitle = options?.requireTitle === true;
-        const titleKey = mode === 'create'
-            ? '@workplacesafety-management:safety-plan-sections.entities.safety-plan-section.actions.add-row.title'
-            : '@general:actions.edit.title';
-        const dialogTitle = (await this.translationService.translateAsync(titleKey)) ||
-            (mode === 'create' ? 'Add Row' : 'Edit');
-        const result = await this.layoutBuilder
-            .create()
-            .dialog((dialog) => {
-            dialog
-                .setTitle(dialogTitle)
-                .setSize('lg')
-                .setCloseButton(true)
-                .setContext({ ...seed })
-                .content((layout) => {
-                layout.mode('edit');
-                layout.dynamicForm(this.buildStepTableRowFormDefinition(columns, { includeTitle: requireTitle }));
-            })
-                .setActions((actions) => {
-                actions.cancel('@general:actions.cancel.title').submit('@general:actions.save.title');
-            })
-                .onAction((dialogRef) => {
-                if (dialogRef.action() === 'cancel') {
-                    return { success: false };
-                }
-                const context = dialogRef.context();
-                const customTitle = String(context['title'] ?? '').trim();
-                if (requireTitle && !customTitle) {
-                    return { success: false };
-                }
-                const cells = this.dialogValueToCells(context, columns);
-                if (!this.validateRequiredStepTableCells(cells, columns)) {
-                    return { success: false };
-                }
-                return {
-                    success: true,
-                    kind: 'object',
-                    value: {
-                        cells,
-                        title: customTitle || summarizeStepTableRow(cells, columns),
-                    },
-                };
-            });
-        })
-            .show();
-        return result?.success && result.value ? result.value : null;
-    }
-    buildStepTableRowFormDefinition(columns, options) {
-        const ordered = sortStepTableColumns(columns);
-        const parameters = [];
-        if (options?.includeTitle) {
-            parameters.push({
-                path: 'title',
-                title: '@workplacesafety-management:safety-plan-sections.entities.safety-plan-section.fields.title.title',
-                widget: {
-                    path: 'title',
-                    type: AXPWidgetsCatalog.text,
-                    options: {
-                        placeholder: '@workplacesafety-management:safety-plan-sections.entities.safety-plan-section.fields.title.placeholder',
-                    },
-                },
-            });
-        }
-        for (const column of ordered) {
-            const key = stepTableColumnKey(column);
-            const lookupEntity = resolveStepTableColumnLookupEntity(column);
-            const multi = isStepTableColumnMultiLookup(column);
-            parameters.push({
-                path: key,
-                title: stepTableColumnTitle(column),
-                widget: lookupEntity
-                    ? {
-                        path: key,
-                        type: AXPWidgetsCatalog.lookup,
-                        options: {
-                            look: multi ? 'lookup' : 'select',
-                            entity: lookupEntity,
-                            textField: 'title',
-                            valueField: 'id',
-                            columns: ['code', 'title'],
-                            ...(multi ? { multiple: true } : {}),
-                            expose: multi
-                                ? [
-                                    { source: 'id', target: `${key}Refs.{id}` },
-                                    { source: 'title', target: `${key}Refs.{title}` },
-                                    { source: 'code', target: `${key}Refs.{code}` },
-                                ]
-                                : [
-                                    { source: 'id', target: `${key}Ref.id` },
-                                    { source: 'title', target: `${key}Ref.title` },
-                                    { source: 'code', target: `${key}Ref.code` },
-                                ],
-                        },
-                    }
-                    : {
-                        path: key,
-                        type: AXPWidgetsCatalog.text,
-                    },
-            });
-        }
-        return {
-            groups: [
-                {
-                    name: 'step-table-row',
-                    title: '@workplacesafety-management:safety-plan-work-steps.entities.safety-plan-work-step.groups.table-content',
-                    parameters,
-                },
-            ],
-        };
-    }
-    validateRequiredStepTableCells(cells, columns) {
-        for (const column of columns) {
-            if (column.required !== true) {
-                continue;
-            }
-            const key = stepTableColumnKey(column);
-            const cell = cells.find((entry) => entry.columnKey === key);
-            if (!cell) {
-                return false;
-            }
-            const lookupEntity = resolveStepTableColumnLookupEntity(column);
-            if (lookupEntity) {
-                if (!(cell.refIds?.length)) {
-                    return false;
-                }
-            }
-            else if (!cell.textValue?.trim()) {
-                return false;
-            }
-        }
-        return true;
-    }
-    cellsToDialogValue(cells, columns) {
-        const ordered = sortStepTableColumns(columns);
-        const normalized = normalizeStepTableRows([{ id: 'row', sortOrder: 1, cells }], ordered)[0];
-        const dialogRow = {};
-        for (const column of ordered) {
-            const key = stepTableColumnKey(column);
-            const cell = normalized?.cells.find((entry) => entry.columnKey === key);
-            if (!cell) {
-                continue;
-            }
-            const lookupEntity = resolveStepTableColumnLookupEntity(column);
-            if (!lookupEntity) {
-                dialogRow[key] = cell.textValue ?? '';
-                continue;
-            }
-            if (isStepTableColumnMultiLookup(column)) {
-                dialogRow[key] = cell.refIds ?? [];
-                dialogRow[`${key}Refs`] = cell.refs ?? [];
-            }
-            else {
-                dialogRow[key] = cell.refIds?.[0];
-                dialogRow[`${key}Ref`] = cell.refs?.[0];
-            }
-        }
-        return dialogRow;
-    }
-    dialogValueToCells(row, columns) {
-        const ordered = sortStepTableColumns(columns);
-        return ordered.map((column) => {
-            const key = stepTableColumnKey(column);
-            const lookupEntity = resolveStepTableColumnLookupEntity(column);
-            if (!lookupEntity) {
-                return {
-                    columnKey: key,
-                    textValue: typeof row[key] === 'string' ? String(row[key]) : '',
-                };
-            }
-            if (isStepTableColumnMultiLookup(column)) {
-                const refs = Array.isArray(row[`${key}Refs`])
-                    ? row[`${key}Refs`]
-                    : [];
-                const ids = Array.isArray(row[key])
-                    ? row[key].filter((value) => typeof value === 'string')
-                    : refs
-                        .map((ref) => (typeof ref?.id === 'string' ? ref.id : ''))
-                        .filter(Boolean);
-                return {
-                    columnKey: key,
-                    refIds: ids,
-                    refs: ids.map((idValue) => {
-                        const ref = refs.find((entry) => entry?.id === idValue);
-                        return { id: idValue, title: ref?.title, code: ref?.code };
-                    }),
-                };
-            }
-            const ref = row[`${key}Ref`];
-            const idValue = (typeof row[key] === 'string' && String(row[key])) ||
-                (typeof ref?.id === 'string' ? ref.id : '');
-            return {
-                columnKey: key,
-                refIds: idValue ? [idValue] : [],
-                refs: idValue ? [{ id: idValue, title: ref?.title, code: ref?.code }] : [],
-            };
+    /** Opens the SafetyPlanActivity update form so predefined sections (items) can be viewed/edited. */
+    async openSafetyPlanActivityEditor(activityId) {
+        const activityEntity = `${RootConfig.module.name}.${RootConfig.entities.safetyPlanActivity.name}`;
+        const result = await this.commandService.execute('Entity:Edit', {
+            entity: activityEntity,
+            data: activityId,
+            dialogSize: 'lg',
         });
+        if (!result?.success) {
+            return null;
+        }
+        return this.loadSafetyPlanActivity(activityId);
     }
-    async loadWorkStepType(workStepTypeId) {
+    async loadSafetyPlanActivity(activityId) {
         try {
-            const entityKey = `${RootConfig.module.name}.${RootConfig.entities.workStepType.name}`;
-            const row = await this.entityService.withEntity(entityKey).data().byKey(workStepTypeId);
+            const entityKey = `${RootConfig.module.name}.${RootConfig.entities.safetyPlanActivity.name}`;
+            const row = await this.entityService.withEntity(entityKey).data().byKey(activityId);
             if (!row) {
                 return null;
             }
             const record = row;
             return {
-                id: String(record.id ?? workStepTypeId),
+                id: String(record.id ?? activityId),
                 title: record.title,
                 code: record.code,
-                columns: normalizeStepTableColumns(record.columns),
+                description: typeof record.description === 'string' ? record.description : undefined,
+                sections: mapSafetyPlanActivityItemsToSectionSnapshots(record.items),
             };
         }
         catch {
@@ -1278,7 +1043,6 @@ const SAFETY_PLAN_SECTIONS_ADD_SECTION_COMMAND = 'SafetyPlan:Sections:AddSection
 const SAFETY_PLAN_SECTIONS_PREVIEW_COMMAND = 'SafetyPlan:Sections:Preview';
 const SAFETY_PLAN_SECTIONS_DISCARD_COMMAND = 'SafetyPlan:Sections:Discard';
 const SAFETY_PLAN_SECTION_ENTITY = `${RootConfig.module.name}.${RootConfig.entities.safetyPlanSection.name}`;
-const SAFETY_PLAN_WORK_STEP_ENTITY = `${RootConfig.module.name}.${RootConfig.entities.safetyPlanWorkStep.name}`;
 const SAFETY_PLAN_TYPE_SECTION_ENTITY = `${RootConfig.module.name}.${RootConfig.entities.safetyPlanTypeSection.name}`;
 const SECTION_TYPE_ENTITY = `${RootConfig.module.name}.${RootConfig.entities.sectionType.name}`;
 //#endregion
@@ -1693,9 +1457,10 @@ class AXMSafetyPlanSectionsPageComponent extends AXPPageLayoutBaseComponent {
         const locale = this.translateService.getActiveLang?.() ?? 'en-US';
         const planTitle = resolveEntityRowDisplayText(this.rootContext()?.['title'], locale);
         const title = planTitle ? `${previewLabel}: ${planTitle}` : previewLabel;
+        const structure = await hydrateSafetyPlanActivitySectionsForPreview(this.entityService, this.translateService, cloneDeep(this.committedValue() ?? { sections: [] }));
         await this.previewService.open({
             title,
-            structure: cloneDeep(this.committedValue() ?? { sections: [] }),
+            structure,
         });
     }
     async handleSave(options) {
@@ -1799,18 +1564,8 @@ class AXMSafetyPlanSectionsPageComponent extends AXPPageLayoutBaseComponent {
         });
         const rawLoaded = safetyPlanSectionsToBuilderValue((result.items ?? []));
         const deduped = dedupeSafetyPlanSectionStructure(rawLoaded, { repeatableSectionTypeIds });
-        const workStepsResult = await this.entityService.withEntity(SAFETY_PLAN_WORK_STEP_ENTITY).data().query({
-            skip: 0,
-            take: 2000,
-            filter: {
-                logic: 'and',
-                filters: [{ field: 'safetyPlanId', operator: { type: 'equal' }, value: planId }],
-            },
-        });
-        const columnsByWorkStepTypeId = await this.loadWorkStepTypeColumns(deduped.sections
-            .map((section) => section.workStepTypeId)
-            .filter((id) => typeof id === 'string' && id.length > 0));
-        return this.hydrateCatalogItemSnapshots(hydrateStepTableSectionsWithWorkSteps(deduped, (workStepsResult.items ?? []), columnsByWorkStepTypeId));
+        // Activity sections store SafetyPlanActivity rows on items; no column schema to hydrate.
+        return this.hydrateCatalogItemSnapshots(deduped);
     }
     /**
      * Repeater lookups are not joined on query. Fill missing catalog item titles from
@@ -1820,7 +1575,7 @@ class AXMSafetyPlanSectionsPageComponent extends AXPPageLayoutBaseComponent {
         const locale = this.translateService.getActiveLang?.() ?? 'en-US';
         const missingByEntity = new Map();
         for (const section of value.sections) {
-            if (isStepTableSectionType(section.sectionTypeId, section.sectionType)) {
+            if (isActivitySectionType(section.sectionTypeId, section.sectionType)) {
                 continue;
             }
             const entityName = resolveSectionItemEntityName(section.sectionTypeId, section.sectionType);
@@ -1890,29 +1645,6 @@ class AXMSafetyPlanSectionsPageComponent extends AXPPageLayoutBaseComponent {
             })),
         };
     }
-    async loadWorkStepTypeColumns(workStepTypeIds) {
-        const uniqueIds = [...new Set(workStepTypeIds)];
-        const columnsById = new Map();
-        if (!uniqueIds.length) {
-            return columnsById;
-        }
-        const entityKey = `${RootConfig.module.name}.${RootConfig.entities.workStepType.name}`;
-        const accessor = this.entityService.withEntity(entityKey);
-        await Promise.all(uniqueIds.map(async (id) => {
-            try {
-                const row = await accessor.data().byKey(id);
-                if (!row) {
-                    return;
-                }
-                const record = row;
-                columnsById.set(id, normalizeStepTableColumns(record.columns));
-            }
-            catch {
-                // Leave missing types without columns; hydrate falls back to row snapshots.
-            }
-        }));
-        return columnsById;
-    }
     async loadRepeatableSectionTypeIds() {
         const builtIn = collectBuiltInRepeatableSectionTypeIds();
         try {
@@ -2137,4 +1869,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImpor
         }] });
 
 export { AXMSafetyPlanSectionBuilderComponent, AXMSafetyPlanSectionsPageComponent, AXMSafetyPlanSectionsPageComponentProvider, SAFETY_PLAN_SECTIONS_SAVE_COMMAND };
-//# sourceMappingURL=acorex-platform-module-workplacesafety-management-client-index-gbDgxqrV.mjs.map
+//# sourceMappingURL=acorex-platform-module-workplacesafety-management-client-index-CInaiEjw.mjs.map