Merge "Added presentation of owner of EiJob" 1.0.0 2.1.0
authorPatrik Buhr <patrik.buhr@est.tech>
Mon, 30 Nov 2020 15:40:19 +0000 (15:40 +0000)
committerGerrit Code Review <gerrit@o-ran-sc.org>
Mon, 30 Nov 2020 15:40:19 +0000 (15:40 +0000)
1  2 
webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.html
webapp-frontend/src/app/ei-coordinator/ei-coordinator.component.ts

@@@ -21,7 -21,7 +21,7 @@@ 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)="refresh()">
 +        <button mat-icon-button color="primary" aria-label="Button with a refresh icon" (click)="refreshTables()">
              <mat-icon>refresh</mat-icon>
          </button>
      </div>
          <th mat-header-cell *matHeaderCellDef> Type ID </th>
          <td mat-cell *matCellDef="let eiJob"> {{this.getEITypeId(eiJob)}} </td>
      </ng-container>
+     <ng-container matColumnDef="owner">
+         <th mat-header-cell *matHeaderCellDef> Owner </th>
+         <td mat-cell *matCellDef="let eiJob"> {{eiJob.owner}} </td>
+     </ng-container>
      <ng-container matColumnDef="targetUri">
          <th mat-header-cell *matHeaderCellDef> Target URI </th>
          <td mat-cell *matCellDef="let eiJob"> {{this.getTargetUri(eiJob)}} </td>
      </ng-container>
-     <tr mat-header-row *matHeaderRowDef="['id', 'typeId', 'targetUri']"></tr>
-     <tr mat-row *matRowDef="let row; columns: ['id', 'typeId', 'targetUri'];"></tr>
+     <tr mat-header-row *matHeaderRowDef="['id', 'typeId', 'owner', 'targetUri']"></tr>
+     <tr mat-row *matRowDef="let row; columns: ['id', 'typeId', 'owner', 'targetUri'];"></tr>
  </table>
@@@ -97,14 -97,14 +97,14 @@@ export class EICoordinatorComponent imp
      }
  
      getEITypeId(eiJob: EIJob): string {
-         if (eiJob.ei_type_identity){
+         if (eiJob.ei_type_identity) {
              return eiJob.ei_type_identity;
          }
          return '< No type >';
      }
  
      getTargetUri(eiJob: EIJob): string {
-         if (eiJob.target_uri){
+         if (eiJob.target_uri) {
              return eiJob.target_uri;
          }
          return '< No target URI >';
      }
  
      getEIProducerId(eiProducer: EIProducer): string {
-         if (eiProducer.ei_producer_id){
+         if (eiProducer.ei_producer_id) {
              return eiProducer.ei_producer_id;
          }
          return '< No id>';
      }
  
      getEIProducerTypes(eiProducer: EIProducer): string[] {
-         if (eiProducer.ei_producer_types){
+         if (eiProducer.ei_producer_types) {
              return eiProducer.ei_producer_types;
          }
          return ['< No types >'];
      }
  
      getEIProducerStatus(eiProducer: EIProducer): string {
-         if (eiProducer.status){
+         if (eiProducer.status) {
              return eiProducer.status;
          }
          return '< No status >';
      }
  
 -    refresh() {
 -        location.reload();
 +    refreshTables() {
 +        this.eiJobsDataSource.loadTable();
 +        this.eiProducersDataSource.loadTable();
      }
  }