From 27c5a6b074b428fdb6fb0910886481f4ec41baa6 Mon Sep 17 00:00:00 2001 From: Jake Bassett Date: Wed, 24 Mar 2021 10:29:35 -0700 Subject: [PATCH 1/2] feat: add spacing between title and table when title is set --- .../dashboard/widgets/table/table-widget-base.model.ts | 8 -------- .../widgets/table/table-widget-renderer.component.scss | 4 ++++ .../widgets/table/table-widget-renderer.component.ts | 3 ++- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-base.model.ts b/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-base.model.ts index ac304ece7..2589fc049 100644 --- a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-base.model.ts +++ b/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-base.model.ts @@ -23,14 +23,6 @@ import { TableWidgetControlCheckboxOptionModel } from './table-widget-control-ch import { TableWidgetControlSelectOptionModel } from './table-widget-control-select-option.model'; export abstract class TableWidgetBaseModel extends BaseModel { - @ModelProperty({ - key: 'title', - displayName: 'Title', - type: STRING_PROPERTY.type - }) - // @deprecated - public title?: string; - @ModelProperty({ // tslint:disable-next-line: no-object-literal-type-assertion type: { diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.scss b/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.scss index 59a6119c2..5a06a0907 100644 --- a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.scss +++ b/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.scss @@ -2,6 +2,10 @@ .table-content-container { @include flex-layout(column); + + &.titled { + padding-top: 12px; + } } .table { diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.ts b/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.ts index 07b7e40db..70f192d6d 100644 --- a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.ts +++ b/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.ts @@ -47,11 +47,12 @@ import { TableWidgetModel } from './table-widget.model'; changeDetection: ChangeDetectionStrategy.OnPush, template: ` -
+
Date: Wed, 24 Mar 2021 15:28:19 -0700 Subject: [PATCH 2/2] fix: removed margin prop from table header --- .../dashboards/src/widgets/header/widget-header.model.ts | 6 ------ .../widgets/table/table-widget-renderer.component.ts | 1 - .../backend-detail/overview/backend-overview.component.ts | 3 +-- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/projects/dashboards/src/widgets/header/widget-header.model.ts b/projects/dashboards/src/widgets/header/widget-header.model.ts index 6f57cf598..53c18c83a 100644 --- a/projects/dashboards/src/widgets/header/widget-header.model.ts +++ b/projects/dashboards/src/widgets/header/widget-header.model.ts @@ -49,10 +49,4 @@ export class WidgetHeaderModel { } as ModelModelPropertyTypeInstance }) public link?: LinkWidgetModel; - - @ModelProperty({ - key: 'top-margin', - type: BOOLEAN_PROPERTY.type - }) - public topMargin?: boolean = false; } diff --git a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.ts b/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.ts index 70f192d6d..481932261 100644 --- a/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.ts +++ b/projects/distributed-tracing/src/shared/dashboard/widgets/table/table-widget-renderer.component.ts @@ -69,7 +69,6 @@ import { TableWidgetModel } from './table-widget.model';