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=18af73bf777e52f748f9085f02f60659d89de119;hb=55472d9367cf229b2b87a625a8aa1dfb822cbaad;hp=159d33dd912c7097a56d8e4b51e6ced15f414c25;hpb=dfa4f23a94fcbf31deab33abde4c6a8318fd4186;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 159d33dd..18af73bf 100644
--- a/webapp-frontend/src/app/app-control/app-control.component.ts
+++ b/webapp-frontend/src/app/app-control/app-control.component.ts
@@ -17,6 +17,7 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
+import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { MatSort } from '@angular/material/sort';
 import { Router } from '@angular/router';
@@ -24,61 +25,76 @@ import { XappControlRow } from '../interfaces/app-mgr.types';
 import { AppMgrService } from '../services/app-mgr/app-mgr.service';
 import { ConfirmDialogService } from '../services/ui/confirm-dialog.service';
 import { ErrorDialogService } from '../services/ui/error-dialog.service';
+import { LoadingDialogService } from '../services/ui/loading-dialog.service';
 import { NotificationService } from '../services/ui/notification.service';
 import { AppControlAnimations } from './app-control.animations';
 import { AppControlDataSource } from './app-control.datasource';
+import { finalize } from 'rxjs/operators';
 
 @Component({
-  selector: 'control-app-control',
+  selector: 'rd-app-control',
   templateUrl: './app-control.component.html',
-  styleUrls: ['./app-control.component.css'],
+  styleUrls: ['./app-control.component.scss'],
   animations: [AppControlAnimations.messageTrigger]
 })
 export class AppControlComponent implements OnInit {
 
   displayedColumns: string[] = ['xapp', 'name', 'status', 'ip', 'port', 'action'];
   dataSource: AppControlDataSource;
-  @ViewChild(MatSort) sort: MatSort;
+  @ViewChild(MatSort, {static: true}) sort: MatSort;
 
   constructor(
     private appMgrSvc: AppMgrService,
     private router: Router,
     private confirmDialogService: ConfirmDialogService,
     private errorDialogService: ErrorDialogService,
-    private notification: NotificationService) { }
+    private loadingDialogService: LoadingDialogService,
+    private notificationService: NotificationService) { }
 
   ngOnInit() {
-    this.dataSource = new AppControlDataSource(this.appMgrSvc, this.sort);
+    this.dataSource = new AppControlDataSource(this.appMgrSvc, this.sort, this.notificationService);
     this.dataSource.loadTable();
   }
 
   controlApp(app: XappControlRow): void {
-    const acXappPattern =  /[Aa][Dd][Mm][Ii][Ss]{2}[Ii][Oo][Nn]/;
-    const anrXappPattern = /[Aa][Nn][Rr]/;
-    if (acXappPattern.test(app.xapp)) {
+    // TODO: identify apps without hardcoding to names
+    const acAppPattern0 =  /[Aa][Dd][Mm][Ii][Nn]/;
+    const acAppPattern1 =  /[Aa][Dd][Mm][Ii][Ss]{2}[Ii][Oo][Nn]/;
+    const anrAppPattern0 = /ANR/;
+    const anrAppPattern1 = /[Aa][Uu][Tt][Oo][Mm][Aa][Tt][Ii][Cc]/;
+    const anrAppPattern2 = /[Nn][Ee][Ii][Gg][Hh][Bb][Oo][Rr]/;
+    if (acAppPattern0.test(app.xapp) || acAppPattern1.test(app.xapp)) {
       this.router.navigate(['/ac']);
-    } else if (anrXappPattern.test(app.xapp)) {
+    } else if (anrAppPattern0.test(app.xapp) || (anrAppPattern1.test(app.xapp) && anrAppPattern2.test(app.xapp))) {
       this.router.navigate(['/anr']);
     } else {
       this.errorDialogService.displayError('No control available for ' + app.xapp + ' (yet)');
     }
   }
 
-  undeployApp(app: XappControlRow): void {
-    this.confirmDialogService.openConfirmDialog('Are you sure you want to undeploy xApp ' + app.xapp + '?')
-      .afterClosed().subscribe(res => {
+  onUndeployApp(app: XappControlRow): void {
+    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(
-            response => {
+          this.loadingDialogService.startLoading("Undeploying " + app.xapp);
+          this.appMgrSvc.undeployXapp(app.xapp)
+            .pipe(
+              finalize(() => this.loadingDialogService.stopLoading())
+            )
+            .subscribe(
+            ( httpResponse: HttpResponse<Object>) => {
+              // Answers 204/No content on success
+              this.notificationService.success('App undeployed successfully!');
               this.dataSource.loadTable();
-              switch (response.status) {
-                case 200:
-                  this.notification.success('xApp undeployed successfully!');
-                  break;
-                default:
-                  this.notification.warn('xApp undeploy failed.');
+            },
+            ( (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);
+            })
           );
         }
       });