From: Volker Theile <vtheile@suse.com>
Date: Mon, 30 Mar 2020 08:17:55 +0000 (+0200)
Subject: mgr/dashboard: 'Prometheus / All Alerts' page shows progress bar
X-Git-Tag: wip-pdonnell-testing-20200918.022351~1684^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1efe1a76da4671bd2df301a9e7080eda2bb01cd2;p=ceph-ci.git

mgr/dashboard: 'Prometheus / All Alerts' page shows progress bar

Fixes: https://tracker.ceph.com/issues/44805

Signed-off-by: Volker Theile <vtheile@suse.com>
---

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.html
index 1c2aeb9ea74..ef80573a2c8 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.html
@@ -1,8 +1,14 @@
 <cd-table [data]="data"
           [columns]="columns"
           (updateSelection)="selectionUpdated($event)"
-          [selectionType]="'single'"></cd-table>
-
-<cd-table-key-value [data]="selectedRule"
-                    [renderObjects]="true"
-                    [hideKeys]="hideKeys"></cd-table-key-value>
+          [selectionType]="'single'">
+  <tabset cdTableDetail
+          *ngIf="selectedRule">
+    <tab i18n-heading
+         heading="Details">
+      <cd-table-key-value [data]="selectedRule"
+                          [renderObjects]="true"
+                          [hideKeys]="hideKeys"></cd-table-key-value>
+    </tab>
+  </tabset>
+</cd-table>
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.spec.ts
index f09bd49d152..4e2495f9dd1 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.spec.ts
@@ -1,6 +1,8 @@
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
+import { TabsModule } from 'ngx-bootstrap/tabs';
+
 import { configureTestBed, i18nProviders } from '../../../../../testing/unit-test-helper';
 import { PrometheusService } from '../../../../shared/api/prometheus.service';
 import { SettingsService } from '../../../../shared/api/settings.service';
@@ -13,7 +15,7 @@ describe('RulesListComponent', () => {
 
   configureTestBed({
     declarations: [RulesListComponent],
-    imports: [HttpClientTestingModule, SharedModule],
+    imports: [HttpClientTestingModule, SharedModule, TabsModule.forRoot()],
     providers: [PrometheusService, SettingsService, i18nProviders]
   });