Skip to content

refactor: push variables down to app-aware-dash #934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2021
Merged

refactor: push variables down to app-aware-dash #934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions ...d-tracing/src/shared/dashboard/dashboard-wrapper/application-aware-dashboard.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core';
import { TimeRangeService } from '@hypertrace/common';
import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, OnDestroy, Output } from '@angular/core';
import { Dictionary, TimeRangeService } from '@hypertrace/common';
import { Dashboard, ModelJson } from '@hypertrace/hyperdash';
import { TypedSimpleChanges } from '@hypertrace/hyperdash-angular/util/angular-change-object';
import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import { GraphQlFilterDataSourceModel } from '../data/graphql/filter/graphql-filter-data-source.model';
Expand Down Expand Up @@ -28,7 +29,7 @@ import { GraphQlFilterDataSourceModel } from '../data/graphql/filter/graphql-fil
</div>
`
})
export class ApplicationAwareDashboardComponent implements OnDestroy {
export class ApplicationAwareDashboardComponent implements OnDestroy, OnChanges {
@Input()
public json?: ModelJson;

Expand All @@ -38,6 +39,9 @@ export class ApplicationAwareDashboardComponent implements OnDestroy {
@Input()
public padding?: number;

@Input()
public variables?: Dictionary<unknown>;

@Output()
public readonly dashboardReady: EventEmitter<Dashboard> = new EventEmitter();

Expand All @@ -50,11 +54,11 @@ export class ApplicationAwareDashboardComponent implements OnDestroy {

public constructor(private readonly timeRangeService: TimeRangeService) {}

/* Dashboards */
public onDashboardReady(dashboard: Dashboard): void {
this.destroyDashboard$.next();

dashboard.createAndSetRootDataFromModelClass(GraphQlFilterDataSourceModel);
this.applyVariablesToDashboard(dashboard, this.variables ?? undefined);
this.dashboard = dashboard;
this.widgetSelection = dashboard.root;

Expand All @@ -71,11 +75,24 @@ export class ApplicationAwareDashboardComponent implements OnDestroy {
this.destroyDashboard$.complete();
}

public ngOnChanges(changes: TypedSimpleChanges<this>): void {
if (changes.variables && this.dashboard) {
this.applyVariablesToDashboard(this.dashboard, this.variables ?? undefined);
}
}

public onWidgetSelectionChange(newSelection: object): void {
this.widgetSelection = newSelection;
}

public onDashboardUpdated(): void {
this.jsonChange.emit(this.dashboard!.serialize() as ModelJson);
}

private applyVariablesToDashboard(dashboard: Dashboard, variables: Dictionary<unknown> = {}): void {
for (const key of Object.keys(variables)) {
dashboard.setVariable(key, variables[key]);
}
dashboard.refresh();
}
}
8 changes: 1 addition & 7 deletions ...stributed-tracing/src/shared/dashboard/dashboard-wrapper/navigable-dashboard.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import { GraphQlFilterDataSourceModel } from '../data/graphql/filter/graphql-fil
class="dashboard"
[json]="dashboardJson"
[padding]="this.padding"
[variables]="this.variables"
(dashboardReady)="this.onDashboardReady($event)"
>
</ht-application-aware-dashboard>
Expand Down Expand Up @@ -94,7 +95,6 @@ export class NavigableDashboardComponent implements OnChanges {

public onDashboardReady(dashboard: Dashboard): void {
this.dashboard = dashboard;
this.applyVariablesToDashboard(this.dashboard, this.variables);
this.applyFiltersToDashboard(dashboard, this.explicitFilters);
this.dashboardReady.emit(dashboard);
}
Expand All @@ -106,12 +106,6 @@ export class NavigableDashboardComponent implements OnChanges {
}
}

public applyVariablesToDashboard(dashboard: Dashboard, variables: Dictionary<unknown> = {}): void {
for (const key of Object.keys(variables)) {
dashboard.setVariable(key, variables[key]);
}
}

public applyFiltersToDashboard(dashboard: Dashboard, explicitFilters: Filter[]): void {
const rootDataSource = dashboard.getRootDataSource<GraphQlFilterDataSourceModel>();
rootDataSource
Expand Down