X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fcatalog%2Fcatalog.component.ts;h=fd28f0a38595a0c562392966e5dbd094b4add0a3;hb=3e69af1763ea2ce5f9485ab1cb5a39b089b109a7;hp=c5aa195c178c665404ec7737a278072ed2f32c35;hpb=1275b31b7d0d4b9056e671614761452c151be008;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/catalog/catalog.component.ts b/webapp-frontend/src/app/catalog/catalog.component.ts
index c5aa195c..fd28f0a3 100644
--- a/webapp-frontend/src/app/catalog/catalog.component.ts
+++ b/webapp-frontend/src/app/catalog/catalog.component.ts
@@ -1,6 +1,6 @@
 /*-
  * ========================LICENSE_START=================================
- * ORAN-OSC
+ * O-RAN-SC
  * %%
  * Copyright (C) 2019 AT&T Intellectual Property and Nokia
  * %%
@@ -17,22 +17,19 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-import { Component, Inject } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 import { LocalDataSource } from 'ng2-smart-table';
-import { CatalogService } from '../services/catalog/catalog.service';
-import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
-
-export interface DialogData {
-    name: string;
-}
-
+import { XappMgrService } from '../services/xapp-mgr/xapp-mgr.service';
+import { ConfirmDialogService } from './../services/ui/confirm-dialog.service'
+import { NotificationService } from './../services/ui/notification.service'
+import { XMXapp } from '../interfaces/xapp-mgr.types';
 
 @Component({
   selector: 'app-catalog',
   templateUrl: './catalog.component.html',
   styleUrls: ['./catalog.component.css']
 })
-export class CatalogComponent {
+export class CatalogComponent implements OnInit{
 
   settings = {
     hideSubHeader: true,
@@ -42,8 +39,8 @@ export class CatalogComponent {
       edit: false,
       delete: false,
       custom: [
-      { name: 'deployxApp', title: 'Deploy'},
-    ],
+        { name: 'deployxApp', title: 'Deploy' },
+      ],
       position: 'right'
 
     },
@@ -65,44 +62,32 @@ export class CatalogComponent {
 
   source: LocalDataSource = new LocalDataSource();
 
-    constructor(private service: CatalogService, public dialog: MatDialog) {
-    this.service.getAll().subscribe((val:any[]) => this.source.load(val));
-  }
-
-
-    onDeployxApp(event): void {
-        const dialogRef = this.dialog.open(AppCatalogDeployDialog, {
-            width: '400px',
-            data: { name: event.data.name }
-        });
-
-        dialogRef.afterClosed().subscribe(result => {
-            console.log('The dialog was closed');
-        });
-    }
-
-}
+  constructor(
+    private xappMgrSvc: XappMgrService,
+    private confirmDialogService: ConfirmDialogService,
+    private notification: NotificationService) { }
 
-@Component({
-    selector: 'app-catalog-deploy-dialog',
-    templateUrl: 'catalog.component.deploy-dialog.html',
-    styleUrls: ['./catalog.component.css']
-})
-
-export class AppCatalogDeployDialog{
-
-    constructor(
-        public dialogRef: MatDialogRef<AppCatalogDeployDialog>,
-        private service: CatalogService,
-        @Inject(MAT_DIALOG_DATA) public data: DialogData) { }
-
-    onNoClick(): void {
-        this.dialogRef.close();
-    }
+  ngOnInit() {
+    this.xappMgrSvc.getAll().subscribe((xapps: XMXapp[]) => this.source.load(xapps));
+  }
 
-    deployXapp(): void {
-        this.service.deployXapp(this.data.name).subscribe((val: any[]) => console.log(val));;
-        this.dialogRef.close();
-    }
+  onDeployxApp(event): void {
+    this.confirmDialogService.openConfirmDialog('Are you sure you want to deploy this xApp?')
+      .afterClosed().subscribe(res => {
+        if (res) {
+          this.xappMgrSvc.deployXapp(event.data.name).subscribe(
+            response => {
+              switch (response.status) {
+                case 200:
+                  this.notification.success('xApp deploy succeeded!');
+                  break;
+                default:
+                  this.notification.warn('xApp deploy failed.');
+              }
+            }
+          );
+        }
+      });
 
-}
+  }
+}
\ No newline at end of file