X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-frontend%2Fsrc%2Fapp%2Fcatalog%2Fcatalog.component.ts;h=ad90b361037e7760b296dcb35a0107c1af72d057;hb=refs%2Fchanges%2F72%2F2272%2F8;hp=07e0e020e9cd429f5c7b4b34efaf5b62be40a6e4;hpb=59f2bcb96fad2d6faee48b4ca65da36249ec5297;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/catalog/catalog.component.ts b/webapp-frontend/src/app/catalog/catalog.component.ts
index 07e0e020..ad90b361 100644
--- a/webapp-frontend/src/app/catalog/catalog.component.ts
+++ b/webapp-frontend/src/app/catalog/catalog.component.ts
@@ -18,55 +18,70 @@
  * ========================LICENSE_END===================================
  */
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { MatSort } from '@angular/material/sort';
+import { Subscription } from 'rxjs';
 import { finalize } from 'rxjs/operators';
+import { RicInstance } from '../interfaces/dashboard.types';
 import { XMDeployableApp } from '../interfaces/app-mgr.types';
 import { AppMgrService } from '../services/app-mgr/app-mgr.service';
-import { ErrorDialogService } from '../services/ui/error-dialog.service';
+import { InstanceSelectorService } from '../services/instance-selector/instance-selector.service';
 import { LoadingDialogService } from '../services/ui/loading-dialog.service';
+import { UiService } from '../services/ui/ui.service';
 import { AppConfigurationComponent } from './../app-configuration/app-configuration.component';
-import { ConfirmDialogService } from './../services/ui/confirm-dialog.service';
-import { NotificationService } from './../services/ui/notification.service';
+import { ConfirmDialogService } from '../services/ui/confirm-dialog.service';
+import { NotificationService } from '../services/ui/notification.service';
 import { CatalogDataSource } from './catalog.datasource';
-import { UiService } from '../services/ui/ui.service';
 
 @Component({
   selector: 'rd-app-catalog',
   templateUrl: './catalog.component.html',
   styleUrls: ['./catalog.component.scss'],
 })
-export class CatalogComponent implements OnInit {
+export class CatalogComponent implements OnInit, OnDestroy {
 
   darkMode: boolean;
-  panelClass: string = "";
+  panelClass: string;
   displayedColumns: string[] = ['name', 'version', 'action'];
   dataSource: CatalogDataSource;
+  private instanceChange: Subscription;
+  private instanceKey: string;
+
   @ViewChild(MatSort, { static: true }) sort: MatSort;
 
   constructor(
     private appMgrService: AppMgrService,
     private confirmDialogService: ConfirmDialogService,
     private dialog: MatDialog,
-    private errorDiaglogService: ErrorDialogService,
     private loadingDialogService: LoadingDialogService,
     private notificationService: NotificationService,
+    public instanceSelectorService: InstanceSelectorService,
     public ui: UiService) { }
 
   ngOnInit() {
     this.dataSource = new CatalogDataSource(this.appMgrService, this.sort, 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();
   }
 
   onConfigureApp(xapp: XMDeployableApp): void {
     if (this.darkMode) {
-      this.panelClass = "dark-theme";
+      this.panelClass = 'dark-theme';
     } else {
-      this.panelClass = "";
+      this.panelClass = '';
     }
     const dialogRef = this.dialog.open(AppConfigurationComponent, {
       panelClass: this.panelClass,
@@ -75,8 +90,12 @@ export class CatalogComponent implements OnInit {
       position: {
         top: '10%'
       },
-      data: xapp
-    })
+      data: {
+        xapp: xapp,
+        instanceKey: this.instanceKey
+      }
+
+    });
   }
 
   onDeployApp(app: XMDeployableApp): void {
@@ -84,7 +103,7 @@ export class CatalogComponent implements OnInit {
       .afterClosed().subscribe((res: boolean) => {
         if (res) {
           this.loadingDialogService.startLoading('Deploying ' + app.name);
-          this.appMgrService.deployXapp(app.name)
+          this.appMgrService.deployXapp(this.instanceKey, app.name)
             .pipe(
               finalize(() => this.loadingDialogService.stopLoading())
             )