frontend: Fix router event handling in base class

Fix router event handling in DataJobsBaseGridComponent. Distinguish between Browser popped state and changed Team. Signed-off-by: Goran Kokinovski <[email protected]>
vmware · Jul 10, 2023 · e8ddd7b · e8ddd7b
1 parent 62e2da9
commit e8ddd7b
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/...gui/projects/data-pipelines/src/lib/components/base-grid/data-jobs-base-grid.component.ts b/...gui/projects/data-pipelines/src/lib/components/base-grid/data-jobs-base-grid.component.ts
@@ -318,6 +318,7 @@ export abstract class DataJobsBaseGridComponent
      */
     onModelInit(): void {
         let initializationFinished = false;
+        let previousState: RouteState;
 
         this.subscriptions.push(
             this.routerService
@@ -332,21 +333,28 @@ export abstract class DataJobsBaseGridComponent
                 )
                 .subscribe((routerState) => {
                     if (initializationFinished) {
-                        if (!this._areQueryParamsPristine(routerState.state)) {
+                        // check if route state comes from Browser popped state (Browser stack)
+                        if (
+                            (!previousState || previousState.absoluteRoutePath === routerState.state.absoluteRoutePath) &&
+                            !this._areQueryParamsPristine(routerState.state)
+                        ) {
                             this._extractQueryParams(routerState.state);
                             this._updateUrlStateManager();
 
-                            // set query params mutation to false, because it's popped state from Browser stack
+                            // set query params mutation to false, because it's Browser popped state
                             // no need to update the Browser URL, just URLStateManager need to be updated
                             this.urlStateManager.isQueryParamsStateMutated = false;
                         } else {
                             this._updateUrlStateManager(routerState.state);
                         }
 
+                        previousState = routerState.state;
+
                         return;
                     }
 
                     initializationFinished = true;
+                    previousState = routerState.state;
 
                     this._initUrlStateManager(routerState.state);
                     this._extractQueryParams(routerState.state);