@acorex/platform 20.9.38 → 20.9.40

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

@@ -1,4 +1,4 @@
-import { mergeForeignKeyFieldIntoCreateActions, collectNestedCreateHiddenProperties, AXPEntityCommandScope, normalizeEntityDisplayTemplate, sanitizeResolvedEntityDisplayTitle, isUnresolvedEntityDisplayTemplate, resolveEntityListFilterContextField, resolveEntityListFilterQueryField, AXPEntityDataSourceKeys, isCardFieldBadgeDisplay, resolveCardFieldBadgeColor, isEntityActionPermitted, getEntityInfo, resolveEnabledMasterListLayouts, resolveDefaultMasterListLayout, AXPEntityEventsKeys, collectEntityListSortableFields, collectEntityListFilterDefinitions, parseDottedFieldPath, ENTITY_ROW_POPUP_TITLE_OPTION, resolveLookupWidgetCreateOptions, buildPageListWidgetName, AXPEntityQueryType, buildEntitySearchTitleContext } from '@acorex/platform/layout/entity-contracts';
+import { mergeForeignKeyFieldIntoCreateActions, collectNestedCreateHiddenProperties, AXPEntityCommandScope, normalizeEntityDisplayTemplate, sanitizeResolvedEntityDisplayTitle, isUnresolvedEntityDisplayTemplate, resolveEntityListFilterContextField, resolveEntityListFilterQueryField, AXPEntityDataSourceKeys, isCardFieldBadgeDisplay, resolveCardFieldBadgeColor, isEntityActionPermitted, getEntityInfo, resolveEnabledMasterListLayouts, resolveDefaultMasterListLayout, AXPEntityEventsKeys, collectEntityListSortableFields, collectEntityListFilterDefinitions, parseDottedFieldPath, ENTITY_ROW_POPUP_TITLE_OPTION, buildPageListWidgetName, resolveLookupWidgetCreateOptions, AXPEntityQueryType, buildEntitySearchTitleContext } from '@acorex/platform/layout/entity-contracts';
 export * from '@acorex/platform/layout/entity-contracts';
 export { collectNestedCreateHiddenProperties, entityDetailsCreateActions, entityDetailsCreateActionsDeferredParent, entityDetailsCrudActions, entityDetailsEditAction, entityDetailsNewEditAction, entityDetailsReferenceCondition, entityDetailsReferenceCreateActions, entityDetailsSimpleCondition, entityMasterBulkDeleteAction, entityMasterCreateAction, entityMasterCrudActions, entityMasterDeleteAction, entityMasterEditAction, entityMasterRecordActions, entityMasterViewAction, entityOverrideDetailsViewAction, mergeForeignKeyFieldIntoCreateActions } from '@acorex/platform/layout/entity-contracts';
 import { AXToastService } from '@acorex/components/toast';
@@ -24,7 +24,7 @@ import { AXButtonModule } from '@acorex/components/button';
 import * as i3 from '@acorex/components/skeleton';
 import { AXSkeletonModule } from '@acorex/components/skeleton';
 import * as i2 from '@acorex/platform/layout/widget-core';
-import { AXPWidgetCoreModule, AXPWidgetRegistryService, AXPColumnWidgetComponent, AXPValueWidgetComponent, AXPWidgetRendererDirective, AXPBaseWidgetComponent, WIDGET_CASCADE_TRACE_NS, AXP_WIDGETS_ADVANCE_SUB_MEDIA, AXP_WIDGETS_ADVANCE_CATEGORY, AXP_WIDGETS_EDITOR_CATEGORY, AXP_WIDGET_DEFINITION_PROVIDER } from '@acorex/platform/layout/widget-core';
+import { AXPWidgetCoreModule, AXPWidgetRegistryService, AXPColumnWidgetComponent, AXPValueWidgetComponent, AXPWidgetRendererDirective, AXPBaseWidgetComponent, WIDGET_CASCADE_TRACE_NS, AXP_WIDGETS_EDITOR_CATEGORY, AXP_WIDGETS_ADVANCE_SUB_MEDIA, AXP_WIDGETS_ADVANCE_CATEGORY, AXP_WIDGET_DEFINITION_PROVIDER } from '@acorex/platform/layout/widget-core';
 import { AXPCommandService, AXPQueryService, AXPQueryExecutor, AXPCommandExecutor, provideCommandSetups, provideQuerySetups, AXPCommandRegistry, AXPQueryRegistry } from '@acorex/platform/runtime';
 import * as i5 from '@angular/common';
 import { CommonModule, DOCUMENT, AsyncPipe, NgClass } from '@angular/common';
@@ -4552,12 +4552,14 @@ class AXPEntityListViewColumnViewModel {
         this.width = this.column?.options?.width;
         this.node = computed(() => {
             const widget = this.property.schema.interface;
+            // Column `visible` is resolved by the list viewmodel; do not forward expressions into widget options.
+            const { visible: _columnVisible, ...columnOptions } = this.column?.options ?? {};
             return {
                 path: this.column.options?.dataPath ?? this.name,
                 type: widget.type,
                 options: {
                     ...widget?.options,
-                    ...this.column?.options,
+                    ...columnOptions,
                     columnName: this.name,
                     // Include children from widget interface so column components can access them
                     ...(widget.children ? { children: widget.children } : {}),
@@ -5587,7 +5589,7 @@ class AXPEntityMasterListViewModel {
         if (shouldApplyViewState) {
             this.view.set(nextView);
             this.applyViewSorts();
-            this.applyViewColumns();
+            await this.applyViewColumns();
             this.applyCardFields();
             this.applyViewFilters();
             this.resolvedListPaging.set(null);
@@ -5971,7 +5973,12 @@ class AXPEntityMasterListViewModel {
                     for (const column of next) {
                         const columnKey = column.column?.options?.dataPath ?? column.name;
                         column.width = defaultTo(columnWidthsMap.get(columnKey), column.column?.options?.width);
-                        column.visible = columnVisibilityMap.get(columnKey) ?? column.visible;
+                        // Definition visibility (view.columns whitelist + options.visible) always wins for "hide".
+                        // Persisted settings may only further hide an already-allowed column.
+                        const definitionVisible = column.visible === true;
+                        const persistedVisible = columnVisibilityMap.get(columnKey);
+                        column.visible =
+                            definitionVisible && (persistedVisible === undefined ? true : persistedVisible !== false);
                     }
                     return next;
                 });
@@ -6107,7 +6114,7 @@ class AXPEntityMasterListViewModel {
                     const existingColumns = prev?.list?.views?.[this.view().name]?.columns;
                     const baseColumns = Array.isArray(existingColumns) && existingColumns.length
                         ? existingColumns
-                        : this.allAvailableColumns().map((c) => ({
+                        : this.columns().map((c) => ({
                             name: c.column?.options?.dataPath ?? c.name,
                             visible: c.visible,
                             width: c.width,
@@ -6116,11 +6123,6 @@ class AXPEntityMasterListViewModel {
                         ...c,
                         width: c.name === field ? columnSizeData.width : c.width,
                     }));
-                    const x = this.allAvailableColumns().map((c) => ({
-                        name: c.column?.options?.dataPath ?? c.name,
-                        visible: c.visible,
-                        width: c.width,
-                    }));
                     set(newSettings, `list.views.${this.view().name}.columns`, updatedColumns);
                     return newSettings;
                 });
@@ -6638,22 +6640,59 @@ class AXPEntityMasterListViewModel {
         const relatedDef = this.getRegisteredEntity(related.entity);
         return relatedDef?.properties?.find((property) => property.name === propertyName) ?? null;
     }
-    resetColumns() {
-        this.applyViewColumns();
+    async resetColumns() {
+        await this.applyViewColumns();
     }
     async onColumnsChanged(columns) {
         this.saveSettings('columnOrders', columns);
     }
-    applyViewColumns() {
-        const cols = this.view().columns;
-        const cloned = this.allAvailableColumns().map((c) => {
+    /**
+     * Builds list columns for the active view:
+     * - `view.columns` is a whitelist (empty = all columns)
+     * - string `options.visible` is evaluated against the master-list scope
+     */
+    async applyViewColumns() {
+        const viewColumnNames = this.view().columns ?? [];
+        const scope = this.createLogicExpressionScope(null);
+        const cloned = await Promise.all(this.allAvailableColumns().map(async (c) => {
             const column = this.entityDef.columns?.find((cc) => cc.name == c.name);
             const col = new AXPEntityListViewColumnViewModel(c.property, column);
-            col.visible = !cols.some((c) => c == col.name) && col.visible != false;
+            const expressionVisible = await this.resolveColumnVisibleExpression(col.visible, scope);
+            const includedInView = viewColumnNames.length === 0 || viewColumnNames.some((name) => name === col.name);
+            col.visible = includedInView && expressionVisible;
             return col;
-        });
+        }));
+        if (viewColumnNames.length > 0) {
+            cloned.sort((a, b) => {
+                const aIndex = viewColumnNames.indexOf(a.name);
+                const bIndex = viewColumnNames.indexOf(b.name);
+                const aOrder = aIndex === -1 ? Number.MAX_SAFE_INTEGER : aIndex;
+                const bOrder = bIndex === -1 ? Number.MAX_SAFE_INTEGER : bIndex;
+                return aOrder - bOrder;
+            });
+        }
         this.columns.set(cloned);
     }
+    /**
+     * Resolves column `options.visible` (boolean or expression) to a boolean for the current list scope.
+     */
+    async resolveColumnVisibleExpression(visible, scope) {
+        if (visible === false) {
+            return false;
+        }
+        if (visible === true || visible == null || visible === '') {
+            return true;
+        }
+        if (typeof visible === 'string') {
+            if (!visible.includes('{{')) {
+                const normalized = visible.trim().toLowerCase();
+                return normalized !== 'false' && normalized !== '0';
+            }
+            const result = await this.expressionEvaluator.evaluate(visible, scope);
+            return result !== false;
+        }
+        return Boolean(visible);
+    }
     onColumnsOrderChanged(event) {
         const columns = [...this.columns()];
         moveItemInArray(columns, event.previousIndex - 1, event.currentIndex - 1);
@@ -12144,6 +12183,8 @@ class AXPEntityDefinitionProviderWidgetEditComponent extends AXPProviderSelectWi
         super(...arguments);
         //#region ---- Services & Dependencies ----
         this.entityRegistry = inject(AXPEntityDefinitionRegistryService);
+        this.entityResolver = inject(AXPEntityResolver);
+        this.translationService = inject(AXTranslationService);
         /**
          * Last applied module filter (from context) to avoid redundant reloads.
          */
@@ -12182,18 +12223,26 @@ class AXPEntityDefinitionProviderWidgetEditComponent extends AXPProviderSelectWi
      * - `valueFormat`: `fullKey` (`module.name`, default) or `entityName` (short name only, for menus that store `entityListRef.entity`).
      */
     async loadDataSourceRows() {
-        const entities = this.entityRegistry.getAll();
+        const entries = await this.entityResolver.listAll();
         const filterModuleField = this.options()['filterModuleField'];
         const valueFormat = this.options()['valueFormat'] ?? 'fullKey';
-        let list = entities;
+        let list = entries;
         if (filterModuleField) {
             const mod = this.readModuleFromContext(filterModuleField);
-            list = mod ? entities.filter((e) => e.module === mod) : [];
+            list = mod ? entries.filter((e) => e.module === mod) : [];
         }
-        return list.map((e) => ({
-            value: valueFormat === 'entityName' ? e.name : `${e.module}.${e.name}`,
-            title: `${e.title} (${e.module}.${e.name})`,
-        }));
+        const locale = this.translationService.getActiveLang();
+        const registeredByKey = new Map(this.entityRegistry.getAll().map((e) => [`${e.module}.${e.name}`, e]));
+        return list.map((e) => {
+            const cached = registeredByKey.get(e.fullName);
+            const resolvedTitle = cached
+                ? resolveSearchableText(cached.title, locale, this.translationService).trim() || e.name
+                : e.name;
+            return {
+                value: valueFormat === 'entityName' ? e.name : e.fullName,
+                title: `${resolvedTitle} (${e.fullName})`,
+            };
+        });
     }
     //#endregion
     //#region ---- Refresh (e.g. when sibling module field changes) ----
@@ -13131,6 +13180,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
     /**
      * Route `filters` apply only when the active details `page` matches this list's entity
      * (e.g. WorkOrder filters must not affect FailureRegister on the same asset layout).
+     * page-list sidebar pages use `page-list-{module.entity}` as their page id.
      */
     shouldApplyRouteFilters() {
         const pageId = this.route.snapshot.queryParamMap.get('page');
@@ -13142,7 +13192,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
             return false;
         }
         const [, entityName] = entitySource.split('.');
-        return !!entityName && pageId === entityName;
+        return ((!!entityName && pageId === entityName) || pageId === buildPageListWidgetName(entitySource));
     }
     /**
      * Merges route filters into related-entity toolbar filters (route wins per field).
@@ -17364,7 +17414,7 @@ const AXPLookupWidget = {
     name: 'lookup-editor',
     title: 'Lookup',
     categories: [],
-    groups: [AXPWidgetGroupEnum.EntityWidget],
+    groups: [AXPWidgetGroupEnum.EntityWidget, AXPWidgetGroupEnum.FormElement],
     defaultFilterWidgetName: 'lookup-filter',
     type: 'editor',
     icon: 'fa-light fa-list-radio',
@@ -17395,7 +17445,25 @@ const AXPLookupWidget = {
                 interface: {
                     name: 'entity',
                     path: 'options.entity',
-                    type: AXPWidgetsCatalog.text,
+                    type: AXPWidgetsCatalog.entityDefinitionProvider,
+                    options: {
+                        hasClearButton: true,
+                        allowSearch: true,
+                    },
+                },
+            },
+            visible: true,
+        },
+        {
+            name: 'filter',
+            title: 'Filters',
+            group: AXP_DATA_PROPERTY_GROUP,
+            schema: {
+                dataType: 'object',
+                interface: {
+                    name: 'filter',
+                    path: 'options.filter',
+                    type: 'lookup-filter-options',
                 },
             },
             visible: true,
@@ -17533,6 +17601,250 @@ const AXPLookupWidget = {
     },
 };
 
+//#region ----   Imports   ----
+//#endregion
+//#region ----   Widget Config   ----
+const AXPLookupFilterOptionsWidget = {
+    name: 'lookup-filter-options',
+    title: 'Lookup Filter Options',
+    description: 'Configure lookup entity filter conditions',
+    icon: 'fa-light fa-filter',
+    categories: AXP_WIDGETS_EDITOR_CATEGORY,
+    groups: [AXPWidgetGroupEnum.EntityWidget],
+    type: 'editor',
+    properties: [AXP_NAME_PROPERTY, AXP_DATA_PATH_PROPERTY],
+    components: {
+        edit: {
+            component: () => Promise.resolve().then(function () { return lookupFilterOptionsWidgetEditor_component; }).then((c) => c.AXPLookupFilterOptionsWidgetEditComponent),
+        },
+    },
+};
+//#endregion
+
+//#endregion
+//#region ----   Constants   ----
+const LOOKUP_FILTER_OPTIONS_I18N = {
+    filters: '@general:widgets.data-source-options.filters',
+    filtersButtonEmpty: '@general:widgets.data-source-options.filters-button-empty',
+    filtersButtonWithCount: '@general:widgets.data-source-options.filters-button-with-count',
+    filtersModalTitle: '@general:widgets.data-source-options.filters-modal-title',
+    selectEntityFirst: '@general:widgets.lookup-filter-options.select-entity-first',
+    noFilterableFields: '@general:widgets.lookup-filter-options.no-filterable-fields',
+};
+//#endregion
+//#region ----   Helpers   ----
+function getFilterKey(filter, index) {
+    return filter.id ?? filter.field ?? slugFilterTitle(filter.title ?? '') ?? `filter_${index}`;
+}
+function slugFilterTitle(title) {
+    return (title
+        .toLowerCase()
+        .replace(/[^a-z0-9\s]/g, '')
+        .replace(/\s+/g, '_')
+        .substring(0, 50) || 'filter');
+}
+function flattenFilterLeaves(filter) {
+    if (!filter) {
+        return [];
+    }
+    if (filter.filters?.length) {
+        return filter.filters.flatMap((child) => flattenFilterLeaves(child));
+    }
+    if (filter.field) {
+        return [filter];
+    }
+    return [];
+}
+function filterToExpressionMap(filter, definitions) {
+    const map = {};
+    definitions.forEach((definition, index) => {
+        map[getFilterKey(definition, index)] = '';
+    });
+    for (const leaf of flattenFilterLeaves(filter)) {
+        const definitionIndex = definitions.findIndex((definition) => definition.field === leaf.field);
+        if (definitionIndex < 0) {
+            continue;
+        }
+        const key = getFilterKey(definitions[definitionIndex], definitionIndex);
+        const value = leaf.value;
+        map[key] = typeof value === 'string' ? value : value != null ? String(value) : '';
+    }
+    return map;
+}
+function expressionsToFilter(expressions, definitions) {
+    const clauses = definitions
+        .map((definition, index) => {
+        const key = getFilterKey(definition, index);
+        const expression = expressions[key]?.trim();
+        if (!expression) {
+            return null;
+        }
+        return {
+            field: definition.field,
+            operator: definition.operator ?? { type: 'equal' },
+            value: expression,
+        };
+    })
+        .filter((clause) => clause != null);
+    if (!clauses.length) {
+        return undefined;
+    }
+    return {
+        logic: 'and',
+        filters: clauses,
+    };
+}
+function countConfiguredExpressions(filter) {
+    return flattenFilterLeaves(filter).filter((leaf) => {
+        const value = leaf.value;
+        const text = typeof value === 'string' ? value : value != null ? String(value) : '';
+        return text.trim().length > 0;
+    }).length;
+}
+//#endregion
+//#region ----   Component   ----
+class AXPLookupFilterOptionsWidgetEditComponent extends AXPValueWidgetComponent {
+    constructor() {
+        super(...arguments);
+        //#region ----   Services & Dependencies   ----
+        this.entityRegistry = inject(AXPEntityDefinitionRegistryService);
+        this.widgetRegistry = inject(AXPWidgetRegistryService);
+        this.layoutBuilder = inject(AXPLayoutBuilderService);
+        this.translationService = inject(AXTranslationService);
+        //#endregion
+        //#region ----   State   ----
+        this.I18N = LOOKUP_FILTER_OPTIONS_I18N;
+        this.filterDefinitions = signal([], ...(ngDevMode ? [{ debugName: "filterDefinitions" }] : /* istanbul ignore next */ []));
+        this.entityTitle = signal('', ...(ngDevMode ? [{ debugName: "entityTitle" }] : /* istanbul ignore next */ []));
+        this.loadedEntityKey = signal(null, ...(ngDevMode ? [{ debugName: "loadedEntityKey" }] : /* istanbul ignore next */ []));
+        //#endregion
+        //#region ----   Computed   ----
+        this.entityKey = computed(() => {
+            this.contextService.data();
+            const key = this.contextService.getValue('options.entity');
+            const trimmed = key?.trim();
+            return trimmed && trimmed.length > 0 ? trimmed : null;
+        }, ...(ngDevMode ? [{ debugName: "entityKey" }] : /* istanbul ignore next */ []));
+        this.filterCount = computed(() => countConfiguredExpressions(this.getValue()), ...(ngDevMode ? [{ debugName: "filterCount" }] : /* istanbul ignore next */ []));
+        //#endregion
+        //#region ----   Effects   ----
+        this.loadFilterDefinitionsEffect = effect(() => {
+            const key = this.entityKey();
+            untracked(() => {
+                void this.loadFilterDefinitions(key);
+            });
+        }, ...(ngDevMode ? [{ debugName: "loadFilterDefinitionsEffect" }] : /* istanbul ignore next */ []));
+    }
+    //#endregion
+    //#region ----   UI Handlers   ----
+    async openFilterEditor() {
+        const definitions = this.filterDefinitions();
+        if (!definitions.length) {
+            return;
+        }
+        const initialFilters = filterToExpressionMap(this.getValue(), definitions);
+        const filtersModalTitle = await this.translationService.translateAsync(LOOKUP_FILTER_OPTIONS_I18N.filtersModalTitle);
+        const ref = await this.layoutBuilder
+            .create()
+            .dialog((dialog) => {
+            dialog
+                .setTitle(filtersModalTitle)
+                .setMessage(this.entityTitle())
+                .setSize('md')
+                .setContext({ filters: initialFilters })
+                .content((layoutBuilder) => {
+                layoutBuilder.flex((flex) => {
+                    flex
+                        .mode('edit')
+                        .setOptions({
+                        flexDirection: 'column',
+                        maxHeight: '60vh',
+                        overflowY: 'auto',
+                    });
+                    definitions.forEach((filter, index) => {
+                        const key = getFilterKey(filter, index);
+                        flex.formField(filter.title, (field) => {
+                            field.path(`filters.${key}`).customWidget('code-editor', {
+                                language: 'javascript',
+                                lineNumbers: true,
+                                height: 'min-h-48',
+                            });
+                        });
+                    });
+                });
+            })
+                .setActions((actions) => {
+                actions.cancel('@general:actions.cancel.title');
+                actions.submit('@general:actions.save.title');
+            });
+        })
+            .show();
+        if (ref.action() === 'submit') {
+            const context = ref.context();
+            const expressions = context?.filters ?? {};
+            this.setValue(expressionsToFilter(expressions, definitions));
+            ref.close();
+            return;
+        }
+        ref.close();
+    }
+    //#endregion
+    //#region ----   Private Methods   ----
+    async loadFilterDefinitions(entityKey) {
+        if (!entityKey) {
+            this.filterDefinitions.set([]);
+            this.entityTitle.set('');
+            if (this.loadedEntityKey()) {
+                this.setValue(undefined);
+            }
+            this.loadedEntityKey.set(null);
+            return;
+        }
+        const [module, entity] = entityKey.split('.');
+        if (!module || !entity) {
+            this.filterDefinitions.set([]);
+            this.entityTitle.set('');
+            if (this.loadedEntityKey()) {
+                this.setValue(undefined);
+            }
+            this.loadedEntityKey.set(null);
+            return;
+        }
+        const previousKey = this.loadedEntityKey();
+        if (previousKey && previousKey !== entityKey) {
+            this.setValue(undefined);
+        }
+        const entityDef = await this.entityRegistry.resolve(module, entity).catch(() => null);
+        if (!entityDef) {
+            this.filterDefinitions.set([]);
+            this.entityTitle.set('');
+            this.loadedEntityKey.set(null);
+            return;
+        }
+        this.entityTitle.set(typeof entityDef.title === 'string' ? entityDef.title : entityKey);
+        const definitions = await collectEntityListFilterDefinitions(entityDef, (moduleName, entityName) => this.entityRegistry.resolve(moduleName, entityName).catch(() => null), {
+            resolveWidget: (type) => this.widgetRegistry.resolve(type),
+        });
+        this.filterDefinitions.set(definitions);
+        this.loadedEntityKey.set(entityKey);
+        const current = this.getValue();
+        if (current && !isEmpty(current) && countConfiguredExpressions(current) === 0) {
+            this.setValue(undefined);
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLookupFilterOptionsWidgetEditComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPLookupFilterOptionsWidgetEditComponent, isStandalone: true, selector: "axp-lookup-filter-options-widget-editor", usesInheritance: true, ngImport: i0, template: "<div class=\"axp-lookup-filter-options ax-flex ax-flex-col ax-gap-2 ax-py-2\">\n  @if (!entityKey()) {\n    <span class=\"ax-text-sm ax-opacity-70\">{{ I18N.selectEntityFirst | translate | async }}</span>\n  } @else if (filterDefinitions().length === 0) {\n    <span class=\"ax-text-sm ax-opacity-70\">{{ I18N.noFilterableFields | translate | async }}</span>\n  } @else {\n    @if (filterCount() === 0) {\n      <ax-button\n        look=\"twotone\"\n        color=\"default\"\n        size=\"sm\"\n        [text]=\"(I18N.filtersButtonEmpty | translate | async) ?? ''\"\n        (onClick)=\"openFilterEditor()\"\n        class=\"ax-w-full\"\n      >\n        <ax-prefix>\n          <ax-icon icon=\"fa-light fa-filter\"></ax-icon>\n        </ax-prefix>\n      </ax-button>\n    } @else {\n      <ax-button\n        look=\"twotone\"\n        color=\"default\"\n        size=\"sm\"\n        [text]=\"((I18N.filtersButtonWithCount | translate: { params: { count: filterCount() } }) | async) ?? ''\"\n        (onClick)=\"openFilterEditor()\"\n        class=\"ax-w-full\"\n      >\n        <ax-prefix>\n          <ax-icon icon=\"fa-light fa-filter\"></ax-icon>\n        </ax-prefix>\n      </ax-button>\n    }\n  }\n</div>\n", styles: [".axp-lookup-filter-options{min-width:0}\n"], dependencies: [{ kind: "ngmodule", type: AXButtonModule }, { kind: "component", type: i1.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: AXDecoratorModule }, { kind: "component", type: i3$2.AXDecoratorIconComponent, selector: "ax-icon", inputs: ["icon"] }, { kind: "component", type: i3$2.AXDecoratorGenericComponent, selector: "ax-footer, ax-header, ax-content, ax-divider, ax-form-hint, ax-prefix, ax-suffix, ax-text, ax-title, ax-subtitle, ax-placeholder, ax-overlay" }, { kind: "ngmodule", type: AXTranslationModule }, { kind: "pipe", type: AsyncPipe, name: "async" }, { kind: "pipe", type: i3$1.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLookupFilterOptionsWidgetEditComponent, decorators: [{
+            type: Component,
+            args: [{ selector: 'axp-lookup-filter-options-widget-editor', changeDetection: ChangeDetectionStrategy.OnPush, imports: [AsyncPipe, AXButtonModule, AXDecoratorModule, AXTranslationModule], template: "<div class=\"axp-lookup-filter-options ax-flex ax-flex-col ax-gap-2 ax-py-2\">\n  @if (!entityKey()) {\n    <span class=\"ax-text-sm ax-opacity-70\">{{ I18N.selectEntityFirst | translate | async }}</span>\n  } @else if (filterDefinitions().length === 0) {\n    <span class=\"ax-text-sm ax-opacity-70\">{{ I18N.noFilterableFields | translate | async }}</span>\n  } @else {\n    @if (filterCount() === 0) {\n      <ax-button\n        look=\"twotone\"\n        color=\"default\"\n        size=\"sm\"\n        [text]=\"(I18N.filtersButtonEmpty | translate | async) ?? ''\"\n        (onClick)=\"openFilterEditor()\"\n        class=\"ax-w-full\"\n      >\n        <ax-prefix>\n          <ax-icon icon=\"fa-light fa-filter\"></ax-icon>\n        </ax-prefix>\n      </ax-button>\n    } @else {\n      <ax-button\n        look=\"twotone\"\n        color=\"default\"\n        size=\"sm\"\n        [text]=\"((I18N.filtersButtonWithCount | translate: { params: { count: filterCount() } }) | async) ?? ''\"\n        (onClick)=\"openFilterEditor()\"\n        class=\"ax-w-full\"\n      >\n        <ax-prefix>\n          <ax-icon icon=\"fa-light fa-filter\"></ax-icon>\n        </ax-prefix>\n      </ax-button>\n    }\n  }\n</div>\n", styles: [".axp-lookup-filter-options{min-width:0}\n"] }]
+        }] });
+
+var lookupFilterOptionsWidgetEditor_component = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    AXPLookupFilterOptionsWidgetEditComponent: AXPLookupFilterOptionsWidgetEditComponent
+});
+
 /**
  * Source type
  */
@@ -22486,6 +22798,7 @@ const AXPSelectorStructureWidget = {
 //#region ----   Entity Widgets Provider   ----
 const ENTITY_WIDGETS = [
     AXPLookupWidget,
+    AXPLookupFilterOptionsWidget,
     AXPSelectorStructureWidget,
     AXPEntityListWidget,
     AXPPageComponentWidget,
@@ -23406,8 +23719,10 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                 hidden: true,
             };
         }) ?? []);
+        // Unique from host overview page id (`entity.name`) so self-referential related lists navigate correctly.
+        const pageId = buildPageListWidgetName(relatedEntity.entity);
         return {
-            id: entityDef?.name ?? '',
+            id: pageId,
             title: context.rootTitle ?? '',
             label: relatedEntity.title,
             icon: relatedEntity.icon || entityDef.icon,
@@ -24638,11 +24953,14 @@ class AXPLayoutAdapterFactory {
     composePagesWithPositions(mainPage, relatedPages, entity) {
         // Only consider related entities with layout types page-detail or page-list
         const pageEntities = (entity?.relatedEntities || []).filter((re) => !re.hidden && (re.layout?.type === 'page-detail' || re.layout?.type === 'page-list'));
-        // Build a map from entity name to its layout config (order/position)
+        // Build a map from page id to its layout config (order/position).
+        // page-list ids use `page-list-{module.entity}` so they never collide with the host overview page.
         const layoutConfigByEntity = {};
         for (const re of pageEntities) {
             const [, entityName] = (re.entity || '').split('.');
-            const key = entityName || re.entity;
+            const key = re.layout?.type === 'page-list'
+                ? buildPageListWidgetName(re.entity)
+                : entityName || re.entity;
             layoutConfigByEntity[key] = { order: re.layout?.order, position: re.layout?.position };
         }
         // Nested pages from merge-detail (e.g. PartyContact from Party) have no layout config.