X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fstats%2Fstats.component.ts;h=b966230400910aae90532794f3f92eb1138c872b;hb=44203c43bb16a87eb54cc97431a026e111842c97;hp=aa4cd4ab5faa9e9da2bd6df426da01b4eca715fa;hpb=226fd436a085f717d4cbf81bf1719bdaf1468414;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..b9662304 100644
--- a/webapp-frontend/src/app/stats/stats.component.ts
+++ b/webapp-frontend/src/app/stats/stats.component.ts
@@ -2,14 +2,14 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * Copyright (C) 2019 AT&T Intellectual Property
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -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,8 @@ export class StatsComponent implements OnInit {
     checked = false;
     load;
     delay;
+    metricsUrlAc : SafeResourceUrl;
+    metricsUrlMc : SafeResourceUrl;
 
     public latencyChartColors: Array<any> = [
         { // blue
@@ -304,7 +308,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 +326,12 @@ 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);
+        });
+        this.service.getAppMetricsUrl('MC').subscribe((res:DashboardSuccessTransport) => {
+            this.metricsUrlMc = this.sanitize.bypassSecurityTrustResourceUrl(res.data);
+        });
     }
 
     startLoadTimer() {
@@ -347,34 +357,25 @@ export class StatsComponent implements OnInit {
 
     fetchMetrics() {
         return this.httpClient.get<any[]>(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<any[]>(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<any[]>(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 +383,6 @@ export class StatsComponent implements OnInit {
     }
 
     saveLoad() {
-        // console.log(this.load);
         this.service.putLoad(this.load);
     }