X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-frontend%2Fsrc%2Fapp%2Fstats%2Fstats.component.ts;h=515d4ff3c7d93a1cfc0bfed84fc2e016e9d14b29;hb=6b79976523018d41b3643b15deeb6706ad4daa6e;hp=aa4cd4ab5faa9e9da2bd6df426da01b4eca715fa;hpb=847b44ffdd48cd1fa6b201887d3728df54305891;p=portal%2Fric-dashboard.git diff --git a/webapp-frontend/src/app/stats/stats.component.ts b/webapp-frontend/src/app/stats/stats.component.ts index aa4cd4ab..515d4ff3 100644 --- a/webapp-frontend/src/app/stats/stats.component.ts +++ b/webapp-frontend/src/app/stats/stats.component.ts @@ -22,6 +22,8 @@ import { BaseChartDirective } from 'ng2-charts/ng2-charts'; import { StatsService } from '../services/stats/stats.service'; import { HttpClient } from '@angular/common/http'; import { map } from 'rxjs/operators'; +import { DashboardSuccessTransport } from '../interfaces/dashboard.types'; +import { DomSanitizer, SafeUrl, SafeResourceUrl } from '@angular/platform-browser'; @Component({ selector: 'rd-stats', @@ -36,6 +38,7 @@ export class StatsComponent implements OnInit { checked = false; load; delay; + metricsUrlAc : SafeResourceUrl; public latencyChartColors: Array = [ { // blue @@ -304,7 +307,7 @@ export class StatsComponent implements OnInit { return value; } - constructor(private service: StatsService, private httpClient: HttpClient) { + constructor(private service: StatsService, private httpClient: HttpClient, private sanitize: DomSanitizer) { this.sliderLoadMax = Number(this.service.loadMax) || 0; this.sliderDelayMax = Number(this.service.delayMax) || 0; // console.log('this.sliderLoadMax: ' + this.sliderLoadMax); @@ -322,6 +325,9 @@ export class StatsComponent implements OnInit { this.fetchMetrics().subscribe(metricsv => { // console.log('metricsv.load: ' + metricsv['load']); }); + this.service.getAppMetricsUrl('AC').subscribe((res:DashboardSuccessTransport) => { + this.metricsUrlAc = this.sanitize.bypassSecurityTrustResourceUrl(res.data); + }); } startLoadTimer() { @@ -347,34 +353,25 @@ export class StatsComponent implements OnInit { fetchMetrics() { return this.httpClient.get(this.service.hostURL + this.service.metricsPath, this.service.httpOptions).pipe(map(res => { - // console.log(res); - // console.log(res['load']); return res; })); } fetchDelay() { return this.httpClient.get(this.service.hostURL + this.service.delayPath, this.service.httpOptions).pipe(map(res => { - // console.log(res); - // console.log(res['delay']); const delayv = res['delay']; - // console.log(delayv); this.delay = delayv; return this.delay; })); } saveDelay() { - // console.log(this.delay); this.service.putDelay(this.delay); } fetchLoad() { return this.httpClient.get(this.service.hostURL + this.service.loadPath, this.service.httpOptions).pipe(map(res => { - // console.log(res); - // console.log(res['load']); const loadv = res['load']; - // console.log(loadv); this.load = loadv; return this.load; })); @@ -382,7 +379,6 @@ export class StatsComponent implements OnInit { } saveLoad() { - // console.log(this.load); this.service.putLoad(this.load); }