@open-rlb/ng-app 3.0.21 → 3.0.23

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

@@ -502,8 +502,19 @@ class AppsService {
             appRoutesMatched = appRoutes?.filter(app => app.routes?.some(r => r.includes(fullPath))) ?? [];
         }
         this.logger.info('Route fullPath:', fullPath, 'Matched appRoute:', appRoutesMatched);
-        return this.store.select(state => state[appContextFeatureKey].apps).pipe(map(apps => {
-            // handle root route case
+        return this.store.select(state => state[appContextFeatureKey].apps).pipe(
+        // waiting for all "finalizeApp" dispatches
+        filter(apps => {
+            if (!apps || apps.length === 0)
+                return true;
+            const allFinalized = !apps.some(app => !app.id);
+            if (!allFinalized) {
+                this.logger.info('Waiting for apps initialization (finalizeApp)...');
+            }
+            return allFinalized;
+        }), 
+        // 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 };
             }
@@ -513,27 +524,28 @@ class AppsService {
     handleResolvedApps(data) {
         const route = this.findDeepestChild(this.activatedRoute);
         const storedId = this.getStoredAppId();
-        // Check if it is a root route
+        // Check if route is root
         const currentPath = route.snapshot.url.map(s => s.path).join('/');
         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;
@@ -543,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}` : '');
@@ -1367,23 +1388,11 @@ class AuthenticationService {
                 }
                 else {
                     this.logger.info(`User authenticated, no redirectUrl found. Staying on current route.`);
-                    // this.router.navigate([], {
-                    //   queryParams: {},
-                    //   replaceUrl: true,
-                    //   relativeTo: this.router.routerState.root
-                    // });
                 }
             }
             else {
                 this.logger.warn(`No authenticatedConfig found for ${url}`);
             }
-            // if (data.some(o => o.isAuthenticated)) {
-            //   const redirect = this.cookiesService.getCookie('loginRedirectUrl');
-            //   if (redirect) {
-            //     this.cookiesService.deleteCookie('loginRedirectUrl');
-            //     this.router.navigate([redirect]);
-            //   }
-            // }
         }));
         //}
     }