]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard: Remove useless tab in monitoring/alerts datatable details 35828/head
authorVolker Theile <vtheile@suse.com>
Mon, 29 Jun 2020 08:42:56 +0000 (10:42 +0200)
committerVolker Theile <vtheile@suse.com>
Mon, 29 Jun 2020 09:05:06 +0000 (11:05 +0200)
Fixes: https://tracker.ceph.com/issues/46249
Signed-off-by: Volker Theile <vtheile@suse.com>
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.html
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.spec.ts

index 8a23ed67ebfb99824d92272d5d0f36adbfde824d..ba9e7e63cfbd119a3c547e139f4a684b5e06be54 100644 (file)
@@ -3,22 +3,10 @@
           [hasDetails]="true"
           (updateSelection)="setExpandedRow($event)"
           [selectionType]="'single'">
-  <ng-container cdTableDetail
-                *ngIf="expandedRow">
-    <ul ngbNav
-        #nav="ngbNav"
-        class="nav-tabs">
-      <li ngbNavItem>
-        <a ngbNavLink
-           i18n>Details</a>
-        <ng-template ngbNavContent>
-          <cd-table-key-value [data]="expandedRow"
-                              [renderObjects]="true"
-                              [hideKeys]="hideKeys"></cd-table-key-value>
-        </ng-template>
-      </li>
-    </ul>
-
-    <div [ngbNavOutlet]="nav"></div>
-  </ng-container>
+  <cd-table-key-value cdTableDetail
+                      *ngIf="expandedRow"
+                      [data]="expandedRow"
+                      [renderObjects]="true"
+                      [hideKeys]="hideKeys">
+  </cd-table-key-value>
 </cd-table>
index 74073fcf0810cabc5e05ba4b7b7ae388e5d72b7d..7959717d80c859b09108839bb69e5c3966e14450 100644 (file)
@@ -2,8 +2,6 @@ import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 
-import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
-
 import { configureTestBed, i18nProviders } from '../../../../../testing/unit-test-helper';
 import { PrometheusService } from '../../../../shared/api/prometheus.service';
 import { SettingsService } from '../../../../shared/api/settings.service';
@@ -16,7 +14,7 @@ describe('RulesListComponent', () => {
 
   configureTestBed({
     declarations: [RulesListComponent],
-    imports: [HttpClientTestingModule, SharedModule, NgbNavModule, BrowserAnimationsModule],
+    imports: [HttpClientTestingModule, SharedModule, BrowserAnimationsModule],
     providers: [PrometheusService, SettingsService, i18nProviders]
   });