@open-rlb/ng-app 3.0.21 → 3.0.22

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 };
             }
@@ -1367,23 +1378,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]);
-            //   }
-            // }
         }));
         //}
     }