X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fei-coordinator%2Fjobs-list%2Fjobs-list.component.html;h=d325d4d2b5265cdc664066a7cf35419edd0a3adb;hb=fb9a5699b247ad1518c5714224396205485a3c4c;hp=840cc952a7fbebbdaae5f59292b415bed6ecedac;hpb=f8f8ed0d00fb9c8ba0ca88f180cad5f13381db2a;p=portal%2Fnonrtric-controlpanel.git

diff --git a/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.html b/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.html
index 840cc95..d325d4d 100644
--- a/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.html
+++ b/webapp-frontend/src/app/ei-coordinator/jobs-list/jobs-list.component.html
@@ -18,20 +18,37 @@ limitations under the License.
 ========================LICENSE_END===================================
 -->
 <div class="table-container">
+    <div class="spinner-container" style="display: flex; justify-content: center; align-items: center;"
+        *ngIf="loading$ | async">
+        <mat-spinner></mat-spinner>
+    </div>
     <mat-table id="jobsTable" [dataSource]="jobsDataSource" fixedLayout matSort (matSortChange)="sortJobs($event)"
-        class="ei-coordinator-table mat-elevation-z8">
-        <ng-container matColumnDef="id">
+        matSortDisableClear matSortDirection="asc" class="ei-coordinator-table mat-elevation-z8">
+        <ng-container matColumnDef="jobId">
             <mat-header-cell *matHeaderCellDef mat-sort-header>
                 <div (click)="stopSort($event)">
                     <form style="display: flex" [formGroup]="jobForm">
                         <mat-form-field>
-                            <input id="jobIdFilter" matInput formControlName="id">
+                            <input id="jobIdFilter" matInput formControlName="jobId">
                             <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>
+            <mat-cell *matCellDef="let eiJob"> {{eiJob.jobId}} </mat-cell>
+        </ng-container>
+        <ng-container matColumnDef="prodId">
+            <mat-header-cell *matHeaderCellDef mat-sort-header>
+                <div (click)="stopSort($event)">
+                    <form style="display: flex" [formGroup]="jobForm">
+                        <mat-form-field>
+                            <input id="jobProdIdFilter" matInput formControlName="prodId">
+                            <mat-placeholder>Producer ID</mat-placeholder>
+                        </mat-form-field>
+                    </form>
+                </div>
+            </mat-header-cell>
+            <mat-cell *matCellDef="let eiJob"> {{eiJob.prodId}} </mat-cell>
         </ng-container>
         <ng-container matColumnDef="typeId">
             <mat-header-cell *matHeaderCellDef mat-sort-header>
@@ -70,9 +87,11 @@ limitations under the License.
                     </form>
                 </div>
             </mat-header-cell>
-            <mat-cell *matCellDef="let eiJob"> {{eiJob.target_uri}} </mat-cell>
+            <mat-cell *matCellDef="let eiJob"> {{eiJob.targetUri}} </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-header-row *matHeaderRowDef="['jobId', 'prodId', 'typeId', 'owner', 'targetUri']"></mat-header-row>
+        <mat-row *matRowDef="let row; columns: ['jobId', 'prodId', 'typeId', 'owner', 'targetUri'];"></mat-row>
     </mat-table>
+    <mat-paginator [length]="jobs()?.length" [pageSize]="10" [pageSizeOptions]="[5, 10, 25, 100]" showFirstLastButtons
+        class="ei-coordinator-table mat-elevation-z8"></mat-paginator>
 </div>
\ No newline at end of file