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=1bb082c64075724abbf1c95d3d78414130f5a376;hb=d5e2acb3624c6705f47bed520d1330c0e75f78e4;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..1bb082c 100644
--- a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
@@ -17,160 +17,40 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-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 { Component, OnInit, ViewChild } from '@angular/core';
 
-import { EIJob, EIProducer } from '../interfaces/ei.types';
-import { EIJobDataSource } from './ei-job.datasource';
-import { EIProducerDataSource } from './ei-producer.datasource';
 import { UiService } from '../services/ui/ui.service';
+import { JobsListComponent } from './jobs-list/jobs-list.component';
+import { ProducersListComponent } from './producers-list/producers-list.component';
 
 @Component({
     selector: 'nrcp-ei-coordinator',
     templateUrl: './ei-coordinator.component.html',
-    styleUrls: ['./ei-coordinator.component.scss']
+    styleUrls: ['./ei-coordinator.component.scss'],
+    providers: [
+        ProducersListComponent,
+        JobsListComponent
+    ]
 })
 export class EICoordinatorComponent implements OnInit {
 
     darkMode: boolean;
-    searchString: string;
-    formGroup: FormGroup;
-    jobsDataSource: MatTableDataSource<EIJob>;
-    producersDataSource: MatTableDataSource<EIProducer>;
+    @ViewChild(ProducersListComponent) producersList: ProducersListComponent;
+    @ViewChild(JobsListComponent) jobComponent: JobsListComponent;
 
-    readonly jobsFormControl: AbstractControl;
-    readonly producersFormControl: AbstractControl;
 
     constructor(
-        private eiJobsDataSource: EIJobDataSource,
-        private eiProducersDataSource: EIProducerDataSource,
-        private ui: UiService,
-        private formBuilder: FormBuilder) {
-            this.formGroup = formBuilder.group({ filter: [""] });
-
-            this.jobsFormControl = formBuilder.group({
-                id: '',
-                typeId: '',
-                owner: '',
-                targetUri:''
-            });
-            this.producersFormControl = formBuilder.group({
-                ei_producer_id: '',
-                ei_producer_types: '',
-                status: ''
-            });
+        private ui: UiService) {
     }
 
     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.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)
-                && this.isDataIncluding(data.target_uri, filter.targetUri)
-                && this.isDataIncluding(data.owner, filter.owner)
-                && 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';
-            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);
-    }
-
-    getJobTypeId(eiJob: EIJob): string {
-        if (eiJob.ei_type_identity) {
-            return eiJob.ei_type_identity;
-        }
-        return '< No type >';
-    }
-
-    getJobOwner(eiJob: EIJob): string {
-        if (eiJob.owner) {
-            return eiJob.owner;
-        }
-        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.jobComponent.loadJobs();
+        this.producersList.loadProducers();
     }
 }