From d900239826667a56f9e78bd55f9b6e3982dd2ebc Mon Sep 17 00:00:00 2001 From: Jake Bassett Date: Tue, 16 Feb 2021 13:04:38 -0800 Subject: [PATCH 1/2] feat: add property to cartesian widget to allow disabling band fetches --- .../charts/cartesian-widget/cartesian-widget.model.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/projects/observability/src/shared/dashboard/widgets/charts/cartesian-widget/cartesian-widget.model.ts b/projects/observability/src/shared/dashboard/widgets/charts/cartesian-widget/cartesian-widget.model.ts index 40c8a4fc3..95d4eba8e 100644 --- a/projects/observability/src/shared/dashboard/widgets/charts/cartesian-widget/cartesian-widget.model.ts +++ b/projects/observability/src/shared/dashboard/widgets/charts/cartesian-widget/cartesian-widget.model.ts @@ -10,7 +10,7 @@ import { STRING_PROPERTY } from '@hypertrace/hyperdash'; import { ModelInject, MODEL_API } from '@hypertrace/hyperdash-angular'; -import { Observable } from 'rxjs'; +import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; import { Band, CartesianSeriesVisualizationType, Series } from '../../../../components/cartesian/chart'; import { LegendPosition } from '../../../../components/legend/legend.component'; @@ -48,6 +48,12 @@ export class CartesianWidgetModel { }) public bands: BandModel[] = []; + @ModelProperty({ + key: 'disable-bands', + type: BOOLEAN_PROPERTY.type + }) + public disableBands: boolean = false; + @ModelProperty({ key: 'color-palette', displayName: 'Color Palette', @@ -258,7 +264,7 @@ export class CartesianWidgetModel { bands: DecoratedBandDataFetcher[], interval: TimeDuration ): Observable[]> { - return forkJoinSafeEmpty(bands.map(fetcher => fetcher.getData(interval))); + return this.disableBands ? of([]) : forkJoinSafeEmpty(bands.map(fetcher => fetcher.getData(interval))); } private getDecoratedSeriesDataFetchers(): Observable[]> { From a4afeee81a2fc3e8eec1589d7916bc231247fa24 Mon Sep 17 00:00:00 2001 From: Jake Bassett Date: Tue, 16 Feb 2021 13:12:41 -0800 Subject: [PATCH 2/2] fix: rename to showBands --- .../charts/cartesian-widget/cartesian-widget.model.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/observability/src/shared/dashboard/widgets/charts/cartesian-widget/cartesian-widget.model.ts b/projects/observability/src/shared/dashboard/widgets/charts/cartesian-widget/cartesian-widget.model.ts index 95d4eba8e..995c45f73 100644 --- a/projects/observability/src/shared/dashboard/widgets/charts/cartesian-widget/cartesian-widget.model.ts +++ b/projects/observability/src/shared/dashboard/widgets/charts/cartesian-widget/cartesian-widget.model.ts @@ -49,10 +49,10 @@ export class CartesianWidgetModel { public bands: BandModel[] = []; @ModelProperty({ - key: 'disable-bands', + key: 'show-bands', type: BOOLEAN_PROPERTY.type }) - public disableBands: boolean = false; + public showBands: boolean = true; @ModelProperty({ key: 'color-palette', @@ -264,7 +264,7 @@ export class CartesianWidgetModel { bands: DecoratedBandDataFetcher[], interval: TimeDuration ): Observable[]> { - return this.disableBands ? of([]) : forkJoinSafeEmpty(bands.map(fetcher => fetcher.getData(interval))); + return this.showBands ? forkJoinSafeEmpty(bands.map(fetcher => fetcher.getData(interval))) : of([]); } private getDecoratedSeriesDataFetchers(): Observable[]> {