@acorex/platform 20.9.20 → 20.9.22

package/fesm2022/acorex-platform-themes-default.mjs

@@ -1241,6 +1241,7 @@ class AXPEntityMasterToolbarViewComponent {
         this.deviceService = inject(AXPDeviceService);
         this.parent = inject(AXPEntityMasterListViewComponent);
         this.router = inject(Router);
+        this.activeRoute = inject(ActivatedRoute);
         this.settingsService = inject(AXPSettingsService);
         this.injector = inject(Injector);
         this.isInitializing = false;
@@ -1326,9 +1327,9 @@ class AXPEntityMasterToolbarViewComponent {
         }, ...(ngDevMode ? [{ debugName: "sortDefinitions" }] : /* istanbul ignore next */ []));
     }
     async ngOnInit() {
-        // Prefer saved settings (view/columns/sorts/filters) if available, then apply once
+        // Prefer URL `view` over saved settings; fall back to settings when URL has no view.
         await this.loadSettings();
-        await this.vm.setView();
+        await this.vm.setView(this.activeRoute.snapshot.queryParamMap.get('view'));
         await this.vm.ensureListPagingResolved();
         await this.runInitialListLoad();
     }
@@ -1374,6 +1375,7 @@ class AXPEntityMasterToolbarViewComponent {
     async onViewChanged(view) {
         await this.vm.setView(view.name);
         if (axpIsEntityListRoute(this.router)) {
+            this.vm.markRouteQueryContextSynced(this.activeRoute.snapshot.queryParamMap, { view: view.name });
             axpReplaceEntityListRouteQueryParams(this.router, { view: view.name });
         }
         await this.runInitialListLoad();
@@ -1424,6 +1426,8 @@ class AXPEntityMasterToolbarViewComponent {
         if (!url.includes('filters=')) {
             return;
         }
+        // Mark the post-strip key first so queryParamMap emission does not trigger an extra list reload.
+        this.vm.markRouteQueryContextSynced(this.activeRoute.snapshot.queryParamMap, { filters: null });
         axpReplaceEntityListRouteQueryParams(this.router, { filters: null });
     }
     onSortQueriesChange(e) {
@@ -2063,12 +2067,22 @@ class AXPEntityMasterListViewComponent extends AXPPageLayoutBaseComponent {
         this.restoreExpandedRowsScheduled = false;
         /** Blocks deferred `replaceUrl` view sync after destroy or once details navigation has started. */
         this.listQueryParamSyncDisabled = false;
+        /** Tracks layout so card → table can reveal rows without a second fetch. */
+        this.lastListLayout = this.vm.activeListLayout();
         effect(() => {
             const grid = this.grid();
             if (grid) {
                 grid.selectedRows = this.vm.selectedItems();
             }
         });
+        effect(() => {
+            const layout = this.vm.activeListLayout();
+            const previousLayout = untracked(() => this.lastListLayout);
+            this.lastListLayout = layout;
+            if (layout === 'table' && previousLayout === 'card') {
+                untracked(() => this.acknowledgeManualTableReady());
+            }
+        });
         this.vm.events$.subscribe(async (e) => {
             const refreshTargetId = e.meta?.refreshTargetId;
             const highlightRowId = e.meta?.highlightRowId;
@@ -2098,7 +2112,8 @@ class AXPEntityMasterListViewComponent extends AXPPageLayoutBaseComponent {
             }
             const currentViewName = this.vm.view().name;
             const urlView = this.activeRoute.snapshot.queryParamMap.get('view');
-            if (currentViewName && currentViewName !== urlView) {
+            // Only fill a missing `view` query param. When URL and VM diverge, URL wins via queryParam sync.
+            if (currentViewName && !urlView) {
                 this.syncListViewQueryParam(currentViewName);
             }
         });
@@ -2143,9 +2158,13 @@ class AXPEntityMasterListViewComponent extends AXPPageLayoutBaseComponent {
         const resolvedView = this.vm.view().name;
         const currentUrlView = this.activeRoute.snapshot.queryParamMap.get('view');
         if (currentUrlView !== resolvedView) {
+            // Mark the post-replaceUrl key before navigating so the emission does not reload without filters.
+            this.vm.markRouteQueryContextSynced(this.activeRoute.snapshot.queryParamMap, { view: resolvedView });
             this.syncListViewQueryParam(resolvedView);
         }
-        this.vm.markRouteQueryContextSynced(this.activeRoute.snapshot.queryParamMap);
+        else {
+            this.vm.markRouteQueryContextSynced(this.activeRoute.snapshot.queryParamMap);
+        }
         this.initializedFromRoute = true;
         this.bindExpandedRowPersistence();
         this.scheduleRestoreExpandedRows();
@@ -2283,6 +2302,7 @@ class AXPEntityMasterListViewComponent extends AXPPageLayoutBaseComponent {
             if (this.listQueryParamSyncDisabled) {
                 return;
             }
+            this.vm.markRouteQueryContextSynced(this.activeRoute.snapshot.queryParamMap, { view: viewName });
             axpReplaceEntityListRouteQueryParams(this.router, { view: viewName });
         });
     }
@@ -2293,6 +2313,8 @@ class AXPEntityMasterListViewComponent extends AXPPageLayoutBaseComponent {
         }
         if (this.vm.activeListLayout() === 'card') {
             await this.cardList()?.reload(resetPagination);
+            // Shared DS load updates table rows via onChanged but not isRefreshCalled; prepare for a later table switch.
+            this.acknowledgeManualTableReady();
             return;
         }
         const grid = this.grid();
@@ -2311,6 +2333,19 @@ class AXPEntityMasterListViewComponent extends AXPPageLayoutBaseComponent {
             await dataReady;
         }
     }
+    /**
+     * Manual-mode table gates the body on `isRefreshCalled` (set only by `grid.refresh()`).
+     * Card loads use shared `dataSource.refresh()`, so rows/totalCount update while the gate stays closed.
+     * Opening the gate here avoids an extra network refresh when switching to table.
+     */
+    acknowledgeManualTableReady() {
+        // `isRefreshCalled` is private on AXDataTableComponent; runtime access is intentional (zero-fetch reveal).
+        const grid = this.grid();
+        if (!grid?.isRefreshCalled || grid.isRefreshCalled()) {
+            return;
+        }
+        grid.isRefreshCalled.set(true);
+    }
     /**
      * Waits until a `refresh()` load cycle completes (loading started, then finished with data).
      */