@acorex/platform 20.9.12 → 20.9.13

package/fesm2022/acorex-platform-common.mjs

@@ -3001,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.
@@ -3021,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);
@@ -3044,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;
     }
@@ -3072,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) => {
@@ -3098,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) {
@@ -3122,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 };
             }
         }