@open-rlb/ng-app 3.1.48 → 3.1.49

package/fesm2022/open-rlb-ng-app.mjs

@@ -563,7 +563,7 @@ class AppsService {
             return null;
         return {
             busId: app.data[this.confAcl.businessIdKey],
-            resId: app.data[this.confAcl.resourceIdKey]
+            resId: app.data[this.confAcl.resourceIdKey],
         };
     }
     get currentApp() {
@@ -592,7 +592,7 @@ class AppsService {
         this.store.dispatch(AppContextActions.setCurrentApp({ app, mode: viewMode, url }));
     }
     initAuthProviders(store, confAuth) {
-        const currentProviderInStore = this.store.selectSignal((state) => state[authsFeatureKey].currentProvider)();
+        const currentProviderInStore = this.store.selectSignal(state => state[authsFeatureKey].currentProvider)();
         if (currentProviderInStore) {
             this.logger.info(`Auth provider already set to '${currentProviderInStore}' by Initializer. AppsService initAuthProviders skipping init.`);
             return;
@@ -637,14 +637,17 @@ class AppsService {
             routes: app.routes || [],
             viewMode: app.viewMode,
             enabled: app.enabled,
-            core: app.core
+            core: app.core,
         }));
         let appRoutesMatched = [];
         if (configPath && !this.isDefaultRoute(configPath)) {
-            appRoutesMatched = appRoutes?.filter(app => app.routes?.some(r => r.includes(configPath))) ?? [];
+            appRoutesMatched =
+                appRoutes?.filter(app => app.routes?.some(r => r.includes(configPath))) ?? [];
         }
         this.logger.info('Matched appRoute:', appRoutesMatched);
-        return this.store.select(state => state[appContextFeatureKey].apps).pipe(
+        return this.store
+            .select(state => state[appContextFeatureKey].apps)
+            .pipe(
         // waiting for all "finalizeApp" dispatches
         filter(apps => {
             if (!apps || apps.length === 0)
@@ -660,7 +663,7 @@ class AppsService {
                     route,
                     appsConfig: appRoutesMatched,
                     apps,
-                    fullPath: actualPath
+                    fullPath: actualPath,
                 };
             }
             return null;
@@ -683,7 +686,7 @@ class AppsService {
             return;
         }
         // Filter by domain
-        const domainApps = data.apps.filter(app => !app.domains || app.domains?.some((domain) => domain.includes(this.currentDomain)));
+        const domainApps = data.apps.filter(app => !app.domains || app.domains?.some(domain => domain.includes(this.currentDomain)));
         if (domainApps.length === 0) {
             this.logger.warn(`No apps allowed for domain: ${this.currentDomain}`);
             this.selectApp(undefined);
@@ -698,7 +701,7 @@ class AppsService {
                 this.logger.info(`[AutoRedirect] Single app detected at root. Redirecting to: ${targetUrl}`);
                 this.router.navigate([targetUrl], {
                     queryParams: route.snapshot.queryParams,
-                    replaceUrl: true
+                    replaceUrl: true,
                 });
                 return;
             }
@@ -708,7 +711,7 @@ class AppsService {
         // ====================================================================
         if (isRoot && domainApps.length > 1) {
             this.logger.info(`Root detected with multiple apps (${domainApps.length}). Showing App Hub / Core home page.`);
-            const redirectApps = domainApps.filter((app) => app.autoRedirectOnRootEnabled);
+            const redirectApps = domainApps.filter(app => app.autoRedirectOnRootEnabled);
             if (redirectApps?.length > 1) {
                 this.logger.warn('Multiple apps have autoRedirectOnRootEnabled: true. Picking the first one.', redirectApps);
             }
@@ -717,7 +720,7 @@ class AppsService {
                 this.logger.info(`[AutoRedirect] Detected app with root redirect. Redirecting to: ${targetUrl}`);
                 this.router.navigate([targetUrl], {
                     queryParams: route.snapshot.queryParams,
-                    replaceUrl: true
+                    replaceUrl: true,
                 });
                 return;
             }
@@ -726,8 +729,15 @@ class AppsService {
         }
         // CASE 3: Standard logic to get app (Deep linking) ---
         // Here we go only if route not empty  !="" and not root !="/"
-        const matchedApps = domainApps.filter(app => app.routes?.some(r => r.includes(route.routeConfig?.path)) ||
-            app.core?.url === '/' + route.routeConfig?.path);
+        const configPath = this.getConfigPath(route);
+        const matchedApps = domainApps.filter(app => {
+            if (!configPath || configPath === '') {
+                return false;
+            }
+            const hasRouteMatch = app.routes?.some(r => r.includes(configPath) || configPath.includes(r));
+            const hasCoreMatch = app.core?.url === '/' + configPath || app.core?.url?.includes(configPath);
+            return hasRouteMatch || hasCoreMatch;
+        });
         let appToSelect;
         if (matchedApps.length === 1) {
             appToSelect = matchedApps[0];
@@ -767,8 +777,7 @@ class AppsService {
         return route.routeConfig?.path?.includes('settings') ?? false;
     }
     isDefaultRoute(route) {
-        return DEFAULT_ROUTES_CONFIG
-            .some(r => r.path.includes(route));
+        return DEFAULT_ROUTES_CONFIG.some(r => r.path.includes(route));
     }
     getConfigPath(route) {
         const segments = [];
@@ -799,7 +808,7 @@ class AppsService {
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.1", ngImport: i0, type: AppsService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    providedIn: 'root',
                 }]
         }], ctorParameters: () => [{ type: i1$1.Store }, { type: i2.ActivatedRoute }, { type: i2.Router }, { type: AppLoggerService }, { type: undefined, decorators: [{
                     type: Inject,