@c8y/ngx-components 1021.59.1 → 1021.59.6

package/fesm2022/c8y-ngx-components.mjs

@@ -24710,10 +24710,10 @@ class ScopedContextRouteService {
             throw new Error(`${ScopedContextRouteService.name} should not be used on a route without a rootContext`);
         }
         this.router.events
-            .pipe(filter(e => e instanceof ActivationEnd), takeUntilDestroyed(this.destroyRef))
-            .subscribe((e) => this.redirectToFirstTab(e));
-        route.data
-            .pipe(merge$1(this.updatedContext(route), this.refreshTrigger$), switchMap(() => this.tabsResolver.resolve(route.snapshot)), takeUntilDestroyed(this.destroyRef))
+            .pipe(filter(event => event instanceof ActivationEnd && this.needsRedirect(event)), switchMap((event) => this.tabsResolver.resolve(event.snapshot)), takeUntilDestroyed(this.destroyRef))
+            .subscribe((tabs) => this.redirectToFirstTabOnActivationEnd(tabs));
+        merge(this.updatedContext(route), this.refreshTrigger$, route.data)
+            .pipe(switchMap(() => this.tabsResolver.resolve(route.snapshot)), takeUntilDestroyed(this.destroyRef))
             .subscribe(tabs => this.updateTabs(tabs));
     }
     /**
@@ -24728,6 +24728,22 @@ class ScopedContextRouteService {
     refreshContext() {
         this.refreshTrigger$.next();
     }
+    redirectToFirstTabOnActivationEnd(tabs) {
+        if (!tabs.length) {
+            return;
+        }
+        const tab = this.tabsService.sortTabs(tabs)[0];
+        const currentQueryParams = this.router.routerState.snapshot.root.queryParams;
+        const queryParamsString = new URLSearchParams(currentQueryParams).toString();
+        const queryParamsSuffix = queryParamsString ? `?${queryParamsString}` : '';
+        const currentContextId = (this.router.url.match(this.ID_REGEX) || []).shift();
+        const tabPathId = (tab.path.match(this.ID_REGEX) || []).shift();
+        if (currentContextId === tabPathId) {
+            this.router.navigateByUrl(`${tab.path}${queryParamsSuffix}`, {
+                replaceUrl: true
+            });
+        }
+    }
     /**
      * Sets an API hook to refresh the contextData on changes.
      * @param activatedRoute The current activated route.
@@ -24755,39 +24771,22 @@ class ScopedContextRouteService {
         this.lastAddedTabs.forEach(t => this.tabsService.remove(t));
         this.lastAddedTabs = tabs;
         tabs.forEach(t => this.tabsService.add(t));
-        this.redirectToFirstTab();
+        this.redirectToFirstTabOnUpdateTabs();
     }
-    redirectToFirstTab(event) {
+    redirectToFirstTabOnUpdateTabs() {
         const currentQueryParams = this.router.routerState.snapshot.root.queryParams;
         const queryParamsString = new URLSearchParams(currentQueryParams).toString();
         const queryParamsSuffix = queryParamsString ? `?${queryParamsString}` : '';
-        if (event) {
-            if (this.needsRedirect(event)) {
-                const tab = this.tabsService.sortTabs(event.snapshot.data.tabs)?.[0];
-                if (!tab) {
-                    return;
-                }
-                const currentContextId = (this.router.url.match(this.ID_REGEX) || []).shift();
+        const currentContextId = (this.router.url.match(this.ID_REGEX) || []).shift();
+        if (this.needsRedirectLegacy()) {
+            this.tabsService.firstTab$
+                .pipe(filter((tab) => typeof tab?.path === 'string'))
+                .subscribe((tab) => {
                 const tabPathId = (tab.path.match(this.ID_REGEX) || []).shift();
                 if (currentContextId === tabPathId) {
-                    this.router.navigateByUrl(`${tab.path}${queryParamsSuffix}`, {
-                        replaceUrl: true
-                    });
+                    this.router.navigateByUrl(`${tab.path}${queryParamsSuffix}`, { replaceUrl: true });
                 }
-            }
-        }
-        else {
-            const currentContextId = (this.router.url.match(this.ID_REGEX) || []).shift();
-            if (this.needsRedirectLegacy()) {
-                this.tabsService.firstTab$
-                    .pipe(filter((tab) => typeof tab?.path === 'string'))
-                    .subscribe((tab) => {
-                    const tabPathId = (tab.path.match(this.ID_REGEX) || []).shift();
-                    if (currentContextId === tabPathId) {
-                        this.router.navigateByUrl(`${tab.path}${queryParamsSuffix}`, { replaceUrl: true });
-                    }
-                });
-            }
+            });
         }
     }
     needsRedirectLegacy() {