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 a8a786f..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,87 +18,57 @@
  * ========================LICENSE_END===================================
  */
 
-import { DataSource } from '@angular/cdk/collections';
-import { HttpErrorResponse } from '@angular/common/http';
-import { MatSort } from '@angular/material';
-import { Observable } from 'rxjs/Observable';
+import { Injectable } from '@angular/core';
+
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
-import { merge } from 'rxjs';
-import { of } from 'rxjs/observable/of';
-import { catchError, finalize, map } from 'rxjs/operators';
-import { EIJob } from '../interfaces/ei.jobs';
+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';
 
-export class EIJobDataSource extends DataSource<EIJob> {
 
-    private eiJobSubject = new BehaviorSubject<EIJob[]>([]);
+@Injectable({
+    providedIn: 'root'
+})
+
+export class EIJobDataSource {
+
+    private jobs: Array<EIJob> = [];
+
+    public eiJobs(): EIJob[] {
+        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();
 
     public rowCount = 1; // hide footer during intial load
 
     constructor(
-        private eiSvc: EIService,
-        public sort: MatSort,
-        private notificationService: NotificationService) {
-        super();
+        private eiSvc: EIService) {
     }
 
-    loadTable() {
+    loadJobs() {
         this.loadingSubject.next(true);
-        this.eiSvc.getEIJobs()
-            .pipe(
-                catchError((her: HttpErrorResponse) => {
-                    this.notificationService.error('Failed to get EI jobs: ' + her.error);
-                    return of([]);
-                }),
-                finalize(() => this.loadingSubject.next(false))
-            )
-            .subscribe((instances: EIJob[]) => {
-                console.log("Jobs: " + instances);
-                this.rowCount = instances.length;
-                this.eiJobSubject.next(instances);
-            });
+        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(): Observable<EIJob[]> {
-        const dataMutations = [
-            this.eiJobSubject.asObservable(),
-            this.sort.sortChange
-        ];
-        return merge(...dataMutations).pipe(map(() => {
-            return this.getSortedData([...this.eiJobSubject.getValue()]);
-        }));
-    }
-
-    disconnect(): void {
-        this.eiJobSubject.complete();
-        this.loadingSubject.complete();
-    }
-
-    private getSortedData(data: EIJob[]) {
-        if (!this.sort || !this.sort.active || this.sort.direction === '') {
-            return data;
-        }
-
-        return data.sort((a, b) => {
-            const isAsc = this.sort.direction === 'asc';
-            switch (this.sort.active) {
-                case 'id': return compare(a.ei_job_identity, b.ei_job_identity, isAsc);
-                //case 'eiTypeId': return compare(a.eiTypeId, b.eiTypeId, isAsc);
-                //case 'jobResultUri': return compare(a.jobResultUri, b.jobResultUri, isAsc);
-                //case 'jobOwner': return compare(a.jobOwner, b.jobOwner, isAsc);
-                //case 'jobStatusNotificationUri': return compare(a.jobStatusNotificationUri, b.jobStatusNotificationUri, isAsc);
-                //case 'jobDefinition': return compare(a.jobDefinition, b.jobDefinition, isAsc);
-                default: return 0;
-            }
-        });
-    }
-}
-
-function compare(a: string, b: string, isAsc: boolean) {
-    return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
+ 
 }