From 19a61ce6ebb8482404eab2beebdab44c582f4724 Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld Date: Mon, 31 May 2021 20:29:01 -0400 Subject: [PATCH 1/2] chore: allow ht link to support null from async pipe --- projects/components/src/link/link.component.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/components/src/link/link.component.ts b/projects/components/src/link/link.component.ts index fc97eacd0..14e435854 100644 --- a/projects/components/src/link/link.component.ts +++ b/projects/components/src/link/link.component.ts @@ -1,6 +1,7 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; import { NavigationExtras } from '@angular/router'; import { NavigationParams, NavigationPath, NavigationService } from '@hypertrace/common'; +import { isNil } from 'lodash-es'; @Component({ selector: 'ht-link', @@ -23,7 +24,7 @@ import { NavigationParams, NavigationPath, NavigationService } from '@hypertrace }) export class LinkComponent implements OnChanges { @Input() - public paramsOrUrl?: NavigationParams | string; + public paramsOrUrl?: NavigationParams | string | null; @Input() public disabled?: boolean; @@ -38,7 +39,10 @@ export class LinkComponent implements OnChanges { } private setNavigationParams(): void { - if (this.paramsOrUrl !== undefined) { + if (isNil(this.paramsOrUrl)) { + this.navigationPath = undefined; + this.navigationPath = undefined; + } else { const { path, extras } = this.navigationService.buildNavigationParams(this.paramsOrUrl); this.navigationPath = path; this.navigationOptions = extras; From 535c9c20cf5c4d22a7907ea2ed9929104d38dc0b Mon Sep 17 00:00:00 2001 From: Aaron Steinfeld <45047841+aaron-steinfeld@users.noreply.github.com> Date: Mon, 31 May 2021 17:48:08 -0700 Subject: [PATCH 2/2] Update projects/components/src/link/link.component.ts --- projects/components/src/link/link.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/components/src/link/link.component.ts b/projects/components/src/link/link.component.ts index 14e435854..9a58b868a 100644 --- a/projects/components/src/link/link.component.ts +++ b/projects/components/src/link/link.component.ts @@ -41,7 +41,7 @@ export class LinkComponent implements OnChanges { private setNavigationParams(): void { if (isNil(this.paramsOrUrl)) { this.navigationPath = undefined; - this.navigationPath = undefined; + this.navigationOptions = undefined; } else { const { path, extras } = this.navigationService.buildNavigationParams(this.paramsOrUrl); this.navigationPath = path;