@acorex-platform/framework-client 0.0.30 → 0.0.32

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

@@ -14,7 +14,7 @@ import { AXDecoratorModule } from '@acorex/components/decorators';
 import * as i6 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, axpIsEntityListPath, axpGetEntityListReturnUrl, axpIsEntityDetailsViewRoute, AXPNotFoundError, AXP_NOT_FOUND_ROUTE, AXPUnsavedChangesPopstateService, createUnsavedChangesCanDeactivateGuard } from '@acorex-platform/framework-client/common';
+import { AXPTabNavigationService, AXPStickyDirective, AXPCommonSettings, AXPHomePageService, AXPSettingsService, AXPTabPreviewService, AXPUnsavedChangesConfirmService, AXPBrowserTitleService, axpJoinTabTitleSegments, normalizeRouterUrl, AXP_HOME_TAB_KEY, axpResolveTabKey, axpIsEntityListPath, axpGetEntityListReturnUrl, axpIsEntityDetailsPath, axpIsEntityDetailsViewRoute, AXPNotFoundError, AXP_NOT_FOUND_ROUTE, AXPUnsavedChangesPopstateService, createUnsavedChangesCanDeactivateGuard } from '@acorex-platform/framework-client/common';
 import * as i9 from '@acorex-platform/framework-client/core';
 import { AXPDeviceService, AXPComponentSlotModule, AXPDebugService, OVERLAY_DETAILS_VIEW_TRACE_NS, AXPExpressionEvaluatorService, AXPContextEvalFactory, normalizeKeyboardShortcuts, AXPContextStore, AXPEntityBroadcastService, AXPKeyboardShortcutRegistry } from '@acorex-platform/framework-client/core';
 import * as i1 from '@acorex/cdk/drawer';
@@ -976,6 +976,34 @@ function applyEntityListReturnUrlToBreadcrumb(item, moduleName, entityName) {
         },
     };
 }
+/** Points the entity-name crumb at the host overview/profile page instead of the current sidebar page. */
+function applyPrimaryPageToEntityViewBreadcrumb(item, primaryPageId) {
+    if (!primaryPageId || item.command?.name !== 'navigate') {
+        return item;
+    }
+    const options = item.command.options;
+    const path = options?.path;
+    if (typeof path !== 'string' || !axpIsEntityDetailsPath(path)) {
+        return item;
+    }
+    const [pathOnly, query = ''] = path.split('?');
+    const params = new URLSearchParams(query);
+    if (params.get('page') === primaryPageId) {
+        return item;
+    }
+    params.set('page', primaryPageId);
+    const queryString = params.toString();
+    return {
+        ...item,
+        command: {
+            ...item.command,
+            options: {
+                ...options,
+                path: queryString ? `${pathOnly}?${queryString}` : pathOnly,
+            },
+        },
+    };
+}
 //#endregion
 const AXPLayoutDetailsViewViewModel = signalStore(withState(() => {
     const state = {
@@ -1143,10 +1171,9 @@ const AXPLayoutDetailsViewViewModel = signalStore(withState(() => {
                 return;
             }
             const pageId = params['page'];
-            if (!pageId) {
-                return;
-            }
-            const targetPage = adapter.pages.find((p) => p.id === pageId);
+            const targetPage = pageId
+                ? adapter.pages.find((p) => p.id === pageId)
+                : (adapter.pages.find((p) => p.isPrimary) ?? adapter.pages[0] ?? null);
             if (!targetPage || store.currentPage()?.id === targetPage.id) {
                 return;
             }
@@ -1234,6 +1261,9 @@ const AXPLayoutDetailsViewViewModel = signalStore(withState(() => {
         if (translateService.isValidMultiLanguageObject(value)) {
             return translateService.resolve(value);
         }
+        if (typeof value === 'string' && value.trim().startsWith('@')) {
+            return value.trim();
+        }
         return formatService.format(value, 'string', store.context()) ?? '';
     }
     /** Resolves the list URL with query params captured before opening details. */
@@ -1607,7 +1637,8 @@ const AXPLayoutDetailsViewViewModel = signalStore(withState(() => {
             }
             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));
+            const primaryPageId = primaryPage?.id ?? null;
+            return breadcrumbs.map((item) => applyEntityListReturnUrlToBreadcrumb(applyPrimaryPageToEntityViewBreadcrumb(item, primaryPageId), moduleName, entityName));
         },
         /** Aligns view-model context with the container after revert/commit (saved baseline). */
         applySavedState(context) {