*/
import { Injectable } from '@angular/core';
-import { MatTableDataSource } from '@angular/material';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { mergeMap, finalize } from 'rxjs/operators';
+import { Observable, forkJoin } from 'rxjs';
import { EIJob } from '../interfaces/ei.types';
import { EIService } from '../services/ei/ei.service';
+
@Injectable({
providedIn: 'root'
})
-export class EIJobDataSource extends MatTableDataSource<EIJob> {
+export class EIJobDataSource {
+
+ private jobs: Array<EIJob> = [];
+
+ public eiJobs(): EIJob[] {
+ return this.jobs;
+ }
- eiJobsSubject = new BehaviorSubject<EIJob[]>([]);
+ public eiJobsSubject(): Observable<EIJob[]> {
+ return this.jobsSubject.asObservable() as Observable<EIJob[]>;
+ }
private loadingSubject = new BehaviorSubject<boolean>(false);
+ private jobsSubject = new BehaviorSubject<EIJob[]>([]);
public loading$ = this.loadingSubject.asObservable();
constructor(
private eiSvc: EIService) {
- super();
}
- getJobs() {
+ loadJobs() {
this.loadingSubject.next(true);
- this.eiSvc.getProducerIds()
- .subscribe((producerIds: string[]) => {
- producerIds.forEach(id => {
- this.getJobsForProducer(id);
- });
- });
- }
-
- 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.jobs = [];
+ this.eiSvc.getProducerIds().pipe(
+ mergeMap(prodIds =>
+ forkJoin(prodIds.map(id => this.eiSvc.getJobsForProducer(id)))),
+ mergeMap(result => result),
+ finalize(() => this.loadingSubject.next(false))
+ ).subscribe(result => {
+ this.jobs = this.jobs.concat(result);
+ this.jobsSubject.next(this.jobs);
});
+ this.rowCount = this.jobs.length;
}
- 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();
- }
}