@acorex/platform 20.9.20 → 20.9.22

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

@@ -5442,12 +5442,16 @@ class AXPEntityMasterListViewModel {
             const entitySetting = await this.settings.get(this.settingEntityKey);
             selectedViewName = entitySetting?.list?.currentView;
         }
+        // URL `view` wins; fall back to persisted currentView when the query param is absent.
         const resolvedViewName = viewName ?? selectedViewName;
         const currentViewName = this.view().name;
         const currentViewUnavailable = !availableViews.some((v) => v.name === currentViewName);
         const nextView = availableViews.find((c) => c.name == resolvedViewName) ??
             (currentViewUnavailable ? availableViews[0] : this.view());
-        const shouldApplyViewState = viewName != currentViewName || nextView.name !== currentViewName || currentViewUnavailable;
+        // Columns start empty; bootstrap them on first setView even when the view name is unchanged
+        // (e.g. URL already has ?view=all matching the default view).
+        const needsColumnBootstrap = this.columns().length === 0;
+        const shouldApplyViewState = nextView.name !== currentViewName || currentViewUnavailable || needsColumnBootstrap;
         if (shouldApplyViewState) {
             this.view.set(nextView);
             this.applyViewSorts();
@@ -5825,17 +5829,16 @@ class AXPEntityMasterListViewModel {
             }
             this.loadListPagingFromViewSettings(listViewSetting);
             if (columns && columnVisibilityMap && columnWidthsMap) {
-                this.columns.update((prev) => prev
-                    .map((c) => {
-                    const columnKey = c.column?.options?.dataPath ?? c.name;
-                    return {
-                        ...c,
-                        width: defaultTo(columnWidthsMap.get(columnKey), c.column?.options?.width),
-                        visible: columnVisibilityMap.get(columnKey) ?? c.visible,
-                    };
-                }) // Update visibility
-                    .sort((a, b) => columns.findIndex((col) => col.name === (a.column?.options?.dataPath ?? a.name)) -
-                    columns.findIndex((col) => col.name === (b.column?.options?.dataPath ?? b.name))));
+                this.columns.update((prev) => {
+                    const next = [...prev].sort((a, b) => columns.findIndex((col) => col.name === (a.column?.options?.dataPath ?? a.name)) -
+                        columns.findIndex((col) => col.name === (b.column?.options?.dataPath ?? b.name)));
+                    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;
+                    }
+                    return next;
+                });
             }
             if (Array.isArray(sorts) && sorts.length) {
                 this.setActiveSortsFromQueries(sorts);
@@ -6331,9 +6334,10 @@ class AXPEntityMasterListViewModel {
     /**
      * Records the current route query context after initial resolver / view init so the first
      * subscription emission does not re-sync unnecessarily.
+     * Pass `overrides` when about to `replaceUrl` query params so the upcoming emission is treated as synced.
      */
-    markRouteQueryContextSynced(queryParamMap) {
-        this.routeQueryContextKey = this.buildRouteQueryContextKey(queryParamMap);
+    markRouteQueryContextSynced(queryParamMap, overrides) {
+        this.routeQueryContextKey = this.buildRouteQueryContextKey(queryParamMap, overrides);
     }
     /**
      * Reacts to any route query param change while the list route is reused (`reuse: queryParamsChange`).
@@ -6353,14 +6357,31 @@ class AXPEntityMasterListViewModel {
         if (filtersChanged || viewChanged) {
             this.lastAppliedFilterKey = null;
             this.lastAppliedSortKey = null;
+            // applyFilterAndSort already emits refresh — avoid a second reloadListData in the host.
             await this.applyFilterAndSort();
+            return { reloadList: false };
         }
+        // Other query-param context changes (e.g. expression-driven visibility) still need a list reload.
         return { reloadList: true };
     }
-    buildRouteQueryContextKey(queryParamMap) {
-        return [...queryParamMap.keys]
+    buildRouteQueryContextKey(queryParamMap, overrides) {
+        const params = {};
+        for (const key of queryParamMap.keys) {
+            params[key] = queryParamMap.get(key) ?? '';
+        }
+        if (overrides) {
+            for (const [key, value] of Object.entries(overrides)) {
+                if (value == null) {
+                    delete params[key];
+                }
+                else {
+                    params[key] = value;
+                }
+            }
+        }
+        return Object.keys(params)
             .sort()
-            .map((key) => `${key}=${queryParamMap.get(key) ?? ''}`)
+            .map((key) => `${key}=${params[key]}`)
             .join('&');
     }
     async syncFiltersFromRouteQueryParam(filtersJson) {
@@ -25176,7 +25197,7 @@ const AXPCrudModifier = {
                 queries.list = {
                     execute: async (e) => {
                         const res = await dataService.query(e);
-                        //console.log('query', res, ctx.module.get() + '.' + ctx.name.get(), e);
+                        // console.log('query', res, ctx.module.get() + '.' + ctx.name.get(), e);
                         return res;
                     },
                     type: AXPEntityQueryType.List,