@acorex/platform 20.9.45 → 20.9.46

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

@@ -1625,10 +1625,10 @@ class PropertyFilter {
                 customFilterDefinitions: relatedEntity.customFilterDefinitions,
                 ...(foreignKeyField ? { foreignKeyField } : {}),
                 ...(nestedCreateHiddenProperties?.length ? { nestedCreateHiddenProperties } : {}),
-                ...(syncRelatedFromRoot && relatedEntity.conditions?.length
+                ...(relatedEntity.conditions?.length
                     ? {
                         relatedFilterConditionSpecs: cloneDeep(relatedEntity.conditions),
-                        syncRelatedListFiltersFromDialogContext: true,
+                        ...(syncRelatedFromRoot ? { syncRelatedListFiltersFromDialogContext: true } : {}),
                     }
                     : {}),
             },
@@ -12420,6 +12420,18 @@ function applyIncludeExclude(items, include = [], exclude = []) {
 function getVisibleProperties(entity) {
     return entity.properties.filter((prop) => prop.schema?.visible !== false);
 }
+/**
+ * Merges toolbar filters by `field`. Overlay entries win and keep parent-scope filters from being dropped.
+ */
+function mergeEntityListToolbarFilters(baseFilters, overlayFilters) {
+    const byField = new Map(baseFilters.map((filter) => [filter.field, filter]));
+    for (const filter of overlayFilters) {
+        if (filter.field) {
+            byField.set(filter.field, filter);
+        }
+    }
+    return [...byField.values()];
+}
 //#endregion
 
 class AXPEntityListTableService {
@@ -12873,6 +12885,8 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         this.initListTimeoutId = null;
         /** Unpatched data-list refresh (hits the grid). Prefer this over the scoped patch to avoid recursion. */
         this.boundDataListRefresh = null;
+        /** Parent-scope filters (related-entity conditions) that must survive user toolbar edits. */
+        this.scopedToolbarFilters = [];
         //options
         this.entitySource = computed(() => this.options()['entity'], ...(ngDevMode ? [{ debugName: "entitySource" }] : /* istanbul ignore next */ []));
         this.excludeColumns = computed(() => this.options()['excludeColumns'], ...(ngDevMode ? [{ debugName: "excludeColumns" }] : /* istanbul ignore next */ []));
@@ -13195,22 +13209,36 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
         return ((!!entityName && pageId === entityName) || pageId === buildPageListWidgetName(entitySource));
     }
     /**
-     * Merges route filters into related-entity toolbar filters (route wins per field).
+     * Captures hidden related-entity filters from the widget value before the toolbar can overwrite them.
      */
-    mergeToolbarFilters(baseFilters, routeFilters) {
-        const byField = new Map(baseFilters.map((filter) => [filter.field, filter]));
-        for (const filter of routeFilters) {
-            byField.set(filter.field, filter);
+    captureScopedToolbarFiltersFromValue() {
+        if (this.scopedToolbarFilters.length) {
+            return;
         }
-        return [...byField.values()];
+        const hidden = (this.getValue()?.toolbar?.filters ?? []).filter((filter) => filter.hidden === true);
+        if (hidden.length) {
+            this.scopedToolbarFilters = hidden;
+        }
+    }
+    /**
+     * Merges overlay filters into base filters (overlay wins per field).
+     */
+    mergeToolbarFilters(baseFilters, overlayFilters) {
+        return mergeEntityListToolbarFilters(baseFilters, overlayFilters);
     }
+    /**
+     * User toolbar filters plus parent-scope (related-entity / route) filters. Scoped fields always win.
+     */
     getMergedToolbarFilters() {
-        const base = (this.getValue()?.toolbar?.filters ?? []);
-        if (!this.shouldApplyRouteFilters()) {
-            return base;
+        const user = (this.getValue()?.toolbar?.filters ?? []).filter((filter) => filter.hidden !== true);
+        let scoped = this.scopedToolbarFilters;
+        if (this.shouldApplyRouteFilters()) {
+            const routeFilters = this.parseFiltersFromRoute();
+            if (routeFilters.length) {
+                scoped = this.mergeToolbarFilters(scoped, routeFilters);
+            }
         }
-        const routeFilters = this.parseFiltersFromRoute();
-        return routeFilters.length ? this.mergeToolbarFilters(base, routeFilters) : base;
+        return this.mergeToolbarFilters(user, scoped);
     }
     //#region ---- Scoped filter / initial load (race-safe) ----
     beginOp() {
@@ -13312,16 +13340,19 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
                 eval: (path) => get(root, path),
             },
         };
-        const filters = await Promise.all(specs.map(async (c) => ({
+        const relatedFilters = await Promise.all(specs.map(async (c) => ({
             field: c.name,
             operator: c.operator,
             value: await this.expressionEvaluator.evaluate(c.value, scope),
             hidden: true,
         })));
+        this.scopedToolbarFilters = relatedFilters;
         if (this.isViewDestroyed || !this.fullPath()) {
             return;
         }
         const current = this.getValue();
+        const user = (current?.toolbar?.filters ?? []).filter((filter) => filter.hidden !== true);
+        const filters = this.mergeToolbarFilters(user, relatedFilters);
         if (isEqual(current?.toolbar?.filters, filters)) {
             return;
         }
@@ -13339,11 +13370,11 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
     pushToolbarFiltersToDataSource() {
         const listInstance = this.listWidget()?.instance;
         const dataSource = listInstance?.options?.()?.['dataSource'];
-        const toolbar = this.getValue()?.toolbar;
-        if (!dataSource?.filter || !toolbar?.filters?.length) {
+        const filters = this.getMergedToolbarFilters();
+        if (!dataSource?.filter || !filters.length) {
             return false;
         }
-        dataSource.filter({ filters: toolbar.filters });
+        dataSource.filter({ filters });
         return true;
     }
     /**
@@ -13453,10 +13484,11 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
      * Applies filter and sort changes to the data source
      */
     applyDataSourceChanges(dataSource, queries, changeTracker, isMounted) {
-        const shouldApplyFilters = changeTracker.isFilterChanged || (!isMounted && (queries?.filters?.length ?? 0) > 0);
+        const mergedFilters = this.getMergedToolbarFilters();
+        const shouldApplyFilters = changeTracker.isFilterChanged || (!isMounted && mergedFilters.length > 0);
         if (shouldApplyFilters) {
             dataSource.filter({
-                filters: queries?.filters,
+                filters: mergedFilters,
             });
         }
         if (changeTracker.isSortChanged) {
@@ -13511,6 +13543,7 @@ class AXPEntityListWidgetViewComponent extends AXPValueWidgetComponent {
     }
     async ngOnInit() {
         super.ngOnInit();
+        this.captureScopedToolbarFiltersFromValue();
         const [moduleName, entityName] = this.entitySource().split('.');
         if (!moduleName || !entityName) {
             throw new Error('Invalid entity source');
@@ -23918,6 +23951,9 @@ class AXPPageListConverter extends AXPBaseRelatedEntityConverter {
                         relatedTableColumns,
                         customFilterDefinitions: relatedEntity.customFilterDefinitions,
                         excludeProperties: relatedEntity.excludeProperties,
+                        ...(relatedEntity.conditions?.length
+                            ? { relatedFilterConditionSpecs: cloneDeep(relatedEntity.conditions) }
+                            : {}),
                     },
                 },
             ],
@@ -24037,6 +24073,9 @@ class AXPTabListConverter extends AXPBaseRelatedEntityConverter {
                         relatedTableColumns,
                         customFilterDefinitions: relatedEntity.customFilterDefinitions,
                         excludeProperties: relatedEntity.excludeProperties,
+                        ...(relatedEntity.conditions?.length
+                            ? { relatedFilterConditionSpecs: cloneDeep(relatedEntity.conditions) }
+                            : {}),
                     },
                 },
             ],