From affe5ea87dc55976fe0948a9644b31ce2c5b8144 Mon Sep 17 00:00:00 2001 From: Chahat Jain Date: Thu, 28 Jul 2022 11:01:39 +0530 Subject: [PATCH 1/3] feat(navigation): privacy policy in new tab --- .../navigation-list.component.test.ts | 14 +++++++++++++- .../navigation/navigation-list.component.ts | 19 +++++++++++++++++-- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/projects/components/src/navigation/navigation-list.component.test.ts b/projects/components/src/navigation/navigation-list.component.test.ts index ac60c0288..6cea7ea60 100644 --- a/projects/components/src/navigation/navigation-list.component.test.ts +++ b/projects/components/src/navigation/navigation-list.component.test.ts @@ -1,6 +1,13 @@ import { ActivatedRoute } from '@angular/router'; import { IconType } from '@hypertrace/assets-library'; -import { FeatureState, FeatureStateResolver, MemoizeModule, NavigationService } from '@hypertrace/common'; +import { + ExternalNavigationWindowHandling, + FeatureState, + FeatureStateResolver, + MemoizeModule, + NavigationParamsType, + NavigationService +} from '@hypertrace/common'; import { createHostFactory, mockProvider, SpectatorHost } from '@ngneat/spectator/jest'; import { MockComponent } from 'ng-mocks'; import { EMPTY, of } from 'rxjs'; @@ -191,5 +198,10 @@ describe('Navigation List Component', () => { ); expect(spectator.query('.nav-group-icon')).toExist(); expect(spectator.query('.nav-group-label')).toExist(); + expect(spectator.query(LinkComponent)?.paramsOrUrl).toMatchObject({ + navType: NavigationParamsType.External, + url: 'http://test', + windowHandling: ExternalNavigationWindowHandling.NewWindow + }); }); }); diff --git a/projects/components/src/navigation/navigation-list.component.ts b/projects/components/src/navigation/navigation-list.component.ts index 9ea5578f7..257b1600a 100644 --- a/projects/components/src/navigation/navigation-list.component.ts +++ b/projects/components/src/navigation/navigation-list.component.ts @@ -1,11 +1,18 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { IconType } from '@hypertrace/assets-library'; -import { NavigationService, TypedSimpleChanges } from '@hypertrace/common'; +import { + ExternalNavigationParams, + ExternalNavigationWindowHandling, + NavigationParamsType, + NavigationService, + TypedSimpleChanges +} from '@hypertrace/common'; import { Observable } from 'rxjs'; import { map, startWith } from 'rxjs/operators'; import { IconSize } from '../icon/icon-size'; import { NavigationListComponentService } from './navigation-list-component.service'; + import { FooterItemConfig, NavItemConfig, @@ -69,7 +76,7 @@ import {
- + @@ -111,6 +118,14 @@ export class NavigationListComponent implements OnChanges { private readonly navListComponentService: NavigationListComponentService ) {} + public getFooterItemNavigationParams(url: string): ExternalNavigationParams { + return { + navType: NavigationParamsType.External, + url: url, + windowHandling: ExternalNavigationWindowHandling.NewWindow + }; + } + public ngOnChanges(changes: TypedSimpleChanges): void { if (changes.navItems) { this.navItems = this.navListComponentService.resolveFeaturesAndUpdateVisibilityForNavItems(this.navItems); From 50e0acfa0ff1b81fd3f68d443a734d640ad6e56a Mon Sep 17 00:00:00 2001 From: Chahat Jain Date: Fri, 29 Jul 2022 15:00:46 +0530 Subject: [PATCH 2/3] feat(navigation): privacy policy in new tab --- .../src/navigation/navigation-list.component.test.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/components/src/navigation/navigation-list.component.test.ts b/projects/components/src/navigation/navigation-list.component.test.ts index 6cea7ea60..cb79ee4d0 100644 --- a/projects/components/src/navigation/navigation-list.component.test.ts +++ b/projects/components/src/navigation/navigation-list.component.test.ts @@ -85,6 +85,11 @@ describe('Navigation List Component', () => { ); const footerItemsCount = spectator.component.footerItems?.length; expect(spectator.queryAll('.footer-item').length).toBe(footerItemsCount); + expect(spectator.query(LinkComponent)?.paramsOrUrl).toMatchObject({ + navType: NavigationParamsType.External, + url: 'http://test', + windowHandling: ExternalNavigationWindowHandling.NewWindow + }); }); test('should update layout when collapsed input is updated', () => { @@ -198,10 +203,5 @@ describe('Navigation List Component', () => { ); expect(spectator.query('.nav-group-icon')).toExist(); expect(spectator.query('.nav-group-label')).toExist(); - expect(spectator.query(LinkComponent)?.paramsOrUrl).toMatchObject({ - navType: NavigationParamsType.External, - url: 'http://test', - windowHandling: ExternalNavigationWindowHandling.NewWindow - }); }); }); From efaaa4b1a8373a9467f1992a2835e5a3cc0d46dd Mon Sep 17 00:00:00 2001 From: Chahat Jain Date: Mon, 1 Aug 2022 10:47:58 +0530 Subject: [PATCH 3/3] fix: line removed --- projects/components/src/navigation/navigation-list.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/components/src/navigation/navigation-list.component.ts b/projects/components/src/navigation/navigation-list.component.ts index 066e9bb2c..8cdfd3c1c 100644 --- a/projects/components/src/navigation/navigation-list.component.ts +++ b/projects/components/src/navigation/navigation-list.component.ts @@ -12,7 +12,6 @@ import { Observable } from 'rxjs'; import { map, startWith } from 'rxjs/operators'; import { IconSize } from '../icon/icon-size'; import { NavigationListComponentService } from './navigation-list-component.service'; - import { FooterItemConfig, NavItemConfig,