From: Ricardo Marques <rimarques@suse.com>
Date: Wed, 18 Apr 2018 09:48:19 +0000 (+0100)
Subject: mgr/dashboard: Add 'executing' cell template
X-Git-Tag: v13.1.0~208^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f0d8338e982333357eaa69b8bf9f42a39b960d5a;p=ceph.git

mgr/dashboard: Add 'executing' cell template

Signed-off-by: Ricardo Marques <rimarques@suse.com>
---

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 d1686d558bd9..51dcb0b7f7df 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
 </ng-template>
+
+<ng-template #executingTpl
+             let-row="row"
+             let-value="value">
+  <i class="fa fa-spinner fa-spin fa-fw"
+     *ngIf="row.cdExecuting"></i>
+  {{ value }}
+  <span *ngIf="row.cdExecuting"
+        class="text-muted italic">({{ row.cdExecuting }}... )</span>
+</ng-template>
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 8d1470d3fa2a..4e76195e0e17 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<any>;
   @ViewChild('routerLinkTpl') routerLinkTpl: TemplateRef<any>;
   @ViewChild('perSecondTpl') perSecondTpl: TemplateRef<any>;
+  @ViewChild('executingTpl') executingTpl: TemplateRef<any>;
 
   // 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 7c1c2162f58d..c02e7ff7de92 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'
 }