X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fran-control%2Fran-control.component.ts;h=8baa556b59c42b04d28703245054f54495b951eb;hb=67bad64d2c84ff56f020b17e97daf2d35278289a;hp=e911d18d00352ed259e69ae1344c8e2aaa947301;hpb=226fd436a085f717d4cbf81bf1719bdaf1468414;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/ran-control/ran-control.component.ts b/webapp-frontend/src/app/ran-control/ran-control.component.ts
index e911d18d..8baa556b 100644
--- a/webapp-frontend/src/app/ran-control/ran-control.component.ts
+++ b/webapp-frontend/src/app/ran-control/ran-control.component.ts
@@ -2,14 +2,14 @@
  * ========================LICENSE_START=================================
  * O-RAN-SC
  * %%
- * Copyright (C) 2019 AT&T Intellectual Property and Nokia
+ * Copyright (C) 2019 AT&T Intellectual Property
  * %%
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
+ * 
  *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,15 +17,17 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
+import { HttpErrorResponse } from '@angular/common/http';
 import { Component, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { RanControlConnectDialogComponent } from './ran-connection-dialog.component';
+import { finalize } from 'rxjs/operators';
 import { E2ManagerService } from '../services/e2-mgr/e2-mgr.service';
-import { ErrorDialogService } from '../services/ui/error-dialog.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 { RanControlConnectDialogComponent } from './ran-connection-dialog.component';
 import { RANControlDataSource } from './ran-control.datasource';
-import { HttpErrorResponse } from '@angular/common/http';
 
 @Component({
   selector: 'rd-ran-control',
@@ -40,6 +42,7 @@ export class RanControlComponent implements OnInit {
     private errorDialogService: ErrorDialogService,
     private confirmDialogService: ConfirmDialogService,
     private notificationService: NotificationService,
+    private loadingDialogService: LoadingDialogService,
     public dialog: MatDialog) { }
 
   ngOnInit() {
@@ -49,33 +52,41 @@ export class RanControlComponent implements OnInit {
 
   setupRANConnection() {
     const dialogRef = this.dialog.open(RanControlConnectDialogComponent, {
-      width: '450px',
-      data: {}
+      width: '450px'
     });
-    dialogRef.afterClosed().subscribe(result => {
-      this.dataSource.loadTable();
+    dialogRef.afterClosed().subscribe( (result: boolean) => {
+      if (result) {
+        this.dataSource.loadTable();
+      }
     });
   }
 
   disconnectAllRANConnections() {
-    let httpErrRes: HttpErrorResponse;
     const aboutError = 'Disconnect all RAN Connections Failed: ';
     this.confirmDialogService.openConfirmDialog('Are you sure you want to disconnect all RAN connections?')
-      .afterClosed().subscribe(res => {
+      .afterClosed().subscribe( (res: boolean) => {
         if (res) {
-          this.e2MgrSvc.nodebDelete().subscribe(
-            response => {
-              if (response.status === 200) {
-                this.notificationService.success('Disconnect all RAN Connections Succeeded!');
-                this.dataSource.loadTable();
-              }
+          this.loadingDialogService.startLoading("Disconnecting");
+          this.e2MgrSvc.nodebPut()
+            .pipe(
+              finalize(() => this.loadingDialogService.stopLoading())
+            )
+            .subscribe(
+            ( body: any ) => {
+              this.notificationService.success('Disconnect succeeded!');
+              this.dataSource.loadTable();
             },
-            (error => {
-              httpErrRes = error;
-              this.errorDialogService.displayError(aboutError + httpErrRes.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.errorDialogService.displayError('Disconnect failed: ' + msg);
+            }
           );
         }
       });
   }
+
 }