X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-frontend%2Fsrc%2Fapp%2Fran-control%2Fran-control.component.ts;h=ac995f07c0c75fdc3433232897ae5ec32be039d8;hb=refs%2Fchanges%2F72%2F2272%2F8;hp=b5aba669a07a6bb38f31d9bd21a2a0051e923521;hpb=a4b2e71472b32a8244da846af20128504f4cbc65;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 b5aba669..ac995f07 100644
--- a/webapp-frontend/src/app/ran-control/ran-control.component.ts
+++ b/webapp-frontend/src/app/ran-control/ran-control.component.ts
@@ -18,88 +18,108 @@
  * ========================LICENSE_END===================================
  */
 import { HttpErrorResponse } from '@angular/common/http';
-import { Component, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
+import { Subscription } from 'rxjs';
 import { finalize } from 'rxjs/operators';
+import { RicInstance } from '../interfaces/dashboard.types';
 import { E2ManagerService } from '../services/e2-mgr/e2-mgr.service';
+import { InstanceSelectorService } from '../services/instance-selector/instance-selector.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 { UiService } from '../services/ui/ui.service';
 import { RanControlConnectDialogComponent } from './ran-connection-dialog.component';
 import { RANControlDataSource } from './ran-control.datasource';
-import { UiService } from '../services/ui/ui.service';
 
 @Component({
   selector: 'rd-ran-control',
   templateUrl: './ran-control.component.html',
   styleUrls: ['./ran-control.component.scss']
 })
-export class RanControlComponent implements OnInit {
+export class RanControlComponent implements OnInit, OnDestroy {
 
   darkMode: boolean;
-  panelClass: string = "";
+  panelClass: string;
   displayedColumns: string[] = ['nbId', 'nodeType', 'ranName', 'ranIp', 'ranPort', 'connectionStatus'];
   dataSource: RANControlDataSource;
+  private instanceChange: Subscription;
+  private instanceKey: string;
 
   constructor(private e2MgrSvc: E2ManagerService,
     private errorDialogService: ErrorDialogService,
     private confirmDialogService: ConfirmDialogService,
     private notificationService: NotificationService,
     private loadingDialogService: LoadingDialogService,
+    public instanceSelectorService: InstanceSelectorService,
     public dialog: MatDialog,
     public ui: UiService) { }
 
   ngOnInit() {
     this.dataSource = new RANControlDataSource(this.e2MgrSvc, this.notificationService);
-    this.dataSource.loadTable();
+
     this.ui.darkModeState.subscribe((isDark) => {
       this.darkMode = isDark;
     });
+
+    this.instanceChange = this.instanceSelectorService.getSelectedInstance().subscribe((instance: RicInstance) => {
+      if (instance.key) {
+        this.instanceKey = instance.key;
+        this.dataSource.loadTable(instance.key);
+      }
+    });
+  }
+
+  ngOnDestroy() {
+    this.instanceChange.unsubscribe();
   }
 
   setupRANConnection() {
     if (this.darkMode) {
-      this.panelClass = "dark-theme";
+      this.panelClass = 'dark-theme';
     } else {
-      this.panelClass = "";
+      this.panelClass = '';
     }
     const dialogRef = this.dialog.open(RanControlConnectDialogComponent, {
       panelClass: this.panelClass,
-      width: '450px'
+      width: '450px',
+      data: {
+        instanceKey: this.instanceKey
+      }
     });
     dialogRef.afterClosed()
       .subscribe((result: boolean) => {
-      if (result) {
-        this.dataSource.loadTable();
-      }
-    });
+        if (result) {
+          this.dataSource.loadTable(this.instanceKey);
+        }
+      });
   }
 
   disconnectAllRANConnections() {
     const aboutError = 'Disconnect all RAN Connections Failed: ';
     this.confirmDialogService.openConfirmDialog('Are you sure you want to disconnect all RAN connections?')
-      .afterClosed().subscribe( (res: boolean) => {
+      .afterClosed().subscribe((res: boolean) => {
         if (res) {
-          this.loadingDialogService.startLoading("Disconnecting");
-          this.e2MgrSvc.nodebPut()
+          this.loadingDialogService.startLoading('Disconnecting');
+          this.e2MgrSvc.nodebPut(this.instanceKey)
             .pipe(
               finalize(() => this.loadingDialogService.stopLoading())
             )
             .subscribe(
-            ( body: any ) => {
-              this.notificationService.success('Disconnect succeeded!');
-              this.dataSource.loadTable();
-            },
-            (her: HttpErrorResponse) => {
-              // the error field should have an ErrorTransport object
-              let msg = her.message;
-              if (her.error && her.error.message) {
-                msg = her.error.message;
+              (body: any) => {
+                this.notificationService.success('Disconnect succeeded!');
+                this.dataSource.loadTable(this.instanceKey);
+              },
+              (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);
               }
-              this.errorDialogService.displayError('Disconnect failed: ' + msg);
-            }
-          );
+            );
         }
       });
   }