X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-frontend%2Fsrc%2Fapp%2Fcontrol%2Fcontrol.component.ts;h=29a88ccf0cf2b29f92725759e14aff599157d068;hb=29ce34b03e4099786f14cd7fc5473305da8750d6;hp=1c8839322ad3f25cfce702163452ccb9b06d9b31;hpb=2316ebd446dc9993b7c364ccb96d24f009195aa8;p=portal%2Fric-dashboard.git
diff --git a/webapp-frontend/src/app/control/control.component.ts b/webapp-frontend/src/app/control/control.component.ts
index 1c883932..29a88ccf 100644
--- a/webapp-frontend/src/app/control/control.component.ts
+++ b/webapp-frontend/src/app/control/control.component.ts
@@ -7,9 +7,9 @@
* 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.
@@ -17,101 +17,56 @@
* limitations under the License.
* ========================LICENSE_END===================================
*/
-import { Component, OnInit, ViewEncapsulation } from '@angular/core';
-import { LocalDataSource } from 'ng2-smart-table';
-import { ControlService } from '../services/control/control.service';
+import { Component, OnInit } from '@angular/core';
+import { XappMgrService } from '../services/xapp-mgr/xapp-mgr.service';
import { Router } from '@angular/router';
-import { ConfirmDialogService } from './../services/ui/confirm-dialog.service'
-import { NotificationService } from './../services/ui/notification.service'
-
+import { ErrorDialogService } from './../services/ui/error-dialog.service';
+import { ConfirmDialogService } from './../services/ui/confirm-dialog.service';
+import { NotificationService } from './../services/ui/notification.service';
+import { XappControlRow } from '../interfaces/xapp-mgr.types';
+import { ControlAnimations } from './control.animations';
+import { ControlDataSource } from './control.datasource';
+import { routerNgProbeToken } from '@angular/router/src/router_module';
@Component({
selector: 'app-control',
templateUrl: './control.component.html',
styleUrls: ['./control.component.css'],
- encapsulation: ViewEncapsulation.Emulated,
+ animations: [ControlAnimations.messageTrigger],
})
-export class ControlComponent {
-
- settings = {
- hideSubHeader: true,
- actions: {
- columnTitle: 'Actions',
- add: false,
- edit: false,
- delete: false,
- custom: [
- { name: 'view', title: 'visibility', },
- { name: 'undeploy', title: 'close', },
- ],
- position: 'right'
+export class ControlComponent implements OnInit {
- },
- columns: {
- xapp: {
- title: 'xApp Name',
- type: 'string',
- },
- name: {
- title: 'Instance Name',
- type: 'string',
- },
- status: {
- title: 'Status',
- type: 'string',
- },
- ip: {
- title: 'IP',
- type: 'string',
- },
- port: {
- title: 'Port',
- type: 'integer',
- },
- txMessages: {
- title: 'txMessages',
- type: 'array',
- },
- rxMessages: {
- title: 'rxMessages',
- type: 'array',
- },
- },
- };
-
- source: LocalDataSource = new LocalDataSource();
+ displayedColumns: string[] = ['xapp', 'name', 'status', 'ip', 'port', 'action'];
+ dataSource: ControlDataSource;
constructor(
- private service: ControlService,
+ private xappMgrSvc: XappMgrService,
private router: Router,
private confirmDialogService: ConfirmDialogService,
- private notification: NotificationService) {
- this.service.getxAppInstances((instances) => { this.source.load(instances); });
- }
+ private errorDialogService: ErrorDialogService,
+ private notification: NotificationService) { }
- onxAppControlAction(event) {
- switch (event.action) {
- case 'view':
- this.view(event);
- break;
- case 'undeploy':
- this.undeploy(event);
- break;
- }
+ ngOnInit() {
+ this.dataSource = new ControlDataSource(this.xappMgrSvc);
+ this.dataSource.loadTable();
}
- view(event): void {
- const url = '/xapp';
- this.router.navigate([url, event]);
+ controlApp(app: XappControlRow): void {
+ const anrXappPattern = /[Aa][Nn][Rr]/;
+ if (anrXappPattern.test(app.xapp)) {
+ this.router.navigate(['/anr']);
+ } else {
+ this.errorDialogService.displayError('No control available for ' + app.xapp + ' (yet)');
+ }
}
- undeploy(event): void {
- this.confirmDialogService.openConfirmDialog('Are you sure you want to undeploy this xApp ?')
+ undeployApp(app: XappControlRow): void {
+ this.confirmDialogService.openConfirmDialog('Are you sure you want to undeploy xApp ' + app.xapp + '?')
.afterClosed().subscribe(res => {
if (res) {
- this.service.undeployxApp(event.data.xapp).subscribe(
+ this.xappMgrSvc.undeployXapp(app.xapp).subscribe(
response => {
- this.service.getxAppInstances((instances) => { this.source.load(instances); });
+ this.dataSource.loadTable();
switch (response.status) {
case 200:
this.notification.success('xApp undeployed successfully!');
@@ -125,5 +80,4 @@ export class ControlComponent {
});
}
-
}