RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 19:47:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35828 from votdev/issue_46249_rm_tab

Browse Source 
mgr/dashboard: Remove useless tab in monitoring/alerts datatable details

Reviewed-by: Stephan Müller <smueller@suse.com>
Reviewed-by: Tiago Melo <tmelo@suse.com>
This commit is contained in:
Lenz Grimmer 2020-07-02 09:57:37 +02:00 committed by GitHub
commit ea7fd5fc35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.html
View 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>

4
src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/rules-list/rules-list.component.spec.ts
View 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]
});