Fix producers and jobs don't appear on interface

[portal/nonrtric-controlpanel.git] / webapp-frontend / src / app / ei-coordinator / ei-job.datasource.ts

diff --git a/webapp-frontend/src/app/ei-coordinator/ei-job.datasource.ts b/webapp-frontend/src/app/ei-coordinator/ei-job.datasource.ts
index 2e0e0c8..ac4109d 100644 (file)
--- a/webapp-frontend/src/app/ei-coordinator/ei-job.datasource.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-job.datasource.ts
@@ -18,75 +18,57 @@
  * ========================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 { mergeMap, finalize } from 'rxjs/operators';
+import { Observable, forkJoin } from 'rxjs';
 
 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 {
+
+    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();
 
     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.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);
-                });
-            });
-    }
-
-    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;
-        });
-    }
-
-    private addJobsToSubject(jobs: EIJob[]) {
-        const currentValue = this.eiJobsSubject.value;
-        const updatedValue = [...currentValue, ...jobs];
-        this.eiJobsSubject.next(updatedValue);
+        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;
     }
 
-    connect(): BehaviorSubject<EIJob[]> {
-        return this.eiJobsSubject;
-    }
-
-    disconnect(): void {
-        this.eiJobsSubject.complete();
-        this.loadingSubject.complete();
-    }
+ 
 }