@acorex/platform 20.9.38 → 20.9.39

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';
@@ -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);
@@ -13131,6 +13170,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 +13182,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).
@@ -23406,8 +23446,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 +24680,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.