@acorex/platform 20.7.6 → 20.7.8

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

@@ -1,9 +1,10 @@
 import { AXToastService } from '@acorex/components/toast';
+import { AXPlatform } from '@acorex/core/platform';
 import * as i6 from '@acorex/core/translation';
 import { AXTranslationService, AXTranslationModule } from '@acorex/core/translation';
 import * as i4$1 from '@acorex/platform/common';
 import { AXPSettingsService, AXPFilterOperatorMiddlewareService, AXPEntityCommandScope, getEntityInfo, AXPRefreshEvent, AXPReloadEvent, AXPCommonSettings, AXPEntityQueryType, AXPCleanNestedFilters, AXPWorkflowNavigateAction, AXPToastAction, AXP_SEARCH_DEFINITION_PROVIDER } from '@acorex/platform/common';
-import { AXPDeviceService, AXPBroadcastEventService, resolveActionLook, AXPExpressionEvaluatorService, AXPDistributedEventListenerService, AXPPlatformScope, AXPColumnWidthService, AXHighlightService, extractValue, setSmart, getChangedPaths, defaultColumnWidthProvider, AXP_COLUMN_WIDTH_PROVIDER, AXPSystemActionType } from '@acorex/platform/core';
+import { AXPDeviceService, AXPBroadcastEventService, applyFilterArray, applySortArray, resolveActionLook, AXPExpressionEvaluatorService, AXPDistributedEventListenerService, AXPPlatformScope, AXPColumnWidthService, AXHighlightService, extractValue, setSmart, getChangedPaths, defaultColumnWidthProvider, AXP_COLUMN_WIDTH_PROVIDER, AXP_DATASOURCE_DEFINITION_PROVIDER, AXPSystemActionType } from '@acorex/platform/core';
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Injector, runInInjectionContext, Injectable, input, viewChild, signal, ElementRef, ChangeDetectionStrategy, Component, ApplicationRef, EnvironmentInjector, createComponent, computed, ChangeDetectorRef, effect, Input, afterNextRender, untracked, ViewEncapsulation, viewChildren, linkedSignal, HostBinding, output, NgModule } from '@angular/core';
 import { Subject, takeUntil } from 'rxjs';
@@ -18,7 +19,7 @@ import { AXLoadingModule } from '@acorex/components/loading';
 import * as i2 from '@acorex/components/popover';
 import { AXPopoverModule } from '@acorex/components/popover';
 import * as i3$1 from '@acorex/platform/layout/widget-core';
-import { AXPWidgetsCatalog, AXPWidgetCoreModule, AXPPageStatus, AXPWidgetRegistryService, AXPColumnWidgetComponent, AXPValueWidgetComponent, AXPWidgetGroupEnum, AXPWidgetRendererDirective } from '@acorex/platform/layout/widget-core';
+import { AXPWidgetsCatalog, AXPWidgetCoreModule, AXPPageStatus, AXPWidgetRegistryService, AXPColumnWidgetComponent, AXPValueWidgetComponent, AXPWidgetGroupEnum, AXPWidgetRendererDirective, AXP_WIDGETS_EDITOR_CATEGORY } from '@acorex/platform/layout/widget-core';
 import { AXPCommandService, AXPQueryService, AXPQueryExecutor, provideCommandSetups, provideQuerySetups } from '@acorex/platform/runtime';
 import * as i5 from '@angular/common';
 import { CommonModule } from '@angular/common';
@@ -31,7 +32,6 @@ import { moveItemInArray } from '@angular/cdk/drag-drop';
 import { AXDialogService } from '@acorex/components/dialog';
 import { AXLoadingDialogService } from '@acorex/components/loading-dialog';
 import { AXPopupService } from '@acorex/components/popup';
-import { AXPlatform } from '@acorex/core/platform';
 import * as i2$1 from '@acorex/components/badge';
 import { AXBadgeModule } from '@acorex/components/badge';
 import { AXCheckBoxModule } from '@acorex/components/check-box';
@@ -58,7 +58,6 @@ import * as i4$3 from '@acorex/components/dropdown';
 import { AXDropdownModule } from '@acorex/components/dropdown';
 import * as i4$4 from '@acorex/components/select-box';
 import { AXSelectBoxModule } from '@acorex/components/select-box';
-import { AXTextBoxModule } from '@acorex/components/text-box';
 import * as i2$2 from '@acorex/components/tabs';
 import { AXTabsModule } from '@acorex/components/tabs';
 import { transform, isEqual as isEqual$1 } from 'lodash';
@@ -411,42 +410,43 @@ class AXPEntityResolver {
     constructor() {
         this.providers = inject(AXP_ENTITY_DEFINITION_LOADER);
     }
-    async get(moduleName, entityName) {
-        // Load from DI tokens
-        if (Array.isArray(this.providers)) {
-            for (const loader of this.providers) {
-                let resolvedLoader;
-                if (loader instanceof Promise) {
-                    // If loader is a promise, resolve it
-                    resolvedLoader = await loader;
-                }
-                else {
-                    // If loader is a direct instance, use it directly
-                    resolvedLoader = loader;
-                }
-                const entity = await resolvedLoader.get(moduleName, entityName);
-                if (entity) {
-                    return entity;
-                }
+    /** Aggregates list() from all entity loaders (including lazy). Populates fullName. */
+    async listAll() {
+        const loaders = await this.resolveLoaders();
+        const results = [];
+        for (const loader of loaders) {
+            const items = await loader.list();
+            for (const it of items) {
+                results.push({
+                    name: it.name,
+                    module: it.module,
+                    fullName: `${it.module}.${it.name}`,
+                });
             }
         }
-        else {
-            let resolvedLoader;
-            if (this.providers instanceof Promise) {
-                // If loader is a promise, resolve it
-                resolvedLoader = await this.providers;
-            }
-            else {
-                // If loader is a direct instance, use it directly
-                resolvedLoader = this.providers;
-            }
-            const entity = await resolvedLoader.get(moduleName, entityName);
-            if (entity) {
+        return results;
+    }
+    async get(moduleName, entityName) {
+        const loaders = await this.resolveLoaders();
+        for (const loader of loaders) {
+            const entity = await loader.get(moduleName, entityName);
+            if (entity)
                 return entity;
-            }
         }
         return null;
     }
+    async resolveLoaders() {
+        const raw = this.providers;
+        if (!raw)
+            return [];
+        const arr = Array.isArray(raw) ? raw : [raw];
+        const loaders = [];
+        for (const p of arr) {
+            const loader = p instanceof Promise ? await p : p;
+            loaders.push(loader);
+        }
+        return loaders;
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPEntityResolver, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPEntityResolver, providedIn: 'root' }); }
 }
@@ -784,28 +784,173 @@ class PropertyFilter {
         const { moduleName, entityName } = parseEntityFullName(this.fullName);
         const entity = await this.entityRegistry.resolve(moduleName, entityName);
         // Select the appropriate interface based on kind
-        let iface;
-        if (this.kind === 'create') {
-            iface = entity?.interfaces?.master?.create;
-        }
-        else if (this.kind === 'update') {
-            iface = entity?.interfaces?.master?.update;
-        }
-        else {
-            iface = entity?.interfaces?.master?.single;
-        }
+        const iface = getEntityInterface(entity, this.kind);
         if (!iface) {
             throw new Error(`Entity interface not found: ${entity.module}.${entity.name}.interfaces.master.${this.kind}`);
         }
         // Title and size
         const title = this.overrideTitle || entity.formats?.individual || entity.title || `${entity.module}.${entity.name}`;
         // Build content using LayoutBuilder
-        const sections = (iface.sections ?? []).slice();
-        const entityProps = (entity.properties ?? []).slice();
-        const nameToViewLayout = buildViewLayoutMap(iface.properties ?? []);
-        const allowedNames = this.computeAllowedNames(entityProps.map((p) => p.name));
-        // Calculate recommended dialog size based on form complexity
-        const calculatedSize = this.calculateRecommendedDialogSize(sections, entityProps, nameToViewLayout, allowedNames);
+        const mainSections = (iface.sections ?? []).slice();
+        const mainProps = (entity.properties ?? []).slice();
+        const mainViewLayoutMap = buildViewLayoutMap(iface.properties ?? []);
+        const allowedNames = this.computeAllowedNames(mainProps.map((p) => p.name));
+        // Collect all groups for title lookup (main + merged)
+        const allGroups = [...(entity.groups ?? [])];
+        // Process merge-detail related entities
+        const mergeDetailEntities = (entity.relatedEntities ?? []).filter((re) => !re.hidden && re.layout?.type === 'merge-detail');
+        // Build merged properties map by section
+        const mergedPropsBySection = new Map();
+        // Initialize with main entity properties
+        for (const prop of mainProps) {
+            if (!allowedNames.has(prop.name) || !mainViewLayoutMap.has(prop.name))
+                continue;
+            const groupId = prop.groupId ?? 'default';
+            if (!mergedPropsBySection.has(groupId)) {
+                mergedPropsBySection.set(groupId, []);
+            }
+            const viewLayout = mainViewLayoutMap.get(prop.name);
+            mergedPropsBySection.get(groupId).push({
+                ...prop,
+                __layout: viewLayout?.layout,
+                __order: viewLayout?.layout?.order,
+            });
+        }
+        // Track extra sections from related entities
+        const extraSections = [];
+        const mainSectionIds = new Set(mainSections.map((s) => s.id));
+        // Group related entities by position for ordered processing
+        const beforeEntities = mergeDetailEntities
+            .filter((re) => re.layout?.position === 'before')
+            .sort((a, b) => (a.layout?.order ?? Infinity) - (b.layout?.order ?? Infinity));
+        const middleEntities = mergeDetailEntities.filter((re) => !re.layout?.position || re.layout?.position === 'middle');
+        const afterEntities = mergeDetailEntities
+            .filter((re) => re.layout?.position === 'after')
+            .sort((a, b) => (a.layout?.order ?? Infinity) - (b.layout?.order ?? Infinity));
+        // Process related entities in order: before, middle, after
+        const processRelatedEntity = async (relatedEntity) => {
+            try {
+                const [relModuleName, relEntityName] = relatedEntity.entity.split('.');
+                const relEntityDef = await this.entityRegistry.resolve(relModuleName, relEntityName);
+                if (!relEntityDef)
+                    return;
+                // Get the matching interface for the related entity
+                const relIface = getEntityInterface(relEntityDef, this.kind);
+                if (!relIface)
+                    return;
+                // Merge related groups into allGroups (avoid duplicates)
+                for (const rg of relEntityDef.groups ?? []) {
+                    if (!allGroups.some((g) => g.id === rg.id)) {
+                        allGroups.push(rg);
+                    }
+                }
+                // Compute dataPath for field prefixing
+                const dataPath = relatedEntity.persistence?.dataPath || relEntityName;
+                const position = relatedEntity.layout?.position ?? 'middle';
+                const entityOrder = relatedEntity.layout?.order ?? Infinity;
+                // Build view layout map for related entity
+                const relViewLayoutMap = buildViewLayoutMap(relIface.properties ?? []);
+                // Process each section in related interface
+                for (const relSection of relIface.sections ?? []) {
+                    const sectionId = relSection.id;
+                    const sectionHasMainEquivalent = mainSectionIds.has(sectionId);
+                    // Get properties for this section
+                    const sectionProps = [];
+                    for (const prop of relEntityDef.properties ?? []) {
+                        if (prop.groupId !== sectionId)
+                            continue;
+                        if (!relViewLayoutMap.has(prop.name))
+                            continue;
+                        const viewLayout = relViewLayoutMap.get(prop.name);
+                        // Clone property and add merge-detail metadata
+                        const mergedProp = {
+                            ...prop,
+                            __dataPath: dataPath,
+                            __layout: viewLayout?.layout,
+                            __order: viewLayout?.layout?.order,
+                        };
+                        // Prefix expressions in schema options
+                        if (mergedProp.schema?.interface?.options) {
+                            mergedProp.schema = {
+                                ...mergedProp.schema,
+                                interface: {
+                                    ...mergedProp.schema.interface,
+                                    options: prefixExpressions(mergedProp.schema.interface.options, dataPath),
+                                },
+                            };
+                        }
+                        // Prefix expressions in visible/readonly if they are strings
+                        if (typeof mergedProp.schema?.visible === 'string') {
+                            mergedProp.schema = {
+                                ...mergedProp.schema,
+                                visible: prefixExpressions(mergedProp.schema.visible, dataPath),
+                            };
+                        }
+                        if (typeof mergedProp.schema?.readonly === 'string') {
+                            mergedProp.schema = {
+                                ...mergedProp.schema,
+                                readonly: prefixExpressions(mergedProp.schema.readonly, dataPath),
+                            };
+                        }
+                        sectionProps.push(mergedProp);
+                    }
+                    if (sectionProps.length === 0)
+                        continue;
+                    if (sectionHasMainEquivalent) {
+                        // Merge into existing section
+                        const existing = mergedPropsBySection.get(sectionId) ?? [];
+                        if (position === 'before') {
+                            mergedPropsBySection.set(sectionId, [...sectionProps, ...existing]);
+                        }
+                        else {
+                            mergedPropsBySection.set(sectionId, [...existing, ...sectionProps]);
+                        }
+                    }
+                    else {
+                        // Create new section entry
+                        if (!mergedPropsBySection.has(sectionId)) {
+                            mergedPropsBySection.set(sectionId, []);
+                        }
+                        const existing = mergedPropsBySection.get(sectionId) ?? [];
+                        if (position === 'before') {
+                            mergedPropsBySection.set(sectionId, [...sectionProps, ...existing]);
+                        }
+                        else {
+                            mergedPropsBySection.set(sectionId, [...existing, ...sectionProps]);
+                        }
+                        // Track as extra section if not already tracked
+                        if (!extraSections.some((s) => s.id === sectionId)) {
+                            extraSections.push({
+                                ...relSection,
+                                __entityOrder: entityOrder,
+                                __position: position,
+                            });
+                        }
+                    }
+                }
+            }
+            catch {
+                // Silently ignore failures to resolve or merge
+            }
+        };
+        // Process in order
+        for (const re of beforeEntities)
+            await processRelatedEntity(re);
+        for (const re of middleEntities)
+            await processRelatedEntity(re);
+        for (const re of afterEntities)
+            await processRelatedEntity(re);
+        // Build final sorted sections list
+        const finalSections = sortMergedSections(mainSections, extraSections, mainSectionIds);
+        // Calculate recommended dialog size based on form complexity (using merged data)
+        const allMergedProps = Array.from(mergedPropsBySection.values()).flat();
+        const mergedViewLayoutMap = new Map();
+        for (const prop of allMergedProps) {
+            if (prop.__layout) {
+                mergedViewLayoutMap.set(prop.name, { name: prop.name, layout: prop.__layout });
+            }
+        }
+        const calculatedSize = this.calculateRecommendedDialogSize(finalSections, allMergedProps, mergedViewLayoutMap, new Set(allMergedProps.map((p) => p.name)));
         const dialog = this.layoutBuilder.create().dialog((d) => {
             d.setTitle(title);
             d.setSize(this.externalSize ?? calculatedSize);
@@ -819,24 +964,27 @@ class PropertyFilter {
                     // Configure grid with 12 columns (like Bootstrap)
                     grid.setColumns(12);
                     grid.setGap('1rem');
-                    for (const section of sections) {
+                    for (const section of finalSections) {
                         const groupId = section.id;
-                        // Only render properties that are explicitly present in the selected interface's `properties` list.
-                        // This prevents cross-plugin leaks when multiple properties share the same group/section.
-                        const groupProps = entityProps.filter((p) => p.groupId === groupId && allowedNames.has(p.name) && nameToViewLayout.has(p.name));
+                        const sectionProps = mergedPropsBySection.get(groupId) ?? [];
                         const extraFields = this.extraFieldsByGroup.get(groupId) ?? [];
-                        if (groupProps.length === 0 && extraFields.length === 0) {
+                        if (sectionProps.length === 0 && extraFields.length === 0) {
                             continue;
                         }
                         grid.fieldset((fs) => {
                             fs.setLook('fieldset');
-                            fs.setTitle((getGroupTitle(entity, groupId) || groupId));
+                            fs.setTitle((getGroupTitleFromList(allGroups, groupId) || groupId));
                             fs.setCols(12); // Set fieldset to use 12-column grid layout
-                            // Preserve properties order as defined in interface.properties (if present), otherwise entity.properties order
-                            const orderedProps = orderProperties(groupProps, iface.properties ?? []);
+                            // Sort properties by order within section
+                            const orderedProps = [...sectionProps].sort((a, b) => {
+                                const aOrder = a.__order ?? Infinity;
+                                const bOrder = b.__order ?? Infinity;
+                                return aOrder - bOrder;
+                            });
                             for (const prop of orderedProps) {
-                                const viewLayout = nameToViewLayout.get(prop.name);
-                                const fieldPath = buildFieldPath(prop, iface.properties ?? []);
+                                const mergedProp = prop;
+                                const dataPath = mergedProp.__dataPath;
+                                const fieldPath = dataPath ? `${dataPath}.${prop.name}` : prop.name;
                                 fs.formField(prop.title, (field) => {
                                     // Path & field-level visibility/readonly
                                     field.path(fieldPath);
@@ -849,8 +997,8 @@ class PropertyFilter {
                                     if (prop.schema?.defaultValue !== undefined) {
                                         field.defaultValue(prop.schema.defaultValue);
                                     }
-                                    // Layout mapping (per-field). Only colSpan is supported by dynamic-form per breakpoint.
-                                    const fieldLayout = toFieldLayout(viewLayout?.layout);
+                                    // Layout mapping (per-field)
+                                    const fieldLayout = toFieldLayout(mergedProp.__layout);
                                     if (fieldLayout) {
                                         field.layout(fieldLayout);
                                     }
@@ -861,8 +1009,12 @@ class PropertyFilter {
                                     const widgetType = prop.schema?.interface?.type || '';
                                     const widgetOptions = buildWidgetOptions(prop);
                                     const extendedProperties = buildWidgetExtendedProperties(prop);
+                                    // Prefix extended properties expressions if from related entity
+                                    const finalExtendedProps = dataPath
+                                        ? prefixExpressions(extendedProperties, dataPath)
+                                        : extendedProperties;
                                     // Merge extended properties into options (they will be extracted in addSingleWidget)
-                                    field.customWidget(widgetType, { ...widgetOptions, ...extendedProperties });
+                                    field.customWidget(widgetType, { ...widgetOptions, ...finalExtendedProps });
                                 });
                             }
                             // Append any extra fields requested by the caller for this group
@@ -1088,6 +1240,24 @@ function getGroupTitle(entity, groupId) {
     const g = (entity.groups || []).find((x) => x.id === groupId);
     return g?.title;
 }
+function getGroupTitleFromList(groups, groupId) {
+    const g = groups.find((x) => x.id === groupId);
+    return g?.title;
+}
+/**
+ * Gets the appropriate interface from an entity based on the kind
+ */
+function getEntityInterface(entity, kind) {
+    if (kind === 'create') {
+        return entity?.interfaces?.master?.create;
+    }
+    else if (kind === 'update') {
+        return entity?.interfaces?.master?.update;
+    }
+    else {
+        return entity?.interfaces?.master?.single;
+    }
+}
 function toCompatFormFieldBuilder(field) {
     return {
         ...field,
@@ -1099,6 +1269,109 @@ function toCompatFormFieldBuilder(field) {
         mode: (mode) => field.mode(mode),
     };
 }
+/**
+ * Prefixes context.eval() expressions and expose targets with a dataPath.
+ * - Transforms `context.eval("field")` to `context.eval("dataPath.field")`
+ * - Transforms expose `target: "field"` to `target: "dataPath.field"`
+ * Recursively processes objects and arrays.
+ */
+function prefixExpressions(value, dataPath, parentKey) {
+    if (!dataPath)
+        return value;
+    if (typeof value === 'string') {
+        // Special handling for 'target' key in expose arrays - prefix the path directly
+        if (parentKey === 'target') {
+            // Don't prefix if already prefixed or if it starts with $ (absolute path)
+            if (value.startsWith(dataPath + '.') || value.startsWith('$')) {
+                return value;
+            }
+            return `${dataPath}.${value}`;
+        }
+        // Match context.eval("...") or context.eval('...')
+        return value.replace(/context\.eval\(["']([^"']+)["']\)/g, (match, path) => {
+            // Don't prefix if already prefixed or if it's an absolute path
+            if (path.startsWith(dataPath + '.') || path.startsWith('$')) {
+                return match;
+            }
+            return `context.eval("${dataPath}.${path}")`;
+        });
+    }
+    if (Array.isArray(value)) {
+        return value.map((item) => prefixExpressions(item, dataPath, parentKey));
+    }
+    if (value !== null && typeof value === 'object') {
+        const result = {};
+        for (const key of Object.keys(value)) {
+            result[key] = prefixExpressions(value[key], dataPath, key);
+        }
+        return result;
+    }
+    return value;
+}
+/**
+ * Groups properties by their groupId (section)
+ */
+function groupPropertiesBySection(properties) {
+    const map = new Map();
+    for (const prop of properties) {
+        const groupId = prop.groupId ?? 'default';
+        if (!map.has(groupId)) {
+            map.set(groupId, []);
+        }
+        map.get(groupId).push(prop);
+    }
+    return map;
+}
+/**
+ * Sorts sections by position and order:
+ * 1. Before sections (sorted by entityOrder, then section order)
+ * 2. Middle sections (main + middle-only, sorted by effective order while preserving original index for stable sort)
+ * 3. After sections (sorted by entityOrder, then section order)
+ */
+function sortMergedSections(mainSections, extraSections, mainSectionIds) {
+    const beforeSections = extraSections
+        .filter((s) => s.__position === 'before' && !mainSectionIds.has(s.id))
+        .sort((a, b) => {
+        const entityOrderDiff = (a.__entityOrder ?? Infinity) - (b.__entityOrder ?? Infinity);
+        if (entityOrderDiff !== 0)
+            return entityOrderDiff;
+        return (a.order ?? 0) - (b.order ?? 0);
+    });
+    const middleSections = extraSections.filter((s) => s.__position === 'middle' && !mainSectionIds.has(s.id));
+    const afterSections = extraSections
+        .filter((s) => s.__position === 'after' && !mainSectionIds.has(s.id))
+        .sort((a, b) => {
+        const entityOrderDiff = (a.__entityOrder ?? Infinity) - (b.__entityOrder ?? Infinity);
+        if (entityOrderDiff !== 0)
+            return entityOrderDiff;
+        return (a.order ?? 0) - (b.order ?? 0);
+    });
+    // Build index map for main sections to preserve original order when no explicit order is specified
+    const mainSectionIndexMap = new Map();
+    mainSections.forEach((s, idx) => mainSectionIndexMap.set(s.id, idx));
+    // Middle block: main sections + middle-only sections
+    // Sort by explicit order if present, otherwise use original array index for main sections
+    // Extra middle sections without order go after main sections
+    const middleBlock = [...mainSections, ...middleSections].sort((a, b) => {
+        const aHasOrder = a.order !== undefined;
+        const bHasOrder = b.order !== undefined;
+        // If both have explicit order, sort by order
+        if (aHasOrder && bHasOrder) {
+            return a.order - b.order;
+        }
+        // If neither has order, preserve original array position for main sections
+        if (!aHasOrder && !bHasOrder) {
+            const aIdx = mainSectionIndexMap.get(a.id) ?? Infinity;
+            const bIdx = mainSectionIndexMap.get(b.id) ?? Infinity;
+            return aIdx - bIdx;
+        }
+        // If only one has order, the one with order comes first (explicit ordering takes precedence)
+        if (aHasOrder)
+            return -1;
+        return 1;
+    });
+    return [...beforeSections, ...middleBlock, ...afterSections];
+}
 
 class AXPCreateEntityCommand {
     constructor() {
@@ -1108,6 +1381,7 @@ class AXPCreateEntityCommand {
         this.toastService = inject(AXToastService);
         this.translationService = inject(AXTranslationService);
         this.eventService = inject(AXPBroadcastEventService);
+        this.platform = inject(AXPlatform);
         this.context = {};
     }
     async execute(input) {
@@ -1115,6 +1389,11 @@ class AXPCreateEntityCommand {
         const { entity, entityInfo, data, options } = input.__context__;
         const excludeProperties = options?.excludeProperties;
         const includeProperties = options?.includeProperties;
+        // Extract decoration and layout from options (similar to workflow)
+        const decoration = options?.['decoration'];
+        const layout = options?.['layout'];
+        const headerTitle = decoration?.header?.title;
+        const layoutSize = layout?.size;
         const [moduleName, entityName] = (entity || '').split('.');
         if (!moduleName || !entityName) {
             return {
@@ -1138,13 +1417,25 @@ class AXPCreateEntityCommand {
             if (includeProperties && includeProperties.length > 0) {
                 chain = chain.include(...includeProperties);
             }
-            if (entityInfo?.title) {
+            // Set dialog title: use decoration.header.title if available, otherwise use entityInfo.title
+            if (headerTitle) {
+                chain = chain.title(headerTitle);
+            }
+            else if (entityInfo?.title) {
                 const createText = await this.translationService.translateAsync('@general:actions.create.title');
                 const translatedTitle = await this.translationService.translateAsync(entityInfo.title);
                 chain = chain.title(`${createText} ${translatedTitle}`);
             }
-            if (dialogSize) {
-                chain.size(dialogSize);
+            // Set dialog size: prioritize layout.size, then dialogSize from input, with platform-aware defaults
+            const finalSize = layoutSize || dialogSize;
+            if (this.platform.is('Mobile') || this.platform.is('SM')) {
+                chain.size('full');
+            }
+            else if (finalSize) {
+                chain.size(finalSize);
+            }
+            else {
+                chain.size('md');
             }
             dialogRef = await chain.show();
             if (dialogRef.action() == 'cancel') {
@@ -1780,7 +2071,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", "disabled", "offsetX", "offsetY", "target", "placement", "content", "openOn", "closeOn", "hasBackdrop", "openAfter", "closeAfter", "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 [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", "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,
@@ -1884,6 +2175,95 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
             args: [{ providedIn: 'root' }]
         }] });
 
+/**
+ * Data source definition provider that returns all entity names
+ * from entity loaders' list() (const.ts in each module).
+ */
+class AXPEntitiesListDataSourceDefinition {
+    constructor() {
+        //#region ---- Services & Dependencies ----
+        this.entityResolver = inject(AXPEntityResolver);
+        //#endregion
+    }
+    //#endregion
+    //#region ---- Public Methods ----
+    items() {
+        return Promise.resolve([
+            {
+                name: 'entities',
+                title: 'Entities',
+                columns: [
+                    {
+                        name: 'entity',
+                        title: 'Entity',
+                        datatype: 'string',
+                        type: AXPWidgetsCatalog.text,
+                    },
+                    {
+                        name: 'module',
+                        title: 'Module',
+                        datatype: 'string',
+                        type: AXPWidgetsCatalog.text,
+                    },
+                    {
+                        name: 'title',
+                        title: 'Title',
+                        datatype: 'string',
+                        type: AXPWidgetsCatalog.text,
+                    },
+                ],
+                filters: [
+                    {
+                        field: 'entity',
+                        title: 'Entity',
+                        operator: { type: 'equal' },
+                        widget: { type: AXPWidgetsCatalog.text },
+                        filterType: { advance: true, inline: true },
+                    },
+                    {
+                        field: 'module',
+                        title: 'Module',
+                        operator: { type: 'equal' },
+                        widget: { type: AXPWidgetsCatalog.text },
+                        filterType: { advance: true, inline: true },
+                    },
+                ],
+                textField: { name: 'title', title: 'Title' },
+                valueField: { name: 'title', title: 'Title' },
+                source: () => {
+                    return new AXDataSource({
+                        key: 'title',
+                        load: async (query) => {
+                            const entries = await this.entityResolver.listAll();
+                            let items = entries.map((e) => ({
+                                title: e.fullName,
+                                entity: e.name,
+                                module: e.module,
+                            }));
+                            if (query.filter) {
+                                items = applyFilterArray(items, [query.filter]);
+                            }
+                            const rawSort = Array.isArray(query.sort) ? query.sort : query.sort ? [query.sort] : [];
+                            const sortOpt = rawSort.length > 0 ? rawSort : [{ field: 'title', dir: 'asc' }];
+                            items = applySortArray(items, sortOpt);
+                            return { items, total: items.length };
+                        },
+                        byKey: async (key) => {
+                            const k = String(key);
+                            const entries = await this.entityResolver.listAll();
+                            const e = entries.find((x) => x.fullName === k);
+                            if (!e)
+                                throw new Error(`Entity not found: ${k}`);
+                            return { title: e.fullName, entity: e.name, module: e.module };
+                        },
+                        pageSize: 1000,
+                    });
+                },
+            },
+        ]);
+    }
+}
+
 class AXPEntityCommandTriggerViewModel {
     constructor(entity, action) {
         this.name = `${typeof action.command === 'string' ? action.command : action.command.name}&${action.name}`;
@@ -2909,6 +3289,8 @@ class AXPEntityMasterListViewModel {
         if (sortKey === this.lastAppliedSortKey && filterKey === this.lastAppliedFilterKey) {
             return; // No effective change; avoid redundant refresh
         }
+        // Determine if filters changed (for pagination reset)
+        const filtersChanged = filterKey !== this.lastAppliedFilterKey;
         this.lastAppliedSortKey = sortKey;
         this.lastAppliedFilterKey = filterKey;
         this.dataSource.clearFilter();
@@ -2919,7 +3301,7 @@ class AXPEntityMasterListViewModel {
             operator: null,
             filters: filters,
         }));
-        this.events$.next({ action: 'refresh' });
+        this.events$.next({ action: 'refresh', meta: { resetPagination: filtersChanged } });
     }
     resetColumns() {
         this.applyViewColumns();
@@ -4630,7 +5012,9 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
             };
             return await context.expressionEvaluator.evaluate(actionData, scope);
         };
-        const evaluatedActions = await evaluateExpressions(relatedEntity?.actions);
+        // Don't evaluate actions here - keep expression strings for lazy evaluation at execution time
+        // This ensures actions use the latest context data when executed
+        const actions = relatedEntity?.actions ?? [];
         const filters = await Promise.all(relatedEntity.conditions?.map(async (c) => {
             const value = await evaluateExpressions(c.value);
             return {
@@ -4645,7 +5029,7 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
             title: `${context.rootTitle}`,
             label: relatedEntity.title,
             icon: relatedEntity.icon || entityDef.icon,
-            actions: this.mergeActions(entityDef, evaluatedActions)
+            actions: this.mergeActions(entityDef, actions)
                 ?.filter((a) => a.priority === 'primary')
                 ?.map((a) => {
                 return {
@@ -4669,7 +5053,7 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
             execute: async (command, executeContext) => {
                 try {
                     const commandName = command.name.split('&')[0];
-                    const mergedActions = this.mergeActions(entityDef, evaluatedActions);
+                    const mergedActions = this.mergeActions(entityDef, actions);
                     const action = mergedActions.find((a) => {
                         return a.name === commandName || a.name.split('&')[0] === commandName;
                     });
@@ -4683,6 +5067,28 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                             },
                         };
                     }
+                    // Evaluate action options with current root context for lazy evaluation
+                    // This ensures actions use the latest context data when executed
+                    let evaluatedOptions = action.options;
+                    if (action.options && context.context && context.expressionEvaluator) {
+                        try {
+                            const scope = {
+                                context: {
+                                    eval: (path) => {
+                                        return get(context.context, path);
+                                    },
+                                },
+                            };
+                            evaluatedOptions = await context.expressionEvaluator.evaluate(action.options, scope);
+                        }
+                        catch {
+                            // Keep original options if evaluation fails
+                            evaluatedOptions = action.options;
+                        }
+                    }
+                    const actionData = action.scope == AXPEntityCommandScope.Selected
+                        ? executeContext
+                        : evaluatedOptions?.['process']?.data || null;
                     if (context.commandService.exists(commandName)) {
                         // check options for evaluation
                         await context.commandService.execute(commandName, {
@@ -4695,13 +5101,11 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                                     parentKey: entityDef.parentKey,
                                     source: `${entityDef.module}.${entityDef.name}`,
                                 },
-                                data: action.scope == AXPEntityCommandScope.Selected
-                                    ? executeContext
-                                    : action.options?.['process']?.data || null,
-                                options: action.options,
+                                data: actionData,
+                                options: evaluatedOptions,
                                 metadata: action.metadata,
                             },
-                            options: action.options,
+                            options: evaluatedOptions,
                             metadata: action.metadata,
                         });
                     }
@@ -4715,10 +5119,8 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                                 parentKey: entityDef.parentKey,
                                 source: `${entityDef.module}.${entityDef.name}`,
                             },
-                            data: action.scope == AXPEntityCommandScope.Selected
-                                ? executeContext
-                                : action.options?.['process']?.data || null,
-                            options: action.options,
+                            data: actionData,
+                            options: evaluatedOptions,
                             metadata: action.metadata,
                         });
                     }
@@ -4747,7 +5149,7 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                     options: {
                         entity: relatedEntity.entity,
                         showEntityActions: false,
-                        actions: evaluatedActions,
+                        actions: actions,
                         includeColumns: relatedEntity.columns,
                     },
                 },
@@ -4834,7 +5236,9 @@ class AXPTabListConverter extends AXPBaseRelatedEntityConverter {
                 hidden: true,
             };
         }) ?? []);
-        const actions = await evaluateExpressions(relatedEntity.actions);
+        // Don't evaluate actions here - keep expression strings for lazy evaluation at execution time
+        // This ensures actions use the latest context data when executed
+        const actions = relatedEntity.actions;
         return {
             id: entityDef?.name ?? '',
             title: relatedEntity.title ?? entityDef?.title ?? '',
@@ -4854,6 +5258,7 @@ class AXPTabListConverter extends AXPBaseRelatedEntityConverter {
                         showToolbar: false,
                         actions: actions,
                         maxHeight: '300px',
+                        includeColumns: relatedEntity.columns,
                     },
                 },
             ],
@@ -5989,6 +6394,7 @@ const AXPCrudModifier = {
             if (!queries?.list) {
                 queries.list = {
                     execute: async (e) => {
+                        console.log({ e });
                         return await dataService.query(e);
                     },
                     type: AXPEntityQueryType.List,
@@ -10358,6 +10764,7 @@ 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" }] : []));
@@ -10486,7 +10893,32 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                     c.scope == AXPEntityCommandScope.TypeLevel));
         });
         const command = commandName.split('&')[0];
-        // const options = await this.evaluateExpressions(action?.options, data);
+        // 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;
         if (this.commandService.exists(command)) {
             await this.commandService.execute(command, {
                 __context__: {
@@ -10498,10 +10930,8 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                         parentKey: this.entity()?.parentKey,
                         source: `${this.entity()?.module}.${this.entity()?.name}`,
                     },
-                    data: action?.scope == AXPEntityCommandScope.Selected
-                        ? this.selectedItems()
-                        : action?.options?.['process']?.data || null,
-                    options: action?.options,
+                    data: actionData,
+                    options: evaluatedOptions,
                     metadata: action?.metadata,
                 },
             });
@@ -10516,10 +10946,8 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                     parentKey: this.entity()?.parentKey,
                     source: `${this.entity()?.module}.${this.entity()?.name}`,
                 },
-                data: action?.scope == AXPEntityCommandScope.Selected
-                    ? this.selectedItems()
-                    : action?.options?.['process']?.data || null,
-                options: action?.options,
+                data: actionData,
+                options: evaluatedOptions,
                 metadata: action?.metadata,
             });
         }
@@ -10957,189 +11385,6 @@ const AXPEntityListWidget = {
     },
 };
 
-class AXPLookupFilterWidgetEditComponent extends AXPValueWidgetComponent {
-    constructor() {
-        super(...arguments);
-        //#region ----   Computed Properties   ----
-        this.editorPath = `__${this.path}EditorValue`;
-        this.lookupWidgetRenderer = viewChild('widgetRenderer', ...(ngDevMode ? [{ debugName: "lookupWidgetRenderer" }] : []));
-        this.entity = computed(() => this.options()['entity'], ...(ngDevMode ? [{ debugName: "entity" }] : []));
-        this.textField = computed(() => this.options()['textField'] ?? 'title', ...(ngDevMode ? [{ debugName: "textField" }] : []));
-        this.valueField = computed(() => this.options()['valueField'] ?? 'id', ...(ngDevMode ? [{ debugName: "valueField" }] : []));
-        // protected expose = computed<string | undefined | any[]>(() => this.options()['expose'] as string);
-        this.customFilter = computed(() => this.options()['filter'], ...(ngDevMode ? [{ debugName: "customFilter" }] : []));
-        this.multiple = computed(() => (this.options()['multiple'] ?? false), ...(ngDevMode ? [{ debugName: "multiple" }] : []));
-        //#endregion
-        //#region ----   Lookup Node   ----
-        this.lookupNode = signal({
-            type: 'lookup-editor',
-            path: this.path,
-            options: {},
-        }, ...(ngDevMode ? [{ debugName: "lookupNode" }] : []));
-        //#endregion
-        //#region ----   Effects   ----
-        this.#efUpdateLookupNode = effect(() => {
-            // console.log('path:', this.path, this.expose());
-            const node = {
-                type: 'lookup-editor',
-                defaultValue: this.getValue()?.value,
-                path: this.editorPath,
-                options: {
-                    entity: this.entity(),
-                    expose: [
-                        {
-                            source: this.textField(),
-                            target: this.multiple() ? `${this.path}EditorObj.{title}` : `${this.path}EditorObj.title`,
-                        },
-                        {
-                            source: this.valueField(),
-                            target: this.multiple() ? `${this.path}EditorObj.{id}` : `${this.path}EditorObj.id`,
-                        },
-                    ],
-                    look: 'select',
-                    multiple: this.multiple(),
-                    textField: this.textField(),
-                    filter: this.customFilter(),
-                    allowClear: false,
-                },
-            };
-            this.lookupNode.set(node);
-        }, ...(ngDevMode ? [{ debugName: "#efUpdateLookupNode" }] : []));
-        this.#efUpdateValue = effect(() => {
-            const newValueObj = this.contextService.getValue(`${this.path}EditorObj`);
-            const newValueId = untracked(() => this.contextService.getValue(this.editorPath));
-            const prevValue = untracked(() => this.getValue()?.value);
-            const newValue = this.multiple()
-                ? newValueObj?.map((v) => v[this.valueField()])
-                : newValueObj?.[this.valueField()];
-            const valueIsChanged = !isEqual(prevValue, newValue);
-            if (!valueIsChanged) {
-                return;
-            }
-            if (!newValueId || newValueId?.length == 0) {
-                this.setValue({
-                    value: undefined,
-                    operation: {
-                        type: this.multiple() ? 'in' : 'equal',
-                    },
-                });
-            }
-            const value = this.multiple()
-                ? newValueObj.map((v) => v[this.valueField()])
-                : newValueObj?.[this.valueField()];
-            const displayText = this.multiple()
-                ? newValueObj.map((v) => v[this.textField()]).join(',')
-                : newValueObj?.[this.textField()];
-            this.setValue({
-                value: value,
-                operation: {
-                    type: this.multiple() ? 'in' : 'equal',
-                },
-                displayText: displayText,
-            });
-        }, ...(ngDevMode ? [{ debugName: "#efUpdateValue" }] : []));
-        //#endregion
-        //#region ----   Focus Management   ----
-        this.shouldFocus = signal(false, ...(ngDevMode ? [{ debugName: "shouldFocus" }] : []));
-        /**
-         * Reactive effect to auto-focus the lookup editor when component is ready
-         */
-        this.#focusEffect = effect(() => {
-            const renderer = this.lookupWidgetRenderer();
-            const shouldFocus = this.shouldFocus();
-            // Early return if no renderer or shouldn't focus
-            if (!renderer || !shouldFocus) {
-                return;
-            }
-            // Listen to componentRefSignal reactively
-            const componentRef = renderer.componentRefSignal();
-            // When componentRef is set (not null), focus the widget
-            if (componentRef) {
-                const componentInstance = componentRef.instance;
-                // Try to use the component's native focus method
-                if (componentInstance && typeof componentInstance.focus === 'function') {
-                    try {
-                        componentInstance.focus();
-                        // Reset focus flag after successful focus
-                        this.shouldFocus.set(false);
-                    }
-                    catch (error) {
-                        // console.error('Error focusing lookup widget component:', error);
-                    }
-                }
-            }
-        }, ...(ngDevMode ? [{ debugName: "#focusEffect" }] : []));
-    }
-    //#endregion
-    //#region ----   Effects   ----
-    #efUpdateLookupNode;
-    #efUpdateValue;
-    /**
-     * Reactive effect to auto-focus the lookup editor when component is ready
-     */
-    #focusEffect;
-    /**
-     * Public focus method to trigger focusing
-     */
-    focus() {
-        this.shouldFocus.set(true);
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPLookupFilterWidgetEditComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.2.0", version: "20.3.16", type: AXPLookupFilterWidgetEditComponent, isStandalone: true, selector: "ng-component", viewQueries: [{ propertyName: "lookupWidgetRenderer", first: true, predicate: ["widgetRenderer"], descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: `
-    <ng-container
-      axp-widget-renderer
-      #widgetRenderer="widgetRenderer"
-      [node]="lookupNode()"
-      [mode]="'edit'"
-    ></ng-container>
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: FormsModule }, { kind: "ngmodule", type: AXSelectBoxModule }, { kind: "ngmodule", type: AXTextBoxModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "ngmodule", type: AXDecoratorModule }, { kind: "ngmodule", type: AXLoadingModule }, { kind: "ngmodule", type: AXValidationModule }, { kind: "ngmodule", type: AXFormModule }, { kind: "ngmodule", type: AXPWidgetCoreModule }, { kind: "directive", type: i3$1.AXPWidgetRendererDirective, selector: "[axp-widget-renderer]", inputs: ["parentNode", "index", "mode", "node"], outputs: ["onOptionsChanged", "onValueChanged", "onLoad"], exportAs: ["widgetRenderer"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPLookupFilterWidgetEditComponent, decorators: [{
-            type: Component,
-            args: [{
-                    template: `
-    <ng-container
-      axp-widget-renderer
-      #widgetRenderer="widgetRenderer"
-      [node]="lookupNode()"
-      [mode]="'edit'"
-    ></ng-container>
-  `,
-                    changeDetection: ChangeDetectionStrategy.OnPush,
-                    imports: [
-                        FormsModule,
-                        AXSelectBoxModule,
-                        AXTextBoxModule,
-                        AXButtonModule,
-                        AXDecoratorModule,
-                        AXLoadingModule,
-                        AXValidationModule,
-                        AXFormModule,
-                        AXPWidgetCoreModule,
-                    ],
-                }]
-        }], propDecorators: { lookupWidgetRenderer: [{ type: i0.ViewChild, args: ['widgetRenderer', { isSignal: true }] }] } });
-
-var lookupFilterWidgetEdit_component = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    AXPLookupFilterWidgetEditComponent: AXPLookupFilterWidgetEditComponent
-});
-
-const AXPLookupFilterWidget = {
-    name: 'lookup-filter',
-    title: 'Lookup Filter',
-    // categories: AXP_WIDGETS_FILTER_CATEGORY,
-    type: 'filter',
-    groups: [AXPWidgetGroupEnum.EntityWidget],
-    icon: 'fa-light fa-square',
-    properties: [AXP_NAME_PROPERTY, AXP_DATA_PATH_PROPERTY, AXP_DISABLED_PROPERTY],
-    components: {
-        edit: {
-            component: () => Promise.resolve().then(function () { return lookupFilterWidgetEdit_component; }).then((c) => c.AXPLookupFilterWidgetEditComponent),
-        },
-    },
-};
-
 class AXPLookupWidgetViewComponent extends AXPValueWidgetComponent {
     constructor() {
         super(...arguments);
@@ -11853,7 +12098,7 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
         this.multiple = input.required(...(ngDevMode ? [{ debugName: "multiple" }] : []));
         this.isLoading = input.required(...(ngDevMode ? [{ debugName: "isLoading" }] : []));
         this.validationRules = input.required(...(ngDevMode ? [{ debugName: "validationRules" }] : []));
-        this.allowClear = input.required(...(ngDevMode ? [{ debugName: "allowClear" }] : []));
+        this.hasClearButton = input(false, ...(ngDevMode ? [{ debugName: "hasClearButton" }] : []));
         // Entity and configuration data (for showSelector and searchByValue)
         this.entityDef = input.required(...(ngDevMode ? [{ debugName: "entityDef" }] : []));
         this.customFilter = input.required(...(ngDevMode ? [{ debugName: "customFilter" }] : []));
@@ -11902,7 +12147,6 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
         this.multipleValue = computed(() => this.multiple()(), ...(ngDevMode ? [{ debugName: "multipleValue" }] : []));
         this.isLoadingValue = computed(() => this.isLoading()(), ...(ngDevMode ? [{ debugName: "isLoadingValue" }] : []));
         this.validationRulesValue = computed(() => this.validationRules()(), ...(ngDevMode ? [{ debugName: "validationRulesValue" }] : []));
-        this.allowClearValue = computed(() => this.allowClear()(), ...(ngDevMode ? [{ debugName: "allowClearValue" }] : []));
     }
     #focusEffect;
     focus() {
@@ -12055,7 +12299,7 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
     refresh() {
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPLookupWidgetTagboxComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: AXPLookupWidgetTagboxComponent, isStandalone: true, selector: "axp-lookup-widget-tagbox", inputs: { selectedItems: { classPropertyName: "selectedItems", publicName: "selectedItems", isSignal: true, isRequired: true, transformFunction: null }, displayField: { classPropertyName: "displayField", publicName: "displayField", isSignal: true, isRequired: true, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: true, transformFunction: null }, displayFormat: { classPropertyName: "displayFormat", publicName: "displayFormat", isSignal: true, isRequired: false, transformFunction: null }, disabled: { classPropertyName: "disabled", publicName: "disabled", isSignal: true, isRequired: true, transformFunction: null }, multiple: { classPropertyName: "multiple", publicName: "multiple", isSignal: true, isRequired: true, transformFunction: null }, isLoading: { classPropertyName: "isLoading", publicName: "isLoading", isSignal: true, isRequired: true, transformFunction: null }, validationRules: { classPropertyName: "validationRules", publicName: "validationRules", isSignal: true, isRequired: true, transformFunction: null }, allowClear: { classPropertyName: "allowClear", publicName: "allowClear", isSignal: true, isRequired: true, transformFunction: null }, entityDef: { classPropertyName: "entityDef", publicName: "entityDef", isSignal: true, isRequired: true, transformFunction: null }, customFilter: { classPropertyName: "customFilter", publicName: "customFilter", isSignal: true, isRequired: true, transformFunction: null }, columns: { classPropertyName: "columns", publicName: "columns", isSignal: true, isRequired: true, transformFunction: null }, parentFilters: { classPropertyName: "parentFilters", publicName: "parentFilters", isSignal: true, isRequired: false, transformFunction: null }, onSetLoading: { classPropertyName: "onSetLoading", publicName: "onSetLoading", isSignal: true, isRequired: true, transformFunction: null } }, outputs: { valueChanged: "valueChanged" }, providers: [
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: AXPLookupWidgetTagboxComponent, isStandalone: true, selector: "axp-lookup-widget-tagbox", inputs: { selectedItems: { classPropertyName: "selectedItems", publicName: "selectedItems", isSignal: true, isRequired: true, transformFunction: null }, displayField: { classPropertyName: "displayField", publicName: "displayField", isSignal: true, isRequired: true, transformFunction: null }, valueField: { classPropertyName: "valueField", publicName: "valueField", isSignal: true, isRequired: true, transformFunction: null }, displayFormat: { classPropertyName: "displayFormat", publicName: "displayFormat", isSignal: true, isRequired: false, transformFunction: null }, disabled: { classPropertyName: "disabled", publicName: "disabled", isSignal: true, isRequired: true, transformFunction: null }, multiple: { classPropertyName: "multiple", publicName: "multiple", isSignal: true, isRequired: true, transformFunction: null }, isLoading: { classPropertyName: "isLoading", publicName: "isLoading", isSignal: true, isRequired: true, transformFunction: null }, validationRules: { classPropertyName: "validationRules", publicName: "validationRules", isSignal: true, isRequired: true, transformFunction: null }, hasClearButton: { classPropertyName: "hasClearButton", publicName: "hasClearButton", isSignal: true, isRequired: false, transformFunction: null }, entityDef: { classPropertyName: "entityDef", publicName: "entityDef", isSignal: true, isRequired: true, transformFunction: null }, customFilter: { classPropertyName: "customFilter", publicName: "customFilter", isSignal: true, isRequired: true, transformFunction: null }, columns: { classPropertyName: "columns", publicName: "columns", isSignal: true, isRequired: true, transformFunction: null }, parentFilters: { classPropertyName: "parentFilters", publicName: "parentFilters", isSignal: true, isRequired: false, transformFunction: null }, onSetLoading: { classPropertyName: "onSetLoading", publicName: "onSetLoading", isSignal: true, isRequired: true, transformFunction: null } }, outputs: { valueChanged: "valueChanged" }, providers: [
             {
                 provide: LookupWidgetLookBase,
                 useExisting: AXPLookupWidgetTagboxComponent,
@@ -12082,7 +12326,7 @@ class AXPLookupWidgetTagboxComponent extends LookupWidgetLookBase {
           [options]="validation.options"
         ></ax-validation-rule>
       }
-      @if (selectedItemsValue().length > 1 || allowClearValue()) {
+      @if (selectedItemsValue().length > 1 || hasClearButton()) {
         <ax-clear-button ></ax-clear-button>
       }
 
@@ -12137,7 +12381,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
           [options]="validation.options"
         ></ax-validation-rule>
       }
-      @if (selectedItemsValue().length > 1 || allowClearValue()) {
+      @if (selectedItemsValue().length > 1 || hasClearButton()) {
         <ax-clear-button ></ax-clear-button>
       }
 
@@ -12184,7 +12428,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                         }
                     ],
                 }]
-        }], propDecorators: { selectedItems: [{ type: i0.Input, args: [{ isSignal: true, alias: "selectedItems", required: true }] }], displayField: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayField", required: true }] }], valueField: [{ type: i0.Input, args: [{ isSignal: true, alias: "valueField", required: true }] }], displayFormat: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayFormat", required: false }] }], disabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "disabled", required: true }] }], multiple: [{ type: i0.Input, args: [{ isSignal: true, alias: "multiple", required: true }] }], isLoading: [{ type: i0.Input, args: [{ isSignal: true, alias: "isLoading", required: true }] }], validationRules: [{ type: i0.Input, args: [{ isSignal: true, alias: "validationRules", required: true }] }], allowClear: [{ type: i0.Input, args: [{ isSignal: true, alias: "allowClear", required: true }] }], entityDef: [{ type: i0.Input, args: [{ isSignal: true, alias: "entityDef", required: true }] }], customFilter: [{ type: i0.Input, args: [{ isSignal: true, alias: "customFilter", required: true }] }], columns: [{ type: i0.Input, args: [{ isSignal: true, alias: "columns", required: true }] }], parentFilters: [{ type: i0.Input, args: [{ isSignal: true, alias: "parentFilters", required: false }] }], onSetLoading: [{ type: i0.Input, args: [{ isSignal: true, alias: "onSetLoading", required: true }] }], valueChanged: [{ type: i0.Output, args: ["valueChanged"] }], tagBox: [{ type: i0.ViewChild, args: ['tagBoxComponent', { isSignal: true }] }] } });
+        }], propDecorators: { selectedItems: [{ type: i0.Input, args: [{ isSignal: true, alias: "selectedItems", required: true }] }], displayField: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayField", required: true }] }], valueField: [{ type: i0.Input, args: [{ isSignal: true, alias: "valueField", required: true }] }], displayFormat: [{ type: i0.Input, args: [{ isSignal: true, alias: "displayFormat", required: false }] }], disabled: [{ type: i0.Input, args: [{ isSignal: true, alias: "disabled", required: true }] }], multiple: [{ type: i0.Input, args: [{ isSignal: true, alias: "multiple", required: true }] }], isLoading: [{ type: i0.Input, args: [{ isSignal: true, alias: "isLoading", required: true }] }], validationRules: [{ type: i0.Input, args: [{ isSignal: true, alias: "validationRules", required: true }] }], hasClearButton: [{ type: i0.Input, args: [{ isSignal: true, alias: "hasClearButton", required: false }] }], entityDef: [{ type: i0.Input, args: [{ isSignal: true, alias: "entityDef", required: true }] }], customFilter: [{ type: i0.Input, args: [{ isSignal: true, alias: "customFilter", required: true }] }], columns: [{ type: i0.Input, args: [{ isSignal: true, alias: "columns", required: true }] }], parentFilters: [{ type: i0.Input, args: [{ isSignal: true, alias: "parentFilters", required: false }] }], onSetLoading: [{ type: i0.Input, args: [{ isSignal: true, alias: "onSetLoading", required: true }] }], valueChanged: [{ type: i0.Output, args: ["valueChanged"] }], tagBox: [{ type: i0.ViewChild, args: ['tagBoxComponent', { isSignal: true }] }] } });
 
 class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
     constructor() {
@@ -12201,21 +12445,16 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         //#region ----   Computed Properties   ----
         this.expose = computed(() => this.options()['expose'], ...(ngDevMode ? [{ debugName: "expose" }] : []));
         this.entity = computed(() => this.options()['entity'], ...(ngDevMode ? [{ debugName: "entity" }] : []));
-        this.disabled = computed(() => this.options()['disabled'], ...(ngDevMode ? [{ debugName: "disabled" }] : []));
+        this.disabled = computed(() => this.filterMode() ? false : this.options()['disabled'], ...(ngDevMode ? [{ debugName: "disabled" }] : []));
         this.columns = computed(() => this.options()['columns'] ?? [], ...(ngDevMode ? [{ debugName: "columns" }] : []));
         this.textField = computed(() => this.options()['textField'] ?? '', ...(ngDevMode ? [{ debugName: "textField" }] : []));
         this.hasClearButton = computed(() => this.options()['hasClearButton'] ?? false, ...(ngDevMode ? [{ debugName: "hasClearButton" }] : []));
         this.customFilter = computed(() => this.options()['filter'], ...(ngDevMode ? [{ debugName: "customFilter" }] : []));
+        this.filterMode = computed(() => this.options()['filterMode'], ...(ngDevMode ? [{ debugName: "filterMode" }] : []));
         this.multiple = computed(() => (this.options()['multiple'] ?? false), ...(ngDevMode ? [{ debugName: "multiple" }] : []));
         this.look = computed(() => this.options()['look'] ?? 'lookup', ...(ngDevMode ? [{ debugName: "look" }] : []));
-        this.allowClear = computed(() => (this.options()['allowClear'] ?? false), ...(ngDevMode ? [{ debugName: "allowClear" }] : []));
         this.defaultTextField = computed(() => {
-            const list = [
-                'title',
-                'name',
-                'code',
-                'description',
-            ];
+            const list = ['title', 'name', 'code', 'description'];
             const textField = list.find((c) => this.entityDef()?.properties.find((p) => p.name == c)) ?? 'title';
             return textField;
         }, ...(ngDevMode ? [{ debugName: "defaultTextField" }] : []));
@@ -12240,9 +12479,6 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             const [module, entity] = this.entity().split('.');
             this.entityDef.set(await this.entityResolver.resolve(module, entity));
         }, ...(ngDevMode ? [{ debugName: "#efEntity" }] : []));
-        this.#efFilter = effect(async () => {
-            console.log('filter:', this.customFilter());
-        }, ...(ngDevMode ? [{ debugName: "#efFilter" }] : []));
         this.hasValue = (value) => (Array.isArray(value) && !isEmpty(value)) || !isNil(value);
         this.#efValue = effect(() => {
             const currentValue = this.getValue();
@@ -12277,7 +12513,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             // Ensure items is always an array
             items = castArray(items);
             // Filter out null/undefined items
-            items = items.filter(item => item != null);
+            items = items.filter((item) => item != null);
             this.selectedItems.set(items);
             //
             const keys = items.map((item) => get(item, this.valueField()));
@@ -12288,17 +12524,29 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
                 this.expoesItems();
             }
             const newValue = this.singleOrMultiple(keys);
-            this.setValue(newValue);
+            if (this.filterMode()) {
+                this.setValue({
+                    value: newValue,
+                    displayText: text,
+                    operation: {
+                        type: this.multiple() ? 'in' : 'equal',
+                    },
+                });
+            }
+            else {
+                this.setValue(newValue);
+            }
         };
     }
     #efEntity;
-    #efFilter;
     #efValue;
     async findByValue() {
         this.isLoading.set(true);
         const rawValue = this.getValue();
         // When multiple is true, ensure we always work with arrays
-        const values = this.multiple() ? castArray(rawValue) : [rawValue].filter(v => v != null);
+        const values = this.multiple()
+            ? castArray(this.filterMode() ? rawValue.value : rawValue)
+            : [rawValue].filter((v) => v != null);
         if (!values.length) {
             this.setItems([]);
             this.isLoading.set(false);
@@ -12311,14 +12559,14 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             if (this.multiple()) {
                 const items = await Promise.all(values
                     .map((value) => extractValue(value, this.valueField()))
-                    .filter(id => id != null)
+                    .filter((id) => id != null)
                     .map((id) => entityDataAccessor.byKey(id)));
                 // Filter out null/undefined results
-                const validItems = items.filter(item => item != null);
+                const validItems = items.filter((item) => item != null);
                 this.setItems(validItems);
             }
             else {
-                const id = extractValue(values[0], this.valueField());
+                const id = extractValue(this.filterMode() ? values[0].value : values[0], this.valueField());
                 if (id != null) {
                     const item = await entityDataAccessor.byKey(id);
                     this.setItems(item != null ? [item] : []);
@@ -12445,7 +12693,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
             [multiple]="multiple"
             [isLoading]="isLoading"
             [validationRules]="validationRules"
-            [allowClear]="allowClear"
+            [hasClearButton]="hasClearButton()"
             [entityDef]="entityDef"
             [customFilter]="customFilter"
             [columns]="columns"
@@ -12456,7 +12704,7 @@ class AXPLookupWidgetEditComponent extends AXPValueWidgetComponent {
         }
       }
     }
-  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "component", type: AXPLookupWidgetSelectComponent, selector: "axp-lookup-widget-select", inputs: ["entityDef", "customFilter", "selectedItems", "displayField", "valueField", "disabled", "multiple", "validationRules", "hasClearButton"], outputs: ["valueChanged"] }, { kind: "component", type: AXPLookupWidgetTagboxComponent, selector: "axp-lookup-widget-tagbox", inputs: ["selectedItems", "displayField", "valueField", "displayFormat", "disabled", "multiple", "isLoading", "validationRules", "allowClear", "entityDef", "customFilter", "columns", "parentFilters", "onSetLoading"], outputs: ["valueChanged"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "component", type: AXPLookupWidgetSelectComponent, selector: "axp-lookup-widget-select", inputs: ["entityDef", "customFilter", "selectedItems", "displayField", "valueField", "disabled", "multiple", "validationRules", "hasClearButton"], outputs: ["valueChanged"] }, { kind: "component", type: AXPLookupWidgetTagboxComponent, selector: "axp-lookup-widget-tagbox", inputs: ["selectedItems", "displayField", "valueField", "displayFormat", "disabled", "multiple", "isLoading", "validationRules", "hasClearButton", "entityDef", "customFilter", "columns", "parentFilters", "onSetLoading"], outputs: ["valueChanged"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPLookupWidgetEditComponent, decorators: [{
             type: Component,
@@ -12489,7 +12737,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
             [multiple]="multiple"
             [isLoading]="isLoading"
             [validationRules]="validationRules"
-            [allowClear]="allowClear"
+            [hasClearButton]="hasClearButton()"
             [entityDef]="entityDef"
             [customFilter]="customFilter"
             [columns]="columns"
@@ -12502,11 +12750,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
     }
   `,
                     changeDetection: ChangeDetectionStrategy.OnPush,
-                    imports: [
-                        CommonModule,
-                        AXPLookupWidgetSelectComponent,
-                        AXPLookupWidgetTagboxComponent,
-                    ],
+                    imports: [CommonModule, AXPLookupWidgetSelectComponent, AXPLookupWidgetTagboxComponent],
                 }]
         }], propDecorators: { componentLook: [{ type: i0.ViewChild, args: [i0.forwardRef(() => LookupWidgetLookBase), { isSignal: true }] }] } });
 
@@ -12632,7 +12876,7 @@ class AXPLookupWidgetColumnComponent extends AXPColumnWidgetComponent {
         return get(item, this.displayField()) ?? '';
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPLookupWidgetColumnComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: AXPLookupWidgetColumnComponent, isStandalone: true, selector: "ng-component", inputs: { rawValue: "rawValue", rowData: "rowData" }, viewQueries: [{ propertyName: "moreButton", first: true, predicate: ["moreButton"], descendants: true, isSignal: true }, { propertyName: "morePopover", first: true, predicate: ["morePopover"], descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: "<div class=\"ax-flex ax-gap-1 ax-items-center\">\n  @if (visibleItems().length > 0) {\n  @for (item of visibleItems(); track $index) {\n  <span class=\"ax-cursor-pointer hover:ax-text-primary hover:ax-underline\" (click)=\"handleItemClick($index)\">\n    {{ getDisplayText(item) }}\n  </span>\n  @if ($index < visibleItems().length - 1) { <span class=\"ax-text-muted\">\u2022</span>\n    }\n    }\n    } @else {\n    <span class=\"ax-text-muted\">---</span>\n    }\n\n    @if (hasMoreItems()) {\n    <span\n      class=\"ax-absolute ax-flex ax-items-center ax-end-0 ax-px-1 ax-cursor-pointer ax-h-full hover:ax-primary-lighter\"\n      (click)=\"showMoreItems()\" #moreButton>\n      <i class=\"fa-light fa-ellipsis-vertical\"></i>\n    </span>\n    }\n</div>\n\n<!-- More Items Popover -->\n<ax-popover [openOn]=\"'manual'\" #morePopover (openChange)=\"onMorePopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[280px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold\">All {{ allItems().length }} Items</h3>\n    </div>\n    <div class=\"ax-max-h-64 ax-flex ax-flex-col ax-gap-3\">\n      @for (item of allItems(); track $index) {\n      <span class=\"ax-cursor-pointer hover:ax-text-primary hover:ax-underline\" (click)=\"showItemDetail(item, $index)\">\n        {{ getDisplayText(item) }}\n      </span>\n      }\n    </div>\n  </div>\n</ax-popover>", dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXBadgeModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "ngmodule", type: AXPopoverModule }, { kind: "component", type: i2.AXPopoverComponent, selector: "ax-popover", inputs: ["width", "disabled", "offsetX", "offsetY", "target", "placement", "content", "openOn", "closeOn", "hasBackdrop", "openAfter", "closeAfter", "backdropClass", "panelClass", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.16", type: AXPLookupWidgetColumnComponent, isStandalone: true, selector: "ng-component", inputs: { rawValue: "rawValue", rowData: "rowData" }, viewQueries: [{ propertyName: "moreButton", first: true, predicate: ["moreButton"], descendants: true, isSignal: true }, { propertyName: "morePopover", first: true, predicate: ["morePopover"], descendants: true, isSignal: true }], usesInheritance: true, ngImport: i0, template: "<div class=\"ax-flex ax-gap-1 ax-items-center\">\n  @if (visibleItems().length > 0) {\n  @for (item of visibleItems(); track $index) {\n  <span class=\"ax-cursor-pointer hover:ax-text-primary hover:ax-underline\" (click)=\"handleItemClick($index)\">\n    {{ getDisplayText(item) }}\n  </span>\n  @if ($index < visibleItems().length - 1) { <span class=\"ax-text-muted\">\u2022</span>\n    }\n    }\n    } @else {\n    <span class=\"ax-text-muted\">---</span>\n    }\n\n    @if (hasMoreItems()) {\n    <span\n      class=\"ax-absolute ax-flex ax-items-center ax-end-0 ax-px-1 ax-cursor-pointer ax-h-full hover:ax-primary-lighter\"\n      (click)=\"showMoreItems()\" #moreButton>\n      <i class=\"fa-light fa-ellipsis-vertical\"></i>\n    </span>\n    }\n</div>\n\n<!-- More Items Popover -->\n<ax-popover [openOn]=\"'manual'\" #morePopover (openChange)=\"onMorePopoverOpenChange($event)\">\n  <div class=\"ax-lightest-surface ax-border ax-rounded-lg ax-shadow-lg ax-p-4 ax-min-w-[280px]\">\n    <div class=\"ax-mb-4 ax-border-b ax-pb-2\">\n      <h3 class=\"ax-text-base ax-font-semibold\">All {{ allItems().length }} Items</h3>\n    </div>\n    <div class=\"ax-max-h-64 ax-flex ax-flex-col ax-gap-3\">\n      @for (item of allItems(); track $index) {\n      <span class=\"ax-cursor-pointer hover:ax-text-primary hover:ax-underline\" (click)=\"showItemDetail(item, $index)\">\n        {{ getDisplayText(item) }}\n      </span>\n      }\n    </div>\n  </div>\n</ax-popover>", dependencies: [{ kind: "ngmodule", type: CommonModule }, { kind: "ngmodule", type: AXBadgeModule }, { kind: "ngmodule", type: AXButtonModule }, { kind: "ngmodule", type: AXPopoverModule }, { kind: "component", type: i2.AXPopoverComponent, selector: "ax-popover", inputs: ["width", "disabled", "offsetX", "offsetY", "target", "placement", "content", "openOn", "closeOn", "hasBackdrop", "openAfter", "closeAfter", "repositionOnScroll", "backdropClass", "panelClass", "adaptivityEnabled"], outputs: ["onOpened", "onClosed"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImport: i0, type: AXPLookupWidgetColumnComponent, decorators: [{
             type: Component,
@@ -14461,6 +14705,12 @@ class AXPEntityModule {
                 useValue: defaultColumnWidthProvider,
                 multi: true,
             },
+            // Entities list data source (all entity names from registry)
+            {
+                provide: AXP_DATASOURCE_DEFINITION_PROVIDER,
+                useClass: AXPEntitiesListDataSourceDefinition,
+                multi: true,
+            },
             // {
             //   provide: AXP_ENTITY_MODIFIER,
             //   useValue: layoutOrderingMiddlewareProvider,
@@ -14519,12 +14769,23 @@ class AXPEntityModule {
                 functions: {},
             }),
             AXPWidgetCoreModule.forChild({
-                widgets: [
-                    AXPLookupWidget,
-                    AXPLookupFilterWidget,
-                    AXPEntityListWidget,
-                    AXPEntityCategoryWidget,
-                    AXPMultiSourceSelectorWidget,
+                widgets: [AXPLookupWidget, AXPEntityListWidget, AXPEntityCategoryWidget, AXPMultiSourceSelectorWidget],
+                extendedWidgets: [
+                    {
+                        parentName: AXPLookupWidget.name,
+                        widget: {
+                            name: 'lookup-filter',
+                            title: 'Lookup Filter',
+                            categories: AXP_WIDGETS_EDITOR_CATEGORY,
+                            groups: [AXPWidgetGroupEnum.EntityWidget],
+                            type: 'filter',
+                            components: {},
+                            options: {
+                                look: 'select',
+                                filterMode: true,
+                            },
+                        },
+                    },
                 ],
             })] }); }
 }
@@ -14561,12 +14822,23 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                             functions: {},
                         }),
                         AXPWidgetCoreModule.forChild({
-                            widgets: [
-                                AXPLookupWidget,
-                                AXPLookupFilterWidget,
-                                AXPEntityListWidget,
-                                AXPEntityCategoryWidget,
-                                AXPMultiSourceSelectorWidget,
+                            widgets: [AXPLookupWidget, AXPEntityListWidget, AXPEntityCategoryWidget, AXPMultiSourceSelectorWidget],
+                            extendedWidgets: [
+                                {
+                                    parentName: AXPLookupWidget.name,
+                                    widget: {
+                                        name: 'lookup-filter',
+                                        title: 'Lookup Filter',
+                                        categories: AXP_WIDGETS_EDITOR_CATEGORY,
+                                        groups: [AXPWidgetGroupEnum.EntityWidget],
+                                        type: 'filter',
+                                        components: {},
+                                        options: {
+                                            look: 'select',
+                                            filterMode: true,
+                                        },
+                                    },
+                                },
                             ],
                         }),
                     ],
@@ -14606,6 +14878,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.16", ngImpo
                             useValue: defaultColumnWidthProvider,
                             multi: true,
                         },
+                        // Entities list data source (all entity names from registry)
+                        {
+                            provide: AXP_DATASOURCE_DEFINITION_PROVIDER,
+                            useClass: AXPEntitiesListDataSourceDefinition,
+                            multi: true,
+                        },
                         // {
                         //   provide: AXP_ENTITY_MODIFIER,
                         //   useValue: layoutOrderingMiddlewareProvider,
@@ -14723,18 +15001,22 @@ function entityMasterCreateAction() {
         title: '@general:actions.create.title',
         command: {
             name: 'Entity:Create',
-            // options: {
-            //   process: {
-            //     redirect: true,
-            //     canCreateNewOne: true,
-            //   },
-            // },
         },
         priority: 'primary',
         type: AXPSystemActionType.Create,
         scope: AXPEntityCommandScope.TypeLevel,
     };
 }
+function entityMasterEditAction() {
+    return {
+        title: '@general:actions.edit.title',
+        command: 'Entity:Update',
+        priority: 'secondary',
+        type: AXPSystemActionType.Update,
+        scope: AXPEntityCommandScope.Individual,
+        default: true,
+    };
+}
 function entityMasterBulkDeleteAction() {
     return {
         title: '@general:actions.delete-items.title',
@@ -14784,10 +15066,9 @@ function entityMasterCrudActions(options) {
     if (opts.view) {
         actions.push(entityMasterViewAction());
     }
-    // TODO: Add edit action
-    // if (opts.edit) {
-    //   actions.push(entityMasterViewAction());
-    // }
+    if (opts.edit) {
+        actions.push(entityMasterEditAction());
+    }
     return actions;
 }
 function entityMasterRecordActions() {
@@ -14806,6 +15087,7 @@ function entityDetailsCreateActions(parentId) {
                     canCreateNewOne: true,
                     data: {
                         [parentId]: '{{context.eval("id")}}',
+                        notes: '{{context.eval("displayName")}}',
                     },
                 },
             },
@@ -14953,5 +15235,5 @@ function detectEntityChanges(oldObj, newObj) {
  * Generated bundle index. Do not edit.
  */
 
-export { AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCategoryTreeService, AXPCreateEntityCommand, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEntityApplyUpdatesAction, AXPEntityCategoryTreeSelectorComponent, AXPEntityCategoryWidget, AXPEntityCategoryWidgetColumnComponent, AXPEntityCategoryWidgetEditComponent, AXPEntityCategoryWidgetViewComponent, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDataSelectorService, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailPopoverComponent, AXPEntityDetailPopoverService, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityEventDispatcherService, AXPEntityEventsKeys, AXPEntityFormBuilderService, AXPEntityListTableService, AXPEntityListViewColumnViewModel, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityListWidget, AXPEntityListWidgetViewComponent, AXPEntityMasterCreateViewModel, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityMiddleware, AXPEntityModifyConfirmedAction, AXPEntityModifyEvent, AXPEntityModifySectionPopupAction, AXPEntityModule, AXPEntityPerformDeleteAction, AXPEntityResolver, AXPEntityService, AXPEntityStorageService, AXPEntityUpdateViewSectionViewModel, AXPGetEntityDetailsQuery, AXPLookupFilterWidget, AXPLookupFilterWidgetEditComponent, AXPLookupWidget, AXPLookupWidgetColumnComponent, AXPLookupWidgetEditComponent, AXPLookupWidgetViewComponent, AXPMiddlewareAbortError, AXPMiddlewareEntityStorageService, AXPModifyEntitySectionWorkflow, AXPMultiSourceDefinitionProviderContext, AXPMultiSourceDefinitionProviderService, AXPMultiSourceFederatedSearchService, AXPMultiSourceSelectorComponent, AXPMultiSourceSelectorService, AXPMultiSourceSelectorWidget, AXPMultiSourceSelectorWidgetColumnComponent, AXPMultiSourceSelectorWidgetEditComponent, AXPMultiSourceSelectorWidgetViewComponent, AXPMultiSourceType, AXPOpenEntityDetailsCommand, AXPQuickEntityModifyPopupAction, AXPQuickModifyEntityWorkflow, AXPShowDetailViewAction, AXPShowDetailsViewWorkflow, AXPShowListViewAction, AXPShowListViewWorkflow, AXPTruncatedBreadcrumbComponent, AXPUpdateEntityCommand, AXPViewEntityDetailsCommand, AXP_DATA_SEEDER_TOKEN, AXP_ENTITY_ACTION_PLUGIN, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_DEFINITION_LOADER, AXP_ENTITY_MODIFIER, AXP_ENTITY_STORAGE_BACKEND, AXP_ENTITY_STORAGE_MIDDLEWARE, AXP_MULTI_SOURCE_DEFINITION_PROVIDER, DEFAULT_PROPERTY_ORDER, DEFAULT_SECTION_ORDER, EntityBuilder, EntityDataAccessor, actionExists, cloneLayoutArrays, columnWidthMiddleware, columnWidthMiddlewareProvider, createLayoutOrderingMiddlewareProvider, createModifierContext, detectEntityChanges, ensureLayoutPropertyView, ensureLayoutSection, ensureListActions, entityDetailsCreateActions, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, eventDispatchMiddleware, isAXPMiddlewareAbortError, layoutOrderingMiddlewareFactory, layoutOrderingMiddlewareProvider };
+export { AXMEntityCrudService, AXMEntityCrudServiceImpl, AXPCategoryTreeService, AXPCreateEntityCommand, AXPCreateEntityWorkflow, AXPDataSeederService, AXPDeleteEntityWorkflow, AXPEntitiesListDataSourceDefinition, AXPEntityApplyUpdatesAction, AXPEntityCategoryTreeSelectorComponent, AXPEntityCategoryWidget, AXPEntityCategoryWidgetColumnComponent, AXPEntityCategoryWidgetEditComponent, AXPEntityCategoryWidgetViewComponent, AXPEntityCommandTriggerViewModel, AXPEntityCreateEvent, AXPEntityCreatePopupAction, AXPEntityCreateSubmittedAction, AXPEntityCreateViewElementViewModel, AXPEntityCreateViewModelFactory, AXPEntityCreateViewSectionViewModel, AXPEntityDataProvider, AXPEntityDataProviderImpl, AXPEntityDataSelectorService, AXPEntityDefinitionRegistryService, AXPEntityDeletedEvent, AXPEntityDetailListViewModel, AXPEntityDetailPopoverComponent, AXPEntityDetailPopoverService, AXPEntityDetailViewModelFactory, AXPEntityDetailViewModelResolver, AXPEntityEventDispatcherService, AXPEntityEventsKeys, AXPEntityFormBuilderService, AXPEntityListTableService, AXPEntityListViewColumnViewModel, AXPEntityListViewModelFactory, AXPEntityListViewModelResolver, AXPEntityListWidget, AXPEntityListWidgetViewComponent, AXPEntityMasterCreateViewModel, AXPEntityMasterListViewModel, AXPEntityMasterListViewQueryViewModel, AXPEntityMasterSingleElementViewModel, AXPEntityMasterSingleViewGroupViewModel, AXPEntityMasterSingleViewModel, AXPEntityMasterUpdateElementViewModel, AXPEntityMasterUpdateViewModel, AXPEntityMasterUpdateViewModelFactory, AXPEntityMiddleware, AXPEntityModifyConfirmedAction, AXPEntityModifyEvent, AXPEntityModifySectionPopupAction, AXPEntityModule, AXPEntityPerformDeleteAction, AXPEntityResolver, AXPEntityService, AXPEntityStorageService, AXPEntityUpdateViewSectionViewModel, AXPGetEntityDetailsQuery, AXPLookupWidget, AXPLookupWidgetColumnComponent, AXPLookupWidgetEditComponent, AXPLookupWidgetViewComponent, AXPMiddlewareAbortError, AXPMiddlewareEntityStorageService, AXPModifyEntitySectionWorkflow, AXPMultiSourceDefinitionProviderContext, AXPMultiSourceDefinitionProviderService, AXPMultiSourceFederatedSearchService, AXPMultiSourceSelectorComponent, AXPMultiSourceSelectorService, AXPMultiSourceSelectorWidget, AXPMultiSourceSelectorWidgetColumnComponent, AXPMultiSourceSelectorWidgetEditComponent, AXPMultiSourceSelectorWidgetViewComponent, AXPMultiSourceType, AXPOpenEntityDetailsCommand, AXPQuickEntityModifyPopupAction, AXPQuickModifyEntityWorkflow, AXPShowDetailViewAction, AXPShowDetailsViewWorkflow, AXPShowListViewAction, AXPShowListViewWorkflow, AXPTruncatedBreadcrumbComponent, AXPUpdateEntityCommand, AXPViewEntityDetailsCommand, AXP_DATA_SEEDER_TOKEN, AXP_ENTITY_ACTION_PLUGIN, AXP_ENTITY_CONFIG_TOKEN, AXP_ENTITY_DEFINITION_LOADER, AXP_ENTITY_MODIFIER, AXP_ENTITY_STORAGE_BACKEND, AXP_ENTITY_STORAGE_MIDDLEWARE, AXP_MULTI_SOURCE_DEFINITION_PROVIDER, DEFAULT_PROPERTY_ORDER, DEFAULT_SECTION_ORDER, EntityBuilder, EntityDataAccessor, actionExists, cloneLayoutArrays, columnWidthMiddleware, columnWidthMiddlewareProvider, createLayoutOrderingMiddlewareProvider, createModifierContext, detectEntityChanges, ensureLayoutPropertyView, ensureLayoutSection, ensureListActions, entityDetailsCreateActions, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterEditAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, eventDispatchMiddleware, isAXPMiddlewareAbortError, layoutOrderingMiddlewareFactory, layoutOrderingMiddlewareProvider };
 //# sourceMappingURL=acorex-platform-layout-entity.mjs.map