Skip to content

fix: initial checkbox filtering when using view toggle model #547

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 2 commits into from
Jan 30, 2021
Merged

fix: initial checkbox filtering when using view toggle model #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ca1cab
fix: initial checkbox filtering when using view toggle model
jake-bassett Jan 29, 2021
7248122
fix: aaron provided workaround
jake-bassett Jan 29, 2021
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
18 changes: 9 additions & 9 deletions ...distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,29 +142,29 @@ export class TableWidgetRendererComponent
])
);

this.filterItems = this.model.getFilterOptions().map(filterOption => ({
label: capitalize(filterOption.label),
value: filterOption
}));

this.viewItems = this.model.getViewOptions().map(viewOption => ({
label: capitalize(viewOption),
value: viewOption
}));

this.maybeEmitInitialCheckboxFilterChange();
}

public getChildModel = (row: TableRow): object | undefined => this.model.getChildModel(row);

protected fetchData(): Observable<TableDataSource<TableRow> | undefined> {
return this.model.getData().pipe(
startWith(undefined),
tap(() => this.fetchFilterValues())
tap(() => this.fetchAndPopulateControlFilters())
);
}

protected fetchFilterValues(): void {
protected fetchAndPopulateControlFilters(): void {
this.maybeEmitInitialCheckboxFilterChange();

this.filterItems = this.model.getFilterOptions().map(filterOption => ({
label: capitalize(filterOption.label),
value: filterOption
}));

this.selectFilterItems$ = forkJoinSafeEmpty(
this.model.getSelectFilterOptions().map(selectFilterModel =>
// Fetch the values for the selectFilter dropdown
Expand Down
16 changes: 14 additions & 2 deletions .../distributed-tracing/src/shared/dashboard/widgets/table/table-widget-view-toggle.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { TableDataSource, TableRow } from '@hypertrace/components';
import { ArrayPropertyTypeInstance } from '@hypertrace/dashboards';
import { ARRAY_PROPERTY, Model, ModelApi, ModelProperty, ModelPropertyType } from '@hypertrace/hyperdash';
import { ARRAY_PROPERTY, Model, ModelApi, ModelOnInit, ModelProperty, ModelPropertyType } from '@hypertrace/hyperdash';
import { ModelInject, MODEL_API } from '@hypertrace/hyperdash-angular';
import { NEVER, Observable } from 'rxjs';
import { TableWidgetRowSelectionModel } from './selections/table-widget-row-selection.model';
Expand All @@ -14,7 +14,7 @@ import { TableWidgetModel } from './table-widget.model';
@Model({
type: 'table-widget-view-toggle'
})
export class TableWidgetViewToggleModel extends TableWidgetBaseModel {
export class TableWidgetViewToggleModel extends TableWidgetBaseModel implements ModelOnInit {
@ModelProperty({
key: 'views',
// tslint:disable-next-line: no-object-literal-type-assertion
Expand All @@ -32,8 +32,20 @@ export class TableWidgetViewToggleModel extends TableWidgetBaseModel {
protected readonly api!: ModelApi;

private delegateModel?: TableWidgetModel;
private currentView?: string;

public modelOnInit(): void {
if (this.views.length > 0) {
this.setView(this.views[0].label);
}
}

public setView(view: string): void {
if (this.currentView === view) {
return;
}
this.currentView = view;

if (this.delegateModel) {
this.api.destroyChild(this.delegateModel);
}
Expand Down