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=fb987d4898604318802c5217516fbaf891d1c885;hpb=be7a01eda7e4fb9f97a18009d727e6a0692e9399;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 fb987d48..54ce96d4 100644
--- a/webapp-frontend/src/app/control/control.component.ts
+++ b/webapp-frontend/src/app/control/control.component.ts
@@ -18,76 +18,62 @@
  * ========================LICENSE_END===================================
  */
 import { Component, OnInit } from '@angular/core';
-import { LocalDataSource } from 'ng2-smart-table';
-import { ControlService } from '../services/control/control.service';
+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']
+  styleUrls: ['./control.component.css'],
+  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: 'view', },
-    ],
-      position: 'right'
+  displayedColumns: string[] = ['xapp', 'name', 'status', 'ip', 'port', 'action'];
+  dataSource: ControlDataSource;
 
-    },
-    columns: {
-      id: {
-        title: 'ID',
-        type: 'number',
-      },
-      xAppName: {
-        title: 'xApp Name',
-        type: 'string',
-      },
-      xAppType: {
-        title: 'xApp Type',
-        type: 'string',
-      },
-      podId: {
-        title: 'Pod ID',
-        type: 'number',
-      },
-      k8Status: {
-        title: 'k8 Status',
-        type: 'string',
-      },
-      age: {
-        title: 'Age',
-        type: 'string',
-      },
-    },
-  };
+  constructor(
+    private xappMgrSvc: XappMgrService,
+    private router: Router,
+    private confirmDialogService: ConfirmDialogService,
+    private notification: NotificationService) { }
 
-  source: LocalDataSource = new LocalDataSource();
+  ngOnInit() {
+    this.dataSource = new ControlDataSource(this.xappMgrSvc);
+    this.dataSource.loadTable();
+  }
 
-  constructor(private service: ControlService, private router: Router) {
-    const data = this.service.getData();
-    this.source.load(data);
+  view(): void {
+    const url = '/xapp';
+    this.router.navigate([url]);
   }
 
-  view(event): void {
-      const url = '/xapp';
-      this.router.navigate([url, event]).then( (e) => {
-            if (e) {
-                console.log(event.data);
-                console.log('Navigation is successful!');
-            } else {
-                console.log('Navigation has failed!');
+  undeploy(name: string): void {
+    this.confirmDialogService.openConfirmDialog('Are you sure you want to undeploy this xApp ?')
+      .afterClosed().subscribe(res => {
+        if (res) {
+          this.xappMgrSvc.undeployXapp(name).subscribe(
+            response => {
+              this.dataSource.loadTable();
+              switch (response.status) {
+                case 200:
+                  this.notification.success('xApp undeployed successfully!');
+                  break;
+                default:
+                  this.notification.warn('xApp undeploy failed.');
+              }
             }
-        });
+          );
+        }
+      });
   }
 
 
+
 }