@acorex/modules 20.6.0-next.19 → 20.6.0-next.20

package/fesm2022/acorex-modules-common.mjs

@@ -1,13 +1,13 @@
 import { AXP_PERMISSION_DEFINITION_PROVIDER, AXPSessionService } from '@acorex/platform/auth';
 import { AXPEntityCommandScope, createQueryView, AXPRefreshEvent, createAllQueryView, AXPEntityQueryType, AXPVersioningService, AXPSettingService, AXPSearchService, AXPCommonSettings, AXPHomePageService, AXPSearchCommandProvider, AXPLockService, AXP_MENU_PROVIDER, AXP_SETTING_DEFINITION_PROVIDER, AXP_SEARCH_PROVIDER } from '@acorex/platform/common';
 import * as i1$2 from '@acorex/platform/core';
-import { AXPExpressionEvaluatorService, getSmart, AXPPlatformScope, AXPStatusDefinitionProviderService, AXPStatusProvider, AXPSystemStatuses, AXPSystemStatusType, AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER, AXP_STATUS_PROVIDERS } from '@acorex/platform/core';
-import { ensureListActions, actionExists, AXPEntityDefinitionRegistryService, AXP_ENTITY_ACTION_PLUGIN, AXMEntityCrudServiceImpl, entityMasterCrudActions, entityMasterDeleteAction, AXP_ENTITY_DEFINITION_LOADER, AXP_ENTITY_STORAGE_BACKEND, AXP_ENTITY_STORAGE_MIDDLEWARE, AXPEntityService } from '@acorex/platform/layout/entity';
+import { AXPExpressionEvaluatorService, getSmart, AXPPlatformScope, AXPBroadcastEventService, AXPStatusDefinitionProviderService, AXPStatusProvider, AXPSystemStatuses, AXPSystemStatusType, AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER, AXP_STATUS_PROVIDERS } from '@acorex/platform/core';
+import { ensureListActions, actionExists, cloneLayoutArrays, ensureLayoutSection, ensureLayoutPropertyView, AXPEntityDefinitionRegistryService, AXP_ENTITY_ACTION_PLUGIN, AXMEntityCrudServiceImpl, entityMasterCrudActions, entityMasterDeleteAction, AXP_ENTITY_DEFINITION_LOADER, AXP_ENTITY_STORAGE_BACKEND, AXP_ENTITY_STORAGE_MIDDLEWARE, AXPEntityEventsKeys, AXPEntityService } from '@acorex/platform/layout/entity';
 import { AXPWidgetsModule } from '@acorex/platform/layout/widgets';
 import * as i0 from '@angular/core';
 import { inject, Injector, Injectable, NgModule, runInInjectionContext, input, signal, ViewEncapsulation, Component, InjectionToken, HostListener, computed } from '@angular/core';
 import * as i1 from '@acorex/platform/workflow';
-import { createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule, AXPWorkflowService, AXPWorkflowEventService } from '@acorex/platform/workflow';
+import { createWorkFlowEvent, AXPWorkflowAction, AXPWorkflowModule, AXPWorkflowService } from '@acorex/platform/workflow';
 import { AXDialogService } from '@acorex/components/dialog';
 import { AXLoadingDialogService } from '@acorex/components/loading-dialog';
 import * as i4 from '@acorex/core/translation';
@@ -381,24 +381,17 @@ const archivePlugin = {
         //#endregion
         //#region ----   Update Interface Layouts   ----
         // Ensure layout includes property in modify/single
-        const ensureLayoutProperty = (layout) => {
-            layout.sections = layout.sections ?? [];
-            if (!layout.sections.some((s) => s.id === groupId)) {
-                layout.sections.push({ id: groupId, order: 150 });
-            }
-            layout.properties = layout.properties ?? [];
-            if (!layout.properties.some((p) => p.name === 'isArchived')) {
-                layout.properties.push({
-                    name: 'isArchived',
-                    layout: {
-                        positions: { lg: { colSpan: 6, order: 90 } },
-                    },
-                });
-            }
-            return layout;
+        const applyLayoutPatch = (layout) => {
+            const next = cloneLayoutArrays(layout);
+            ensureLayoutSection(next, { id: groupId, order: 150 });
+            ensureLayoutPropertyView(next, {
+                name: 'isArchived',
+                layout: { positions: { lg: { colSpan: 6, order: 90 } } },
+            });
+            return next;
         };
-        ctx.interfaces.master.modify.update((modify) => ensureLayoutProperty(modify ?? { sections: [], properties: [] }));
-        ctx.interfaces.master.single.update((single) => ensureLayoutProperty(single ?? { title: ctx.entity.title, sections: [], properties: [] }));
+        ctx.interfaces.master.modify.update((modify) => applyLayoutPatch(modify ?? { sections: [], properties: [] }));
+        ctx.interfaces.master.single.update((single) => applyLayoutPatch(single ?? { title: ctx.entity.title, sections: [], properties: [] }));
         // Add archive view to show only archived items
         ctx.interfaces.master.list.update((list) => {
             const next = list ?? { actions: [], views: [] };
@@ -1125,54 +1118,21 @@ const avatarPlugin = {
             });
         }
         ctx.interfaces.master.create.update((create) => {
-            const next = create ?? { sections: [], properties: [] };
-            next.sections = next.sections ?? [];
-            if (!next.sections.some((s) => s.id === groupId)) {
-                next.sections.push({ id: groupId });
-            }
-            next.properties = next.properties ?? [];
-            if (!next.properties.some((p) => p.name === 'avatar')) {
-                next.properties.push({
-                    name: 'avatar',
-                    layout: {
-                        positions: { lg: { colSpan: options?.colSpan ?? 6 } },
-                    },
-                });
-            }
+            const next = cloneLayoutArrays((create ?? { sections: [], properties: [] }));
+            ensureLayoutSection(next, { id: groupId });
+            ensureLayoutPropertyView(next, { name: 'avatar', layout: { positions: { lg: { colSpan: options?.colSpan ?? 6 } } } });
             return next;
         });
         ctx.interfaces.master.modify.update((update) => {
-            const next = update ?? { sections: [], properties: [] };
-            next.sections = next.sections ?? [];
-            if (!next.sections.some((s) => s.id === groupId)) {
-                next.sections.push({ id: groupId });
-            }
-            next.properties = next.properties ?? [];
-            if (!next.properties.some((p) => p.name === 'avatar')) {
-                next.properties.push({
-                    name: 'avatar',
-                    layout: {
-                        positions: { lg: { colSpan: options?.colSpan ?? 6 } },
-                    },
-                });
-            }
+            const next = cloneLayoutArrays((update ?? { sections: [], properties: [] }));
+            ensureLayoutSection(next, { id: groupId });
+            ensureLayoutPropertyView(next, { name: 'avatar', layout: { positions: { lg: { colSpan: options?.colSpan ?? 6 } } } });
             return next;
         });
         ctx.interfaces.master.single.update((single) => {
-            const next = single ?? { title: ctx.entity.title, sections: [], properties: [] };
-            next.sections = next.sections ?? [];
-            if (!next.sections.some((s) => s.id === groupId)) {
-                next.sections.push({ id: groupId });
-            }
-            next.properties = next.properties ?? [];
-            if (!next.properties.some((p) => p.name === 'avatar')) {
-                next.properties.push({
-                    name: 'avatar',
-                    layout: {
-                        positions: { lg: { colSpan: options?.colSpan ?? 6 } },
-                    },
-                });
-            }
+            const next = cloneLayoutArrays((single ?? { title: ctx.entity.title, sections: [], properties: [] }));
+            ensureLayoutSection(next, { id: groupId });
+            ensureLayoutPropertyView(next, { name: 'avatar', layout: { positions: { lg: { colSpan: options?.colSpan ?? 6 } } } });
             return next;
         });
     },
@@ -1253,25 +1213,18 @@ const categoryPlugin = {
             };
         });
         // Ensure layout includes property in create/modify/single
-        const ensureLayoutProperty = (layout) => {
-            layout.sections = layout.sections ?? [];
-            if (!layout.sections.some((s) => s.id === groupId)) {
-                layout.sections.push({ id: groupId, order: 150 });
-            }
-            layout.properties = layout.properties ?? [];
-            if (!layout.properties.some((p) => p.name === propertyName)) {
-                layout.properties.push({
-                    name: propertyName,
-                    layout: {
-                        positions: { lg: { colSpan: 6, order: 12 } },
-                    },
-                });
-            }
-            return layout;
+        const applyLayoutPatch = (layout) => {
+            const next = cloneLayoutArrays(layout);
+            ensureLayoutSection(next, { id: groupId, order: 150 });
+            ensureLayoutPropertyView(next, {
+                name: propertyName,
+                layout: { positions: { lg: { colSpan: 6, order: 12 } } },
+            });
+            return next;
         };
-        ctx.interfaces.master.create.update((create) => ensureLayoutProperty(create ?? { sections: [], properties: [] }));
-        ctx.interfaces.master.modify.update((modify) => ensureLayoutProperty(modify ?? { sections: [], properties: [] }));
-        ctx.interfaces.master.single.update((single) => ensureLayoutProperty(single ?? { title: ctx.entity.title, sections: [], properties: [] }));
+        ctx.interfaces.master.create.update((create) => applyLayoutPatch(create ?? { sections: [], properties: [] }));
+        ctx.interfaces.master.modify.update((modify) => applyLayoutPatch(modify ?? { sections: [], properties: [] }));
+        ctx.interfaces.master.single.update((single) => applyLayoutPatch(single ?? { title: ctx.entity.title, sections: [], properties: [] }));
         // Mark extension for dynamic category entity generation
         ctx.entity.extensions ??= {};
         ctx.entity.extensions.category = {
@@ -1870,54 +1823,21 @@ const colorPlugin = {
         }
         //#endregion
         ctx.interfaces.master.create.update((create) => {
-            const next = create ?? { sections: [], properties: [] };
-            next.sections = next.sections ?? [];
-            if (!next.sections.some((s) => s.id === groupId)) {
-                next.sections.push({ id: groupId });
-            }
-            next.properties = next.properties ?? [];
-            if (!next.properties.some((p) => p.name === 'color')) {
-                next.properties.push({
-                    name: 'color',
-                    layout: {
-                        positions: { lg: { colSpan: 6 } },
-                    },
-                });
-            }
+            const next = cloneLayoutArrays((create ?? { sections: [], properties: [] }));
+            ensureLayoutSection(next, { id: groupId });
+            ensureLayoutPropertyView(next, { name: 'color', layout: { positions: { lg: { colSpan: 6 } } } });
             return next;
         });
         ctx.interfaces.master.modify.update((update) => {
-            const next = update ?? { sections: [], properties: [] };
-            next.sections = next.sections ?? [];
-            if (!next.sections.some((s) => s.id === groupId)) {
-                next.sections.push({ id: groupId });
-            }
-            next.properties = next.properties ?? [];
-            if (!next.properties.some((p) => p.name === 'color')) {
-                next.properties.push({
-                    name: 'color',
-                    layout: {
-                        positions: { lg: { colSpan: 6 } },
-                    },
-                });
-            }
+            const next = cloneLayoutArrays((update ?? { sections: [], properties: [] }));
+            ensureLayoutSection(next, { id: groupId });
+            ensureLayoutPropertyView(next, { name: 'color', layout: { positions: { lg: { colSpan: 6 } } } });
             return next;
         });
         ctx.interfaces.master.single.update((single) => {
-            const next = single ?? { title: ctx.entity.title, sections: [], properties: [] };
-            next.sections = next.sections ?? [];
-            if (!next.sections.some((s) => s.id === groupId)) {
-                next.sections.push({ id: groupId });
-            }
-            next.properties = next.properties ?? [];
-            if (!next.properties.some((p) => p.name === 'color')) {
-                next.properties.push({
-                    name: 'color',
-                    layout: {
-                        positions: { lg: { colSpan: 6 } },
-                    },
-                });
-            }
+            const next = cloneLayoutArrays((single ?? { title: ctx.entity.title, sections: [], properties: [] }));
+            ensureLayoutSection(next, { id: groupId });
+            ensureLayoutPropertyView(next, { name: 'color', layout: { positions: { lg: { colSpan: 6 } } } });
             return next;
         });
     },
@@ -2012,7 +1932,7 @@ class AXMCompareEntityRecordsAction extends AXPWorkflowAction {
         const getById = entityRef.queries.byKey?.execute;
         //
         const fields = entityRef.properties
-            .filter(p => p.schema.interface && p.schema.hidden != true)
+            .filter((p) => p.schema.interface && p.schema.visible !== false)
             .map((p) => ({
             path: p.name,
             title: p.title,
@@ -2063,10 +1983,12 @@ class AXMCompareEntityRecordVersionsAction extends AXPWorkflowAction {
         const refType = context.getVariable('data.refType');
         const ids = context.getVariable('data.ids');
         const streamId = await this.versioning.getStreamIdIfExists(refType, refId);
-        const histories = streamId ? (await this.versioning.listEntries(streamId)).filter((e) => ids.includes(e.id)) : [];
+        const histories = streamId
+            ? (await this.versioning.listEntries(streamId)).filter((e) => ids.includes(e.id))
+            : [];
         //
         const fields = entityRef.properties
-            .filter(p => p.schema.interface && p.schema.hidden != true)
+            .filter((p) => p.schema.interface && p.schema.visible !== false)
             .map((p) => ({
             path: p.name,
             title: p.title,
@@ -2079,11 +2001,11 @@ class AXMCompareEntityRecordVersionsAction extends AXPWorkflowAction {
             },
         }));
         const objects = await Promise.all(histories.map(async (h) => {
-            const title = await this.translate.translateAsync(`@activity-log:terms.${h.changeType === 'Create' ? 'created' : (h.changeType === 'Delete' ? 'deleted' : 'updated')}-by-title`, {
+            const title = await this.translate.translateAsync(`@activity-log:terms.${h.changeType === 'Create' ? 'created' : h.changeType === 'Delete' ? 'deleted' : 'updated'}-by-title`, {
                 params: {
                     user: h.changedBy ?? 'system',
                     date: this.formatService.format(new Date(h.changedAt), 'datetime', { format: 'short' }),
-                }
+                },
             });
             const snapshot = structuredClone(h.snapshotJson ?? {});
             return {
@@ -2117,7 +2039,7 @@ const AXMCompareEntityRecordsWorkflow = {
                 {
                     conditions: [{ type: 'SINGLE', expression: 'context.getOutput("result") == true' }],
                     nextStepId: 'show-popup',
-                }
+                },
             ],
         },
         'show-popup': {
@@ -2134,7 +2056,7 @@ const AXMCompareEntityRecordVersionsWorkflow = {
                 {
                     conditions: [{ type: 'SINGLE', expression: 'context.getOutput("result") == true' }],
                     nextStepId: 'show-popup',
-                }
+                },
             ],
         },
         'show-popup': {
@@ -2451,21 +2373,15 @@ const computedPropertiesPlugin = {
             }
             // Ensure Single (details) view shows it
             ctx.interfaces.master.single.update((single) => {
-                const next = single ?? { title: ctx.entity.title, sections: [], properties: [] };
-                next.sections = next.sections ?? [];
-                if (!next.sections.some((s) => s.id === groupId)) {
-                    next.sections.push({ id: groupId, order: 90 });
-                }
-                next.properties = next.properties ?? [];
-                if (!next.properties.some((p) => p.name === f.name)) {
-                    next.properties.push({
-                        name: f.name,
-                        layout: {
-                            positions: { lg: { colSpan: f.layout?.colSpan ?? 12, order: f.layout?.order ?? 99 } },
-                            label: { visible: true },
-                        },
-                    });
-                }
+                const next = cloneLayoutArrays((single ?? { title: ctx.entity.title, sections: [], properties: [] }));
+                ensureLayoutSection(next, { id: groupId, order: 90 });
+                ensureLayoutPropertyView(next, {
+                    name: f.name,
+                    layout: {
+                        positions: { lg: { colSpan: f.layout?.colSpan ?? 12, order: f.layout?.order ?? 99 } },
+                        label: { visible: true },
+                    },
+                });
                 return next;
             });
         }
@@ -2531,9 +2447,9 @@ const disablePlugin = {
                     sort: { enabled: true },
                     filter: {
                         advance: { enabled: true },
-                        inline: { enabled: true }
-                    }
-                }
+                        inline: { enabled: true },
+                    },
+                },
             });
         }
         // Add isDisabled to columns for list view
@@ -2665,24 +2581,39 @@ const disablePlugin = {
         //#endregion
         //#region ----   Update Interface Layouts   ----
         // Ensure layout includes property in modify/single
-        const ensureLayoutProperty = (layout) => {
-            layout.sections = layout.sections ?? [];
-            if (!layout.sections.some((s) => s.id === groupId)) {
-                layout.sections.push({ id: groupId, order: 150 });
+        const ensureIsDisabledLayout = (base) => {
+            // IMPORTANT:
+            // Many entities reuse the same `sections` / `properties` arrays across create/update/single (shared reference).
+            // Never mutate those arrays in-place; always clone before pushing to avoid leaking changes into other interfaces.
+            const sections = [...base.sections];
+            const properties = [...(base.properties ?? [])];
+            if (!sections.some((s) => s.id === groupId)) {
+                sections.push({ id: groupId, order: 150 });
             }
-            layout.properties = layout.properties ?? [];
-            if (!layout.properties.some((p) => p.name === 'isDisabled')) {
-                layout.properties.push({
+            if (!properties.some((p) => p.name === 'isDisabled')) {
+                properties.push({
                     name: 'isDisabled',
                     layout: {
                         positions: { lg: { colSpan: 6, order: 95 } },
                     },
                 });
             }
-            return layout;
+            return {
+                ...base,
+                sections,
+                properties,
+            };
+        };
+        const ensureUpdateLayoutProperty = (layout) => {
+            const base = layout ?? { sections: [], properties: [] };
+            return ensureIsDisabledLayout(base);
         };
-        ctx.interfaces.master.modify.update((modify) => ensureLayoutProperty(modify ?? { sections: [], properties: [] }));
-        ctx.interfaces.master.single.update((single) => ensureLayoutProperty(single ?? { title: ctx.entity.title, sections: [], properties: [] }));
+        const ensureSingleLayoutProperty = (layout) => {
+            const base = layout ?? { title: ctx.entity.title, sections: [], properties: [] };
+            return ensureIsDisabledLayout(base);
+        };
+        ctx.interfaces.master.modify.update((modify) => ensureUpdateLayoutProperty(modify));
+        ctx.interfaces.master.single.update((single) => ensureSingleLayoutProperty(single));
         // Add disabled view to show only disabled items
         ctx.interfaces.master.list.update((list) => {
             const next = list ?? { actions: [], views: [] };
@@ -2695,7 +2626,7 @@ const disablePlugin = {
                             name: 'isDisabled',
                             operator: { type: 'equal' },
                             value: true,
-                            hidden: true
+                            hidden: true,
                         },
                     ],
                     sorts: [
@@ -3439,25 +3370,18 @@ const defaultPlugin = {
         //#endregion
         //#region ----   Update Interface Layouts   ----
         // Ensure layout includes property in create/modify/single
-        const ensureLayoutProperty = (layout) => {
-            layout.sections = layout.sections ?? [];
-            if (!layout.sections.some((s) => s.id === groupId)) {
-                layout.sections.push({ id: groupId, order: 150 });
-            }
-            layout.properties = layout.properties ?? [];
-            if (!layout.properties.some((p) => p.name === 'isDefault')) {
-                layout.properties.push({
-                    name: 'isDefault',
-                    layout: {
-                        positions: { lg: { colSpan: 6, order: 92 } },
-                    },
-                });
-            }
-            return layout;
+        const applyLayoutPatch = (layout) => {
+            const next = cloneLayoutArrays(layout);
+            ensureLayoutSection(next, { id: groupId, order: 150 });
+            ensureLayoutPropertyView(next, {
+                name: 'isDefault',
+                layout: { positions: { lg: { colSpan: 6, order: 92 } } },
+            });
+            return next;
         };
-        ctx.interfaces.master.create.update((create) => ensureLayoutProperty(create ?? { sections: [], properties: [] }));
-        ctx.interfaces.master.modify.update((modify) => ensureLayoutProperty(modify ?? { sections: [], properties: [] }));
-        ctx.interfaces.master.single.update((single) => ensureLayoutProperty(single ?? { title: ctx.entity.title, sections: [], properties: [] }));
+        ctx.interfaces.master.create.update((create) => applyLayoutPatch(create ?? { sections: [], properties: [] }));
+        ctx.interfaces.master.modify.update((modify) => applyLayoutPatch(modify ?? { sections: [], properties: [] }));
+        ctx.interfaces.master.single.update((single) => applyLayoutPatch(single ?? { title: ctx.entity.title, sections: [], properties: [] }));
         //#endregion
     },
 };
@@ -3653,7 +3577,7 @@ class AXPExtraPropertiesModule {
             //
             provideCommandSetups([{
                     key: 'manage-extra-properties',
-                    command: () => import('./acorex-modules-common-manage-extra-properties.command-Cl7ANDKN.mjs').then(m => m.AXPManageExtraPropertiesCommand),
+                    command: () => import('./acorex-modules-common-manage-extra-properties.command-C4jE3MPJ.mjs').then(m => m.AXPManageExtraPropertiesCommand),
                 }]),
         ] }); }
 }
@@ -3667,7 +3591,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
                         //
                         provideCommandSetups([{
                                 key: 'manage-extra-properties',
-                                command: () => import('./acorex-modules-common-manage-extra-properties.command-Cl7ANDKN.mjs').then(m => m.AXPManageExtraPropertiesCommand),
+                                command: () => import('./acorex-modules-common-manage-extra-properties.command-C4jE3MPJ.mjs').then(m => m.AXPManageExtraPropertiesCommand),
                             }]),
                     ],
                 }]
@@ -3993,25 +3917,15 @@ const iconPlugin = {
         //#endregion
         //#region ----   Update Interface Layouts   ----
         // Ensure layout includes property in create/modify/single
-        const ensureLayoutProperty = (layout) => {
-            layout.sections = layout.sections ?? [];
-            if (!layout.sections.some((s) => s.id === groupId)) {
-                layout.sections.push({ id: groupId, order: 150 });
-            }
-            layout.properties = layout.properties ?? [];
-            if (!layout.properties.some((p) => p.name === 'icon')) {
-                layout.properties.push({
-                    name: 'icon',
-                    layout: {
-                        positions: { lg: { colSpan: 6 } },
-                    },
-                });
-            }
-            return layout;
+        const applyLayoutPatch = (layout) => {
+            const next = cloneLayoutArrays(layout);
+            ensureLayoutSection(next, { id: groupId, order: 150 });
+            ensureLayoutPropertyView(next, { name: 'icon', layout: { positions: { lg: { colSpan: 6 } } } });
+            return next;
         };
-        ctx.interfaces.master.create.update((create) => ensureLayoutProperty(create ?? { sections: [], properties: [] }));
-        ctx.interfaces.master.modify.update((modify) => ensureLayoutProperty(modify ?? { sections: [], properties: [] }));
-        ctx.interfaces.master.single.update((single) => ensureLayoutProperty(single ?? { title: ctx.entity.title, sections: [], properties: [] }));
+        ctx.interfaces.master.create.update((create) => applyLayoutPatch(create ?? { sections: [], properties: [] }));
+        ctx.interfaces.master.modify.update((modify) => applyLayoutPatch(modify ?? { sections: [], properties: [] }));
+        ctx.interfaces.master.single.update((single) => applyLayoutPatch(single ?? { title: ctx.entity.title, sections: [], properties: [] }));
         //#endregion
     },
 };
@@ -4067,9 +3981,9 @@ const primaryPlugin = {
                     sort: { enabled: true },
                     filter: {
                         advance: { enabled: true },
-                        inline: { enabled: true }
-                    }
-                }
+                        inline: { enabled: true },
+                    },
+                },
             });
         }
         //#endregion
@@ -4129,25 +4043,18 @@ const primaryPlugin = {
         //#endregion
         //#region ----   Update Interface Layouts   ----
         // Ensure layout includes property in create/modify/single
-        const ensureLayoutProperty = (layout) => {
-            layout.sections = layout.sections ?? [];
-            if (!layout.sections.some((s) => s.id === groupId)) {
-                layout.sections.push({ id: groupId, order: 150 });
-            }
-            layout.properties = layout.properties ?? [];
-            if (!layout.properties.some((p) => p.name === 'isPrimary')) {
-                layout.properties.push({
-                    name: 'isPrimary',
-                    layout: {
-                        positions: { lg: { colSpan: 6, order: 90 } },
-                    },
-                });
-            }
-            return layout;
+        const applyLayoutPatch = (layout) => {
+            const next = cloneLayoutArrays(layout);
+            ensureLayoutSection(next, { id: groupId, order: 150 });
+            ensureLayoutPropertyView(next, {
+                name: 'isPrimary',
+                layout: { positions: { lg: { colSpan: 6, order: 90 } } },
+            });
+            return next;
         };
-        ctx.interfaces.master.create.update((create) => ensureLayoutProperty(create ?? { sections: [], properties: [] }));
-        ctx.interfaces.master.modify.update((modify) => ensureLayoutProperty(modify ?? { sections: [], properties: [] }));
-        ctx.interfaces.master.single.update((single) => ensureLayoutProperty(single ?? { title: ctx.entity.title, sections: [], properties: [] }));
+        ctx.interfaces.master.create.update((create) => applyLayoutPatch(create ?? { sections: [], properties: [] }));
+        ctx.interfaces.master.modify.update((modify) => applyLayoutPatch(modify ?? { sections: [], properties: [] }));
+        ctx.interfaces.master.single.update((single) => applyLayoutPatch(single ?? { title: ctx.entity.title, sections: [], properties: [] }));
         // Add primary view to show only primary items
         ctx.interfaces.master.list.update((list) => {
             const next = list ?? { actions: [], views: [] };
@@ -4160,7 +4067,7 @@ const primaryPlugin = {
                             name: 'isPrimary',
                             operator: { type: 'equal' },
                             value: true,
-                            hidden: true
+                            hidden: true,
                         },
                     ],
                     sorts: [
@@ -4390,18 +4297,18 @@ const commandMessageToastMiddleware = async (input, next) => {
  * Dispatches an entity refresh event after successful command execution.
  */
 const commandRefreshMiddleware = async (input, next) => {
-    const workflowEventService = inject(AXPWorkflowEventService);
+    const broadcastEventService = inject(AXPBroadcastEventService);
     const result = await next(input);
-    if (result.success) {
+    if (result.success && result.metadata?.['refresh'] !== false) {
         const payload = input;
         const context = payload ? payload['__context__'] : undefined;
         const entity = context ? context['entity'] : undefined;
         if (entity) {
             const meta = context ? context['meta'] : undefined;
-            workflowEventService.dispatch(AXPRefreshEvent({
-                entity,
+            broadcastEventService.publish(AXPEntityEventsKeys.REFRESH_LAYOUT, {
+                name: entity,
                 ...(meta !== undefined ? { meta } : {}),
-            }));
+            });
         }
     }
     return result;
@@ -4594,20 +4501,9 @@ const statusPlugin = {
         //#region ----   Update Interface Layouts   ----
         // Add status to create view
         ctx.interfaces.master.create.update((create) => {
-            const next = create ?? { sections: [], properties: [] };
-            next.sections = next.sections ?? [];
-            if (!next.sections.some((s) => s.id === groupId)) {
-                next.sections.push({ id: groupId });
-            }
-            next.properties = next.properties ?? [];
-            if (!next.properties.some((p) => p.name === fieldName)) {
-                next.properties.push({
-                    name: fieldName,
-                    layout: {
-                        positions: { lg: { colSpan: 4 } },
-                    },
-                });
-            }
+            const next = cloneLayoutArrays((create ?? { sections: [], properties: [] }));
+            ensureLayoutSection(next, { id: groupId });
+            ensureLayoutPropertyView(next, { name: fieldName, layout: { positions: { lg: { colSpan: 4 } } } });
             // Transitions management removed - not needed with provider system
             // if (false && next.properties && !next.properties.some((p: any) => p.name === 'transitions')) {
             //     next.properties.push({
@@ -4621,38 +4517,16 @@ const statusPlugin = {
         });
         // Add status to update view
         ctx.interfaces.master.modify.update((update) => {
-            const next = update ?? { sections: [], properties: [] };
-            next.sections = next.sections ?? [];
-            if (!next.sections.some((s) => s.id === groupId)) {
-                next.sections.push({ id: groupId });
-            }
-            next.properties = next.properties ?? [];
-            if (!next.properties.some((p) => p.name === fieldName)) {
-                next.properties.push({
-                    name: fieldName,
-                    layout: {
-                        positions: { lg: { colSpan: 6 } },
-                    },
-                });
-            }
+            const next = cloneLayoutArrays((update ?? { sections: [], properties: [] }));
+            ensureLayoutSection(next, { id: groupId });
+            ensureLayoutPropertyView(next, { name: fieldName, layout: { positions: { lg: { colSpan: 6 } } } });
             return next;
         });
         // Add status to single view
         ctx.interfaces.master.single.update((single) => {
-            const next = single ?? { title: ctx.entity.title, sections: [], properties: [] };
-            next.sections = next.sections ?? [];
-            if (!next.sections.some((s) => s.id === groupId)) {
-                next.sections.push({ id: groupId });
-            }
-            next.properties = next.properties ?? [];
-            if (!next.properties.some((p) => p.name === fieldName)) {
-                next.properties.push({
-                    name: fieldName,
-                    layout: {
-                        positions: { lg: { colSpan: 6 } },
-                    },
-                });
-            }
+            const next = cloneLayoutArrays((single ?? { title: ctx.entity.title, sections: [], properties: [] }));
+            ensureLayoutSection(next, { id: groupId });
+            ensureLayoutPropertyView(next, { name: fieldName, layout: { positions: { lg: { colSpan: 6 } } } });
             return next;
         });
         // Add status to list view columns