[DSC-1917]Port of [CST-16492] Changed navigation through item tab in order to remove query params

Author: atarix83

src/app/app.component.ts

@@ -134,7 +134,7 @@ export class AppComponent implements OnInit, AfterViewInit {
       ))
     ).subscribe(([currentUrl, event]: [string, RouterEvent]) => {
       if (event instanceof NavigationStart) {
-        if (!(currentUrl.startsWith(getEditItemPageRoute()) || currentUrl.startsWith(getWorkspaceItemModuleRoute()) || currentUrl.startsWith(getWorkflowItemModuleRoute()))) {
+        if (!(currentUrl.startsWith('/entities' || getEditItemPageRoute()) || currentUrl.startsWith(getWorkspaceItemModuleRoute()) || currentUrl.startsWith(getWorkflowItemModuleRoute()))) {
           distinctNext(this.isRouteLoading$, true);
         }
         // distinctNext(this.isRouteLoading$, true);

src/app/core/services/route.service.spec.ts

@@ -9,7 +9,6 @@ import { RouteService } from './route.service';
 import { RouterMock } from '../../shared/mocks/router.mock';
 import { TestScheduler } from 'rxjs/testing';
 import { AddUrlToHistoryAction } from '../history/history.actions';
-import { NativeWindowRefMock} from '../../shared/mocks/mock-native-window-ref';
 
 describe('RouteService', () => {
   let scheduler: TestScheduler;
@@ -49,19 +48,17 @@ describe('RouteService', () => {
         },
         { provide: Router, useValue: router },
         { provide: Store, useValue: store },
-        { provide: NativeWindowRefMock, useClass: NativeWindowRefMock }
       ]
     });
   }));
 
   beforeEach(() => {
-    service = new RouteService(TestBed.inject(ActivatedRoute), TestBed.inject(Router), TestBed.inject(Store), TestBed.inject(NativeWindowRefMock));
+    service = new RouteService(TestBed.inject(ActivatedRoute), TestBed.inject(Router), TestBed.inject(Store));
     serviceAsAny = service;
   });
 
   describe('hasQueryParam', () => {
     it('should return true when the parameter name exists', () => {
-      spyOnProperty(serviceAsAny._window.nativeWindow.location, 'href').and.returnValue('http://localhost?name=Test%20Name');
       service.hasQueryParam(paramName1).subscribe((status) => {
         expect(status).toBeTruthy();
       });
@@ -75,7 +72,6 @@ describe('RouteService', () => {
 
   describe('hasQueryParamWithValue', () => {
     it('should return true when the parameter name exists and contains the specified value', () => {
-      spyOnProperty(serviceAsAny._window.nativeWindow.location, 'href').and.returnValue('http://localhost?name=Test%20Name');
       service.hasQueryParamWithValue(paramName2, paramValue2a).subscribe((status) => {
         expect(status).toBeTruthy();
       });
@@ -94,7 +90,6 @@ describe('RouteService', () => {
 
   describe('getQueryParameterValues', () => {
     it('should return a list of values when the parameter exists', () => {
-      spyOnProperty(serviceAsAny._window.nativeWindow.location, 'href').and.returnValue('http://localhost?id=Test%20id&another=another%20id');
       service.getQueryParameterValues(paramName2).subscribe((params) => {
         expect(params).toEqual([paramValue2a, paramValue2b]);
       });
@@ -109,14 +104,12 @@ describe('RouteService', () => {
 
   describe('getQueryParameterValue', () => {
     it('should return a single value when the parameter exists', () => {
-      spyOnProperty(serviceAsAny._window.nativeWindow.location, 'href').and.returnValue('http://localhost?name=Test%20Name');
       service.getQueryParameterValue(paramName1).subscribe((params) => {
         expect(params).toEqual(paramValue1);
       });
     });
 
     it('should return only the first value when the parameter exists', () => {
-      spyOnProperty(serviceAsAny._window.nativeWindow.location, 'href').and.returnValue('http://localhost?id=Test%id');
       service.getQueryParameterValue(paramName2).subscribe((params) => {
         expect(params).toEqual(paramValue2a);
       });

src/app/core/services/route.service.ts

@@ -1,6 +1,6 @@
 import { distinctUntilChanged, filter, map, take } from 'rxjs/operators';
-import {Inject, Injectable} from '@angular/core';
-import {ActivatedRoute, NavigationEnd, ParamMap, Params, Router, RouterStateSnapshot,} from '@angular/router';
+import { Injectable } from '@angular/core';
+import { ActivatedRoute, NavigationEnd, Params, Router, RouterStateSnapshot, } from '@angular/router';
 
 import { combineLatest, Observable } from 'rxjs';
 import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
@@ -12,7 +12,6 @@ import { hasValue } from '../../shared/empty.util';
 import { historySelector } from '../history/selectors';
 import { AddUrlToHistoryAction } from '../history/history.actions';
 import { CoreState } from '../core-state.model';
-import {NativeWindowRef, NativeWindowService} from './window.service';
 
 /**
  * Selector to select all route parameters from the store
@@ -64,7 +63,7 @@ export function parameterSelector(key: string, paramsSelector: (state: CoreState
   providedIn: 'root'
 })
 export class RouteService {
-  constructor(private route: ActivatedRoute, private router: Router, private store: Store<CoreState>, @Inject(NativeWindowService) private _window: NativeWindowRef) {
+  constructor(private route: ActivatedRoute, private router: Router, private store: Store<CoreState>) {
     this.saveRouting();
   }
 
@@ -142,14 +141,9 @@ export class RouteService {
 
   public getQueryParamMap(): Observable<any> {
     return this.route.queryParamMap.pipe(
-      map((paramMap: ParamMap) => {
+      map((paramMap) => {
         const snapshot: RouterStateSnapshot = this.router.routerState.snapshot;
         // Due to an Angular bug, sometimes change of QueryParam is not detected so double checks with route snapshot
-        if (!(this._window.nativeWindow.location.href || '').includes('?')){
-          // Prevent sending outdated query params
-          const emptyParamMap: ParamMap = { keys: [], has: (name: string) => false, get: (name: string) => null, getAll: (name: string) => [] };
-          return emptyParamMap;
-        }
         if (!isEqual(paramMap, snapshot.root.queryParamMap)) {
           return snapshot.root.queryParamMap;
         } else {

src/app/cris-layout/cris-layout-loader/shared/cris-layout-tabs/cris-layout-tabs.component.ts

@@ -112,9 +112,13 @@ export abstract class CrisLayoutTabsComponent {
     this.activeTab$.next(tab);
     this.emitSelected(tab);
     if (this.tabs[0].shortname === tab.shortname) {
-      this.location.replaceState(itemPageRoute);
+      this.router.navigate([], { queryParams: {}, replaceUrl: true, skipLocationChange: true }).then(() => {
+        this.location.replaceState(itemPageRoute);
+      });
     } else {
-      this.location.replaceState(itemPageRoute + '/' + tab.shortname);
+      this.router.navigate([], { queryParams: {}, replaceUrl: true, skipLocationChange: true  }).then(() => {
+        this.location.replaceState(itemPageRoute + '/' + tab.shortname);
+      });
     }
   }