* ========================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 { MatSort } from '@angular/material';
-import { merge } from 'rxjs';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { HttpErrorResponse } from '@angular/common/http';
+import { MatSort } from '@angular/material/sort';
import { Observable } from 'rxjs/Observable';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { merge } from 'rxjs';
import { of } from 'rxjs/observable/of';
import { catchError, finalize, map } from 'rxjs/operators';
import { XappControlRow, XMDeployedApp, XMXappInstance } from '../interfaces/app-mgr.types';
import { AppMgrService } from '../services/app-mgr/app-mgr.service';
+import { NotificationService } from '../services/ui/notification.service';
export class AppControlDataSource extends DataSource<XappControlRow> {
- private xAppInstancesSubject = new BehaviorSubject<XappControlRow[]>([]);
+ private appControlSubject = new BehaviorSubject<XappControlRow[]>([]);
private loadingSubject = new BehaviorSubject<boolean>(false);
public loading$ = this.loadingSubject.asObservable();
- emptyInstances: XMXappInstance =
+ public rowCount = 1; // hide footer during intial load
+
+ private emptyInstances: XMXappInstance =
{ ip: null,
name: null,
port: null,
txMessages: [],
};
- constructor(private appMgrSvc: AppMgrService, private sort: MatSort) {
+ constructor(private appMgrSvc: AppMgrService,
+ private sort: MatSort,
+ private notificationService: NotificationService) {
super();
}
this.loadingSubject.next(true);
this.appMgrSvc.getDeployed()
.pipe(
- catchError(() => of([])),
+ catchError( (her: HttpErrorResponse) => {
+ console.log('AppControlDataSource failed: ' + her.message);
+ this.notificationService.error('Failed to get applications: ' + her.message);
+ return of([]);
+ }),
finalize(() => this.loadingSubject.next(false))
)
- .subscribe(xApps => this.xAppInstancesSubject.next(this.flatten(xApps)));
+ .subscribe( (xApps: XMDeployedApp[]) => {
+ this.rowCount = xApps.length;
+ const flattenedApps = this.flatten(xApps);
+ this.appControlSubject.next(flattenedApps);
+ });
}
connect(collectionViewer: CollectionViewer): Observable<XappControlRow[]> {
const dataMutations = [
- this.xAppInstancesSubject.asObservable(),
+ this.appControlSubject.asObservable(),
this.sort.sortChange
];
return merge(...dataMutations).pipe(map(() => {
- return this.getSortedData([...this.xAppInstancesSubject.getValue()]);
+ return this.getSortedData([...this.appControlSubject.getValue()]);
}));
}
disconnect(collectionViewer: CollectionViewer): void {
- this.xAppInstancesSubject.complete();
+ this.appControlSubject.complete();
this.loadingSubject.complete();
}
- private flatten(allxappdata: XMDeployedApp[]) {
+ private flatten(allxappdata: XMDeployedApp[]): XappControlRow[] {
const xAppInstances: XappControlRow[] = [];
for (const xapp of allxappdata) {
if (!xapp.instances) {
}
}
-function compare(a, b, isAsc) {
+function compare(a: any, b: any, isAsc: boolean) {
return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
}