X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fcatalog%2Fcatalog.component.ts;h=ad90b361037e7760b296dcb35a0107c1af72d057;hb=refs%2Fchanges%2F72%2F2272%2F8;hp=d46c99f73149e039b8b374ad587df4a8ab112ae3;hpb=43e79e4a410e1cf377d344cae2c9a7a6e4806fe9;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 d46c99f7..ad90b361 100644 --- a/webapp-frontend/src/app/catalog/catalog.component.ts +++ b/webapp-frontend/src/app/catalog/catalog.component.ts @@ -23,14 +23,15 @@ 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 { 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'; @Component({ @@ -64,10 +65,10 @@ export class CatalogComponent implements OnInit, OnDestroy { this.darkMode = isDark; }); - this.instanceChange = this.instanceSelectorService.getSelectedInstancekey().subscribe((instanceKey: string) => { - if (instanceKey) { - this.instanceKey = instanceKey; - this.dataSource.loadTable(instanceKey); + this.instanceChange = this.instanceSelectorService.getSelectedInstance().subscribe((instance: RicInstance) => { + if (instance.key) { + this.instanceKey = instance.key; + this.dataSource.loadTable(instance.key); } }); }