@acorex/platform 20.9.11 → 20.9.13

package/fesm2022/acorex-platform-common.mjs

@@ -2908,6 +2908,24 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
             args: [{ selector: 'axp-background-operation-slot', changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, imports: [CommonModule, AXDecoratorModule, AXTranslationModule, AXPopoverModule, AXPBackgroundOperationPanelComponent], template: "@if (showSlot()) {\n  <button type=\"button\" class=\"operation-slot__trigger\" #operationTrigger>\n    <ax-icon class=\"operation-slot__icon\">\n      @if (slotShowsFailureOnly()) {\n        <i class=\"fa-light fa-circle-exclamation\"></i>\n      } @else {\n        <i class=\"fa-light fa-spinner fa-spin\"></i>\n      }\n    </ax-icon>\n    <span class=\"operation-slot__text\">\n      {{ slotLabelKey() | translate: { params: slotLabelParams() } | async }}\n    </span>\n  </button>\n\n  <ax-popover [target]=\"operationTrigger\" [openOn]=\"'toggle'\" [closeOn]=\"'clickOut'\" [adaptivityEnabled]=\"true\">\n    <div class=\"ax-bg-lightest ax-rounded-md ax-w-full\">\n      <axp-background-operation-panel (onClosePopover)=\"closePopover()\"></axp-background-operation-panel>\n    </div>\n  </ax-popover>\n}\n", styles: ["axp-background-operation-slot{display:inline-flex}.operation-slot__trigger{display:inline-flex;cursor:pointer;align-items:center;gap:.375rem;border-width:0px;background-color:transparent;padding:0;color:rgb(var(--ax-sys-color-primary-600))}@media(hover:hover){.operation-slot__trigger:hover{color:rgb(var(--ax-sys-color-primary-700))}}.operation-slot__icon{font-size:.875rem;line-height:1.25rem}.operation-slot__text{font-size:.875rem;line-height:1.25rem;font-weight:500}\n"] }]
         }], propDecorators: { popover: [{ type: i0.ViewChild, args: [i0.forwardRef(() => AXPopoverComponent), { isSignal: true }] }] } });
 
+const ENVIRONMENT = new InjectionToken('ENVIRONMENT');
+const AXP_PLATFORM_CONFIG_TOKEN = new InjectionToken('AXP_PLATFORM_CONFIG_TOKEN', {
+    providedIn: 'root',
+    factory: () => {
+        return AXPPlatformDefaultConfigs;
+    },
+});
+const AXPPlatformDefaultConfigs = {
+    copyright: 'ACoreX @ 2024',
+    title: 'ACoreX Platform',
+    network: {
+        timeOut: 5000,
+    },
+};
+function configPlatform(config = AXPPlatformDefaultConfigs) {
+    return merge(AXPPlatformDefaultConfigs, config);
+}
+
 //#endregion
 //#region ----   App Path Navigation   ----
 /**
@@ -2983,6 +3001,8 @@ function axpReplaceEntityListRouteQueryParams(router, queryParams) {
 //#endregion
 
 const DEFAULT_TRAILING_SEGMENTS = ['list', 'view', 'edit', 'create'];
+/** Query params managed by entity list UI; ignored when matching generic (no-query) menu paths. */
+const ENTITY_LIST_UI_QUERY_KEYS = new Set(['view']);
 //#region ---- Entity Route Helpers ----
 /**
  * Parses `/{app}/m/{module}/e/{entity}/...` routes into a stable entity key.
@@ -3003,15 +3023,89 @@ function axpParseEntityRouteKey(segments) {
 function axpEntityRouteKeysEqual(left, right) {
     return left.app === right.app && left.module === right.module && left.entity === right.entity;
 }
+function axpParseQueryString(queryString) {
+    return new URLSearchParams(queryString);
+}
+function axpMenuDeclaredNavigationParams(queryString) {
+    const params = axpParseQueryString(queryString);
+    const navigationParams = new URLSearchParams();
+    params.forEach((value, key) => {
+        if (!ENTITY_LIST_UI_QUERY_KEYS.has(key)) {
+            navigationParams.append(key, value);
+        }
+    });
+    return navigationParams;
+}
+function axpMenuHasDeclaredNavigationParams(itemQueryString) {
+    return axpMenuDeclaredNavigationParams(itemQueryString).toString().length > 0;
+}
+/**
+ * True when every navigation query param declared on the menu path equals the current URL.
+ */
+function axpMenuDeclaredQueryParamsMatch(itemQueryString, currentQueryString) {
+    const itemParams = axpMenuDeclaredNavigationParams(itemQueryString);
+    const declaredPairs = [];
+    itemParams.forEach((value, key) => {
+        declaredPairs.push([key, value]);
+    });
+    if (declaredPairs.length === 0) {
+        return axpGenericEntityListMenuQueryParamsMatch(currentQueryString);
+    }
+    const currentParams = axpParseQueryString(currentQueryString);
+    return declaredPairs.every(([key, value]) => currentParams.get(key) === value);
+}
+/**
+ * Generic entity list menu items (no declared query params) match only when the URL has no
+ * navigation query params beyond UI-managed keys such as `view`.
+ */
+function axpGenericEntityListMenuQueryParamsMatch(currentQueryString) {
+    const currentParams = axpParseQueryString(currentQueryString);
+    let hasNavigationParam = false;
+    currentParams.forEach((_value, key) => {
+        if (!ENTITY_LIST_UI_QUERY_KEYS.has(key)) {
+            hasNavigationParam = true;
+        }
+    });
+    return !hasNavigationParam;
+}
+/**
+ * Counts declared menu query params that match the current URL (for best-match selection).
+ */
+function axpMenuQueryParamSpecificity(itemPath, currentPath) {
+    const itemQueryString = itemPath.split('#')[0].split('?')[1] ?? '';
+    const currentQueryString = currentPath.split('#')[0].split('?')[1] ?? '';
+    const itemParams = axpMenuDeclaredNavigationParams(itemQueryString);
+    const currentParams = axpParseQueryString(currentQueryString);
+    let specificity = 0;
+    itemParams.forEach((value, key) => {
+        if (currentParams.get(key) === value) {
+            specificity++;
+        }
+    });
+    return specificity;
+}
 /**
  * Matches entity list menu entries against list/detail/create/edit routes for the same entity.
  */
-function axpTryMatchEntityMenuRoute(itemSegments, pathSegments, currentBase) {
+function axpTryMatchEntityMenuRoute(itemSegments, pathSegments, currentBase, itemQueryString, currentQueryString) {
     const menuEntity = axpParseEntityRouteKey(itemSegments);
     const currentEntity = axpParseEntityRouteKey(pathSegments);
     if (!menuEntity || !currentEntity || !axpEntityRouteKeysEqual(menuEntity, currentEntity)) {
         return null;
     }
+    const itemHasDeclaredParams = axpMenuHasDeclaredNavigationParams(itemQueryString);
+    if (itemHasDeclaredParams) {
+        if (!axpIsEntityListPath(currentBase)) {
+            return { isMatch: false, isPartial: false };
+        }
+        if (!axpMenuDeclaredQueryParamsMatch(itemQueryString, currentQueryString)) {
+            return { isMatch: false, isPartial: false };
+        }
+        return { isMatch: true, isPartial: false };
+    }
+    if (axpIsEntityListPath(currentBase) && !axpGenericEntityListMenuQueryParamsMatch(currentQueryString)) {
+        return { isMatch: false, isPartial: false };
+    }
     const isPartial = pathSegments.length > menuEntity.entityEndIndex ||
         axpIsEntityDetailsPath(currentBase) ||
         !axpIsEntityListPath(currentBase);
@@ -3026,10 +3120,10 @@ function axpMenuPathsMatch(itemPath, currentPath, trailingSegmentsToIgnore = DEF
     const itemNoHash = itemPath.split('#')[0];
     const currentNoHash = currentPath.split('#')[0];
     const [itemBase, itemQueryString = ''] = itemNoHash.split('?');
-    const [currentBase] = currentNoHash.split('?');
+    const [currentBase, currentQueryString = ''] = currentNoHash.split('?');
     const itemSegments = itemBase.split('/').filter((segment) => segment.length > 0);
     const pathSegments = currentBase.split('/').filter((segment) => segment.length > 0);
-    const entityMatch = axpTryMatchEntityMenuRoute(itemSegments, pathSegments, `/${currentBase}`);
+    const entityMatch = axpTryMatchEntityMenuRoute(itemSegments, pathSegments, `/${currentBase}`, itemQueryString, currentQueryString);
     if (entityMatch) {
         return entityMatch;
     }
@@ -3054,8 +3148,8 @@ function axpMenuPathsMatch(itemPath, currentPath, trailingSegmentsToIgnore = DEF
     }
     const isPartialMatch = effectiveMenuLength < pathLength;
     const isExactMatch = effectiveMenuLength === pathLength;
-    const itemParams = new URLSearchParams(itemQueryString);
-    const currentParams = new URLSearchParams(currentNoHash.split('?')[1] ?? '');
+    const itemParams = axpParseQueryString(itemQueryString);
+    const currentParams = axpParseQueryString(currentQueryString);
     let queryMatches = true;
     const itemParamPairs = [];
     itemParams.forEach((value, key) => {
@@ -3080,6 +3174,7 @@ function axpMenuPathsMatch(itemPath, currentPath, trailingSegmentsToIgnore = DEF
 function axpFindMenuItemByRoute(items, currentPath, trailingSegmentsToIgnore = DEFAULT_TRAILING_SEGMENTS) {
     let bestMatch = null;
     let bestEffectiveLength = -1;
+    let bestQuerySpecificity = -1;
     const visit = (menuItems, ancestors) => {
         for (const item of menuItems) {
             if (item.children?.length) {
@@ -3104,8 +3199,11 @@ function axpFindMenuItemByRoute(items, currentPath, trailingSegmentsToIgnore = D
             if (menuEntity) {
                 effectiveMenuLength = menuEntity.entityEndIndex;
             }
-            if (effectiveMenuLength > bestEffectiveLength) {
+            const querySpecificity = axpMenuQueryParamSpecificity(item.path, currentPath);
+            if (effectiveMenuLength > bestEffectiveLength ||
+                (effectiveMenuLength === bestEffectiveLength && querySpecificity > bestQuerySpecificity)) {
                 bestEffectiveLength = effectiveMenuLength;
+                bestQuerySpecificity = querySpecificity;
                 bestMatch = { item, ancestors, isPartialMatch: matchResult.isPartial };
             }
         }
@@ -5271,6 +5369,7 @@ class AXPBrowserTitleService {
         this.tabNavigation = inject(AXPTabNavigationService);
         this.menuService = inject(AXPMenuService);
         this.sessionService = inject(AXPSessionService);
+        this.platformConfig = inject(AXP_PLATFORM_CONFIG_TOKEN);
         this.router = inject(Router);
         this.destroyRef = inject(DestroyRef);
         //#endregion
@@ -5366,11 +5465,15 @@ class AXPBrowserTitleService {
     }
     async resolveApplicationTitle() {
         const application = this.sessionService.application;
-        const raw = application?.title?.trim() || application?.name?.trim() || '';
-        if (!raw) {
+        const sessionTitle = application?.title?.trim() || application?.name?.trim() || '';
+        if (sessionTitle) {
+            return (await this.resolveLocalizedText(sessionTitle)) ?? sessionTitle;
+        }
+        const platformTitle = this.platformConfig.title?.trim() || '';
+        if (!platformTitle) {
             return '';
         }
-        return (await this.resolveLocalizedText(raw)) ?? raw;
+        return (await this.resolveLocalizedText(platformTitle)) ?? platformTitle;
     }
     async resolveLocalizedText(value) {
         const trimmed = value.trim();
@@ -5388,7 +5491,7 @@ class AXPBrowserTitleService {
         if (route && app) {
             return `${route} | ${app}`;
         }
-        return route || app || 'ACoreX';
+        return route || app;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPBrowserTitleService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPBrowserTitleService, providedIn: 'root' }); }
@@ -7466,24 +7569,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImpor
                     args: ['AXPCommonModuleFactory']
                 }] }, { type: AXPKeyboardShortcutsHelpService }, { type: i2$1.AXFormatterRegistryService }] });
 
-const ENVIRONMENT = new InjectionToken('ENVIRONMENT');
-const AXP_PLATFORM_CONFIG_TOKEN = new InjectionToken('AXP_PLATFORM_CONFIG_TOKEN', {
-    providedIn: 'root',
-    factory: () => {
-        return AXPPlatformDefaultConfigs;
-    },
-});
-const AXPPlatformDefaultConfigs = {
-    copyright: 'ACoreX @ 2024',
-    title: 'ACoreX Platform',
-    network: {
-        timeOut: 5000,
-    },
-};
-function configPlatform(config = AXPPlatformDefaultConfigs) {
-    return merge(AXPPlatformDefaultConfigs, config);
-}
-
 /**
  * Resolves post-create list behavior from user settings and optional action overrides.
  */