X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fei-coordinator%2Fei-coordinator.component.ts;h=b8230181eba67fab73d1e7d7bdd3c2163ede82fa;hb=ad70d4114bbfc5dbf20fd1a8151095d89610c759;hp=711b86f15634a4c05d2c07731d25090125edfb83;hpb=c57eea20731c196a5de55faef024c6c07f7689fe;p=portal%2Fnonrtric-controlpanel.git

diff --git a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
index 711b86f..b823018 100644
--- a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
@@ -17,11 +17,11 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { MatSort } from '@angular/material/sort';
+import { Component, OnInit } from '@angular/core';
+import { Sort } from '@angular/material/sort';
 import { animate, state, style, transition, trigger } from '@angular/animations';
 import { FormBuilder, FormGroup, AbstractControl } from '@angular/forms';
-import { MatTableDataSource, MatTable } from '@angular/material';
+import { MatTableDataSource, MatTable } from '@angular/material/table';
 
 import { BehaviorSubject, Observable } from 'rxjs';
 
@@ -51,10 +51,6 @@ class EIJobInfo {
 })
 export class EICoordinatorComponent implements OnInit {
 
-    producers$: Observable<EIProducer[]>;
-    @ViewChild(MatSort, { static: true }) sort: MatSort;
-    @ViewChild('producersTable', { static: true }) table: MatTable<Element>;
-
     eiJobInfo = new Map<string, EIJobInfo>();
     darkMode: boolean;
     searchString: string;
@@ -86,10 +82,10 @@ export class EICoordinatorComponent implements OnInit {
     }
 
     ngOnInit() {
-        this.eiJobsDataSource.getJobs();
-        this.producers$ = this.eiProducersDataSource.loadProducers();
-        this.jobsDataSource = new MatTableDataSource(this.eiJobsDataSource.eiJobsSubject.value);
-        this.producersDataSource = new MatTableDataSource(this.eiProducersDataSource.producerSubject.value)
+        this.eiJobsDataSource.loadJobs();
+        this.eiProducersDataSource.loadProducers();
+        this.jobsDataSource = new MatTableDataSource(this.eiJobsDataSource.eiJobs());
+        this.producersDataSource = new MatTableDataSource(this.eiProducersDataSource.eiProducers());
 
         this.jobsFormControl.valueChanges.subscribe(value => {
             const filter = {...value, id: value.id.trim().toLowerCase()} as string;
@@ -100,7 +96,7 @@ export class EICoordinatorComponent implements OnInit {
             this.producersDataSource.filter = filter;
         });
 
-        this.jobsDataSource.filterPredicate = ((data, filter) => {
+        this.jobsDataSource.filterPredicate = ((data: EIJob, filter) => {
             return this.isDataIncluding(data.ei_job_identity, filter.id)
                 && this.isDataIncluding(data.target_uri, filter.target_uri)
                 && this.isDataIncluding(data.owner, filter.owner)
@@ -118,6 +114,44 @@ export class EICoordinatorComponent implements OnInit {
         });
     }
 
+    sortJobs(sort: Sort){
+        console.log('Jobs new sort: ', sort);
+        const data = this.jobsDataSource.data
+        data.sort((a: EIJob, b: EIJob) => {
+            const isAsc = sort.direction === 'asc';
+            switch (sort.active) {
+              case 'id': return this.compare(a.ei_job_identity, b.ei_job_identity, isAsc);
+              case 'typeId': return this.compare(a.ei_type_identity, b.ei_type_identity, isAsc);
+              case 'owner': return this.compare(a.owner, b.owner, isAsc);
+              case 'targetUri': return this.compare(a.target_uri, b.owner, isAsc);
+              default: return 0;
+            }
+          });
+          this.jobsDataSource.data = data;
+    }
+
+    sortProducers(sort: Sort){
+        const data = this.producersDataSource.data
+        data.sort((a: EIProducer, b: EIProducer) => {
+            const isAsc = sort.direction === 'asc';
+            switch (sort.active) {
+              case 'id': return this.compare(a.ei_producer_id, b.ei_producer_id, isAsc);
+              case 'types': return this.compare(a.ei_producer_types, b.ei_producer_types, isAsc);
+              case 'status': return this.compare(a.status, b.status, isAsc);
+              default: return 0;
+            }
+          });
+          this.producersDataSource.data = data;
+    }
+    
+    compare(a: any, b: any, isAsc: boolean) {
+      return (a < b ? -1 : 1) * (isAsc ? 1 : -1);
+    }
+
+    stopSort(event: any){
+        event.stopPropagation();
+    }
+
     isDataIncluding(data: string, filter: string) : boolean {
         return !filter || data.toLowerCase().includes(filter);
     }
@@ -182,7 +216,9 @@ export class EICoordinatorComponent implements OnInit {
     }
 
     refreshTables() {
-        this.eiJobsDataSource.getJobs();
+        this.eiJobsDataSource.loadJobs();
+        this.jobsDataSource.data = this.eiJobsDataSource.eiJobs();
         this.eiProducersDataSource.loadProducers();
+        this.producersDataSource.data = this.eiProducersDataSource.eiProducers();
     }
 }