Filtering for all producer columns in EIC

Change-Id: I0da1079e9a66037c3fe0ee9729a19395e85247df
Issue-ID: NONRTRIC-423
Signed-off-by: maximesson <maxime.bonneau@est.tech>

diff --git a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.html b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.html
index 09d03ec..00ce9ad 100644 (file)
--- a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.html
+++ b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.html
@@ -29,42 +29,63 @@ limitations under the License.
 
 <br>
 <h4>Producers</h4>
-<form [formGroup]="formGroup" class="filter-form">
-    <input
-      type="text"
-      class="form-control"
-      name="searchString"
-      placeholder="Search Producer"
-      formControlName="filter"
-    />
-</form>
+
 <div class="table-container">
-    <table [ngClass]="{'table-dark': darkMode}" matSort
-    class="ei-coordinator-table mat-elevation-z8">
-        <tr>
-            <th>Producer ID</th>
-            <th>Producer type</th>
-            <th>Producer status</th>
-        </tr>
-        <tr *ngFor="let eiProducer of filteredProducers$ | async">
-            <td class="text-left">
-                {{eiProducer.ei_producer_id}}
-            </td>
-            <td class="text-left">
-                {{this.getEIProducerTypes(eiProducer)}}
-            </td>
-            <td class="text-left">
-                {{this.getEIProducerStatus(eiProducer)}}
-            </td>
-        </tr>
-    </table>
+  <mat-table #producersTable [dataSource]="producersDataSource" matSort class="mat-elevation-z8">
+
+    <ng-container matColumnDef="id">
+      <mat-header-cell *matHeaderCellDef>
+        <form style="display: flex" [formGroup]="producersFormControl">
+          <mat-form-field>
+            <input matInput formControlName="ei_producer_id">
+            <mat-placeholder>Producer ID</mat-placeholder>
+          </mat-form-field>
+        </form>
+      </mat-header-cell>
+      <mat-cell *matCellDef="let eiProducer"> {{eiProducer.ei_producer_id}} </mat-cell>
+    </ng-container>
+
+    <ng-container matColumnDef="types">
+      <mat-header-cell *matHeaderCellDef>
+        <br>
+        <form style="display: flex" [formGroup]="producersFormControl">
+          <mat-form-field>
+            <input matInput formControlName="ei_producer_types">
+            <mat-placeholder>Producer types</mat-placeholder>
+          </mat-form-field>
+        </form>
+      </mat-header-cell>
+      <mat-cell *matCellDef="let eiProducer"> {{this.getEIProducerTypes(eiProducer)}} </mat-cell>
+    </ng-container>
+
+    <ng-container matColumnDef="status">
+      <mat-header-cell *matHeaderCellDef>
+        <br>
+        <form style="display: flex" [formGroup]="producersFormControl">
+          <mat-form-field>
+            <input matInput formControlName="status">
+            <mat-placeholder>Producer status</mat-placeholder>
+          </mat-form-field>
+        </form>
+      </mat-header-cell>
+      <mat-cell *matCellDef="let eiProducer"> {{this.getEIProducerStatus(eiProducer)}} </mat-cell>
+    </ng-container>
+
+    <mat-header-row *matHeaderRowDef="['id', 'types', 'status']"></mat-header-row>
+    <mat-row *matRowDef="let row; columns: ['id', 'types', 'status'];"></mat-row>
+
+     <!-- Row shown when there is no matching data. -->
+    <mat-row *matNoDataRow>
+      <mat-cell colspan="3">No data matching the filter "{{input.value}}"</mat-cell>
+    </mat-row>
+  </mat-table>
 </div>
 
 <br>
 <h4>Jobs</h4>
 
 <div class="table-container">
-    <mat-table [dataSource]="jobsDataSource" 
+    <mat-table [dataSource]="jobsDataSource"
         matSort class="ei-coordinator-table mat-elevation-z8">
         <ng-container matColumnDef="id">
             <mat-header-cell *matHeaderCellDef>

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 8532fcc..711b86f 100644 (file)
--- a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts
@@ -17,13 +17,13 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-import { Component, OnInit} from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { MatSort } from '@angular/material/sort';
 import { animate, state, style, transition, trigger } from '@angular/animations';
 import { FormBuilder, FormGroup, AbstractControl } from '@angular/forms';
-import { MatTableDataSource } from '@angular/material';
+import { MatTableDataSource, MatTable } from '@angular/material';
 
-import { defer, BehaviorSubject, Observable } from 'rxjs';
-import { map, withLatestFrom, startWith } from 'rxjs/operators';
+import { BehaviorSubject, Observable } from 'rxjs';
 
 import { EIJob, EIProducer } from '../interfaces/ei.types';
 import { EIJobDataSource } from './ei-job.datasource';
@@ -52,56 +52,66 @@ class EIJobInfo {
 export class EICoordinatorComponent implements OnInit {
 
     producers$: Observable<EIProducer[]>;
-    filteredProducers$: Observable<EIProducer[]>;
+    @ViewChild(MatSort, { static: true }) sort: MatSort;
+    @ViewChild('producersTable', { static: true }) table: MatTable<Element>;
 
     eiJobInfo = new Map<string, EIJobInfo>();
     darkMode: boolean;
     searchString: string;
     formGroup: FormGroup;
     jobsDataSource: MatTableDataSource<EIJob>;
+    producersDataSource: MatTableDataSource<EIProducer>;
 
     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.formGroup = formBuilder.group({ filter: [""] });
+
+            this.jobsFormControl = formBuilder.group({
+                id: '',
+                typeId: '',
+                owner: '',
+                targetUri:''
+            });
+            this.producersFormControl = formBuilder.group({
+                ei_producer_id: '',
+                ei_producer_types: '',
+                status: ''
+            });
     }
 
     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.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, filter) => {
-            return this.isDataIncluding(data.ei_job_identity, filter.id) 
+            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")
-        .valueChanges.pipe(
-            startWith(""),
-            withLatestFrom(this.producers$),
-            map(([val, producers]) =>
-            !val ? producers : producers.filter((x) =>
-            x.ei_producer_id.toLowerCase().includes(val))))
-        );
+        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 (EIProducer, string) => boolean;
 
         this.ui.darkModeState.subscribe((isDark) => {
             this.darkMode = isDark;

diff --git a/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts b/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
index 78ddd4e..f04d9c5 100644 (file)
--- a/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
+++ b/webapp-frontend/src/app/ei-coordinator/ei-producer.datasource.ts
@@ -84,4 +84,4 @@ export class EIProducerDataSource extends MatTableDataSource<EIProducer> {
         this.producerSubject.complete();
         this.loadingSubject.complete();
     }
-}
+}
\ No newline at end of file