@acorex/platform 20.9.3 → 20.9.6

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

@@ -12,7 +12,7 @@ import { AXDecoratorModule } from '@acorex/components/decorators';
 import * as i5 from '@acorex/components/dropdown';
 import { AXDropdownModule } from '@acorex/components/dropdown';
 import { AXDropdownButtonModule } from '@acorex/components/dropdown-button';
-import { AXPTabNavigationService, AXPStickyDirective, AXPCommonSettings, AXPHomePageService, AXPSettingsService, AXPTabPreviewService, AXPUnsavedChangesConfirmService, AXPBrowserTitleService, axpJoinTabTitleSegments, normalizeRouterUrl, AXP_HOME_TAB_KEY, axpResolveTabKey, axpIsEntityDetailsViewRoute, axpNavigateAppPath, AXPNotFoundError, AXP_NOT_FOUND_ROUTE, AXPUnsavedChangesPopstateService, AXP_ENTITY_DELETED_WORKFLOW_EVENT_TYPE, createUnsavedChangesCanDeactivateGuard } from '@acorex/platform/common';
+import { AXPTabNavigationService, AXPStickyDirective, AXPCommonSettings, AXPHomePageService, AXPSettingsService, AXPTabPreviewService, AXPUnsavedChangesConfirmService, AXPBrowserTitleService, axpJoinTabTitleSegments, normalizeRouterUrl, AXP_HOME_TAB_KEY, axpResolveTabKey, axpIsEntityListPath, axpGetEntityListReturnUrl, axpIsEntityDetailsViewRoute, AXPNotFoundError, AXP_NOT_FOUND_ROUTE, AXPUnsavedChangesPopstateService, AXP_ENTITY_DELETED_WORKFLOW_EVENT_TYPE, createUnsavedChangesCanDeactivateGuard } from '@acorex/platform/common';
 import * as i8 from '@acorex/platform/core';
 import { AXPDeviceService, AXPComponentSlotModule, AXPDebugService, OVERLAY_DETAILS_VIEW_TRACE_NS, AXPExpressionEvaluatorService, AXPContextEvalFactory, normalizeKeyboardShortcuts, AXPContextStore, AXPBroadcastEventService, AXPKeyboardShortcutRegistry, FORM_DIRTY_TRACE_NS } from '@acorex/platform/core';
 import * as i1 from '@acorex/cdk/drawer';
@@ -35,7 +35,7 @@ import { filter } from 'rxjs/operators';
 import { AXBasePageComponent } from '@acorex/components/page';
 import { getSmart, summarizeFormContextDirtyDiff, AXPKeyboardShortcutPriority } from '@acorex/platform/contracts';
 import { AXPPageStatus } from '@acorex/platform/layout/widget-core-contracts';
-import { AXPEntityCommandScope } from '@acorex/platform/layout/entity-contracts';
+import { AXPEntityCommandScope, buildPageListTableWidgetId, isPageListWidgetName } from '@acorex/platform/layout/entity-contracts';
 import { signalStore, withState, withComputed, withMethods, patchState } from '@ngrx/signals';
 import { AXBadgeModule } from '@acorex/components/badge';
 import { AXButtonGroupModule } from '@acorex/components/button-group';
@@ -882,6 +882,29 @@ async function buildEvaluatedPageContentsForRootContext(currentPage, rootContext
     return { evaluatedPageContent, evaluatedTabContentsById };
 }
 //#endregion
+//#region ---- Entity list return URL (breadcrumb / back navigation) ----
+/** Restores query params on the entity list breadcrumb when returning from details. */
+function applyEntityListReturnUrlToBreadcrumb(item, moduleName, entityName) {
+    if (!moduleName || !entityName || item.command?.name !== 'navigate') {
+        return item;
+    }
+    const options = item.command.options;
+    const path = options?.path;
+    if (typeof path !== 'string' || !axpIsEntityListPath(path)) {
+        return item;
+    }
+    return {
+        ...item,
+        command: {
+            ...item.command,
+            options: {
+                ...options,
+                path: axpGetEntityListReturnUrl(moduleName, entityName, path),
+            },
+        },
+    };
+}
+//#endregion
 const AXPLayoutDetailsViewViewModel = signalStore(withState(() => {
     const state = {
         adapter: null,
@@ -942,7 +965,7 @@ const AXPLayoutDetailsViewViewModel = signalStore(withState(() => {
         const evaluatedByTab = store.evaluatedTabContentsById();
         return evaluatedByTab[tab.id] ?? [];
     }),
-})), withMethods((store, evaluatorService = inject(AXPExpressionEvaluatorService), contextEvalFactory = inject(AXPContextEvalFactory), router = inject(Router), route = inject(ActivatedRoute), deviceService = inject(AXPDeviceService), formatService = inject(AXFormatService), toastService = inject(AXToastService), translateService = inject(AXTranslationService), settingsService = inject(AXPSettingsService), layout = inject(AXPLayoutThemeService), adapterLoader = inject(AXP_LAYOUT_DETAILS_VIEW_ADAPTER_LOADER)) => {
+})), withMethods((store, evaluatorService = inject(AXPExpressionEvaluatorService), contextEvalFactory = inject(AXPContextEvalFactory), router = inject(Router), route = inject(ActivatedRoute), deviceService = inject(AXPDeviceService), formatService = inject(AXFormatService), toastService = inject(AXToastService), translateService = inject(AXTranslationService), settingsService = inject(AXPSettingsService), layout = inject(AXPLayoutThemeService), adapterLoader = inject(AXP_LAYOUT_DETAILS_VIEW_ADAPTER_LOADER), tabNavigation = inject(AXPTabNavigationService)) => {
     const resolvePageFromId = (adapter, pageId) => {
         if (pageId) {
             return adapter.pages.find((p) => p.id === pageId) ?? null;
@@ -1212,6 +1235,15 @@ const AXPLayoutDetailsViewViewModel = signalStore(withState(() => {
         }
         return formatService.format(value, 'string', store.context()) ?? '';
     }
+    /** Resolves the list URL with query params captured before opening details. */
+    const resolveListReturnPath = (fallbackPath) => {
+        const moduleName = route.parent?.snapshot.paramMap.get('module');
+        const entityName = route.snapshot.paramMap.get('entity');
+        if (!moduleName || !entityName) {
+            return fallbackPath;
+        }
+        return axpGetEntityListReturnUrl(moduleName, entityName, fallbackPath);
+    };
     return {
         async loadAdapter(adapter) {
             patchState(store, { adapter });
@@ -1535,7 +1567,9 @@ const AXPLayoutDetailsViewViewModel = signalStore(withState(() => {
                     title: await resolveBreadcrumbTitleFields(currentPageLabel, pageScope, store.context()),
                 });
             }
-            return breadcrumbs;
+            const moduleName = route.parent?.snapshot.paramMap.get('module') ?? null;
+            const entityName = route.snapshot.paramMap.get('entity') ?? null;
+            return breadcrumbs.map((item) => applyEntityListReturnUrlToBreadcrumb(item, moduleName, entityName));
         },
         /** Aligns view-model context with the container after revert/commit (saved baseline). */
         applySavedState(context) {
@@ -1634,9 +1668,11 @@ const AXPLayoutDetailsViewViewModel = signalStore(withState(() => {
         },
         async goToListPage() {
             const exitUrl = store.adapter()?.exitUrl;
-            if (exitUrl) {
-                await axpNavigateAppPath(router, exitUrl);
+            if (!exitUrl) {
+                return;
             }
+            const path = resolveListReturnPath(exitUrl);
+            await tabNavigation.navigate(path);
         },
     };
 }));
@@ -1868,8 +1904,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                 }]
         }], propDecorators: { componentKey: [{ type: i0.Input, args: [{ isSignal: true, alias: "componentKey", required: true }] }], rootContext: [{ type: i0.Input, args: [{ isSignal: true, alias: "rootContext", required: false }] }], pageConfig: [{ type: i0.Input, args: [{ isSignal: true, alias: "pageConfig", required: false }] }], options: [{ type: i0.Input, args: [{ isSignal: true, alias: "options", required: false }] }], componentReady: [{ type: i0.Output, args: ["componentReady"] }] } });
 
-/** Registered id of the data-list inside related-entity `page-list` sidebar pages. */
-const PAGE_LIST_TABLE_WIDGET_ID = 'page-list_table';
 class AXPLayoutDetailsViewComponent extends AXPPageLayoutBaseComponent {
     constructor() {
         super(...arguments);
@@ -1931,13 +1965,14 @@ class AXPLayoutDetailsViewComponent extends AXPPageLayoutBaseComponent {
             }));
         }, ...(ngDevMode ? [{ debugName: "#sidebarTabsIndicatorEffect" }] : /* istanbul ignore next */ []));
         /**
-         * Binds list selection whenever `page-list_table` registers (including after remount).
+         * Binds list selection whenever the active page-list data-list registers (including after remount).
          * `find()` / `waitForWidget()` can return a destroyed instance; registration always carries the live widget.
          */
         this.#pageListSelectionBindEffect = effect((onCleanup) => {
             const pageId = this.vm.currentPage()?.id;
             const isPageReady = this.vm.isPageReady();
-            if (!pageId || this.vm.showPages() || !isPageReady || this.getActivePageComponentKey()) {
+            const tableWidgetId = this.activePageListTableWidgetId();
+            if (!pageId || this.vm.showPages() || !isPageReady || this.getActivePageComponentKey() || !tableWidgetId) {
                 return;
             }
             this.vm.currentPageContent();
@@ -1955,13 +1990,13 @@ class AXPLayoutDetailsViewComponent extends AXPPageLayoutBaseComponent {
                 this.onSelectionChangeSubscription = undefined;
             });
             const registrationSub = builder.widgetRegistered$.subscribe(({ id, widget }) => {
-                if (id !== PAGE_LIST_TABLE_WIDGET_ID) {
+                if (id !== tableWidgetId) {
                     return;
                 }
                 this.attachSelectionToListWidget(pageId, generation, widget);
             });
             onCleanup(() => registrationSub.unsubscribe());
-            const existing = builder.getWidget(PAGE_LIST_TABLE_WIDGET_ID);
+            const existing = builder.getWidget(tableWidgetId);
             if (existing) {
                 untracked(() => this.attachSelectionToListWidget(pageId, generation, existing));
             }
@@ -2197,7 +2232,7 @@ class AXPLayoutDetailsViewComponent extends AXPPageLayoutBaseComponent {
     /** Syncs the line indicator when the active page changes programmatically. */
     #sidebarTabsIndicatorEffect;
     /**
-     * Binds list selection whenever `page-list_table` registers (including after remount).
+     * Binds list selection whenever the active page-list data-list registers (including after remount).
      * `find()` / `waitForWidget()` can return a destroyed instance; registration always carries the live widget.
      */
     #pageListSelectionBindEffect;
@@ -2326,14 +2361,25 @@ class AXPLayoutDetailsViewComponent extends AXPPageLayoutBaseComponent {
         this.footerPrimaryActions.set(footerPrimaryActions);
         this.footerSecondaryActions.set(footerSecondaryActions);
     }
-    /** Whether the active page hosts a related-entity list (`page-list` widget). */
+    /** Whether the active page hosts a related-entity list (`page-list` layout widget). */
     pageHasEntityListWidget() {
-        return this.vm.currentPageContent().some((item) => {
-            if ('type' in item && item.type === 'component') {
-                return false;
+        return this.findPageListWidgetNameInContent(this.vm.currentPageContent()) != null;
+    }
+    /** Data-list widget id for the active related-entity `page-list` page, if any. */
+    activePageListTableWidgetId() {
+        const widgetName = this.findPageListWidgetNameInContent(this.vm.currentPageContent());
+        return widgetName ? buildPageListTableWidgetId(widgetName) : null;
+    }
+    findPageListWidgetNameInContent(content) {
+        for (const item of content) {
+            if (AXPLayoutDetailsViewComponent.isComponentPageContent(item)) {
+                continue;
             }
-            return item.name === 'page-list';
-        });
+            if (isPageListWidgetName(item.name)) {
+                return item.name ?? null;
+            }
+        }
+        return null;
     }
     /** Subscribes to the live data-list selection stream for Selected-scope header actions. */
     attachSelectionToListWidget(pageId, generation, widget) {