From f0d8338e982333357eaa69b8bf9f42a39b960d5a Mon Sep 17 00:00:00 2001 From: Ricardo Marques Date: Wed, 18 Apr 2018 10:48:19 +0100 Subject: [PATCH] mgr/dashboard: Add 'executing' cell template Signed-off-by: Ricardo Marques --- .../app/shared/datatable/table/table.component.html | 10 ++++++++++ .../src/app/shared/datatable/table/table.component.ts | 2 ++ .../frontend/src/app/shared/enum/cell-template.enum.ts | 3 ++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.html b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.html index d1686d558bd..51dcb0b7f7d 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.html @@ -119,3 +119,13 @@ let-value="value"> {{ value }} /s + + + + {{ value }} + ({{ row.cdExecuting }}... ) + diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts index 8d1470d3fa2..4e76195e0e1 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/datatable/table/table.component.ts @@ -38,6 +38,7 @@ export class TableComponent implements AfterContentChecked, OnInit, OnChanges, O @ViewChild('sparklineTpl') sparklineTpl: TemplateRef; @ViewChild('routerLinkTpl') routerLinkTpl: TemplateRef; @ViewChild('perSecondTpl') perSecondTpl: TemplateRef; + @ViewChild('executingTpl') executingTpl: TemplateRef; // This is the array with the items to be shown. @Input() data: any[]; @@ -181,6 +182,7 @@ export class TableComponent implements AfterContentChecked, OnInit, OnChanges, O this.cellTemplates.sparkline = this.sparklineTpl; this.cellTemplates.routerLink = this.routerLinkTpl; this.cellTemplates.perSecond = this.perSecondTpl; + this.cellTemplates.executing = this.executingTpl; } ngOnChanges(changes) { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/cell-template.enum.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/cell-template.enum.ts index 7c1c2162f58..c02e7ff7de9 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/cell-template.enum.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/enum/cell-template.enum.ts @@ -2,5 +2,6 @@ export enum CellTemplate { bold = 'bold', sparkline = 'sparkline', perSecond = 'perSecond', - routerLink = 'routerLink' + routerLink = 'routerLink', + executing = 'executing' } -- 2.39.5