@open-rlb/ng-app 3.0.22 → 3.0.24

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

@@ -516,7 +516,7 @@ class AppsService {
         // Return config in there are matched apps, or it's root route case
         map(apps => {
             if (appRoutesMatched.length > 0 || fullPath === '') {
-                return { route, appsConfig: appRoutesMatched, apps };
+                return { route, appsConfig: appRoutesMatched, apps, fullPath };
             }
             return null;
         }));
@@ -524,27 +524,28 @@ class AppsService {
     handleResolvedApps(data) {
         const route = this.findDeepestChild(this.activatedRoute);
         const storedId = this.getStoredAppId();
-        // Check if it is a root route
-        const currentPath = route.snapshot.url.map(s => s.path).join('/');
+        // Check if route is root
+        const currentPath = data ? data.fullPath : this.getFullPath(route);
         const isRoot = currentPath === '';
+        //  Basic check
         if (data?.apps?.some(app => !app.id)) {
             this.logger.error('Some apps are not finalized...');
             return;
         }
         if (!data || !data.apps || data.apps.length === 0) {
-            this.logger.warn(`No apps found (or data is null). Path: '${currentPath}'`);
+            this.logger.warn(`No apps found. Path: '${currentPath}'`);
             this.selectApp(undefined);
             return;
         }
-        // domain filter
+        // Filter by domain
         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);
             return;
         }
-        // Auto-redirect logic
-        // if there is a root route and only 1 app matched -> auto redirect on app home page
+        // CASE 1: SINGLE APP REDIRECT (Partners)
+        // We are in root route and there is only one app available
         if (isRoot && domainApps.length === 1) {
             const singleApp = domainApps[0];
             const targetUrl = singleApp.core?.url;
@@ -554,26 +555,35 @@ class AppsService {
                     queryParams: route.snapshot.queryParams,
                     replaceUrl: true
                 });
-                // break flow, to prevent selectApp
                 return;
             }
         }
-        const matchedApps = domainApps
-            .filter(app => app.routes?.some(r => r.includes(route.routeConfig?.path)) ||
-            app.core?.url === '/' + route.routeConfig?.path ||
-            (isRoot && app.core?.url));
+        // CASE 2: MULTI APP HUB / CORE HOME PAGE
+        // We are in root route, and there are more than one app available
+        // ====================================================================
+        if (isRoot && domainApps.length > 1) {
+            this.logger.info(`Root detected with multiple apps (${domainApps.length}). Showing App Hub / Core home page.`);
+            this.selectApp(undefined); // Explicit reset chosen app
+            return;
+        }
+        // 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);
         let appToSelect;
         if (matchedApps.length === 1) {
             appToSelect = matchedApps[0];
             this.logger.info('Single app matched route:', appToSelect);
         }
         else if (matchedApps.length > 1) {
+            // Fallback in case of conflict routes
             appToSelect = matchedApps.find(a => a.id === storedId) || matchedApps[0];
             this.logger.info('Multiple apps matched route, selected:', appToSelect);
         }
         else {
-            appToSelect = domainApps[0];
-            this.logger.info('No specific route match. Falling back to domain default:', appToSelect);
+            // Fallback: Route path doesn't exist
+            appToSelect = undefined;
+            this.logger.warn('No app matched this specific route:', currentPath);
         }
         const qp = new URLSearchParams(route.snapshot.queryParams).toString();
         const url = currentPath + (qp ? `?${qp}` : '');