@acorex/platform 20.8.21 → 20.8.23

package/fesm2022/acorex-platform-common.mjs

@@ -3,7 +3,7 @@ import { InjectionToken, inject, Injectable, Injector, makeEnvironmentProviders,
 import { kebabCase, merge, sortBy, cloneDeep, get, omit } from 'lodash-es';
 import { Router, ROUTES, RedirectCommand, RouterModule } from '@angular/router';
 import { AXPSessionService, AXPSessionStatus, AXPAuthGuard } from '@acorex/platform/auth';
-import { Subject, distinctUntilChanged, merge as merge$1, first, switchMap, from } from 'rxjs';
+import { Subject, distinctUntilChanged, merge as merge$1, first, switchMap, from, map } from 'rxjs';
 import { AXPPlatformScope, AXPBroadcastEventService, objectKeyValueTransforms, AXPSystemActionType, AXPModuleManifestModule, AXPAppStartUpProvider, AXP_EXPRESSION_EVALUATOR_SCOPE_PROVIDER, AXPHookService, AXPDataGenerator, AXPModuleManifestRegistry } from '@acorex/platform/core';
 import { AXTranslationService } from '@acorex/core/translation';
 import { AXPWidgetsCatalog } from '@acorex/platform/layout/widget-core';
@@ -1042,12 +1042,20 @@ class AXPHomePageService {
         // TODO: check this for custom menu like :app/terms
         router.resetConfig(merged);
     }
+    /**
+     * Resolves the current user's home page as a router URL tree.
+     */
+    resolveHomeUrlTree() {
+        const router = this.injector.get(Router);
+        const current = this.getCurrent();
+        const path = current.path.startsWith('/') ? current.path : `/${current.path}`;
+        return router.parseUrl(path);
+    }
     async navigateTo() {
         // wait for the router to be initialized
         setTimeout(() => {
             const router = this.injector.get(Router);
-            const current = this.getCurrent();
-            router.navigate([current.path], { onSameUrlNavigation: 'reload' });
+            router.navigateByUrl(this.resolveHomeUrlTree(), { onSameUrlNavigation: 'reload' });
         }, 100);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: AXPHomePageService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -1280,6 +1288,27 @@ class AXPNotFoundError extends Error {
 
 /** Canonical route path for the platform 404 page. */
 const AXP_NOT_FOUND_ROUTE = '/error/404';
+/**
+ * Catch-all route that redirects unknown URLs to the platform 404 page.
+ * Register this as the **last** route source in the application (after all app and module routes).
+ */
+const AXP_NOT_FOUND_CATCH_ALL_ROUTE = {
+    path: '**',
+    redirectTo: AXP_NOT_FOUND_ROUTE,
+};
+/**
+ * Registers the platform catch-all 404 route.
+ * Must be the last `ROUTES` provider in `app.config` so custom app routes are matched first.
+ */
+function AXPNotFoundCatchAllRoute() {
+    return makeEnvironmentProviders([
+        {
+            provide: ROUTES,
+            multi: true,
+            useValue: [AXP_NOT_FOUND_CATCH_ALL_ROUTE],
+        },
+    ]);
+}
 /**
  * Returns true when an entity byKey query did not resolve a record.
  */
@@ -1293,6 +1322,15 @@ function axpRedirectToNotFound(router = inject(Router)) {
     return new RedirectCommand(router.parseUrl(AXP_NOT_FOUND_ROUTE));
 }
 
+/** Canonical route path for the platform 401 page. */
+const AXP_UNAUTHORIZED_ROUTE = '/error/401';
+/**
+ * Creates an Angular redirect command to the platform 401 page.
+ */
+function axpRedirectToUnauthorized(router = inject(Router)) {
+    return new RedirectCommand(router.parseUrl(AXP_UNAUTHORIZED_ROUTE));
+}
+
 const AXP_TOKEN_DEFINITION_PROVIDER = new InjectionToken('AXP_TOKEN_DEFINITION_PROVIDER', {
     factory: () => [],
 });
@@ -2373,10 +2411,10 @@ function axpMenuPathsMatch(itemPath, currentPath, trailingSegmentsToIgnore = DEF
 function axpFindMenuItemByRoute(items, currentPath, trailingSegmentsToIgnore = DEFAULT_TRAILING_SEGMENTS) {
     let bestMatch = null;
     let bestEffectiveLength = -1;
-    const visit = (menuItems) => {
+    const visit = (menuItems, ancestors) => {
         for (const item of menuItems) {
             if (item.children?.length) {
-                visit(item.children);
+                visit(item.children, [...ancestors, item]);
             }
             if (!item.path) {
                 continue;
@@ -2395,11 +2433,11 @@ function axpFindMenuItemByRoute(items, currentPath, trailingSegmentsToIgnore = D
             }
             if (effectiveMenuLength > bestEffectiveLength) {
                 bestEffectiveLength = effectiveMenuLength;
-                bestMatch = { item, isPartialMatch: matchResult.isPartial };
+                bestMatch = { item, ancestors, isPartialMatch: matchResult.isPartial };
             }
         }
     };
-    visit(items);
+    visit(items, []);
     return bestMatch;
 }
 
@@ -2509,6 +2547,18 @@ class AXPMenuVisibilityService {
     constructor() {
         this.sessionService = inject(AXPSessionService);
     }
+    /**
+     * Checks visibility for a menu branch, including ancestor policies.
+     * Parent module features and permissions must pass before child routes are accessible.
+     */
+    isMenuBranchVisible(item, ancestors = []) {
+        for (const menuItem of [...ancestors, item]) {
+            if (!this.isItemVisible(menuItem)) {
+                return false;
+            }
+        }
+        return true;
+    }
     /**
      * Checks if a menu item should be visible based on permissions and features.
      */
@@ -2601,19 +2651,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.19", ngImpo
         }] });
 
 const SKIP_ROUTE_PREFIXES = ['/auth', '/error'];
-const SKIP_ROUTE_PATHS = new Set(['/404', '/401']);
-//#region ----   Menu Route Permission Service   ----
+const SKIP_ROUTE_PATHS = new Set(['/404', '/401', '/error/404', '/error/401']);
+//#region ----   Menu Route Access Service   ----
 /**
- * Resolves route access using the same permission and feature policies defined on menu items.
+ * Resolves route access using menu policy, route metadata, permissions, and features.
  */
-class AXPMenuRoutePermissionService {
+class AXPMenuRouteAccessService {
     constructor() {
         //#region ----   Services & Dependencies   ----
         this.menuProvider = inject(AXPMenuProviderService);
         this.menuVisibility = inject(AXPMenuVisibilityService);
         this.sessionService = inject(AXPSessionService);
-        this.toastService = inject(AXToastService);
-        this.translationService = inject(AXTranslationService);
     }
     //#endregion
     //#region ----   Public Methods   ----
@@ -2625,7 +2673,6 @@ class AXPMenuRoutePermissionService {
             return true;
         }
         if (!this.hasExplicitRouteAccess(route)) {
-            await this.showAccessDeniedToast();
             return false;
         }
         const menuItems = await this.menuProvider.items();
@@ -2633,16 +2680,15 @@ class AXPMenuRoutePermissionService {
         if (!menuMatch) {
             return true;
         }
-        if (this.menuVisibility.isItemVisible(menuMatch.item)) {
+        if (this.menuVisibility.isMenuBranchVisible(menuMatch.item, menuMatch.ancestors)) {
             return true;
         }
-        await this.showAccessDeniedToast();
         return false;
     }
     //#endregion
     //#region ----   Utility Methods   ----
     shouldSkip(route, url) {
-        if (this.hasRouteFlag(route, 'skipMenuPermissionGuard')) {
+        if (this.hasRouteFlag(route, 'skipMenuRouteGuard')) {
             return true;
         }
         const normalizedUrl = this.normalizeUrl(url);
@@ -2695,41 +2741,35 @@ class AXPMenuRoutePermissionService {
         const path = url.split('?')[0]?.split('#')[0] ?? url;
         return path.startsWith('/') ? path : `/${path}`;
     }
-    async showAccessDeniedToast() {
-        const title = await this.translationService.translateAsync('@general:messages.network.forbidden.title');
-        const description = await this.translationService.translateAsync('@general:messages.network.forbidden.description');
-        this.toastService.show({
-            color: 'danger',
-            title,
-            content: description,
-            timeOut: 5000,
-        });
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: AXPMenuRoutePermissionService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: AXPMenuRoutePermissionService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: AXPMenuRouteAccessService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: AXPMenuRouteAccessService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: AXPMenuRoutePermissionService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.19", ngImport: i0, type: AXPMenuRouteAccessService, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
 
 /**
- * Blocks navigation when the target route matches a menu item the current user cannot access.
- * Uses the same permission and feature policies applied to menu visibility.
+
+ * Blocks navigation when the target route is not accessible for the current user.
+
+ * Evaluates menu policy, permissions, and features.
+
  */
-const AXPMenuPermissionGuard = (route, state) => {
+const AXPMenuRouteGuard = (route, state) => {
     const sessionService = inject(AXPSessionService);
-    const menuRoutePermissionService = inject(AXPMenuRoutePermissionService);
-    return sessionService.isAuthorized$.pipe(first(), switchMap((isAuthorized) => {
-        if (!isAuthorized) {
-            return from(Promise.resolve(true));
+    const menuRouteAccessService = inject(AXPMenuRouteAccessService);
+    const router = inject(Router);
+    return sessionService.isAuthorizedWithLoading$.pipe(first(), switchMap(() => from(menuRouteAccessService.canAccess(route, state.url))), map((isAllowed) => {
+        if (isAllowed) {
+            return true;
         }
-        return from(menuRoutePermissionService.canAccess(route, state.url));
+        return router.parseUrl(AXP_UNAUTHORIZED_ROUTE);
     }));
 };
 
-/** Standard guards for authenticated routes with menu-based permission enforcement. */
-const AXP_PROTECTED_ROUTE_GUARDS = [AXPAuthGuard, AXPMenuPermissionGuard];
+/** Standard guards for authenticated routes with menu-based access enforcement. */
+const AXP_PROTECTED_ROUTE_GUARDS = [AXPAuthGuard, AXPMenuRouteGuard];
 
 class AXPMenuSearchDefinitionProvider {
     async provide(context) {
@@ -4577,5 +4617,5 @@ class AXPVersioningService {
  * Generated bundle index. Do not edit.
  */
 
-export { ALL_DEFAULT_OPERATORS, AXMWorkflowErrorHandler, AXPAppVersionService, AXPCleanNestedFilters, AXPClipBoardService, AXPCommonModule, AXPCommonSettings, AXPCustomOperatorService, AXPCustomOperatorServiceImpl, AXPDataProvider, AXPDebugService, AXPDialogConfirmAction, AXPEntityCommandScope, AXPEntityQueryType, AXPErrorHandlerRegistryService, AXPExportService, AXPFileActionsService, AXPFileStorageService, AXPFileStorageStatus, AXPFileTypeProviderService, AXPFilterOperatorMiddlewareService, AXPFilterOperatorMiddlewareServiceImpl, AXPFooterTextSlotComponent, AXPGlobalErrorHandler, AXPHomePageModule, AXPHomePageService, AXPLockService, AXPMenuMiddlewareRegistry, AXPMenuPermissionGuard, AXPMenuProviderService, AXPMenuRoutePermissionService, AXPMenuSearchDefinitionProvider, AXPMenuSearchProvider, AXPMenuService, AXPMenuVisibilityService, AXPNavBarSlotComponent, AXPNavigateWorkflow, AXPNotFoundError, AXPPlatformDefaultConfigs, AXPRedirectEvent, AXPRefreshEvent, AXPRegionalSetting, AXPRelationshipCardinality, AXPRelationshipKind, AXPReloadAction, AXPReloadEvent, AXPSearchCommandProvider, AXPSearchDefinitionActionBuilder, AXPSearchDefinitionBuilder, AXPSearchDefinitionProviderContext, AXPSearchDefinitionProviderService, AXPSearchService, AXPSettingDefaultValuesAggregatorService, AXPSettingDefinitionGroupBuilder, AXPSettingDefinitionProviderContext, AXPSettingDefinitionProviderService, AXPSettingDefinitionSectionBuilder, AXPSettingsService, AXPStatusDefinitionProviderService, AXPStatusProvider, AXPStickyDirective, AXPSystemStatusType, AXPSystemStatuses, AXPToastAction, AXPTokenDefinitionService, AXPTokenEvaluatorScopeProvider, AXPVersioningService, AXPWorkflowNavigateAction, AXPWorkflowRouterNavigateAction, AXP_APP_VERSION_PROVIDER, AXP_FILE_ACTION_PROVIDER, AXP_FILE_TYPE_INFO_PROVIDER, AXP_HOME_PAGES, AXP_HOME_PAGE_DEFAULT_KEY, AXP_MENU_MIDDLEWARE, AXP_MENU_PROVIDER, AXP_NOT_FOUND_ROUTE, AXP_PLATFORM_CONFIG_TOKEN, AXP_PROTECTED_ROUTE_GUARDS, AXP_ROOT_CONFIG_TOKEN, AXP_SEARCH_DEFINITION_PROVIDER, AXP_SEARCH_PROVIDER, AXP_SETTING_DEFAULT_VALUES_PROVIDERS, AXP_SETTING_DEFINITION_PROVIDER, AXP_SETTING_VALUE_PROVIDER, AXP_STATUS_PROVIDERS, AXP_TOKEN_DEFINITION_PROVIDER, AXVChangeType, BETWEEN_OPER, BOOLEAN_OPERATORS, CONTAINS_OPER, DATE_OPERATORS, DEFAULT_DATE_FILTER_PRESETS, ENDS_WITH_OPER, ENVIRONMENT, EQ_OPER, GTE_OPER, GT_OPER, IN_OPER, IS_EMPTY_OPER, IS_NOT_EMPTY_OPER, LTE_OPER, LT_OPER, NOT_CONTAINS_OPER, NOT_EQ_OPER, NUMBER_OPERATORS, STARTS_WITH_OPER, STRING_OPERATORS, UploadFromComputerActionProvider, applyDateFilterPreset, axpFindMenuItemByRoute, axpIsEntityRecordNotFound, axpMenuPathsMatch, axpRedirectToNotFound, configPlatform, createAllQueryView, createMenuContext, createMenuMiddleware, createQueryView, findManualPresetIdByOperation, getEntityInfo, getStatusInfo, getSystemStatus, provideDynamicHomePage, provideMenuMiddleware, resolveDateFilterPresets, resolveStatusLook, systemStatusToDefinition };
+export { ALL_DEFAULT_OPERATORS, AXMWorkflowErrorHandler, AXPAppVersionService, AXPCleanNestedFilters, AXPClipBoardService, AXPCommonModule, AXPCommonSettings, AXPCustomOperatorService, AXPCustomOperatorServiceImpl, AXPDataProvider, AXPDebugService, AXPDialogConfirmAction, AXPEntityCommandScope, AXPEntityQueryType, AXPErrorHandlerRegistryService, AXPExportService, AXPFileActionsService, AXPFileStorageService, AXPFileStorageStatus, AXPFileTypeProviderService, AXPFilterOperatorMiddlewareService, AXPFilterOperatorMiddlewareServiceImpl, AXPFooterTextSlotComponent, AXPGlobalErrorHandler, AXPHomePageModule, AXPHomePageService, AXPLockService, AXPMenuMiddlewareRegistry, AXPMenuProviderService, AXPMenuRouteAccessService, AXPMenuRouteGuard, AXPMenuSearchDefinitionProvider, AXPMenuSearchProvider, AXPMenuService, AXPMenuVisibilityService, AXPNavBarSlotComponent, AXPNavigateWorkflow, AXPNotFoundCatchAllRoute, AXPNotFoundError, AXPPlatformDefaultConfigs, AXPRedirectEvent, AXPRefreshEvent, AXPRegionalSetting, AXPRelationshipCardinality, AXPRelationshipKind, AXPReloadAction, AXPReloadEvent, AXPSearchCommandProvider, AXPSearchDefinitionActionBuilder, AXPSearchDefinitionBuilder, AXPSearchDefinitionProviderContext, AXPSearchDefinitionProviderService, AXPSearchService, AXPSettingDefaultValuesAggregatorService, AXPSettingDefinitionGroupBuilder, AXPSettingDefinitionProviderContext, AXPSettingDefinitionProviderService, AXPSettingDefinitionSectionBuilder, AXPSettingsService, AXPStatusDefinitionProviderService, AXPStatusProvider, AXPStickyDirective, AXPSystemStatusType, AXPSystemStatuses, AXPToastAction, AXPTokenDefinitionService, AXPTokenEvaluatorScopeProvider, AXPVersioningService, AXPWorkflowNavigateAction, AXPWorkflowRouterNavigateAction, AXP_APP_VERSION_PROVIDER, AXP_FILE_ACTION_PROVIDER, AXP_FILE_TYPE_INFO_PROVIDER, AXP_HOME_PAGES, AXP_HOME_PAGE_DEFAULT_KEY, AXP_MENU_MIDDLEWARE, AXP_MENU_PROVIDER, AXP_NOT_FOUND_CATCH_ALL_ROUTE, AXP_NOT_FOUND_ROUTE, AXP_PLATFORM_CONFIG_TOKEN, AXP_PROTECTED_ROUTE_GUARDS, AXP_ROOT_CONFIG_TOKEN, AXP_SEARCH_DEFINITION_PROVIDER, AXP_SEARCH_PROVIDER, AXP_SETTING_DEFAULT_VALUES_PROVIDERS, AXP_SETTING_DEFINITION_PROVIDER, AXP_SETTING_VALUE_PROVIDER, AXP_STATUS_PROVIDERS, AXP_TOKEN_DEFINITION_PROVIDER, AXP_UNAUTHORIZED_ROUTE, AXVChangeType, BETWEEN_OPER, BOOLEAN_OPERATORS, CONTAINS_OPER, DATE_OPERATORS, DEFAULT_DATE_FILTER_PRESETS, ENDS_WITH_OPER, ENVIRONMENT, EQ_OPER, GTE_OPER, GT_OPER, IN_OPER, IS_EMPTY_OPER, IS_NOT_EMPTY_OPER, LTE_OPER, LT_OPER, NOT_CONTAINS_OPER, NOT_EQ_OPER, NUMBER_OPERATORS, STARTS_WITH_OPER, STRING_OPERATORS, UploadFromComputerActionProvider, applyDateFilterPreset, axpFindMenuItemByRoute, axpIsEntityRecordNotFound, axpMenuPathsMatch, axpRedirectToNotFound, axpRedirectToUnauthorized, configPlatform, createAllQueryView, createMenuContext, createMenuMiddleware, createQueryView, findManualPresetIdByOperation, getEntityInfo, getStatusInfo, getSystemStatus, provideDynamicHomePage, provideMenuMiddleware, resolveDateFilterPresets, resolveStatusLook, systemStatusToDefinition };
 //# sourceMappingURL=acorex-platform-common.mjs.map