diff options
Diffstat (limited to 'usecaseui-portal/src/app/views')
3 files changed, 28 insertions, 30 deletions
diff --git a/usecaseui-portal/src/app/views/services/sotn-management/manage-service/manage-service.component.ts b/usecaseui-portal/src/app/views/services/sotn-management/manage-service/manage-service.component.ts index 16aee4e7..fa11985c 100644 --- a/usecaseui-portal/src/app/views/services/sotn-management/manage-service/manage-service.component.ts +++ b/usecaseui-portal/src/app/views/services/sotn-management/manage-service/manage-service.component.ts @@ -1,6 +1,6 @@ -import { Component, OnInit, SimpleChanges } from '@angular/core'; -import { HttpClient, HttpHeaders, HttpParams, HttpResponse } from '@angular/common/http'; -import { baseUrl } from '../../../../datainterface'; +import { Component, OnInit } from '@angular/core'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; +import { environment } from '@src/environments/environment'; @Component({ selector: 'app-manage-service', templateUrl: './manage-service.component.html', @@ -25,7 +25,7 @@ export class ManageServiceComponent implements OnInit { uniInfo = []; mapped: any; myKeys = [] as Array<any>; - baseUrl = baseUrl.baseUrl + baseUrl = environment.backendUrl; constructor(private http: HttpClient) { } ngOnInit() { @@ -58,10 +58,10 @@ export class ManageServiceComponent implements OnInit { this.selectedServiceInstance=""; let url = this.baseUrl + "/uui-lcm/Sotnservices/ServiceInstances/"+subscriptionType; this.http.get<any>(url,httpOptions).subscribe((data) => { - this.serviceInstanceList = data.serviceInstanceList; + this.serviceInstanceList = data.serviceInstanceList; }, (err) => { console.log(err); - }); + }); } deleteSelectedService() { @@ -81,8 +81,8 @@ export class ManageServiceComponent implements OnInit { } - - getSubscribedSites() { + + getSubscribedSites() { console.log("on change"); let httpOptions = { headers: new HttpHeaders({ diff --git a/usecaseui-portal/src/app/views/services/sotn-management/monitor-service/monitor-service.component.ts b/usecaseui-portal/src/app/views/services/sotn-management/monitor-service/monitor-service.component.ts index 6ad98216..95254886 100644 --- a/usecaseui-portal/src/app/views/services/sotn-management/monitor-service/monitor-service.component.ts +++ b/usecaseui-portal/src/app/views/services/sotn-management/monitor-service/monitor-service.component.ts @@ -1,9 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { Network, Node, Edge } from 'vis'; import { HttpClient, HttpHeaders } from '@angular/common/http'; -import { Observable } from 'rxjs/Observable'; -import { baseUrl } from '../../../../datainterface'; -import { getLocaleDateFormat } from '@angular/common'; +import { environment } from '@src/environments/environment'; @Component({ selector: 'app-monitor-service', templateUrl: './monitor-service.component.html', @@ -17,7 +15,7 @@ export class MonitorServiceComponent implements OnInit { serviceInstanceList = [] as Array<any>; selectedTopology:string = 'i18nTextDefine_serviceTopology'; - baseUrl = baseUrl.baseUrl + baseUrl = environment.backendUrl; title = 'Network'; public nodes: Node; @@ -41,10 +39,10 @@ export class MonitorServiceComponent implements OnInit { topologyType:"i18nTextDefine_resourceTopology", } ]; - - + + networkOptions = { - layout: { + layout: { randomSeed: 15 }, nodes: { @@ -115,10 +113,10 @@ export class MonitorServiceComponent implements OnInit { }; let url = this.baseUrl + "/uui-lcm/Sotnservices/ServiceInstances/" + subscriptionType; this.http.get<any>(url,httpOptions).subscribe((data) => { - this.serviceInstanceList = data.serviceInstanceList; + this.serviceInstanceList = data.serviceInstanceList; }, (err) => { console.log(err); - }); + }); } getTopologyInfo (topo) { @@ -158,7 +156,7 @@ export class MonitorServiceComponent implements OnInit { </thead>\ <tbody>\ '; - Object.entries(filteredNode[0].dataNode).forEach(entry => { + Object.entries(filteredNode[0].dataNode).forEach(entry => { if( entry[1] !== "null") { t1 += '<tr class="popup-table-row">\ @@ -166,7 +164,7 @@ export class MonitorServiceComponent implements OnInit { <td class="monitor-table-td-th ">'+ entry[1] + '</td>\ </tr>\ '; - } + } }); t1 += '</tbody>\ </table>\ @@ -214,14 +212,14 @@ export class MonitorServiceComponent implements OnInit { } // Getting sitedata Based On Type and ID - getSelectedsubscriptionInfo() { + getSelectedsubscriptionInfo() { this.getData(""); if (this.intervalData) { clearInterval(this.intervalData); - } + } } - + ngOnDestroy() { console.log('clear interval'); if (this.intervalData) { diff --git a/usecaseui-portal/src/app/views/services/sotn-management/order-service/order-service.component.ts b/usecaseui-portal/src/app/views/services/sotn-management/order-service/order-service.component.ts index 1cfd00fd..473681c2 100644 --- a/usecaseui-portal/src/app/views/services/sotn-management/order-service/order-service.component.ts +++ b/usecaseui-portal/src/app/views/services/sotn-management/order-service/order-service.component.ts @@ -1,12 +1,12 @@ import { Component, OnInit, Output, EventEmitter } from '@angular/core'; import { - FormBuilder, + FormBuilder, FormGroup, Validators } from '@angular/forms'; import { HttpClient, HttpHeaders } from '@angular/common/http'; import { NzMessageService } from 'ng-zorro-antd'; -import { baseUrl } from '../../../../datainterface'; +import { environment } from '@src/environments/environment'; @Component({ selector: 'app-order-service', @@ -20,7 +20,7 @@ export class OrderServiceComponent implements OnInit { siteData:object = {}; buttonDisabled:boolean = false; intervalData:any; - baseUrl = baseUrl.baseUrl + baseUrl = environment.backendUrl; expandDataSet = [ { rowIdx: 1, name: 'i18nTextDefine_serviceInformation', expand: true }, { rowIdx: 2, name: 'i18nTextDefine_vpnInformation', expand: true }, @@ -28,7 +28,7 @@ export class OrderServiceComponent implements OnInit { ]; uni = {}; sotnUni = []; - + @Output() childEvent = new EventEmitter<string>(); constructor(private fb: FormBuilder, private http: HttpClient, private message: NzMessageService) { } @@ -58,7 +58,7 @@ export class OrderServiceComponent implements OnInit { }); } - + numberOnly(event): boolean { const charCode = (event.which) ? event.which : event.keyCode; if (charCode > 31 && (charCode < 48 || charCode > 57)) { @@ -78,7 +78,7 @@ export class OrderServiceComponent implements OnInit { deletesotnUni(data) { for(let i = 0; i < this.sotnUni.length; i++) { if(data.sotnuni_tpId == this.sotnUni[i].sotnuni_tpId) { - this.sotnUni.splice(i, 1); + this.sotnUni.splice(i, 1); } } } @@ -139,9 +139,9 @@ export class OrderServiceComponent implements OnInit { 'Content-Type': 'application/json', }) }; - + let url1 = this.baseUrl + '/uui-lcm/Sotnservices_unni'; - this.http.post<any>(url1, body, httpOptions).subscribe((data) => { + this.http.post<any>(url1, body, httpOptions).subscribe((data) => { let comp = this; this.message.info('Instantiation In Progress'); this.intervalData = setInterval(() => { |