X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fcontrol%2Fcontrol.component.ts;h=54ce96d4b6edd39ce2171ee90832a105332a0a23;hb=4347fbc44c279856d5b83a1768638fe571daf4d5;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..54ce96d4 100644
--- a/webapp-frontend/src/app/control/control.component.ts
+++ b/webapp-frontend/src/app/control/control.component.ts
@@ -17,101 +17,50 @@
* 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 { XMXapp } from '../interfaces/xapp-mgr.types';
+import { ControlAnimations } from './control.animations';
+import { ControlDataSource } from './control.datasource';
@Component({
selector: 'app-control',
templateUrl: './control.component.html',
styleUrls: ['./control.component.css'],
- encapsulation: ViewEncapsulation.Emulated,
+ animations: [ControlAnimations.messageTrigger],
})
-export class ControlComponent {
+export class ControlComponent implements OnInit {
- settings = {
- hideSubHeader: true,
- actions: {
- columnTitle: 'Actions',
- add: false,
- edit: false,
- delete: false,
- custom: [
- { name: 'view', title: 'visibility', },
- { name: 'undeploy', title: 'close', },
- ],
- position: 'right'
-
- },
- 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 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 {
+ view(): void {
const url = '/xapp';
- this.router.navigate([url, event]);
+ this.router.navigate([url]);
}
- undeploy(event): void {
+ undeploy(name: string): void {
this.confirmDialogService.openConfirmDialog('Are you sure you want to undeploy this xApp ?')
.afterClosed().subscribe(res => {
if (res) {
- this.service.undeployxApp(event.data.xapp).subscribe(
+ this.xappMgrSvc.undeployXapp(name).subscribe(
response => {
- this.service.getxAppInstances((instances) => { this.source.load(instances); });
+ this.dataSource.loadTable();
switch (response.status) {
case 200:
this.notification.success('xApp undeployed successfully!');
@@ -126,4 +75,5 @@ export class ControlComponent {
}
+
}