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 0727625..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
@@ -21,13 +21,12 @@
 import { Injectable } from '@angular/core';
 
 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';
-import { MatTableDataSource } from '@angular/material';
-import { ViewChild } from '@angular/core';
-import { MatSort } from '@angular/material/sort';
-import { delay } from 'rxjs/operators';
+
 
 @Injectable({
     providedIn: 'root'
@@ -36,15 +35,17 @@ import { delay } from 'rxjs/operators';
 export class EIJobDataSource {
 
     private jobs: Array<EIJob> = [];
-    private dataSource: MatTableDataSource<any> = new MatTableDataSource();
-    @ViewChild(MatSort, { static: true }) sort: MatSort;
 
+    public eiJobs(): EIJob[] {
+        return this.jobs;
+    }
 
-    public jobsDataSource(): MatTableDataSource<any> {
-        return this.dataSource;
+    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();
 
@@ -57,26 +58,17 @@ export class EIJobDataSource {
     loadJobs() {
         this.loadingSubject.next(true);
         this.jobs = [];
-        this.eiSvc.getProducerIds()
-            .subscribe((producerIds: string[]) => {
-                producerIds.forEach(id => {
-                    this.getJobsForProducer(id);
-                });
-                //this.dataSource = new MatTableDataSource();  
-                this.dataSource.data = this.jobs;
-                this.dataSource.sort = this.sort;
-                console.log("datasource: "+this.dataSource.data);  
-            });
+        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 getJobsForProducer(id: string) {
-        console.log('Getting jobs for producer ID: ', id);
-        this.eiSvc.getJobsForProducer(id)//.pipe(delay(5000))
-        .subscribe(producerJobs => {
-            this.jobs = this.jobs.concat(producerJobs);    
-            console.log("producerJobs: "+producerJobs);  
-            
-        });
-    }
+ 
 }