From dcdf9c5b56eeacc72893a7370dfc08d10fb56f22 Mon Sep 17 00:00:00 2001
From: Christian <35982795+Christian862@users.noreply.github.com>
Date: Mon, 4 Apr 2022 17:33:04 -0300
Subject: [PATCH 1/2] fix: environment selector resetting on lef navigation

---
 .../components/src/navigation/nav-item/nav-item.component.ts   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/projects/components/src/navigation/nav-item/nav-item.component.ts b/projects/components/src/navigation/nav-item/nav-item.component.ts
index 92df8587b..1a1ccb8f9 100644
--- a/projects/components/src/navigation/nav-item/nav-item.component.ts
+++ b/projects/components/src/navigation/nav-item/nav-item.component.ts
@@ -45,6 +45,8 @@ import { NavItemLinkConfig, NavViewStyle } from '../navigation.config';
   `
 })
 export class NavItemComponent {
+  private static readonly QUERY_PARAM_HANDLING_STRATEGY = 'merge';
+
   @Input()
   public config!: NavItemLinkConfig;
 
@@ -68,6 +70,7 @@ export class NavItemComponent {
     if (this.config.pageLevelTimeRangeIsEnabled && this.config.timeRangeResolver) {
       return {
         ...navParams,
+        queryParamsHandling: NavItemComponent.QUERY_PARAM_HANDLING_STRATEGY,
         queryParams: this.timeRangeService.toQueryParams(this.config.timeRangeResolver(), true)
       };
     }

From bf94ac619647538ce80eb0d5aade86237a3ce4c4 Mon Sep 17 00:00:00 2001
From: Christian <35982795+Christian862@users.noreply.github.com>
Date: Tue, 5 Apr 2022 14:26:51 -0300
Subject: [PATCH 2/2] fix: revert previous solution, persist global query
 params for buildNavParams

---
 projects/common/src/navigation/navigation.service.ts           | 2 +-
 .../components/src/navigation/nav-item/nav-item.component.ts   | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/projects/common/src/navigation/navigation.service.ts b/projects/common/src/navigation/navigation.service.ts
index 11a4cf84e..a8f1f5508 100644
--- a/projects/common/src/navigation/navigation.service.ts
+++ b/projects/common/src/navigation/navigation.service.ts
@@ -128,7 +128,7 @@ export class NavigationService {
     return {
       path: params.path,
       extras: {
-        queryParams: params?.queryParams ?? this.buildQueryParam(),
+        queryParams: { ...this.buildQueryParam(), ...(params?.queryParams ?? {}) },
         queryParamsHandling: params?.queryParamsHandling,
         replaceUrl: params?.replaceCurrentHistory,
         relativeTo: params?.relativeTo
diff --git a/projects/components/src/navigation/nav-item/nav-item.component.ts b/projects/components/src/navigation/nav-item/nav-item.component.ts
index 1a1ccb8f9..92df8587b 100644
--- a/projects/components/src/navigation/nav-item/nav-item.component.ts
+++ b/projects/components/src/navigation/nav-item/nav-item.component.ts
@@ -45,8 +45,6 @@ import { NavItemLinkConfig, NavViewStyle } from '../navigation.config';
   `
 })
 export class NavItemComponent {
-  private static readonly QUERY_PARAM_HANDLING_STRATEGY = 'merge';
-
   @Input()
   public config!: NavItemLinkConfig;
 
@@ -70,7 +68,6 @@ export class NavItemComponent {
     if (this.config.pageLevelTimeRangeIsEnabled && this.config.timeRangeResolver) {
       return {
         ...navParams,
-        queryParamsHandling: NavItemComponent.QUERY_PARAM_HANDLING_STRATEGY,
         queryParams: this.timeRangeService.toQueryParams(this.config.timeRangeResolver(), true)
       };
     }