X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fcontrol%2Fcontrol.component.html;h=700efd9c75fbf623d2c779fe8f7ad61488695d15;hb=1fde0c3b93c9cf75b9e48382f298f644b03fa249;hp=d29191cc05c806dd9869c8c060d420b914c63637;hpb=8cfd065c881e3004ad2596591176d36ae155b701;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/control/control.component.html b/webapp-frontend/src/app/control/control.component.html
index d29191cc..700efd9c 100644
--- a/webapp-frontend/src/app/control/control.component.html
+++ b/webapp-frontend/src/app/control/control.component.html
@@ -22,43 +22,41 @@
   <div class="spinner-container" *ngIf="dataSource.loading$ | async">
     <mat-spinner></mat-spinner>
   </div>
-  <table mat-table [dataSource]="dataSource" multiTemplateDataRows class="control-table mat-elevation-z8">
+  <table mat-table [dataSource]="dataSource" matSort multiTemplateDataRows class="control-table mat-elevation-z8">
 
     <ng-container matColumnDef="xapp">
-      <mat-header-cell *matHeaderCellDef> xApp Name </mat-header-cell>
+      <mat-header-cell *matHeaderCellDef mat-sort-header> xApp Name </mat-header-cell>
       <mat-cell *matCellDef="let element"> {{element.xapp}} </mat-cell>
     </ng-container>
 
     <ng-container matColumnDef="name">
-      <mat-header-cell *matHeaderCellDef> Instance Name</mat-header-cell>
+      <mat-header-cell *matHeaderCellDef mat-sort-header> Instance Name</mat-header-cell>
       <mat-cell *matCellDef="let element"> {{element.instance.name}} </mat-cell>
     </ng-container>
 
     <ng-container matColumnDef="status">
-      <mat-header-cell *matHeaderCellDef> Status </mat-header-cell>
+      <mat-header-cell *matHeaderCellDef mat-sort-header> Status </mat-header-cell>
       <mat-cell *matCellDef="let element"> {{element.instance.status}} </mat-cell>
     </ng-container>
 
-    <ng-container matColumnDef="ip">
-      <mat-header-cell *matHeaderCellDef> IP </mat-header-cell>
+    <ng-container matColumnDef="ip" >
+      <mat-header-cell *matHeaderCellDef mat-sort-header> IP </mat-header-cell>
       <mat-cell *matCellDef="let element"> {{element.instance.ip}} </mat-cell>
     </ng-container>
 
     <ng-container matColumnDef="port">
-      <mat-header-cell *matHeaderCellDef> Port </mat-header-cell>
+      <mat-header-cell *matHeaderCellDef mat-sort-header> Port </mat-header-cell>
       <mat-cell *matCellDef="let element"> {{element.instance.port}} </mat-cell>
     </ng-container>
 
     <ng-container matColumnDef="action">
       <mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
-      <mat-cell *matCellDef="let element">
-        <button mat-icon-button
-                (click)="view()">
+      <!-- click on button should not expand/collapse the row -->
+      <mat-cell *matCellDef="let element" (click)="$event.stopPropagation()">
+        <button mat-icon-button (click)="controlApp(element)">
           <mat-icon>settings</mat-icon>
         </button>
-        <button mat-icon-button
-                color="warn"
-                (click)="undeploy(element.xapp)">
+        <button mat-icon-button color="warn" (click)="undeployApp(element)">
           <mat-icon>delete</mat-icon>
         </button>
       </mat-cell>
@@ -70,13 +68,13 @@
           <div>
             txMessages:
           </div>
-          <li *ngFor="let rxmessage of element.instance.rxMessage">
+          <li *ngFor="let rxmessage of element.instance.rxMessages">
             <span>{{rxmessage}}</span>
           </li>
           <div>
             rxMessages:
           </div>
-          <li *ngFor="let txmessage of element.instance.txMessage">
+          <li *ngFor="let txmessage of element.instance.txMessages">
             <span>{{txmessage}}</span>
           </li>
         </div>
@@ -85,8 +83,8 @@
 
     <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
     <mat-row *matRowDef="let element; columns: displayedColumns;"
-             [class.example-expanded-row]="expandedElement === element"
-             (click)="expandedElement = expandedElement === element ? null : element"></mat-row>
+      [class.example-expanded-row]="expandedElement === element"
+      (click)="expandedElement = expandedElement === element ? null : element"></mat-row>
     <tr mat-row *matRowDef="let row; columns: ['expandedDetail']" class="message-row"></tr>
   </table>
-</div>
+</div>
\ No newline at end of file