X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-frontend%2Fsrc%2Fapp%2Fei-coordinator%2Fei-coordinator.component.ts;h=8532fccdb3e1c09f5e0ae7687ef7a0733f424ff7;hb=7083fe17ce58e2ef8719b78164f41a459a40f5ef;hp=278911471395f0693f1349245369ae8e78764523;hpb=5840fd8fc16980ade4af6735f991e08f8fca65e7;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 2789114..8532fcc 100644
--- a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
@@ -17,10 +17,9 @@
  * 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 { animate, state, style, transition, trigger } from '@angular/animations';
-import { FormBuilder, FormGroup } from '@angular/forms';
+import { FormBuilder, FormGroup, AbstractControl } from '@angular/forms';
 import { MatTableDataSource } from '@angular/material';
 
 import { defer, BehaviorSubject, Observable } from 'rxjs';
@@ -54,24 +53,45 @@ export class EICoordinatorComponent implements OnInit {
 
     producers$: Observable<EIProducer[]>;
     filteredProducers$: Observable<EIProducer[]>;
-    @ViewChild(MatSort, { static: true }) sort: MatSort;
 
     eiJobInfo = new Map<string, EIJobInfo>();
     darkMode: boolean;
     searchString: string;
     formGroup: FormGroup;
-    eiProducersData: MatTableDataSource<EIProducerDataSource>;
+    jobsDataSource: MatTableDataSource<EIJob>;
+
+    readonly jobsFormControl: AbstractControl;
 
     constructor(
         private eiJobsDataSource: EIJobDataSource,
         private eiProducersDataSource: EIProducerDataSource,
         private ui: UiService,
         private formBuilder: FormBuilder) {
-            this.formGroup = formBuilder.group({ filter: [""] });
-        }
+
+        this.formGroup = formBuilder.group({ filter: [""] });
+        this.jobsFormControl = formBuilder.group({
+            id: '',
+            typeId: '',
+            owner: '',
+            targetUri:'',
+        })
+    }
 
     ngOnInit() {
         this.eiJobsDataSource.getJobs();
+        this.jobsDataSource = new MatTableDataSource(this.eiJobsDataSource.eiJobsSubject.value);
+
+        this.jobsFormControl.valueChanges.subscribe(value => {
+            const filter = {...value, id: value.id.trim().toLowerCase()} as string;
+            this.jobsDataSource.filter = filter;
+        });
+
+        this.jobsDataSource.filterPredicate = ((data, filter) => {
+            return this.isDataIncluding(data.ei_job_identity, filter.id) 
+                && this.isDataIncluding(data.target_uri, filter.target_uri)
+                && this.isDataIncluding(data.owner, filter.owner)
+                && this.isDataIncluding(data.ei_type_identity, filter.typeId);
+          }) as (EIJob, string) => boolean;
 
         this.producers$= this.eiProducersDataSource.loadProducers();
         this.filteredProducers$ = defer(() => this.formGroup.get("filter")
@@ -88,6 +108,10 @@ export class EICoordinatorComponent implements OnInit {
         });
     }
 
+    isDataIncluding(data: string, filter: string) : boolean {
+        return !filter || data.toLowerCase().includes(filter);
+    }
+
     getEIJobInfo(eiJob: EIJob): EIJobInfo {
         let info: EIJobInfo = this.eiJobInfo.get(eiJob.ei_job_data);
         if (!info) {