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=79b7129a3feb4f804eff65a4d54b07216cac79b9;hb=1f5664f310dc6a18ecc10dbd2a0705500b2e15c9;hp=5e5b363c866111ce4dc07b42f8d01766aec801c9;hpb=7ca2d23ec5f7405f219951ccd669dcb17778c56a;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 5e5b363..79b7129 100644
--- a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
@@ -20,12 +20,12 @@
 import { Component, OnInit } from '@angular/core';
 import { Sort } from '@angular/material/sort';
 import { FormBuilder, FormGroup, AbstractControl } from '@angular/forms';
-import { MatTableDataSource, MatTable } from '@angular/material/table';
+import { MatTableDataSource } from '@angular/material/table';
 
-import { EIJob, EIProducer } from '../interfaces/ei.types';
+import { EIJob } from '../interfaces/ei.types';
 import { EIJobDataSource } from './ei-job.datasource';
-import { EIProducerDataSource } from './ei-producer.datasource';
 import { UiService } from '../services/ui/ui.service';
+import { ProducersListComponent } from './producers-list/producers-list.component';
 
 @Component({
     selector: 'nrcp-ei-coordinator',
@@ -35,17 +35,14 @@ import { UiService } from '../services/ui/ui.service';
 export class EICoordinatorComponent implements OnInit {
 
     darkMode: boolean;
-    searchString: string;
     formGroup: FormGroup;
-    jobsDataSource: MatTableDataSource<EIJob>;
-    producersDataSource: MatTableDataSource<EIProducer>;
+    jobsDataSource: MatTableDataSource<EIJob> = new MatTableDataSource<EIJob>();
 
     readonly jobsFormControl: AbstractControl;
-    readonly producersFormControl: AbstractControl;
 
     constructor(
+        private producersList: ProducersListComponent,
         private eiJobsDataSource: EIJobDataSource,
-        private eiProducersDataSource: EIProducerDataSource,
         private ui: UiService,
         private formBuilder: FormBuilder) {
             this.formGroup = formBuilder.group({ filter: [""] });
@@ -56,28 +53,19 @@ export class EICoordinatorComponent implements OnInit {
                 owner: '',
                 targetUri:''
             });
-            this.producersFormControl = formBuilder.group({
-                ei_producer_id: '',
-                ei_producer_types: '',
-                status: ''
-            });
     }
 
     ngOnInit() {
         this.eiJobsDataSource.loadJobs();
-        this.eiProducersDataSource.loadProducers();
-        this.jobsDataSource = new MatTableDataSource(this.eiJobsDataSource.eiJobs());
-        const prods = this.eiProducersDataSource.eiProducers();
-        this.producersDataSource = new MatTableDataSource(prods);
+
+        this.eiJobsDataSource.eiJobsSubject().subscribe((data) => {
+            this.jobsDataSource.data = data;
+        });
 
         this.jobsFormControl.valueChanges.subscribe(value => {
             const filter = {...value, id: value.id.trim().toLowerCase()} as string;
             this.jobsDataSource.filter = filter;
         });
-        this.producersFormControl.valueChanges.subscribe(value => {
-            const filter = {...value, ei_producer_id: value.ei_producer_id.trim().toLowerCase()} as string;
-            this.producersDataSource.filter = filter;
-        });
 
         this.jobsDataSource.filterPredicate = ((data: EIJob, filter) => {
             return this.isDataIncluding(data.ei_job_identity, filter.id)
@@ -86,19 +74,12 @@ export class EICoordinatorComponent implements OnInit {
                 && this.isDataIncluding(data.ei_type_identity, filter.typeId);
           }) as (data: EIJob, filter: any) => boolean;
 
-        this.producersDataSource.filterPredicate = ((data, filter) => {
-            return this.isDataIncluding(data.ei_producer_id, filter.ei_producer_id)
-                && this.isDataIncluding(data.ei_producer_types.join(','), filter.ei_producer_types)
-                && this.isDataIncluding(data.status, filter.status);
-          }) as (data: EIProducer, filter: any) => boolean;
-
         this.ui.darkModeState.subscribe((isDark) => {
             this.darkMode = isDark;
         });
     }
 
     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';
@@ -113,20 +94,6 @@ export class EICoordinatorComponent implements OnInit {
           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);
     }
@@ -152,25 +119,12 @@ export class EICoordinatorComponent implements OnInit {
         }
         return '< No owner >';
     }
-
-    getProducerTypes(eiProducer: EIProducer): string[] {
-        if (eiProducer.ei_producer_types) {
-            return eiProducer.ei_producer_types;
-        }
-        return ['< No types >'];
-    }
-
-    getProducerStatus(eiProducer: EIProducer): string {
-        if (eiProducer.status) {
-            return eiProducer.status;
-        }
-        return '< No status >';
-    }
-
     refreshTables() {
         this.eiJobsDataSource.loadJobs();
-        this.jobsDataSource.data = this.eiJobsDataSource.eiJobs();
-        this.eiProducersDataSource.loadProducers();
-        this.producersDataSource.data = this.eiProducersDataSource.eiProducers();
+        this.eiJobsDataSource.eiJobsSubject().subscribe((data) => {
+            this.jobsDataSource.data = data;
+        });
+
+        this.producersList.refresh();
     }
 }