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=e1832f0d70e78cd78e0f2d958baff2c3961dbcd9;hb=refs%2Fchanges%2F68%2F5668%2F5;hp=09d03ec300572fc8be69672873f45e1af033a150;hpb=7083fe17ce58e2ef8719b78164f41a459a40f5ef;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 09d03ec..e1832f0 100644
--- a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.html
+++ b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.html
@@ -19,102 +19,129 @@ limitations under the License.
 -->
 
 <div fxLayout="row">
-    <div class="nrcp-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>
-<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
+  <mat-table #producersTable [dataSource]="producersDataSource" fixedLayout 
+    matSort (matSortChange)="sortProducers($event)"
     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>
+    <ng-container matColumnDef="id">
+      <mat-header-cell *matHeaderCellDef mat-sort-header>
+        <div (click)="stopSort($event)">
+        <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>
+      </div>
+      </mat-header-cell>
+      <mat-cell *matCellDef="let eiProducer"> {{eiProducer.ei_producer_id}} </mat-cell>
+    </ng-container>
+
+    <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 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.getEIProducerTypes(eiProducer)}} </mat-cell>
+    </ng-container>
+
+    <ng-container matColumnDef="status">
+      <mat-header-cell *matHeaderCellDef mat-sort-header>
+        <div (click)="stopSort($event)">
+        <form style="display: flex" [formGroup]="producersFormControl">
+          <mat-form-field>
+            <input matInput formControlName="status">
+            <mat-placeholder>Producer status</mat-placeholder>
+          </mat-form-field>
+        </form>
+        </div>
+      </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>
+
+  </mat-table>
 </div>
 
 <br>
 <h4>Jobs</h4>
 
 <div class="table-container">
-    <mat-table [dataSource]="jobsDataSource" 
-        matSort class="ei-coordinator-table mat-elevation-z8">
-        <ng-container matColumnDef="id">
-            <mat-header-cell *matHeaderCellDef>
-                <br>
-                <form style="display: flex" [formGroup]="jobsFormControl">
-                    <mat-form-field>
-                        <input matInput formControlName="id">
-                        <mat-placeholder>Job ID</mat-placeholder>
-                    </mat-form-field>
-                </form>
-            </mat-header-cell>
-            <mat-cell *matCellDef="let eiJob"> {{this.getDisplayName(eiJob)}} </mat-cell>
-        </ng-container>
-        <ng-container matColumnDef="typeId">
-            <mat-header-cell *matHeaderCellDef>
-                <br>
-                <form style="display: flex" [formGroup]="jobsFormControl">
-                    <mat-form-field>
-                        <input matInput formControlName="typeId">
-                        <mat-placeholder>Type ID</mat-placeholder>
-                    </mat-form-field>
-                </form>
-            </mat-header-cell>
-            <mat-cell *matCellDef="let eiJob">{{this.getEITypeId(eiJob)}} </mat-cell>
-            </ng-container>
-        <ng-container matColumnDef="owner">
-            <mat-header-cell *matHeaderCellDef>
-                <br>
-                <form style="display: flex" [formGroup]="jobsFormControl">
-                    <mat-form-field>
-                        <input matInput formControlName="owner">
-                        <mat-placeholder>Owner</mat-placeholder>
-                    </mat-form-field>
-                </form>
-            </mat-header-cell>
-            <mat-cell *matCellDef="let eiJob">{{eiJob.owner}} </mat-cell>
-        </ng-container>
-        <ng-container matColumnDef="targetUri">
-            <mat-header-cell *matHeaderCellDef>
-                <br>
-                <form style="display: flex" [formGroup]="jobsFormControl">
-                    <mat-form-field>
-                        <input matInput formControlName="targetUri">
-                        <mat-placeholder>Target URI</mat-placeholder>
-                    </mat-form-field>
-                </form>
-            </mat-header-cell>
-            <mat-cell *matCellDef="let eiJob"> {{this.getTargetUri(eiJob)}}  </mat-cell>
-        </ng-container>
-        <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>
+  <mat-table [dataSource]="jobsDataSource" fixedLayout 
+    matSort (matSortChange)="sortJobs($event)"
+    class="ei-coordinator-table mat-elevation-z8">
+    <ng-container matColumnDef="id">
+      <mat-header-cell *matHeaderCellDef mat-sort-header>
+        <div (click)="stopSort($event)">
+          <form style="display: flex" [formGroup]="jobsFormControl">
+            <mat-form-field>
+              <input matInput formControlName="id">
+              <mat-placeholder>Job ID</mat-placeholder>
+            </mat-form-field>
+          </form>
+        </div>
+      </mat-header-cell>
+      <mat-cell *matCellDef="let eiJob"> {{this.getDisplayName(eiJob)}} </mat-cell>
+    </ng-container>
+    <ng-container matColumnDef="typeId">
+      <mat-header-cell *matHeaderCellDef mat-sort-header>
+        <div (click)="stopSort($event)">
+          <form style="display: flex" [formGroup]="jobsFormControl">
+            <mat-form-field>
+              <input matInput formControlName="typeId">
+              <mat-placeholder>Type ID</mat-placeholder>
+            </mat-form-field>
+          </form>
+        </div>
+      </mat-header-cell>
+      <mat-cell *matCellDef="let eiJob">{{this.getEITypeId(eiJob)}} </mat-cell>
+    </ng-container>
+    <ng-container matColumnDef="owner">
+      <mat-header-cell *matHeaderCellDef mat-sort-header>
+        <div (click)="stopSort($event)">
+          <form style="display: flex" [formGroup]="jobsFormControl">
+            <mat-form-field>
+              <input matInput formControlName="owner">
+              <mat-placeholder>Owner</mat-placeholder>
+            </mat-form-field>
+          </form>
+        </div>
+      </mat-header-cell>
+      <mat-cell *matCellDef="let eiJob">{{eiJob.owner}} </mat-cell>
+    </ng-container>
+    <ng-container matColumnDef="targetUri">
+      <mat-header-cell *matHeaderCellDef mat-sort-header>
+        <div (click)="stopSort($event)">
+          <form style="display: flex" [formGroup]="jobsFormControl">
+            <mat-form-field>
+              <input matInput formControlName="targetUri">
+              <mat-placeholder>Target URI</mat-placeholder>
+            </mat-form-field>
+          </form>
+        </div>
+      </mat-header-cell>
+      <mat-cell *matCellDef="let eiJob"> {{this.getTargetUri(eiJob)}} </mat-cell>
+    </ng-container>
+    <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