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=64c948c158eafe3302c68055d01d7a51342d7496;hb=5840fd8fc16980ade4af6735f991e08f8fca65e7;hp=b0a348accffd70218022beed59890799d8e19fd0;hpb=f34ec0823b56ceaf7a6073be6fc530b0d432b37d;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 b0a348a..64c948c 100644
--- a/webapp-frontend/src/app/ei-coordinator/ei-job.datasource.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-job.datasource.ts
@@ -18,21 +18,21 @@
  * ========================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 { MatTableDataSource } from '@angular/material';
+
 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 { 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> {
+@Injectable({
+    providedIn: 'root'
+})
+
+export class EIJobDataSource extends MatTableDataSource<EIJob> {
 
-    private eiJobSubject = new BehaviorSubject<EIJob[]>([]);
+    eiJobsSubject = new BehaviorSubject<EIJob[]>([]);
 
     private loadingSubject = new BehaviorSubject<boolean>(false);
 
@@ -41,60 +41,40 @@ export class EIJobDataSource extends DataSource<EIJob> {
     public rowCount = 1; // hide footer during intial load
 
     constructor(
-        private eiSvc: EIService,
-        public sort: MatSort,
-        private notificationService: NotificationService) {
+        private eiSvc: EIService) {
         super();
     }
 
-    loadTable() {
+    getJobs() {
         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[]) => {
-                this.rowCount = instances.length;
-                this.eiJobSubject.next(instances);
+        this.eiSvc.getProducerIds()
+            .subscribe((producerIds: string[]) => {
+                producerIds.forEach(id => {
+                    this.getJobsForProducer(id);
+                });
             });
     }
 
-    connect(): Observable<EIJob[]> {
-        const dataMutations = [
-            this.eiJobSubject.asObservable(),
-            this.sort.sortChange
-        ];
-        return merge(...dataMutations).pipe(map(() => {
-            return this.getSortedData([...this.eiJobSubject.getValue()]);
-        }));
+    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;
+        });
     }
 
-    disconnect(): void {
-        this.eiJobSubject.complete();
-        this.loadingSubject.complete();
+    private addJobsToSubject(jobs: EIJob[]) {
+        const currentValue = this.eiJobsSubject.value;
+        const updatedValue = [...currentValue, ...jobs];
+        this.eiJobsSubject.next(updatedValue);
     }
 
-    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 'ei_job_identity': return compare(a.ei_job_identity, b.ei_job_identity, isAsc);
-                case 'owner': return compare(a.owner, b.owner, isAsc);
-                case 'ei_type_identity': return compare(a.ei_type_identity, b.ei_type_identity, isAsc);
-                default: return 0;
-            }
-        });
+    connect(): BehaviorSubject<EIJob[]> {
+        return this.eiJobsSubject;
     }
-}
 
-function compare(a: string, b: string, isAsc: boolean) {
-    return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
+    disconnect(): void {
+        this.eiJobsSubject.complete();
+        this.loadingSubject.complete();
+    }
 }