X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dashboard%2Fwebapp-frontend%2Fsrc%2Fapp%2Fcatalog%2Fcatalog.datasource.ts;fp=dashboard%2Fwebapp-frontend%2Fsrc%2Fapp%2Fcatalog%2Fcatalog.datasource.ts;h=bbdf4396f55f2248a53739c153f98e996f494fa7;hb=fa9065384adda531aa66bcf39ffc5ac6513ff4dd;hp=68362a7c0a8f8da6353503c0183fcbbec91fa4d5;hpb=89f1c3c75b013187d3a59a86b78c2b9ef5dc170e;p=portal%2Fric-dashboard.git diff --git a/dashboard/webapp-frontend/src/app/catalog/catalog.datasource.ts b/dashboard/webapp-frontend/src/app/catalog/catalog.datasource.ts index 68362a7c..bbdf4396 100644 --- a/dashboard/webapp-frontend/src/app/catalog/catalog.datasource.ts +++ b/dashboard/webapp-frontend/src/app/catalog/catalog.datasource.ts @@ -27,12 +27,12 @@ import { merge } from 'rxjs'; import { of } from 'rxjs/observable/of'; import { catchError, finalize, map } from 'rxjs/operators'; import { AppMgrService } from '../services/app-mgr/app-mgr.service'; -import { XMDeployableApp } from '../interfaces/app-mgr.types'; +import { XMXapp } from '../interfaces/app-mgr.types'; import { NotificationService } from '../services/ui/notification.service'; -export class CatalogDataSource extends DataSource { +export class CatalogDataSource extends DataSource { - private catalogSubject = new BehaviorSubject([]); + private catalogSubject = new BehaviorSubject([]); private loadingSubject = new BehaviorSubject(false); public loading$ = this.loadingSubject.asObservable(); public rowCount = 1; // hide footer during intial load @@ -55,13 +55,13 @@ export class CatalogDataSource extends DataSource { }), finalize(() => this.loadingSubject.next(false)) ) - .subscribe((xApps: XMDeployableApp[]) => { + .subscribe((xApps: XMXapp[]) => { this.rowCount = xApps.length; this.catalogSubject.next(xApps); }); } - connect(collectionViewer: CollectionViewer): Observable { + connect(collectionViewer: CollectionViewer): Observable { const dataMutations = [ this.catalogSubject.asObservable(), this.sort.sortChange @@ -76,11 +76,11 @@ export class CatalogDataSource extends DataSource { this.loadingSubject.complete(); } - private getSortedData(data: XMDeployableApp[]) { + private getSortedData(data: XMXapp[]) { if (!this.sort.active || this.sort.direction === '') { return data; } - return data.sort((a: XMDeployableApp, b: XMDeployableApp) => { + return data.sort((a: XMXapp, b: XMXapp) => { const isAsc = this.sort.direction === 'asc'; switch (this.sort.active) { case 'name': return this.compare(a.name, b.name, isAsc);