X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fei-coordinator%2Fjobs-list%2Fjobs-list.component.ts;h=2991c283cbc28d1c8d89cd1ec92d708cac01d0f3;hb=d5e2acb3624c6705f47bed520d1330c0e75f78e4;hp=52081120a47818810aaf817f93e169784b4e4b8f;hpb=869354bad80ea5db92893ad3017eaf9c421c0731;p=portal%2Fnonrtric-controlpanel.git

diff --git a/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.ts b/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.ts
index 5208112..2991c28 100644
--- a/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.ts
+++ b/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.ts
@@ -17,13 +17,17 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
+import { MatPaginator } from '@angular/material/paginator';
 import { Sort } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
-import { EIJob } from 'src/app/interfaces/ei.types';
-import { UiService } from 'src/app/services/ui/ui.service';
-import { EIJobDataSource } from '../ei-job.datasource';
+import { forkJoin } from 'rxjs';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import { mergeMap, finalize } from 'rxjs/operators';
+import { EIJob } from '../../interfaces/ei.types';
+import { EIService } from '../../services/ei/ei.service';
+import { UiService } from '../../services/ui/ui.service';
 
 @Component({
   selector: 'nrcp-jobs-list',
@@ -31,13 +35,18 @@ import { EIJobDataSource } from '../ei-job.datasource';
   styleUrls: ['./jobs-list.component.scss']
 })
 export class JobsListComponent implements OnInit {
+
+  @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
+
   darkMode: boolean;
   jobsDataSource: MatTableDataSource<EIJob> = new MatTableDataSource<EIJob>();
-
   jobForm: FormGroup;
+  private loadingSubject = new BehaviorSubject<boolean>(false);
+  private jobsSubject = new BehaviorSubject<EIJob[]>([]);
+  public loading$ = this.loadingSubject.asObservable();
 
   constructor(
-    private eiJobsDataSource: EIJobDataSource,
+    private eiSvc: EIService,
     private ui: UiService
   ) {
     this.jobForm = new FormGroup({
@@ -46,11 +55,15 @@ export class JobsListComponent implements OnInit {
       owner: new FormControl(''),
       targetUri: new FormControl('')
     });
-
   }
 
   ngOnInit(): void {
-    this.refresh();
+    this.loadJobs();
+    this.jobsSubject.subscribe((data) => {
+      this.jobsDataSource = new MatTableDataSource<EIJob>(data);
+      //this.jobsDataSource.data = data;
+      this.jobsDataSource.paginator = this.paginator;
+    });
 
     this.jobForm.valueChanges.subscribe(value => {
       const filter = { ...value, id: value.id.trim().toLowerCase() } as string;
@@ -69,6 +82,12 @@ export class JobsListComponent implements OnInit {
     });
   }
 
+  ngOnDestroy() {
+    if (!this.jobsSubject) this.jobsSubject.unsubscribe();
+    if (!this.loadingSubject) this.loadingSubject.unsubscribe();
+    if (!this.ui.darkModeState) this.ui.darkModeState.unsubscribe();
+  }
+
   sortJobs(sort: Sort) {
     const data = this.jobsDataSource.data
     data.sort((a: EIJob, b: EIJob) => {
@@ -110,11 +129,21 @@ export class JobsListComponent implements OnInit {
     return '< No owner >';
   }
 
-  refresh() {
-    this.eiJobsDataSource.loadJobs();
+  public jobs(): EIJob[] {
+    return this.jobsSubject.value;
+  }
 
-    this.eiJobsDataSource.eiJobsSubject().subscribe((data) => {
-      this.jobsDataSource.data = data;
+  loadJobs() {
+    this.loadingSubject.next(true);
+    let 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 => {
+      jobs = jobs.concat(result);
+      this.jobsSubject.next(jobs);
     });
   }