X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fcaas-ingress%2Fcaas-ingress.component.ts;h=c389cc91df1aef18b72779674f0f11c7ea757f9c;hb=9cf5b95a5bc9810d739d14d324dd7d80cbdb4a7d;hp=ba25d37e8f780e172a0fc1ce977f016038b8dfba;hpb=55472d9367cf229b2b87a625a8aa1dfb822cbaad;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/caas-ingress/caas-ingress.component.ts b/webapp-frontend/src/app/caas-ingress/caas-ingress.component.ts
index ba25d37e..c389cc91 100644
--- a/webapp-frontend/src/app/caas-ingress/caas-ingress.component.ts
+++ b/webapp-frontend/src/app/caas-ingress/caas-ingress.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.
@@ -18,21 +18,23 @@
  * ========================LICENSE_END===================================
  */
 
-import { Component, Input, OnInit, ViewChild } from '@angular/core';
+import { Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { MatSort } from '@angular/material/sort';
-import { CaasIngressDataSource } from './caas-ingress.datasource';
+import { Subscription } from 'rxjs';
 import { CaasIngressService } from '../services/caas-ingress/caas-ingress.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 { CaasIngressDataSource } from './caas-ingress.datasource';
 
 @Component({
   selector: 'rd-caas-ingress',
   templateUrl: './caas-ingress.component.html',
   styleUrls: ['./caas-ingress.component.scss']
 })
-export class CaasIngressComponent implements OnInit {
+export class CaasIngressComponent implements OnInit, OnDestroy {
 
   // Cluster name is displayed in page title
   @Input() cluster: string;
@@ -40,19 +42,29 @@ export class CaasIngressComponent implements OnInit {
   @Input() namespace: string;
 
   dataSource: CaasIngressDataSource;
-  displayedColumns: string[] = [ 'namespace', 'name', 'status', 'ip', 'containers', 'restartCount', 'creationTime' ];
+  displayedColumns: string[] = ['namespace', 'name', 'status', 'ip', 'containers', 'restartCount', 'creationTime'];
   @ViewChild(MatSort, { static: true }) sort: MatSort;
+  private instanceChange: Subscription;
 
   constructor(
     private caasIngressSvc: CaasIngressService,
     private confirmDialogService: ConfirmDialogService,
     private errorDialogService: ErrorDialogService,
     private loadingDialogService: LoadingDialogService,
+    public instanceSelectorService: InstanceSelectorService,
     private notificationService: NotificationService) { }
 
   ngOnInit() {
     this.dataSource = new CaasIngressDataSource(this.caasIngressSvc, this.sort, this.notificationService);
-    this.dataSource.loadTable(this.cluster, this.namespace);
+    this.instanceChange = this.instanceSelectorService.getSelectedInstancekey().subscribe((instanceKey: string) => {
+      if (instanceKey) {
+        this.dataSource.loadTable(instanceKey, this.cluster, this.namespace);
+      }
+    });
+  }
+
+  ngOnDestroy() {
+    this.instanceChange.unsubscribe();
   }
 
 }