@acorex/platform 20.7.10 → 20.7.12

package/fesm2022/acorex-platform-layout-entity.mjs

@@ -2043,7 +2043,7 @@ class AXPEntityDetailPopoverComponent {
         return importantProperties;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPEntityDetailPopoverComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: AXPEntityDetailPopoverComponent, isStandalone: true, selector: "axp-entity-detail-popover", inputs: { entity: { classPropertyName: "entity", publicName: "entity", isSignal: true, isRequired: true, transformFunction: null }, entityId: { classPropertyName: "entityId", publicName: "entityId", isSignal: true, isRequired: true, transformFunction: null }, textField: { classPropertyName: "textField", publicName: "textField", isSignal: true, isRequired: false, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: false, transformFunction: null }, item: { classPropertyName: "item", publicName: "item", isSignal: true, isRequired: false, transformFunction: null }, breadcrumb: { classPropertyName: "breadcrumb", publicName: "breadcrumb", isSignal: true, isRequired: false, transformFunction: null } }, viewQueries: [{ propertyName: "detailPopover", first: true, predicate: ["detailPopover"], descendants: true, isSignal: true }], ngImport: i0, template: "<ax-popover [openOn]=\"'manual'\" #detailPopover (openChange)=\"onDetailPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[400px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold ax-text-on-lightest-surface\">\n        @if (entityDetails()?.entityData?.[textField()]) {\n          {{ entityDetails()?.entityData[textField()] }}\n        } @else {\n          {{ item()?.[textField()] }}\n        }\n      </h3>\n      @if (breadcrumb()) {\n        <div class=\"ax-text-xs ax-text-neutral-500 ax-mt-1\">{{ breadcrumb() }}</div>\n      }\n    </div>\n    @if (isLoadingDetails()) {\n      <div class=\"ax-flex ax-items-center ax-justify-center ax-py-8\">\n        <ax-loading>Loading details...</ax-loading>\n      </div>\n    } @else if (entityDetails()) {\n      <div class=\"ax-space-y-3 ax-mb-4\">\n        <!-- Important Entity Data -->\n        @if (entityDetails()?.entityData) {\n          <axp-widgets-container [context]=\"entityDetails()?.entityData\">\n            <div class=\"ax-space-y-2\">\n              @for (item of getEntityPropertiesWithWidgets(); track item.name) {\n                <div class=\"ax-flex ax-justify-between ax-items-center\">\n                  <span class=\"ax-text-sm ax-font-medium\">{{ item.title | translate | async }}:</span>\n                  <div class=\"ax-flex-1 ax-ml-2 ax-max-w-48\">\n                    <ng-container axp-widget-renderer [node]=\"item.node\" [mode]=\"'view'\"></ng-container>\n                  </div>\n                </div>\n              }\n            </div>\n          </axp-widgets-container>\n        }\n      </div>\n      <div class=\"ax-flex ax-gap-2 ax-justify-end ax-sm\">\n        <ax-button [color]=\"'primary'\" [look]=\"'solid'\" text=\"Open Details\" (click)=\"navigateToDetails()\"> </ax-button>\n      </div>\n    }\n  </div>\n</ax-popover>\n", dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXPopoverModule }, { kind: "component", type: i2.AXPopoverComponent, selector: "ax-popover", inputs: ["width", "forceDisableActionSheetStyle", "disabled", "offsetX", "offsetY", "target", "placement", "content", "openOn", "closeOn", "hasBackdrop", "openAfter", "closeAfter", "repositionOnScroll", "backdropClass", "panelClass", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "component", type: i3$1.AXPWidgetContainerComponent, selector: "axp-widgets-container", inputs: ["context", "functions"], outputs: ["onContextChanged"] }, { kind: "directive", type: i3$1.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged", "onLoad"], exportAs: ["widgetRenderer"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: AXPEntityDetailPopoverComponent, isStandalone: true, selector: "axp-entity-detail-popover", inputs: { entity: { classPropertyName: "entity", publicName: "entity", isSignal: true, isRequired: true, transformFunction: null }, entityId: { classPropertyName: "entityId", publicName: "entityId", isSignal: true, isRequired: true, transformFunction: null }, textField: { classPropertyName: "textField", publicName: "textField", isSignal: true, isRequired: false, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: false, transformFunction: null }, item: { classPropertyName: "item", publicName: "item", isSignal: true, isRequired: false, transformFunction: null }, breadcrumb: { classPropertyName: "breadcrumb", publicName: "breadcrumb", isSignal: true, isRequired: false, transformFunction: null } }, viewQueries: [{ propertyName: "detailPopover", first: true, predicate: ["detailPopover"], descendants: true, isSignal: true }], ngImport: i0, template: "<ax-popover [openOn]=\"'manual'\" #detailPopover (openChange)=\"onDetailPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[400px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold ax-text-on-lightest-surface\">\n        @if (entityDetails()?.entityData?.[textField()]) {\n          {{ entityDetails()?.entityData[textField()] }}\n        } @else {\n          {{ item()?.[textField()] }}\n        }\n      </h3>\n      @if (breadcrumb()) {\n        <div class=\"ax-text-xs ax-text-neutral-500 ax-mt-1\">{{ breadcrumb() }}</div>\n      }\n    </div>\n    @if (isLoadingDetails()) {\n      <div class=\"ax-flex ax-items-center ax-justify-center ax-py-8\">\n        <ax-loading>Loading details...</ax-loading>\n      </div>\n    } @else if (entityDetails()) {\n      <div class=\"ax-space-y-3 ax-mb-4\">\n        <!-- Important Entity Data -->\n        @if (entityDetails()?.entityData) {\n          <axp-widgets-container [context]=\"entityDetails()?.entityData\">\n            <div class=\"ax-space-y-2\">\n              @for (item of getEntityPropertiesWithWidgets(); track item.name) {\n                <div class=\"ax-flex ax-justify-between ax-items-center\">\n                  <span class=\"ax-text-sm ax-font-medium\">{{ item.title | translate | async }}:</span>\n                  <div class=\"ax-flex-1 ax-ml-2 ax-max-w-48\">\n                    <ng-container axp-widget-renderer [node]=\"item.node\" [mode]=\"'view'\"></ng-container>\n                  </div>\n                </div>\n              }\n            </div>\n          </axp-widgets-container>\n        }\n      </div>\n      <div class=\"ax-flex ax-gap-2 ax-justify-end ax-sm\">\n        <ax-button\n          [color]=\"'primary'\"\n          [look]=\"'solid'\"\n          [text]=\"'@general:open-details.title' | translate | async\"\n          (click)=\"navigateToDetails()\"\n        >\n        </ax-button>\n      </div>\n    }\n  </div>\n</ax-popover>\n", dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i3.AXButtonComponent, selector: "ax-button", inputs: ["disabled", "size", "tabIndex", "color", "look", "text", "toggleable", "selected", "iconOnly", "type", "loadingText"], outputs: ["onBlur", "onFocus", "onClick", "selectedChange", "toggleableChange", "lookChange", "colorChange", "disabledChange", "loadingTextChange"] }, { kind: "ngmodule", type: AXPopoverModule }, { kind: "component", type: i2.AXPopoverComponent, selector: "ax-popover", inputs: ["width", "forceDisableActionSheetStyle", "disabled", "offsetX", "offsetY", "target", "placement", "content", "openOn", "closeOn", "hasBackdrop", "openAfter", "closeAfter", "repositionOnScroll", "backdropClass", "panelClass", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "component", type: i3$1.AXPWidgetContainerComponent, selector: "axp-widgets-container", inputs: ["context", "functions"], outputs: ["onContextChanged"] }, { kind: "directive", type: i3$1.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged", "onLoad"], exportAs: ["widgetRenderer"] }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "component", type: i4.AXLoadingComponent, selector: "ax-loading", inputs: ["visible", "type", "context"], outputs: ["visibleChange"] }, { kind: "pipe", type: i5.AsyncPipe, name: "async" }, { kind: "pipe", type: i6.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPEntityDetailPopoverComponent, decorators: [{
             type: Component,
@@ -2054,7 +2054,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                         AXPWidgetCoreModule,
                         AXTranslationModule,
                         AXLoadingModule,
-                    ], template: "<ax-popover [openOn]=\"'manual'\" #detailPopover (openChange)=\"onDetailPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[400px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold ax-text-on-lightest-surface\">\n        @if (entityDetails()?.entityData?.[textField()]) {\n          {{ entityDetails()?.entityData[textField()] }}\n        } @else {\n          {{ item()?.[textField()] }}\n        }\n      </h3>\n      @if (breadcrumb()) {\n        <div class=\"ax-text-xs ax-text-neutral-500 ax-mt-1\">{{ breadcrumb() }}</div>\n      }\n    </div>\n    @if (isLoadingDetails()) {\n      <div class=\"ax-flex ax-items-center ax-justify-center ax-py-8\">\n        <ax-loading>Loading details...</ax-loading>\n      </div>\n    } @else if (entityDetails()) {\n      <div class=\"ax-space-y-3 ax-mb-4\">\n        <!-- Important Entity Data -->\n        @if (entityDetails()?.entityData) {\n          <axp-widgets-container [context]=\"entityDetails()?.entityData\">\n            <div class=\"ax-space-y-2\">\n              @for (item of getEntityPropertiesWithWidgets(); track item.name) {\n                <div class=\"ax-flex ax-justify-between ax-items-center\">\n                  <span class=\"ax-text-sm ax-font-medium\">{{ item.title | translate | async }}:</span>\n                  <div class=\"ax-flex-1 ax-ml-2 ax-max-w-48\">\n                    <ng-container axp-widget-renderer [node]=\"item.node\" [mode]=\"'view'\"></ng-container>\n                  </div>\n                </div>\n              }\n            </div>\n          </axp-widgets-container>\n        }\n      </div>\n      <div class=\"ax-flex ax-gap-2 ax-justify-end ax-sm\">\n        <ax-button [color]=\"'primary'\" [look]=\"'solid'\" text=\"Open Details\" (click)=\"navigateToDetails()\"> </ax-button>\n      </div>\n    }\n  </div>\n</ax-popover>\n" }]
+                    ], template: "<ax-popover [openOn]=\"'manual'\" #detailPopover (openChange)=\"onDetailPopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[400px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold ax-text-on-lightest-surface\">\n        @if (entityDetails()?.entityData?.[textField()]) {\n          {{ entityDetails()?.entityData[textField()] }}\n        } @else {\n          {{ item()?.[textField()] }}\n        }\n      </h3>\n      @if (breadcrumb()) {\n        <div class=\"ax-text-xs ax-text-neutral-500 ax-mt-1\">{{ breadcrumb() }}</div>\n      }\n    </div>\n    @if (isLoadingDetails()) {\n      <div class=\"ax-flex ax-items-center ax-justify-center ax-py-8\">\n        <ax-loading>Loading details...</ax-loading>\n      </div>\n    } @else if (entityDetails()) {\n      <div class=\"ax-space-y-3 ax-mb-4\">\n        <!-- Important Entity Data -->\n        @if (entityDetails()?.entityData) {\n          <axp-widgets-container [context]=\"entityDetails()?.entityData\">\n            <div class=\"ax-space-y-2\">\n              @for (item of getEntityPropertiesWithWidgets(); track item.name) {\n                <div class=\"ax-flex ax-justify-between ax-items-center\">\n                  <span class=\"ax-text-sm ax-font-medium\">{{ item.title | translate | async }}:</span>\n                  <div class=\"ax-flex-1 ax-ml-2 ax-max-w-48\">\n                    <ng-container axp-widget-renderer [node]=\"item.node\" [mode]=\"'view'\"></ng-container>\n                  </div>\n                </div>\n              }\n            </div>\n          </axp-widgets-container>\n        }\n      </div>\n      <div class=\"ax-flex ax-gap-2 ax-justify-end ax-sm\">\n        <ax-button\n          [color]=\"'primary'\"\n          [look]=\"'solid'\"\n          [text]=\"'@general:open-details.title' | translate | async\"\n          (click)=\"navigateToDetails()\"\n        >\n        </ax-button>\n      </div>\n    }\n  </div>\n</ax-popover>\n" }]
         }], propDecorators: { entity: [{ type: i0.Input, args: [{ isSignal: true, alias: "entity", required: true }] }], entityId: [{ type: i0.Input, args: [{ isSignal: true, alias: "entityId", required: true }] }], textField: [{ type: i0.Input, args: [{ isSignal: true, alias: "textField", required: false }] }], valueField: [{ type: i0.Input, args: [{ isSignal: true, alias: "valueField", required: false }] }], item: [{ type: i0.Input, args: [{ isSignal: true, alias: "item", required: false }] }], breadcrumb: [{ type: i0.Input, args: [{ isSignal: true, alias: "breadcrumb", required: false }] }], detailPopover: [{ type: i0.ViewChild, args: ['detailPopover', { isSignal: true }] }] } });
 
 class AXPEntityDetailPopoverService {
@@ -4662,12 +4662,17 @@ class AXPBaseRelatedEntityConverter {
             groups,
         };
     }
-    async createGridLayoutStructure(singleInterface, helpers, evaluateExpressions) {
-        return await this.createGridLayoutStructureInternal(singleInterface, helpers, evaluateExpressions);
+    async createGridLayoutStructure(singleInterface, helpers, evaluateExpressions, includeProperties) {
+        return await this.createGridLayoutStructureInternal(singleInterface, helpers, evaluateExpressions, includeProperties);
     }
     //#region ----   Visible Evaluation Helpers   ----
-    async getVisiblePropertiesByGroupId(sectionId, helpers, evaluateExpressions) {
-        const properties = helpers.getPropertyByGroupId(sectionId) ?? [];
+    async getVisiblePropertiesByGroupId(sectionId, helpers, evaluateExpressions, includeProperties) {
+        let properties = helpers.getPropertyByGroupId(sectionId) ?? [];
+        // Filter by includeProperties if provided
+        if (includeProperties && includeProperties.length > 0) {
+            const includeSet = new Set(includeProperties);
+            properties = properties.filter((p) => includeSet.has(p.name));
+        }
         const evaluated = await Promise.all(properties.map(async (property) => {
             let visible = property?.schema?.visible;
             if (typeof visible === 'string' && evaluateExpressions) {
@@ -4683,8 +4688,8 @@ class AXPBaseRelatedEntityConverter {
         }));
         return evaluated.filter((x) => x.visible !== false).map((x) => x.property);
     }
-    async createPropertyGrid(sectionId, helpers, evaluateExpressions) {
-        const visibleProperties = await this.getVisiblePropertiesByGroupId(sectionId, helpers, evaluateExpressions);
+    async createPropertyGrid(sectionId, helpers, evaluateExpressions, includeProperties) {
+        const visibleProperties = await this.getVisiblePropertiesByGroupId(sectionId, helpers, evaluateExpressions, includeProperties);
         return {
             type: 'grid-layout',
             mode: 'edit',
@@ -4732,7 +4737,13 @@ class AXPBaseRelatedEntityConverter {
             }),
         };
     }
-    async createGridLayoutStructureInternal(singleInterface, helpers, evaluateExpressions) {
+    async createGridLayoutStructureInternal(singleInterface, helpers, evaluateExpressions, includeProperties) {
+        // Filter out empty sections (sections with no visible properties)
+        const sectionsWithProperties = await Promise.all((singleInterface?.sections ?? []).map(async (s) => {
+            const visibleProperties = await this.getVisiblePropertiesByGroupId(s.id, helpers, evaluateExpressions, includeProperties);
+            return { section: s, hasProperties: visibleProperties.length > 0 };
+        }));
+        const validSections = sectionsWithProperties.filter((item) => item.hasProperties).map((item) => item.section);
         return {
             type: 'grid-layout',
             options: {
@@ -4744,7 +4755,7 @@ class AXPBaseRelatedEntityConverter {
                     },
                 },
             },
-            children: await Promise.all(singleInterface?.sections.map(async (s) => ({
+            children: await Promise.all(validSections.map(async (s) => ({
                 type: 'grid-item-layout',
                 name: s.id,
                 options: {
@@ -4759,7 +4770,7 @@ class AXPBaseRelatedEntityConverter {
                             title: helpers.getGroupById(s.id)?.title ?? '',
                             collapsible: true,
                         },
-                        children: [await this.createPropertyGrid(s.id, helpers, evaluateExpressions)],
+                        children: [await this.createPropertyGrid(s.id, helpers, evaluateExpressions, includeProperties)],
                     },
                 ],
             }))),
@@ -4823,7 +4834,7 @@ class AXPPageDetailsConverter extends AXPBaseRelatedEntityConverter {
             execute: this.createExecuteFunction(entityDef, actions, evaluateExpressions, context),
             actions: await this.buildEvaluatedActions(actions, evaluateExpressions),
             // tabs: [...tabDetailTabs, ...tabListTabs],
-            content: [await this.createGridLayoutStructure(helpers.singleInterface, helpers, evaluateExpressions)],
+            content: [await this.createGridLayoutStructure(helpers.singleInterface, helpers, evaluateExpressions, relatedEntity.properties)],
         };
     }
     //#region ----   Utility Methods   ----
@@ -5231,7 +5242,9 @@ class AXPTabDetailsConverter extends AXPBaseRelatedEntityConverter {
             id: entityDef?.name ?? '',
             title: relatedEntity.title ?? entityDef?.title ?? '',
             icon: relatedEntity.icon || entityDef.icon,
-            content: [await this.createGridLayoutStructure(helpers.singleInterface, helpers)],
+            content: [
+                await this.createGridLayoutStructure(helpers.singleInterface, helpers, undefined, relatedEntity.properties),
+            ],
         };
     }
 }
@@ -5465,7 +5478,19 @@ class AXPMainEntityContentBuilder {
                     const p = relatedEntity?.persistence || {};
                     const strategy = p.strategy || 'embedded';
                     const mappedTargets = Object.keys(p.map || {}).map((k) => (k || '').split('.')[0]);
+                    // Filter by properties if provided (for detail types)
+                    const includeProperties = relatedEntity?.properties && relatedEntity.properties.length > 0
+                        ? new Set(relatedEntity.properties)
+                        : undefined;
                     const relPropsByGroup = (entityDef?.properties ?? []).reduce((acc, p) => {
+                        // Filter by includeProperties if provided (for detail types)
+                        if (includeProperties &&
+                            (relatedEntity?.layout?.type === 'merge-detail' ||
+                                relatedEntity?.layout?.type === 'page-detail' ||
+                                relatedEntity?.layout?.type === 'tab-detail') &&
+                            !includeProperties.has(p.name)) {
+                            return acc; // skip properties not in includeProperties
+                        }
                         if (strategy === 'referenced' &&
                             (relatedEntity?.layout?.type === 'merge-detail' ||
                                 relatedEntity?.layout?.type === 'page-detail' ||
@@ -5743,7 +5768,18 @@ class AXPMainEntityContentBuilder {
                             },
                         },
                     },
-                    children: await Promise.all(combinedSections.map(async (s) => ({
+                    children: await Promise.all((await Promise.all(combinedSections.map(async (s) => {
+                        const properties = await getVisiblePropertyByGroupId(s.id);
+                        const visibleProperties = properties.filter((p) => {
+                            const isFromRelated = p.__dataPath != null;
+                            const visibleInMain = visiblePropertyNames.has(p.name);
+                            const visibleInRelated = isFromRelated ? !!p.__layout : false;
+                            return visibleInMain || visibleInRelated;
+                        });
+                        return { section: s, hasProperties: visibleProperties.length > 0, visibleProperties };
+                    })))
+                        .filter((item) => item.hasProperties)
+                        .map(({ section: s, visibleProperties }) => ({
                         type: 'grid-item-layout',
                         name: s.id,
                         options: {
@@ -5773,14 +5809,7 @@ class AXPMainEntityContentBuilder {
                                                 },
                                             },
                                         },
-                                        children: (await getVisiblePropertyByGroupId(s.id))
-                                            .filter((p) => {
-                                            const isFromRelated = p.__dataPath != null;
-                                            const visibleInMain = visiblePropertyNames.has(p.name);
-                                            const visibleInRelated = isFromRelated ? !!p.__layout : false;
-                                            return visibleInMain || visibleInRelated;
-                                        })
-                                            .map((p) => {
+                                        children: visibleProperties.map((p) => {
                                             const layout = getPropertyLayout(p.name, p);
                                             const prefixed = p.__dataPath ? `${p.__dataPath}.${p.name}` : p.name;
                                             // Check if property is editable (exists in update interface)
@@ -10446,7 +10475,6 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         this.deviceService = inject(AXPDeviceService);
         this.commandService = inject(AXPCommandService);
         this.eventService = inject(AXPBroadcastEventService);
-        this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
         this.isMounted = signal(false, ...(ngDevMode ? [{ debugName: "isMounted" }] : []));
         this.entity = signal(null, ...(ngDevMode ? [{ debugName: "entity" }] : []));
         this.listNode = signal(null, ...(ngDevMode ? [{ debugName: "listNode" }] : []));
@@ -10575,32 +10603,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                     c.scope == AXPEntityCommandScope.TypeLevel));
         });
         const command = commandName.split('&')[0];
-        // Get current context from contextService for lazy evaluation
-        const currentContext = this.contextService.initial();
-        console.log('currentContext', currentContext);
-        // Evaluate action options with current context if they contain expressions
-        let evaluatedOptions = action?.options;
-        if (action?.options && currentContext) {
-            try {
-                const scope = {
-                    context: {
-                        eval: (path) => {
-                            console.log({ path });
-                            return get(currentContext, path);
-                        },
-                    },
-                };
-                evaluatedOptions = await this.expressionEvaluator.evaluate(action.options, scope);
-            }
-            catch {
-                // Keep original options if evaluation fails
-                evaluatedOptions = action?.options;
-            }
-        }
-        debugger;
-        const actionData = action?.scope == AXPEntityCommandScope.Selected
-            ? this.selectedItems()
-            : evaluatedOptions?.['process']?.data || null;
+        // const options = await this.evaluateExpressions(action?.options, data);
         if (this.commandService.exists(command)) {
             await this.commandService.execute(command, {
                 __context__: {
@@ -10612,8 +10615,10 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                         parentKey: this.entity()?.parentKey,
                         source: `${this.entity()?.module}.${this.entity()?.name}`,
                     },
-                    data: actionData,
-                    options: evaluatedOptions,
+                    data: action?.scope == AXPEntityCommandScope.Selected
+                        ? this.selectedItems()
+                        : action?.options?.['process']?.data || null,
+                    options: action?.options,
                     metadata: action?.metadata,
                 },
             });
@@ -10628,8 +10633,10 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                     parentKey: this.entity()?.parentKey,
                     source: `${this.entity()?.module}.${this.entity()?.name}`,
                 },
-                data: actionData,
-                options: evaluatedOptions,
+                data: action?.scope == AXPEntityCommandScope.Selected
+                    ? this.selectedItems()
+                    : action?.options?.['process']?.data || null,
+                options: action?.options,
                 metadata: action?.metadata,
             });
         }
@@ -14393,11 +14400,11 @@ class AXPEntityModule {
                 useClass: AXPEntitiesListDataSourceDefinition,
                 multi: true,
             },
-            {
-                provide: AXP_ENTITY_MODIFIER,
-                useValue: layoutOrderingMiddlewareProvider,
-                multi: true,
-            },
+            // {
+            //   provide: AXP_ENTITY_MODIFIER,
+            //   useValue: layoutOrderingMiddlewareProvider,
+            //   multi: true,
+            // },
             provideCommandSetups([
                 {
                     key: 'Entity:OpenDetails',
@@ -14566,11 +14573,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                             useClass: AXPEntitiesListDataSourceDefinition,
                             multi: true,
                         },
-                        {
-                            provide: AXP_ENTITY_MODIFIER,
-                            useValue: layoutOrderingMiddlewareProvider,
-                            multi: true,
-                        },
+                        // {
+                        //   provide: AXP_ENTITY_MODIFIER,
+                        //   useValue: layoutOrderingMiddlewareProvider,
+                        //   multi: true,
+                        // },
                         provideCommandSetups([
                             {
                                 key: 'Entity:OpenDetails',