X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fcontrol%2Fcontrol.component.html;h=dcd09fcd0c21c77c655151db22df0e9f600e402a;hb=1ddf7dedd6f254a9d31af409a860f8a6573d26c6;hp=5ae35aa0bb6480ccb53ad4bbb0af343e8d5290f1;hpb=19570d54903b181469ee2806043d562dadc1d804;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 5ae35aa0..dcd09fcd 100644
--- a/webapp-frontend/src/app/control/control.component.html
+++ b/webapp-frontend/src/app/control/control.component.html
@@ -18,73 +18,8 @@
   ========================LICENSE_END===================================
   -->
 <div class="control__section">
-  <h3 class="control__header">xApp Control</h3>
-  <div class="spinner-container" *ngIf="dataSource.loading$ | async">
-    <mat-spinner></mat-spinner>
-  </div>
-  <table mat-table [dataSource]="dataSource" matSort multiTemplateDataRows class="control-table mat-elevation-z8">
+  <control-ran-control></control-ran-control>
+  <hr>
+  <control-app-control></control-app-control>
+</div>
 
-    <ng-container matColumnDef="xapp">
-      <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 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 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 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 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>
-      <!-- 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)="undeployApp(element)">
-          <mat-icon>delete</mat-icon>
-        </button>
-      </mat-cell>
-    </ng-container>
-
-    <ng-container matColumnDef="expandedDetail">
-      <td mat-cell *matCellDef="let element" [attr.colspan]="displayedColumns.length">
-        <div [@messageExpand]="element == expandedElement ? 'expanded' : 'collapsed'">
-          <div>
-            txMessages:
-          </div>
-          <li *ngFor="let rxmessage of element.instance.rxMessage">
-            <span>{{rxmessage}}</span>
-          </li>
-          <div>
-            rxMessages:
-          </div>
-          <li *ngFor="let txmessage of element.instance.txMessage">
-            <span>{{txmessage}}</span>
-          </li>
-        </div>
-      </td>
-    </ng-container>
-
-    <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>
-    <tr mat-row *matRowDef="let row; columns: ['expandedDetail']" class="message-row"></tr>
-  </table>
-</div>
\ No newline at end of file