* ========================LICENSE_END===================================
*/
-import { DataSource } from '@angular/cdk/collections';
import { HttpErrorResponse } from '@angular/common/http';
-import { MatSort } from '@angular/material';
-import { Observable } from 'rxjs/Observable';
+import { Injectable } from '@angular/core';
+import { MatTableDataSource } from '@angular/material';
+
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { merge } from 'rxjs';
import { of } from 'rxjs/observable/of';
import { catchError, finalize, map } from 'rxjs/operators';
-import { EIJob } from '../interfaces/ei.jobs';
+
+import { EIJob } from '../interfaces/ei.types';
import { EIService } from '../services/ei/ei.service';
import { NotificationService } from '../services/ui/notification.service';
-export class EIJobDataSource extends DataSource<EIJob> {
+@Injectable({
+ providedIn: 'root'
+})
+
+export class EIJobDataSource extends MatTableDataSource<EIJob> {
private eiJobSubject = new BehaviorSubject<EIJob[]>([]);
constructor(
private eiSvc: EIService,
- public sort: MatSort,
private notificationService: NotificationService) {
super();
}
finalize(() => this.loadingSubject.next(false))
)
.subscribe((instances: EIJob[]) => {
- console.log("Jobs: " + instances);
this.rowCount = instances.length;
this.eiJobSubject.next(instances);
});
}
- connect(): Observable<EIJob[]> {
- const dataMutations = [
- this.eiJobSubject.asObservable(),
- this.sort.sortChange
- ];
- return merge(...dataMutations).pipe(map(() => {
- return this.getSortedData([...this.eiJobSubject.getValue()]);
- }));
+ connect(): BehaviorSubject<EIJob[]> {
+ return this.eiJobSubject;
}
disconnect(): void {
this.eiJobSubject.complete();
this.loadingSubject.complete();
}
-
- private getSortedData(data: EIJob[]) {
- if (!this.sort || !this.sort.active || this.sort.direction === '') {
- return data;
- }
-
- return data.sort((a, b) => {
- const isAsc = this.sort.direction === 'asc';
- switch (this.sort.active) {
- case 'id': return compare(a.ei_job_identity, b.ei_job_identity, isAsc);
- //case 'eiTypeId': return compare(a.eiTypeId, b.eiTypeId, isAsc);
- //case 'jobResultUri': return compare(a.jobResultUri, b.jobResultUri, isAsc);
- //case 'jobOwner': return compare(a.jobOwner, b.jobOwner, isAsc);
- //case 'jobStatusNotificationUri': return compare(a.jobStatusNotificationUri, b.jobStatusNotificationUri, isAsc);
- //case 'jobDefinition': return compare(a.jobDefinition, b.jobDefinition, isAsc);
- default: return 0;
- }
- });
- }
-}
-
-function compare(a: string, b: string, isAsc: boolean) {
- return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
}