From fb9f17da699e635625105c1ccbc49f63bf9edb1f Mon Sep 17 00:00:00 2001 From: Jake Bassett Date: Tue, 15 Feb 2022 09:23:49 -0800 Subject: [PATCH 1/2] feat: configure editable column types to show quick filters if supported --- .../src/pages/explorer/explorer-dashboard-builder.ts | 8 ++++++++ .../table/services/table-widget-columns.service.ts | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/projects/observability/src/pages/explorer/explorer-dashboard-builder.ts b/projects/observability/src/pages/explorer/explorer-dashboard-builder.ts index 14a72b512..eb84fe496 100644 --- a/projects/observability/src/pages/explorer/explorer-dashboard-builder.ts +++ b/projects/observability/src/pages/explorer/explorer-dashboard-builder.ts @@ -304,6 +304,7 @@ export class ExplorerDashboardBuilder { title: 'API Boundary Type', width: '1', visible: false, + filterable: true, value: { type: 'attribute-specification', attribute: 'apiBoundaryType' @@ -317,6 +318,7 @@ export class ExplorerDashboardBuilder { title: 'API Discovery State', width: '1', visible: false, + filterable: true, value: { type: 'attribute-specification', attribute: 'apiDiscoveryState' @@ -330,6 +332,7 @@ export class ExplorerDashboardBuilder { title: 'API ID', width: '1', visible: false, + filterable: true, value: { type: 'attribute-specification', attribute: 'apiId' @@ -343,6 +346,7 @@ export class ExplorerDashboardBuilder { title: 'Entry Span ID', width: '1', visible: false, + filterable: true, value: { type: 'attribute-specification', attribute: 'apiTraceId' @@ -356,6 +360,7 @@ export class ExplorerDashboardBuilder { title: 'Service ID', width: '1', visible: false, + filterable: true, value: { type: 'attribute-specification', attribute: 'serviceId' @@ -369,6 +374,7 @@ export class ExplorerDashboardBuilder { title: 'Trace ID', width: '1', visible: false, + filterable: true, value: { type: 'attribute-specification', attribute: 'traceId' @@ -382,6 +388,7 @@ export class ExplorerDashboardBuilder { title: 'Request URL', width: '1', visible: false, + filterable: true, value: { type: 'attribute-specification', attribute: 'requestUrl' @@ -504,6 +511,7 @@ export class ExplorerDashboardBuilder { { type: 'table-widget-column', visible: false, + filterable: true, value: { type: 'attribute-specification', attribute: 'traceId' diff --git a/projects/observability/src/shared/dashboard/widgets/table/services/table-widget-columns.service.ts b/projects/observability/src/shared/dashboard/widgets/table/services/table-widget-columns.service.ts index 1ee880d1d..cb04cb2df 100644 --- a/projects/observability/src/shared/dashboard/widgets/table/services/table-widget-columns.service.ts +++ b/projects/observability/src/shared/dashboard/widgets/table/services/table-widget-columns.service.ts @@ -55,13 +55,13 @@ export class TableWidgetColumnsService { width: '1', visible: false, editable: true, - filterable: this.isFilterable(attribute), + filterable: this.isFilterable(attribute.type), specification: new SpecificationBuilder().attributeSpecificationForKey(attribute.name) }; } - private isFilterable(attribute: AttributeMetadata): boolean { - return this.filterBuilderLookupService.isBuildableType(toFilterAttributeType(attribute.type)); + private isFilterable(type?: AttributeMetadataType): boolean { + return type === undefined ? false: this.filterBuilderLookupService.isBuildableType(toFilterAttributeType(type)); } private lookupDisplayType(type: AttributeMetadataType): string { From 7229028316f86f25a8909a4967d869509d75b545 Mon Sep 17 00:00:00 2001 From: Jake Bassett Date: Tue, 15 Feb 2022 10:50:33 -0800 Subject: [PATCH 2/2] style: prettier --- .../widgets/table/services/table-widget-columns.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/observability/src/shared/dashboard/widgets/table/services/table-widget-columns.service.ts b/projects/observability/src/shared/dashboard/widgets/table/services/table-widget-columns.service.ts index cb04cb2df..4d3f25730 100644 --- a/projects/observability/src/shared/dashboard/widgets/table/services/table-widget-columns.service.ts +++ b/projects/observability/src/shared/dashboard/widgets/table/services/table-widget-columns.service.ts @@ -61,7 +61,7 @@ export class TableWidgetColumnsService { } private isFilterable(type?: AttributeMetadataType): boolean { - return type === undefined ? false: this.filterBuilderLookupService.isBuildableType(toFilterAttributeType(type)); + return type === undefined ? false : this.filterBuilderLookupService.isBuildableType(toFilterAttributeType(type)); } private lookupDisplayType(type: AttributeMetadataType): string {