Extend ANR mock config to persist edit and delete

[portal/ric-dashboard.git] / webapp-frontend / src / app / anr-xapp / anr-xapp.component.ts

diff --git a/webapp-frontend/src/app/anr-xapp/anr-xapp.component.ts b/webapp-frontend/src/app/anr-xapp/anr-xapp.component.ts
index ba24071..0514687 100644 (file)
--- a/webapp-frontend/src/app/anr-xapp/anr-xapp.component.ts
+++ b/webapp-frontend/src/app/anr-xapp/anr-xapp.component.ts
@@ -18,14 +18,16 @@
  * ========================LICENSE_END===================================
  */
 
+import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
 import { MatSort } from '@angular/material';
 import { MatDialog } from '@angular/material/dialog';
 import { fromEvent } from 'rxjs/observable/fromEvent';
-import { debounceTime, distinctUntilChanged, tap } from 'rxjs/operators';
+import { debounceTime, distinctUntilChanged, finalize, tap } from 'rxjs/operators';
 import { ANRNeighborCellRelation } from '../interfaces/anr-xapp.types';
 import { ANRXappService } from '../services/anr-xapp/anr-xapp.service';
 import { ErrorDialogService } from '../services/ui/error-dialog.service';
+import { LoadingDialogService } from '../services/ui/loading-dialog.service';
 import { ConfirmDialogService } from './../services/ui/confirm-dialog.service';
 import { NotificationService } from './../services/ui/notification.service';
 import { AnrEditNcrDialogComponent } from './anr-edit-ncr-dialog.component';
@@ -40,10 +42,10 @@ export class AnrXappComponent implements AfterViewInit, OnInit {
 
   dataSource: ANRXappDataSource;
   gNodeBIds: string[];
-  @ViewChild('ggNodeB', {static: true}) ggNodeB: ElementRef;
-  @ViewChild('servingCellNrcgi', {static: true}) servingCellNrcgi: ElementRef;
-  @ViewChild('neighborCellNrpci', {static: true}) neighborCellNrpci: ElementRef;
-  @ViewChild(MatSort, {static: true}) sort: MatSort;
+  @ViewChild('ggNodeB', { static: true }) ggNodeB: ElementRef;
+  @ViewChild('servingCellNrcgi', { static: true }) servingCellNrcgi: ElementRef;
+  @ViewChild('neighborCellNrpci', { static: true }) neighborCellNrpci: ElementRef;
+  @ViewChild(MatSort, { static: true }) sort: MatSort;
 
   displayedColumns = ['cellIdentifierNrcgi', 'neighborCellNrpci', 'neighborCellNrcgi',
     'flagNoHo', 'flagNoXn', 'flagNoRemove', 'action'];
@@ -53,6 +55,7 @@ export class AnrXappComponent implements AfterViewInit, OnInit {
     private dialog: MatDialog,
     private confirmDialogService: ConfirmDialogService,
     private errorDialogService: ErrorDialogService,
+    private loadingDialogService: LoadingDialogService,
     private notificationService: NotificationService) { }
 
   ngOnInit() {
@@ -96,32 +99,40 @@ export class AnrXappComponent implements AfterViewInit, OnInit {
       width: '300px',
       data: ncr
     });
-    dialogRef.afterClosed().subscribe(result => {
-      this.loadNcrtPage();
-    });
+    dialogRef.afterClosed().subscribe(
+      (result: any) => {
+        this.loadNcrtPage();
+      }
+    );
   }
 
   deleteNcr(ncr: ANRNeighborCellRelation): void {
     this.confirmDialogService
       .openConfirmDialog('Are you sure you want to delete this relation?')
-      .afterClosed().subscribe(res => {
-        if (res) {
-          this.anrXappService.deleteNcr(ncr.servingCellNrcgi, ncr.neighborCellNrpci)
-            .subscribe(
-              response => {
-                switch (response.status) {
-                  case 200:
-                    this.notificationService.success('Delete succeeded!');
-                    break;
-                  default:
-                    this.notificationService.warn('Delete failed.');
-                }
-              },
-              error => {
-                this.errorDialogService.displayError(error.message);
-              });
-        }
-      });
+      .afterClosed().subscribe(
+        (res: any) => {
+          if (res) {
+            this.loadingDialogService.startLoading("Deleting");
+            this.anrXappService.deleteNcr(ncr.servingCellNrcgi, ncr.neighborCellNrpci)
+              .pipe(
+                finalize(() => this.loadingDialogService.stopLoading())
+              )
+              .subscribe(
+                (response: HttpResponse<Object>) => {
+                  switch (response.status) {
+                    case 200:
+                      this.notificationService.success('Delete succeeded!');
+                      this.loadNcrtPage();
+                      break;
+                    default:
+                      this.notificationService.warn('Delete failed.');
+                  }
+                },
+                (error: HttpErrorResponse) => {
+                  this.errorDialogService.displayError(error.message);
+                });
+          }
+        });
   }
 
 }