X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fei-coordinator%2Fei-job.datasource.ts;h=b008f802750903444f4b31291a88ecebd309d839;hb=869354bad80ea5db92893ad3017eaf9c421c0731;hp=5fc64fc10bd586183ec5419a2951864d0d3c001b;hpb=47d0224358d746f8a290a9c132580a4d46041495;p=portal%2Fnonrtric-controlpanel.git

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 5fc64fc..b008f80 100644
--- a/webapp-frontend/src/app/ei-coordinator/ei-job.datasource.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-job.datasource.ts
@@ -21,23 +21,31 @@
 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';
 
+
 @Injectable({
     providedIn: 'root'
 })
 
 export class EIJobDataSource {
 
-    private eiJobsSubject = new BehaviorSubject<EIJob[]>([]);
+    private jobs: Array<EIJob> = [];
 
     public eiJobs(): EIJob[] {
-        return this.eiJobsSubject.value;
+        return this.jobs;
+    }
+
+    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();
 
@@ -49,25 +57,18 @@ export class EIJobDataSource {
 
     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);
-    }
+
 }