From 1efe1a76da4671bd2df301a9e7080eda2bb01cd2 Mon Sep 17 00:00:00 2001 From: Volker Theile Date: Mon, 30 Mar 2020 10:17:55 +0200 Subject: [PATCH] mgr/dashboard: 'Prometheus / All Alerts' page shows progress bar Fixes: https://tracker.ceph.com/issues/44805 Signed-off-by: Volker Theile --- .../rules-list/rules-list.component.html | 16 +++++++++++----- .../rules-list/rules-list.component.spec.ts | 4 +++- 2 files changed, 14 insertions(+), 6 deletions(-) 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 1c2aeb9ea740c..ef80573a2c892 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 @@ - - + [selectionType]="'single'"> + + + + + + 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 f09bd49d15264..4e2495f9dd1a7 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] }); -- 2.39.5