@c8y/ngx-components 1021.22.138 → 1021.22.140

package/fesm2022/c8y-ngx-components-upgrade.mjs

@@ -207,6 +207,7 @@ class BridgeService {
         this.fixE2eIssues();
         this.$ng1RouteChangeSuccess = this.fromNg1Event(this.injector.get('$rootScope'), '$routeChangeSuccess');
         this.$ng1RouteChangeStart = this.fromNg1Event(this.injector.get('$rootScope'), '$routeChangeStart');
+        this.$ng1RouteUpdate = this.fromNg1Event(this.injector.get('$rootScope'), '$routeUpdate');
         this.hookLanguage();
         this.hookTab();
         this.hookNavigator();
@@ -224,21 +225,11 @@ class BridgeService {
         // fix to trigger an angularjs route change success
         // event on context route match to make legacy
         // view-providers resolve.
-        // reloadOnUrl: true ensures that navigating between different IDs
-        // (e.g., /device/123 -> /device/456) triggers $routeChangeSuccess
-        // reloadOnSearch: true ensures that navigating to different subpaths with the same ID
-        // (e.g., /group/123/dashboard -> /group/123/subassets) also triggers $routeChangeSuccess
-        // Both are needed because AngularJS checks: "is update-only if reloadOnUrl is set
-        // BUT reloadOnSearch is false AND pathParams are equal"
         c8yViews.when('/device/:id', {
-            template: '',
-            reloadOnUrl: true,
-            reloadOnSearch: true
+            template: ''
         });
         c8yViews.when('/group/:id', {
-            template: '',
-            reloadOnUrl: true,
-            reloadOnSearch: true
+            template: ''
         });
         c8yViews.contextViews.subscribe(cfg => this.addRoute(cfg));
     }
@@ -281,9 +272,7 @@ class BridgeService {
             fallbackRoutes.push({
                 keys: [{ name: ViewContextLegacyParameter[context], optional: false }],
                 regexp,
-                template,
-                reloadOnUrl: true,
-                reloadOnSearch: true
+                template
             });
         }
         /**
@@ -391,8 +380,15 @@ class BridgeService {
             liveTabs = [];
             this.$liveTabs.next(liveTabs);
         });
-        this.$ng1RouteChangeSuccess.subscribe(() => {
+        const syncRouters = () => {
             const path = $location.path();
+            // Don't sync if Angular Router is using secondary outlets
+            // (e.g., /device/123/(dashboard-details:general))
+            // Let Angular Router handle these advanced navigation scenarios
+            if (this.router.url.includes('(') && this.router.url.includes(':')) {
+                return;
+            }
+            // Only sync if paths differ and initial navigation is complete
             if (this.router.url !== path) {
                 this.router.navigate(path === '/' ? '' : path.split('/'), {
                     queryParams: $location.search(),
@@ -402,7 +398,18 @@ class BridgeService {
             if (this.actionService) {
                 this.actionService.refresh();
             }
-        });
+        };
+        // Listen to $routeChangeSuccess (full navigation - always sync)
+        this.$ng1RouteChangeSuccess.subscribe(syncRouters);
+        // Listen to $routeUpdate (skip if query-param-only)
+        this.$ng1RouteUpdate
+            .pipe(filter(() => {
+            const path = $location.path();
+            const angularPath = this.router.url.split('?')[0];
+            // Only process if path actually changed (not just query params)
+            return angularPath !== path;
+        }))
+            .subscribe(syncRouters);
         this.$routeChanges = merge(this.$ng1RouteChangeSuccess, this.fromNg1Event(c8yTabs, c8yTabs.EVENT_UPDATE), of(1)).pipe(debounceTime(100));
     }
     hookNavigator() {