* ========================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.
import { CollectionViewer, DataSource } from '@angular/cdk/collections';
import { HttpErrorResponse } from '@angular/common/http';
-import { MatSort } from '@angular/material';
+import { MatSort } from '@angular/material/sort';
import { Observable } from 'rxjs/Observable';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { merge } from 'rxjs';
export class CatalogDataSource extends DataSource<XMDeployableApp> {
private catalogSubject = new BehaviorSubject<XMDeployableApp[]>([]);
-
private loadingSubject = new BehaviorSubject<boolean>(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);
});