X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fapp-control%2Fapp-control.component.ts;h=35c910d8eda5d4a7552b88b0f00de26e4499ccc6;hb=3f812ea25d352ec33d07f5ffa4c2aa2a77e8e793;hp=341754b08d62751bc403e1a7fc676f2ef5007d98;hpb=fa50e55b6e8977ad0a6a28096fe58fb54924ca2b;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/app-control/app-control.component.ts b/webapp-frontend/src/app/app-control/app-control.component.ts
index 341754b0..35c910d8 100644
--- a/webapp-frontend/src/app/app-control/app-control.component.ts
+++ b/webapp-frontend/src/app/app-control/app-control.component.ts
@@ -69,7 +69,7 @@ export class AppControlComponent implements OnInit {
   }
 
   onUndeployApp(app: XappControlRow): void {
-    this.confirmDialogService.openConfirmDialog('Are you sure you want to undeploy xApp ' + app.xapp + '?')
+    this.confirmDialogService.openConfirmDialog('Are you sure you want to undeploy App ' + app.xapp + '?')
       .afterClosed().subscribe( (res: boolean) => {
         if (res) {
           this.appMgrSvc.undeployXapp(app.xapp).subscribe(
@@ -77,14 +77,19 @@ export class AppControlComponent implements OnInit {
               this.dataSource.loadTable();
               switch (httpResponse.status) {
                 case 200:
-                  this.notificationService.success('xApp undeployed successfully!');
+                  this.notificationService.success('App undeployed successfully!');
                   break;
                 default:
-                  this.notificationService.warn('xApp undeploy failed.');
+                  this.notificationService.warn('App undeploy failed.');
               }
             },
-            ( (error: HttpErrorResponse) => {
-              this.notificationService.warn(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 undeploy failed: ' + msg);
             })
           );
         }