X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fcontrol%2Fcontrol.component.ts;fp=webapp-frontend%2Fsrc%2Fapp%2Fcontrol%2Fcontrol.component.ts;h=54ce96d4b6edd39ce2171ee90832a105332a0a23;hb=4347fbc44c279856d5b83a1768638fe571daf4d5;hp=067077edde0f77aa2ca030de0a8cfb037529705e;hpb=5ab97dce8c10eadbe33ada5446cc7fc9b9e1a6cd;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 067077ed..54ce96d4 100644
--- a/webapp-frontend/src/app/control/control.component.ts
+++ b/webapp-frontend/src/app/control/control.component.ts
@@ -17,70 +17,26 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-import { Component, OnInit, ViewEncapsulation } from '@angular/core';
-import { LocalDataSource } from 'ng2-smart-table';
+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 implements OnInit  {
+export class ControlComponent implements OnInit {
 
-  settings = {
-    hideSubHeader: true,
-    actions: {
-      columnTitle: 'Actions',
-      add: false,
-      edit: false,
-      delete: false,
-      custom: [
-        { name: 'view', title: '<i class="material-icons">visibility</i>', },
-        { name: 'undeploy', title: '<i class="material-icons red-close">close</i>', },
-      ],
-      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 xappMgrSvc: XappMgrService,
@@ -89,32 +45,22 @@ export class ControlComponent implements OnInit  {
     private notification: NotificationService) { }
 
   ngOnInit() {
-    this.xappMgrSvc.getAll().subscribe((xapps: XMXapp[]) => this.source.load(this.getInstance(xapps)));
+    this.dataSource = new ControlDataSource(this.xappMgrSvc);
+    this.dataSource.loadTable();
   }
 
-  onxAppControlAction(event) {
-    switch (event.action) {
-      case 'view':
-        this.view(event);
-        break;
-      case 'undeploy':
-        this.undeploy(event);
-        break;
-    }
-  }
-
-  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.xappMgrSvc.undeployXapp(event.data.xapp).subscribe(
+          this.xappMgrSvc.undeployXapp(name).subscribe(
             response => {
-              this.xappMgrSvc.getAll().subscribe((xapps: XMXapp[]) => this.source.load(this.getInstance(xapps)));
+              this.dataSource.loadTable();
               switch (response.status) {
                 case 200:
                   this.notification.success('xApp undeployed successfully!');
@@ -128,19 +74,6 @@ export class ControlComponent implements OnInit  {
       });
   }
 
-  getInstance(allxappdata: XMXapp[]) {
-    const xAppInstances = [];
-    for (const xappindex in allxappdata) {
-      const instancelist = allxappdata[xappindex].instances;
-      for (const instanceindex in instancelist) {
-        var instance: any;
-        instance = instancelist[instanceindex];
-        instance.xapp = allxappdata[xappindex].name;
-        xAppInstances.push(instance);
-      }
-    }
-    return xAppInstances;
-  }
 
 
 }