@open-rlb/ng-app 3.0.23 → 3.0.25

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

@@ -484,12 +484,11 @@ class AppsService {
     // Core logic
     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);
-        // }
+        // 1. Get abstract route template (LIKE ".../:id")
+        const configPath = this.getConfigPath(route);
+        // 2. Get REAL url path (LIKE ".../abc-123")
+        const actualPath = this.getActualPath(route);
+        this.logger.info(`Resolving. ConfigPath: '${configPath}', ActualPath: '${actualPath}'`);
         const appRoutes = this.apps?.map(app => ({
             type: app.type,
             routes: app.routes || [],
@@ -498,10 +497,10 @@ class AppsService {
             core: app.core
         }));
         let appRoutesMatched = [];
-        if (fullPath && !this.isDefaultRoute(fullPath)) {
-            appRoutesMatched = appRoutes?.filter(app => app.routes?.some(r => r.includes(fullPath))) ?? [];
+        if (configPath && !this.isDefaultRoute(configPath)) {
+            appRoutesMatched = appRoutes?.filter(app => app.routes?.some(r => r.includes(configPath))) ?? [];
         }
-        this.logger.info('Route fullPath:', fullPath, 'Matched appRoute:', appRoutesMatched);
+        this.logger.info('Matched appRoute:', appRoutesMatched);
         return this.store.select(state => state[appContextFeatureKey].apps).pipe(
         // waiting for all "finalizeApp" dispatches
         filter(apps => {
@@ -512,11 +511,14 @@ class AppsService {
                 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 };
+        }), map(apps => {
+            if (appRoutesMatched.length > 0 || actualPath === '') {
+                return {
+                    route,
+                    appsConfig: appRoutesMatched,
+                    apps,
+                    fullPath: actualPath
+                };
             }
             return null;
         }));
@@ -525,7 +527,7 @@ class AppsService {
         const route = this.findDeepestChild(this.activatedRoute);
         const storedId = this.getStoredAppId();
         // Check if route is root
-        const currentPath = route.snapshot.url.map(s => s.path).join('/');
+        const currentPath = data ? data.fullPath : this.getActualPath(route);
         const isRoot = currentPath === '';
         //  Basic check
         if (data?.apps?.some(app => !app.id)) {
@@ -612,7 +614,7 @@ class AppsService {
         return DEFAULT_ROUTES_CONFIG
             .some(r => r.path.includes(route));
     }
-    getFullPath(route) {
+    getConfigPath(route) {
         const segments = [];
         let current = route.root;
         while (current) {
@@ -623,6 +625,18 @@ class AppsService {
         }
         return segments.join('/');
     }
+    getActualPath(route) {
+        const segments = [];
+        let current = route.root;
+        while (current) {
+            // map(s => s.path) extract params
+            const path = current.snapshot.url.map(s => s.path).join('/');
+            if (path && path !== '')
+                segments.push(path);
+            current = current.firstChild ?? null;
+        }
+        return segments.join('/');
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AppsService, deps: [{ token: i1$1.Store }, { token: i2.ActivatedRoute }, { token: i2.Router }, { 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: AppsService, providedIn: 'root' }); }
 }