fix: avoid extra emit on deep link (#1538)

* fix: avoid extra emit on deep link

* test: update test

Author: aaron-steinfeld

projects/common/src/time/time-range.service.test.ts

@@ -78,10 +78,7 @@ describe('Time range(TR) service', () => {
                 }
               } as unknown) as ActivatedRoute
             }),
-            getQueryParameter: jest
-              .fn()
-              .mockReturnValueOnce(firstArrivingTimeRange.toUrlString())
-              .mockReturnValue(secondArrivingTimeRange.toUrlString()),
+            getQueryParameter: jest.fn().mockReturnValue(secondArrivingTimeRange.toUrlString()),
             getCurrentActivatedRoute: () =>
               (({ snapshot: { queryParams: { time: 'test-value' } } } as unknown) as ActivatedRoute)
           })
@@ -92,8 +89,8 @@ describe('Time range(TR) service', () => {
 
       expect(() => spectator.service.getCurrentTimeRange()).toThrow();
 
-      expectObservable(recordedTimeRanges).toBe('-x----y', {
-        x: new FixedTimeRange(new Date(1573255100253), new Date(1573255111159)),
+      expectObservable(recordedTimeRanges).toBe('-x---y', {
+        x: firstArrivingTimeRange,
         y: secondArrivingTimeRange
       });
     });

projects/common/src/time/time-range.service.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@angular/core';
 import { ParamMap } from '@angular/router';
 import { isEmpty, isNil, omit } from 'lodash-es';
-import { concat, EMPTY, Observable, ReplaySubject } from 'rxjs';
-import { catchError, distinctUntilChanged, filter, map, switchMap, take } from 'rxjs/operators';
+import { EMPTY, Observable, ReplaySubject } from 'rxjs';
+import { catchError, distinctUntilChanged, filter, map, skip, switchMap, take } from 'rxjs/operators';
 import { NavigationService, QueryParamObject } from '../navigation/navigation.service';
 import { ReplayObservable } from '../utilities/rxjs/rxjs-utils';
 import { FixedTimeRange } from './fixed-time-range';
@@ -80,8 +80,9 @@ export class TimeRangeService {
   private getPageTimeRangeChanges(): Observable<TimeRange> {
     return this.navigationService.navigation$.pipe(
       map(activeRoute => activeRoute.snapshot.queryParamMap),
-      filter(queryParamMap => !isNil(queryParamMap.get(TimeRangeService.TIME_RANGE_QUERY_PARAM))),
       distinctUntilChanged((prevParamMap, currParamMap) => this.shouldNotUpdateTimeRange(prevParamMap, currParamMap)),
+      skip(1), // Skip the first nav, this is handled by initializeTimeRange, but we want to populate prev for distinctUntilChanged
+      filter(queryParamMap => queryParamMap.has(TimeRangeService.TIME_RANGE_QUERY_PARAM)),
       map(currQueryParamMap => {
         const timeRangeQueryParamString = currQueryParamMap.get(TimeRangeService.TIME_RANGE_QUERY_PARAM);
 
@@ -91,7 +92,9 @@ export class TimeRangeService {
   }
 
   private initializeTimeRange(): void {
-    concat(this.getInitialTimeRange(), this.getPageTimeRangeChanges()).subscribe(timeRange => {
+    this.getInitialTimeRange().subscribe(timeRangeFromInitialUrl => this.applyTimeRangeChange(timeRangeFromInitialUrl));
+
+    this.getPageTimeRangeChanges().subscribe(timeRange => {
       if (!this.timeRangeMatchesCurrentUrl(timeRange)) {
         this.setTimeRangeInUrl(timeRange);
       } else {