* ========================LICENSE_END===================================
*/
-import { HttpErrorResponse } from '@angular/common/http';
import { Injectable } from '@angular/core';
-import { MatTableDataSource } from '@angular/material';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { of } from 'rxjs/observable/of';
-import { catchError, finalize, map } from 'rxjs/operators';
import { EIJob } from '../interfaces/ei.types';
import { EIService } from '../services/ei/ei.service';
-import { NotificationService } from '../services/ui/notification.service';
@Injectable({
providedIn: 'root'
})
-export class EIJobDataSource extends MatTableDataSource<EIJob> {
+export class EIJobDataSource {
- eiJobsSubject = new BehaviorSubject<EIJob[]>([]);
+ private jobs: Array<EIJob> = [];
+
+ public eiJobs(): EIJob[] {
+ return this.jobs;
+ }
private loadingSubject = new BehaviorSubject<boolean>(false);
public rowCount = 1; // hide footer during intial load
constructor(
- private eiSvc: EIService,
- private notificationService: NotificationService) {
- super();
+ private eiSvc: EIService) {
}
- getJobs() {
+ loadJobs() {
this.loadingSubject.next(true);
+ this.jobs = [];
this.eiSvc.getProducerIds()
- .pipe(
- catchError((her: HttpErrorResponse) => {
- this.notificationService.error('Failed to get EI jobs: ' + her.error);
- return of([]);
- }),
- finalize(() => this.loadingSubject.next(false))
- )
.subscribe((producerIds: string[]) => {
producerIds.forEach(id => {
this.getJobsForProducer(id);
});
});
+ this.rowCount = this.jobs.length;
}
private getJobsForProducer(id: string) {
console.log('Getting jobs for producer ID: ', id);
- this.eiSvc.getJobsForProducer(id).subscribe(jobs => {
- this.addJobsToSubject(jobs);
- this.rowCount = this.eiJobsSubject.getValue().length;
+ this.eiSvc.getJobsForProducer(id).subscribe(producerJobs => {
+ this.jobs = this.jobs.concat(producerJobs);
});
}
-
- private addJobsToSubject(jobs: EIJob[]) {
- const currentValue = this.eiJobsSubject.value;
- const updatedValue = [...currentValue, ...jobs];
- this.eiJobsSubject.next(updatedValue);
- }
-
- connect(): BehaviorSubject<EIJob[]> {
- return this.eiJobsSubject;
- }
-
- disconnect(): void {
- this.eiJobsSubject.complete();
- this.loadingSubject.complete();
- }
}