X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fcatalog%2Fcatalog.datasource.ts;h=68362a7c0a8f8da6353503c0183fcbbec91fa4d5;hb=b7d7982bbfbf3a1333feb8b811f99497752d3722;hp=f5f6e986377102a46654375ecea6ffeaef1e37f7;hpb=59f2bcb96fad2d6faee48b4ca65da36249ec5297;p=portal%2Fric-dashboard.git diff --git a/webapp-frontend/src/app/catalog/catalog.datasource.ts b/webapp-frontend/src/app/catalog/catalog.datasource.ts index f5f6e986..68362a7c 100644 --- a/webapp-frontend/src/app/catalog/catalog.datasource.ts +++ b/webapp-frontend/src/app/catalog/catalog.datasource.ts @@ -33,31 +33,29 @@ import { NotificationService } from '../services/ui/notification.service'; export class CatalogDataSource extends DataSource { private catalogSubject = new BehaviorSubject([]); - private loadingSubject = new BehaviorSubject(false); - public loading$ = this.loadingSubject.asObservable(); - public rowCount = 1; // hide footer during intial load - constructor(private appMgrSvc: AppMgrService, + constructor( + private appMgrSvc: AppMgrService, private sort: MatSort, private notificationService: NotificationService) { super(); } - loadTable() { + loadTable(instanceKey: string) { this.loadingSubject.next(true); - this.appMgrSvc.getDeployable() + this.appMgrSvc.getDeployable(instanceKey) .pipe( - catchError( (her: HttpErrorResponse) => { + catchError((her: HttpErrorResponse) => { console.log('CatalogDataSource failed: ' + her.message); this.notificationService.error('Failed to get applications: ' + her.message); return of([]); }), finalize(() => this.loadingSubject.next(false)) ) - .subscribe( (xApps: XMDeployableApp[]) => { + .subscribe((xApps: XMDeployableApp[]) => { this.rowCount = xApps.length; this.catalogSubject.next(xApps); });