*/
import { CollectionViewer, DataSource } from '@angular/cdk/collections';
+import { MatSort } from '@angular/material';
+import { merge } from 'rxjs';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { Observable } from 'rxjs/Observable';
-import { catchError, finalize } from 'rxjs/operators';
import { of } from 'rxjs/observable/of';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { XappMgrService } from '../services/xapp-mgr/xapp-mgr.service';
-import { XMXapp, XappControlRow } from '../interfaces/xapp-mgr.types';
+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';
export class ControlDataSource extends DataSource<XappControlRow> {
public loading$ = this.loadingSubject.asObservable();
- constructor(private xappMgrSvc: XappMgrService) {
+ emptyInstances: XMXappInstance =
+ { ip: null,
+ name: null,
+ port: null,
+ status: null,
+ rxMessages: [],
+ txMessages: [],
+ };
+
+ constructor(private appMgrSvc: AppMgrService, private sort: MatSort) {
super();
- };
+ }
loadTable() {
this.loadingSubject.next(true);
- this.xappMgrSvc.getAll()
+ this.appMgrSvc.getDeployed()
.pipe(
catchError(() => of([])),
finalize(() => this.loadingSubject.next(false))
)
- .subscribe(xApps => this.xAppInstancesSubject.next(this.getInstance(xApps)) )
+ .subscribe(xApps => this.xAppInstancesSubject.next(this.flatten(xApps)));
}
connect(collectionViewer: CollectionViewer): Observable<XappControlRow[]> {
- return this.xAppInstancesSubject.asObservable();
+ const dataMutations = [
+ this.xAppInstancesSubject.asObservable(),
+ this.sort.sortChange
+ ];
+ return merge(...dataMutations).pipe(map(() => {
+ return this.getSortedData([...this.xAppInstancesSubject.getValue()]);
+ }));
}
disconnect(collectionViewer: CollectionViewer): void {
this.loadingSubject.complete();
}
- getInstance(allxappdata: XMXapp[]) {
- const xAppInstances: XappControlRow[]= [];
- for (const xappindex in allxappdata) {
- const instancelist = allxappdata[xappindex].instances;
- for (const instanceindex in instancelist) {
- var instance: XappControlRow = {
- xapp: allxappdata[xappindex].name,
- instance: instancelist[instanceindex]
+ private flatten(allxappdata: XMDeployedApp[]) {
+ const xAppInstances: XappControlRow[] = [];
+ for (const xapp of allxappdata) {
+ if (!xapp.instances) {
+ const row: XappControlRow = {
+ xapp: xapp.name,
+ instance: this.emptyInstances
+ };
+ xAppInstances.push(row);
+ } else {
+ for (const ins of xapp.instances) {
+ const row: XappControlRow = {
+ xapp: xapp.name,
+ instance: ins
+ };
+ xAppInstances.push(row);
}
- xAppInstances.push(instance);
}
}
return xAppInstances;
}
+
+ private getSortedData(data: XappControlRow[]) {
+ if (!this.sort.active || this.sort.direction === '') {
+ return data;
+ }
+
+ return data.sort((a, b) => {
+ const isAsc = this.sort.direction === 'asc';
+ switch (this.sort.active) {
+ case 'xapp': return compare(a.xapp, b.xapp, isAsc);
+ case 'name': return compare(a.instance.name, b.instance.name, isAsc);
+ case 'status': return compare(a.instance.status, b.instance.status, isAsc);
+ case 'ip': return compare(a.instance.ip, b.instance.ip, isAsc);
+ case 'port': return compare(a.instance.port, b.instance.port, isAsc);
+ default: return 0;
+ }
+ });
+ }
+}
+
+function compare(a, b, isAsc) {
+ return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
}