@open-rlb/ng-app 3.0.20 → 3.0.22

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

@@ -15,7 +15,7 @@ import { RLB_TRANSLATION_SERVICE, RlbBootstrapModule, ModalDirective, ToastDirec
 import * as i1$5 from 'angular-auth-oidc-client';
 import { AbstractLoggerService, AuthModule, provideAuth, AuthInterceptor, AbstractSecurityStorage } from 'angular-auth-oidc-client';
 import * as i1 from 'ngx-cookie-service-ssr';
-import { filter, switchMap, of, map, BehaviorSubject, share, lastValueFrom, from, zip, EMPTY, catchError, Observable, tap, shareReplay, distinctUntilChanged, take } from 'rxjs';
+import { filter, switchMap, map, BehaviorSubject, of, share, lastValueFrom, from, zip, EMPTY, catchError, Observable, tap, shareReplay, distinctUntilChanged, take } from 'rxjs';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import * as i1$2 from '@ngx-translate/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -485,44 +485,83 @@ class AppsService {
     resolveRouteAndApps() {
         const route = this.findDeepestChild(this.activatedRoute);
         const fullPath = this.getFullPath(route);
-        this.logger.info('Full path for route resolution:', fullPath);
-        if (!fullPath) {
-            this.logger.warn('No valid path found, treating as default route:', route);
-            return of(null);
-        }
+        this.logger.info(`Full path for route resolution: '${fullPath}'`);
+        // if (!fullPath) {
+        // 	this.logger.warn('No valid path found, treating as default route:', route);
+        // 	return of(null);
+        // }
         const appRoutes = this.apps?.map(app => ({
             type: app.type,
             routes: app.routes || [],
             viewMode: app.viewMode,
             enabled: app.enabled,
+            core: app.core
         }));
         let appRoutesMatched = [];
-        if (!this.isDefaultRoute(fullPath)) {
+        if (fullPath && !this.isDefaultRoute(fullPath)) {
             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 => appRoutesMatched.length
-            ? { route, appsConfig: appRoutesMatched, apps }
-            : null));
+        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 };
+            }
+            return null;
+        }));
     }
     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('/');
+        const isRoot = currentPath === '';
         if (data?.apps?.some(app => !app.id)) {
-            this.logger.error('Some apps are not finalized. Please finalize apps before using AppsService.');
+            this.logger.error('Some apps are not finalized...');
             return;
         }
         if (!data || !data.apps || data.apps.length === 0) {
-            this.logger.warn(`No unique app found for route: ${route.routeConfig?.path ? route.routeConfig?.path : "'/'"} - show core`);
-            // const globalDefaultApp = this.apps[0];
+            this.logger.warn(`No apps found (or data is null). Path: '${currentPath}'`);
             this.selectApp(undefined);
             return;
         }
-        const matchedApps = data.apps
-            // domain filter in case apps have similar routes path
-            .filter(app => !app.domains || app.domains?.some((domain) => domain.includes(this.currentDomain)))
+        // domain filter
+        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
+        if (isRoot && domainApps.length === 1) {
+            const singleApp = domainApps[0];
+            const targetUrl = singleApp.core?.url;
+            if (targetUrl && targetUrl !== '/' && targetUrl !== '') {
+                this.logger.info(`[AutoRedirect] Single app detected at root. Redirecting to: ${targetUrl}`);
+                this.router.navigate([targetUrl], {
+                    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);
+            app.core?.url === '/' + route.routeConfig?.path ||
+            (isRoot && app.core?.url));
         let appToSelect;
         if (matchedApps.length === 1) {
             appToSelect = matchedApps[0];
@@ -533,11 +572,11 @@ class AppsService {
             this.logger.info('Multiple apps matched route, selected:', appToSelect);
         }
         else {
-            appToSelect = data.apps[0];
-            this.logger.info('No app matched route. Falling back to default app:', appToSelect);
+            appToSelect = domainApps[0];
+            this.logger.info('No specific route match. Falling back to domain default:', appToSelect);
         }
         const qp = new URLSearchParams(route.snapshot.queryParams).toString();
-        const url = route.snapshot.url.map(segment => segment.path).join('/') + (qp ? `?${qp}` : '');
+        const url = currentPath + (qp ? `?${qp}` : '');
         const viewMode = this.isSettingsRoute(route) ? 'settings' : 'app';
         this.selectApp(appToSelect, viewMode, url);
     }
@@ -1339,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]);
-            //   }
-            // }
         }));
         //}
     }
@@ -2890,10 +2917,7 @@ class AuthEffects {
             return this.actions$.pipe(ofType(AuthActions.setCurrentProvider), map$1(({ currentProvider }) => AuthActionsInternal.setCurrentProvider({ currentProvider })));
         });
         this.logger = this.loggerService.for(this.constructor.name);
-        this.logger.log(`Initialized AuthEffects, auth config: ${authConfig}`);
-        // if (authConfig) {
-        //   auth.checkAuthMultiple().subscribe();
-        // }
+        this.logger.log(`Initialized AuthEffects}`);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AuthEffects, deps: [{ token: i1$8.Actions }, { token: AuthenticationService }, { token: AppLoggerService }, { token: RLB_CFG_AUTH, optional: true }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AuthEffects }); }
@@ -3056,18 +3080,6 @@ function provideRlbConfig(env) {
             },
             multi: true,
         },
-        // {
-        //   provide: APP_INITIALIZER,
-        //   useFactory: authInitializer,
-        //   deps: [AuthenticationService],
-        //   multi: true
-        // },
-        // {
-        //   provide: APP_INITIALIZER,
-        //   useFactory: appsServiceInitializer,
-        //   deps: [AppsService],
-        //   multi: true
-        // },
     ];
 }
 function provideApp(app) {