X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fcatalog%2Fcatalog.component.ts;h=9100de4833886a0ca6d942fbb005b3ebfb133298;hb=52b5162f9ca85034e0def247f4a4e5c1bda85191;hp=97dfd7ca2f5da4f6d6301eb8f9bda901ca5c67f2;hpb=226fd436a085f717d4cbf81bf1719bdaf1468414;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 97dfd7ca..9100de48 100644
--- a/webapp-frontend/src/app/catalog/catalog.component.ts
+++ b/webapp-frontend/src/app/catalog/catalog.component.ts
@@ -25,6 +25,9 @@ import { AppMgrService } from '../services/app-mgr/app-mgr.service';
 import { ConfirmDialogService } from './../services/ui/confirm-dialog.service';
 import { NotificationService } from './../services/ui/notification.service';
 import { CatalogDataSource } from './catalog.datasource';
+import { XMDeployableApp } from '../interfaces/app-mgr.types';
+import { MatDialog } from '@angular/material/dialog';
+import { AppConfigurationComponent } from './../app-configuration/app-configuration.component';
 
 @Component({
   selector: 'rd-app-catalog',
@@ -40,6 +43,7 @@ export class CatalogComponent implements OnInit {
   constructor(
     private appMgrService: AppMgrService,
     private confirmDialogService: ConfirmDialogService,
+    private dialog: MatDialog,
     private errorDiaglogService: ErrorDialogService,
     private notificationService: NotificationService) { }
 
@@ -48,22 +52,34 @@ export class CatalogComponent implements OnInit {
     this.dataSource.loadTable();
   }
 
-  onConfigureApp(name: string): void {
-    const aboutError = 'Configure not implemented (yet)';
-    this.errorDiaglogService.displayError(aboutError);
+  onConfigureApp(xapp: XMDeployableApp): void {
+    const dialogRef = this.dialog.open(AppConfigurationComponent, {
+      width: '40%',
+      maxHeight:'500px',
+      position: {
+        top:'10%'
+      },
+      data: xapp
+    });
+
   }
 
-  onDeployApp(name: string): void {
-    this.confirmDialogService.openConfirmDialog('Deploy application ' + name + '?')
-      .afterClosed().subscribe( (res: any) => {
+  onDeployApp(app: XMDeployableApp): void {
+    this.confirmDialogService.openConfirmDialog('Deploy application ' + app.name + '?')
+      .afterClosed().subscribe( (res: boolean) => {
         if (res) {
-          this.appMgrService.deployXapp(name).subscribe(
-            (response: HttpResponse<object>) => {
-              this.notificationService.success('Deploy succeeded!');
+          this.appMgrService.deployXapp(app.name).subscribe(
+            (response: HttpResponse<Object>) => {
+              this.notificationService.success('App deploy succeeded!');
             },
-            (error: HttpErrorResponse) => {
-              this.notificationService.warn('Deploy failed: ' + error.message);
-            }
+            ( (her: HttpErrorResponse) => {
+              // the error field should have an ErrorTransport object
+              let msg = her.message;
+              if (her.error && her.error.message) {
+                msg = her.error.message;
+              }
+              this.notificationService.warn('App deploy failed: ' + msg);
+            })
           );
         }
       }