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=57a87f91ac74b66df3523fe1ce01f65dc40b2915;hb=1f5664f310dc6a18ecc10dbd2a0705500b2e15c9;hp=00ce9ad04d891bbb7980a783ceb75c04e090869c;hpb=c57eea20731c196a5de55faef024c6c07f7689fe;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 00ce9ad..57a87f9 100644
--- a/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.html
+++ b/webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.html
@@ -19,123 +19,78 @@ 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>
+  <nrcp-producers-list></nrcp-producers-list>
 
-<div class="table-container">
-  <mat-table #producersTable [dataSource]="producersDataSource" matSort class="mat-elevation-z8">
+<br>
+<h4>Jobs</h4>
 
+<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">
-      <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 *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 eiProducer"> {{eiProducer.ei_producer_id}} </mat-cell>
+            <mat-cell *matCellDef="let eiJob"> {{eiJob.ei_job_identity}} </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>
+    <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 id="jobTypeIdFilter" matInput formControlName="typeId">
+              <mat-placeholder>Type ID</mat-placeholder>
+            </mat-form-field>
+          </form>
+        </div>
       </mat-header-cell>
-      <mat-cell *matCellDef="let eiProducer"> {{this.getEIProducerTypes(eiProducer)}} </mat-cell>
+            <mat-cell *matCellDef="let eiJob">{{this.getJobTypeId(eiJob)}} </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>
+    <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 id="jobOwnerFilter" matInput formControlName="owner">
+              <mat-placeholder>Owner</mat-placeholder>
+            </mat-form-field>
+          </form>
+        </div>
       </mat-header-cell>
-      <mat-cell *matCellDef="let eiProducer"> {{this.getEIProducerStatus(eiProducer)}} </mat-cell>
+            <mat-cell *matCellDef="let eiJob">{{this.getJobOwner(eiJob)}} </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>
+    <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 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>
+    <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>
-
-<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>
 </div>
\ No newline at end of file