Merge pull request #22060 from ricardoasmarques/wip-perf-counter-breadcrumb

Add performance counters breadcrumb

Reviewed-by: Tiago Melo <tmelo@suse.com>
This commit is contained in:
Lenz Grimmer 2018-05-23 14:51:42 +02:00 committed by GitHub
commit f895c9d109
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 3 deletions

View File

@ -50,11 +50,13 @@ export class MonitorComponent {
data.in_quorum.map((row) => {
row.cdOpenSessions = row.stats.num_sessions.map(i => i[1]);
row.cdLink = '/perf_counters/mon/' + row.name;
row.cdParams = {fromLink: '/monitor'};
return row;
});
data.out_quorum.map((row) => {
row.cdLink = '/perf_counters/mon/' + row.name;
row.cdParams = {fromLink: '/monitor'};
return row;
});

View File

@ -1,6 +1,19 @@
<nav aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item">Cluster</li>
<li class="breadcrumb-item">
<a [routerLink]="fromLink">
<span *ngIf="fromLink === '/monitor'">Monitors</span>
<span *ngIf="fromLink === '/hosts'">Hosts</span>
</a>
</li>
<li class="breadcrumb-item active"
i18n>Performance Counters</li>
</ol>
</nav>
<fieldset>
<legend i18n>Performance Counters</legend>
<h3>{{ serviceType }}.{{ serviceId }}</h3>
<legend>{{ serviceType }}.{{ serviceId }}</legend>
<cd-table-performance-counter [serviceType]="serviceType"
[serviceId]="serviceId">
</cd-table-performance-counter>

View File

@ -7,10 +7,19 @@ import { ActivatedRoute } from '@angular/router';
styleUrls: ['./performance-counter.component.scss']
})
export class PerformanceCounterComponent {
static defaultFromLink = '/hosts';
serviceId: string;
serviceType: string;
fromLink: string;
constructor(private route: ActivatedRoute) {
this.route.queryParams.subscribe(
(params: { fromLink: string }) => {
this.fromLink = params.fromLink || PerformanceCounterComponent.defaultFromLink;
}
);
this.route.params.subscribe(
(params: { type: string; id: string }) => {
this.serviceId = params.id;

View File

@ -111,7 +111,8 @@
<ng-template #routerLinkTpl
let-row="row"
let-value="value">
<a [routerLink]="[row.cdLink]">{{ value }}</a>
<a [routerLink]="[row.cdLink]"
[queryParams]="row.cdParams">{{ value }}</a>
</ng-template>
<ng-template #checkIconTpl