X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fei-coordinator%2Fei-coordinator.component.html;h=fc560dd83cfcd82c00f623ce6c10413d2edb73b9;hb=8ce8fccb49a3c082c9fde5f20335af8e85b41584;hp=30f1eee820ea5866df8bece50571861e4d6229bc;hpb=9d99a37374c9266f3d11ff0a19c2d068571159ba;p=portal%2Fnonrtric-controlpanel.git

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 30f1eee..fc560dd 100644
--- a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.html
+++ b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.html
@@ -19,58 +19,128 @@ limitations under the License.
 -->
 
 <div fxLayout="row">
-    <div class="rd-global-page-title">Enrichment Information Coordinator</div>
-    <div class="refresh-button">
-        <button mat-icon-button color="primary" aria-label="Button with a refresh icon" (click)="refreshTables()">
-            <mat-icon>refresh</mat-icon>
-        </button>
-    </div>
+  <div class="nrcp-global-page-title">Enrichment Information Coordinator</div>
+  <div class="refresh-button">
+        <button id="refreshButton" mat-icon-button color="primary" (click)="refreshTables()">
+      <mat-icon>refresh</mat-icon>
+    </button>
+  </div>
 </div>
 
 <br>
 <h4>Producers</h4>
-<table mat-table EIProducerTable [dataSource]="eiProducersDataSource" [ngClass]="{'table-dark': darkMode}" matSort
-    multiTemplateDataRows class="ei-coordinator-table mat-elevation-z8">
+
+<div class="table-container">
+  <mat-table id="producersTable" [dataSource]="producersDataSource" fixedLayout
+    matSort (matSortChange)="sortProducers($event)"
+    class="ei-coordinator-table mat-elevation-z8">
     <ng-container matColumnDef="id">
-        <th mat-header-cell *matHeaderCellDef> Producer ID </th>
-        <td mat-cell *matCellDef="let eiProducer"> {{this.getEIProducerId(eiProducer)}} </td>
+      <mat-header-cell *matHeaderCellDef mat-sort-header>
+        <div (click)="stopSort($event)">
+        <form style="display: flex" [formGroup]="producersFormControl">
+          <mat-form-field>
+            <input id="producerIdFilter" matInput formControlName="ei_producer_id">
+            <mat-placeholder>Producer ID</mat-placeholder>
+          </mat-form-field>
+        </form>
+      </div>
+      </mat-header-cell>
+      <mat-cell *matCellDef="let eiProducer"> {{eiProducer.ei_producer_id}} </mat-cell>
     </ng-container>
-    <ng-container matColumnDef="type">
-        <th mat-header-cell *matHeaderCellDef> Producer type </th>
-        <td mat-cell *matCellDef="let eiProducer"> {{this.getEIProducerTypes(eiProducer)}} </td>
+
+    <ng-container matColumnDef="types">
+      <mat-header-cell *matHeaderCellDef mat-sort-header>
+        <div (click)="stopSort($event)">
+        <form style="display: flex" [formGroup]="producersFormControl">
+          <mat-form-field>
+            <input id="producerTypesFilter" matInput formControlName="ei_producer_types">
+            <mat-placeholder>Producer types</mat-placeholder>
+          </mat-form-field>
+        </form>
+        </div>
+      </mat-header-cell>
+      <mat-cell *matCellDef="let eiProducer"> {{this.getProducerTypes(eiProducer)}} </mat-cell>
     </ng-container>
+
     <ng-container matColumnDef="status">
-        <th mat-header-cell *matHeaderCellDef> Producer status </th>
-        <td mat-cell *matCellDef="let eiProducer"> {{this.getEIProducerStatus(eiProducer)}} </td>
+      <mat-header-cell *matHeaderCellDef mat-sort-header>
+        <div (click)="stopSort($event)">
+        <form style="display: flex" [formGroup]="producersFormControl">
+          <mat-form-field>
+            <input id="producerStatusFilter" matInput formControlName="status">
+            <mat-placeholder>Producer status</mat-placeholder>
+          </mat-form-field>
+        </form>
+        </div>
+      </mat-header-cell>
+      <mat-cell *matCellDef="let eiProducer"> {{this.getProducerStatus(eiProducer)}} </mat-cell>
     </ng-container>
-    <tr mat-header-row *matHeaderRowDef="['id', 'type', 'status']"></tr>
-    <tr mat-row *matRowDef="let row; columns: ['id', 'type', 'status'];"></tr>
-</table>
+
+    <mat-header-row *matHeaderRowDef="['id', 'types', 'status']"></mat-header-row>
+    <mat-row *matRowDef="let row; columns: ['id', 'types', 'status'];"></mat-row>
+  </mat-table>
+</div>
 
 <br>
 <h4>Jobs</h4>
-<table mat-table EIJobTable [dataSource]="eiJobsDataSource" [ngClass]="{'table-dark': darkMode}" matSort
-    multiTemplateDataRows class="ei-coordinator-table mat-elevation-z8">
+
+<div class="table-container">
+    <mat-table id="jobsTable" [dataSource]="jobsDataSource" fixedLayout
+    matSort (matSortChange)="sortJobs($event)"
+    class="ei-coordinator-table mat-elevation-z8">
     <ng-container matColumnDef="id">
-        <th mat-header-cell *matHeaderCellDef> Job ID </th>
-        <td mat-cell *matCellDef="let eiJob"> {{this.getDisplayName(eiJob)}} </td>
+      <mat-header-cell *matHeaderCellDef mat-sort-header>
+        <div (click)="stopSort($event)">
+          <form style="display: flex" [formGroup]="jobsFormControl">
+            <mat-form-field>
+                        <input id="jobIdFilter" matInput formControlName="id">
+              <mat-placeholder>Job ID</mat-placeholder>
+            </mat-form-field>
+          </form>
+        </div>
+      </mat-header-cell>
+            <mat-cell *matCellDef="let eiJob"> {{eiJob.ei_job_identity}} </mat-cell>
     </ng-container>
-    <!--ng-container matColumnDef="data">
-        <th mat-header-cell *matHeaderCellDef> Job data </th>
-        <td mat-cell *matCellDef="let eiJob"> {{this.getEIJobInfo(eiJob)}} </td>
-    </ng-container-->
     <ng-container matColumnDef="typeId">
-        <th mat-header-cell *matHeaderCellDef> Type ID </th>
-        <td mat-cell *matCellDef="let eiJob"> {{this.getEITypeId(eiJob)}} </td>
+      <mat-header-cell *matHeaderCellDef mat-sort-header>
+        <div (click)="stopSort($event)">
+          <form style="display: flex" [formGroup]="jobsFormControl">
+            <mat-form-field>
+                        <input id="jobTypeIdFilter" matInput formControlName="typeId">
+              <mat-placeholder>Type ID</mat-placeholder>
+            </mat-form-field>
+          </form>
+        </div>
+      </mat-header-cell>
+            <mat-cell *matCellDef="let eiJob">{{this.getJobTypeId(eiJob)}} </mat-cell>
     </ng-container>
     <ng-container matColumnDef="owner">
-        <th mat-header-cell *matHeaderCellDef> Owner </th>
-        <td mat-cell *matCellDef="let eiJob"> {{eiJob.owner}} </td>
+      <mat-header-cell *matHeaderCellDef mat-sort-header>
+        <div (click)="stopSort($event)">
+          <form style="display: flex" [formGroup]="jobsFormControl">
+            <mat-form-field>
+                        <input id="jobOwnerFilter" matInput formControlName="owner">
+              <mat-placeholder>Owner</mat-placeholder>
+            </mat-form-field>
+          </form>
+        </div>
+      </mat-header-cell>
+            <mat-cell *matCellDef="let eiJob">{{this.getJobOwner(eiJob)}} </mat-cell>
     </ng-container>
     <ng-container matColumnDef="targetUri">
-        <th mat-header-cell *matHeaderCellDef> Target URI </th>
-        <td mat-cell *matCellDef="let eiJob"> {{this.getTargetUri(eiJob)}} </td>
+      <mat-header-cell *matHeaderCellDef mat-sort-header>
+        <div (click)="stopSort($event)">
+          <form style="display: flex" [formGroup]="jobsFormControl">
+            <mat-form-field>
+                        <input id="jobTargetUriFilter" matInput formControlName="targetUri">
+              <mat-placeholder>Target URI</mat-placeholder>
+            </mat-form-field>
+          </form>
+        </div>
+      </mat-header-cell>
+            <mat-cell *matCellDef="let eiJob"> {{eiJob.target_uri}}  </mat-cell>
     </ng-container>
-    <tr mat-header-row *matHeaderRowDef="['id', 'typeId', 'owner', 'targetUri']"></tr>
-    <tr mat-row *matRowDef="let row; columns: ['id', 'typeId', 'owner', 'targetUri'];"></tr>
-</table>
\ No newline at end of file
+    <mat-header-row *matHeaderRowDef="['id', 'typeId', 'owner', 'targetUri']"></mat-header-row>
+    <mat-row *matRowDef="let row; columns: ['id', 'typeId', 'owner', 'targetUri'];"></mat-row>
+  </mat-table>
+</div>
\ No newline at end of file