X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fcatalog%2Fcatalog.component.html;h=fd58336d7e2beaf45d84f4abea926a5ed85522b4;hb=4f8259dcd4597a7c96285907bd33941d44ac456a;hp=5f250b48f1b33a1168248f4e73e587bb92852591;hpb=e2cbc4d0304646febf7e2cbe0dccdf9840189222;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/catalog/catalog.component.html b/webapp-frontend/src/app/catalog/catalog.component.html
index 5f250b48..fd58336d 100644
--- a/webapp-frontend/src/app/catalog/catalog.component.html
+++ b/webapp-frontend/src/app/catalog/catalog.component.html
@@ -1,8 +1,8 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
-  Copyright (C) 2019 AT&T Intellectual Property and Nokia
+  Copyright (C) 2019 AT&T Intellectual Property
   %%
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -18,8 +18,46 @@
   ========================LICENSE_END===================================
   -->
 <div class="catalog__section">
-    <h3 class="catalog__header">xApp Catalog</h3>
-    <ng2-smart-table [settings]="settings" [source]="source" (custom)="onDeployxApp($event)">
-    </ng2-smart-table>
-    <!-- <app-modal-event></app-modal-event> -->
+  <h3 class="catalog__header">xApp Catalog</h3>
+
+  <table mat-table [dataSource]="dataSource" matSort class="catalog-table mat-elevation-z8">
+
+    <ng-container matColumnDef="name">
+      <mat-header-cell *matHeaderCellDef mat-sort-header> App Name </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.name}} </mat-cell>
+    </ng-container>
+
+    <ng-container matColumnDef="version">
+      <mat-header-cell *matHeaderCellDef mat-sort-header> Version </mat-header-cell>
+      <mat-cell *matCellDef="let element"> {{element.version}} </mat-cell>
+    </ng-container>
+
+    <ng-container matColumnDef="action">
+      <mat-header-cell *matHeaderCellDef> Action </mat-header-cell>
+      <mat-cell *matCellDef="let element">
+        <div class="catalog-button-row">
+          <button mat-icon-button (click)="onConfigureApp(element)">
+            <mat-icon matTooltip="Adjust settings">settings</mat-icon>
+          </button>
+          <button mat-icon-button (click)="onDeployApp(element)">
+            <mat-icon matTooltip="Deploy app">cloud_upload</mat-icon>
+          </button>
+        </div>
+      </mat-cell>
+    </ng-container>
+
+    <ng-container matColumnDef="noRecordsFound">
+      <mat-footer-cell *matFooterCellDef>No records found.</mat-footer-cell>
+    </ng-container>
+
+    <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
+    <mat-row *matRowDef="let row; columns: displayedColumns;"></mat-row>
+    <mat-footer-row *matFooterRowDef="['noRecordsFound']" [ngClass]="{'display-none': dataSource.rowCount > 0}"></mat-footer-row>
+
+  </table>
+
+  <div class="spinner-container" *ngIf="dataSource.loading$ | async">
+    <mat-spinner diameter=50></mat-spinner>
+  </div>
+
 </div>