Page level time range

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

@@ -30,22 +30,22 @@ export class PageTimeRangePreferenceService {
     this.pageTimeRangeStringDictionary$ = this.buildPageTimeRangeObservable();
   }
 
-  public getTimeRangePreferenceForPage(rootLevelPath: string): Observable<TimeRangeCallback> {
+  public getTimeRangePreferenceForPage(rootLevelPath: string): Observable<TimeRangeResolver> {
     return combineLatest([
       this.pageTimeRangeStringDictionary$,
       this.featureStateResolver.getFeatureState(ApplicationFeature.PageTimeRange)
     ]).pipe(
       map(([pageTimeRangeStringDictionary, featureState]) => {
         if (featureState === FeatureState.Enabled) {
           if (isNil(pageTimeRangeStringDictionary[rootLevelPath])) {
-            return this.getDefaultTimeRangeForCurrentRoute;
+            return () => this.getDefaultTimeRangeForCurrentRoute();
           }
 
           return () => this.timeRangeService.timeRangeFromUrlString(pageTimeRangeStringDictionary[rootLevelPath]);
         }
 
         // When FF is disabled
-        return this.getGlobalDefaultTimeRange;
+        return () => this.getGlobalDefaultTimeRange();
       })
     );
   }
@@ -81,15 +81,14 @@ export class PageTimeRangePreferenceService {
   public getDefaultTimeRangeForCurrentRoute = (): TimeRange => {
     const currentRoute: ActivatedRoute = this.navigationService.getCurrentActivatedRoute();
     // Right side for when FF is enabled but 'defaultTimeRange' is not set on AR data
+
     return currentRoute.snapshot.data?.defaultTimeRange ?? this.getGlobalDefaultTimeRange();
   };
 
-  public getGlobalDefaultTimeRange = (): TimeRange => {
-    return new RelativeTimeRange(new TimeDuration(1, TimeUnit.Hour));
-  };
+  public getGlobalDefaultTimeRange = (): TimeRange => new RelativeTimeRange(new TimeDuration(1, TimeUnit.Hour));
 }
 
 interface PageTimeRangeStringDictionary {
   [path: string]: string;
 }
-export type TimeRangeCallback = () => TimeRange;
+export type TimeRangeResolver = () => TimeRange;

projects/components/src/navigation/navigation-list-component.service.ts

@@ -47,9 +47,9 @@ export class NavigationListComponentService {
     return navItems.map(navItem => {
       if (navItem.type === NavItemType.Link) {
         return this.pageTimeRangePreferenceService.getTimeRangePreferenceForPage(navItem.matchPaths[0]).pipe(
-          map(resolveTimeRange => ({
+          map(timeRangeResolver => ({
             ...navItem,
-            resolveTimeRange: resolveTimeRange,
+            timeRangeResolver: timeRangeResolver,
             pageLevelTimeRangeIsEnabled: pageLevelTimeRangeFeatureState === FeatureState.Enabled
           }))
         );

projects/components/src/navigation/navigation-list.component.ts

@@ -95,9 +95,10 @@ export class NavigationListComponent implements OnChanges {
         startWith(this.navigationService.getCurrentActivatedRoute()),
         map(() => {
           const activeItem = this.findActiveItem(this.navItems);
-          if (!this.timeRangeService.isInitialized() && activeItem?.resolveTimeRange) {
-            this.timeRangeService.setDefaultTimeRange(activeItem.resolveTimeRange());
+          if (!this.timeRangeService.isInitialized() && activeItem?.timeRangeResolver) {
+            this.timeRangeService.setDefaultTimeRange(activeItem.timeRangeResolver());
           }
+
           return activeItem;
         })
       );

projects/components/src/navigation/navigation.config.ts

@@ -1,4 +1,4 @@
-import { Color, FeatureState, TimeRangeCallback } from '@hypertrace/common';
+import { Color, FeatureState, TimeRangeResolver } from '@hypertrace/common';
 import { Observable } from 'rxjs';
 import { IconSize } from '../icon/icon-size';
 
@@ -16,7 +16,7 @@ export interface NavItemLinkConfig {
   trailingIcon?: string;
   trailingIconTooltip?: string;
   trailingIconColor?: Color;
-  resolveTimeRange?: TimeRangeCallback;
+  timeRangeResolver?: TimeRangeResolver;
   pageLevelTimeRangeIsEnabled?: boolean;
   featureState$?: Observable<FeatureState>;
 }

projects/components/src/page-time-range/page-time-range.component.ts

@@ -1,5 +1,5 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { UrlSegment } from '@angular/router';
+import { ActivatedRoute, UrlSegment } from '@angular/router';
 import { LoggerService, NavigationService, PageTimeRangePreferenceService, TimeRange } from '@hypertrace/common';
 import { isNil } from 'lodash-es';
 
@@ -19,14 +19,12 @@ export class PageTimeRangeComponent {
     const activatedRoute = this.navigationService.getCurrentActivatedRoute();
     const urlSegments: UrlSegment[] = activatedRoute.pathFromRoot.flatMap(activeRoute => activeRoute.snapshot.url);
 
-    if (this.shouldSavePageTimeRange()) {
+    if (this.shouldSavePageTimeRange(activatedRoute)) {
       this.savePageTimeRange(selectedTimeRange, urlSegments[0]);
     }
   }
 
-  public shouldSavePageTimeRange(): boolean {
-    const currentRoute = this.navigationService.getCurrentActivatedRoute();
-
+  public shouldSavePageTimeRange(currentRoute: ActivatedRoute): boolean {
     return !isNil(currentRoute.snapshot.data?.defaultTimeRange);
   }