X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-frontend%2Fsrc%2Fapp%2Fcatalog%2Fcatalog.component.html;h=2a9b72dd94ba7cc518983f6c9e7d1f74a69b04af;hb=226fd436a085f717d4cbf81bf1719bdaf1468414;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..2a9b72dd 100644
--- a/webapp-frontend/src/app/catalog/catalog.component.html
+++ b/webapp-frontend/src/app/catalog/catalog.component.html
@@ -1,15 +1,15 @@
 <!--
   ========================LICENSE_START=================================
-  ORAN-OSC
+  O-RAN-SC
   %%
   Copyright (C) 2019 AT&T Intellectual Property and Nokia
   %%
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -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.name)">
+            <mat-icon matTooltip="Adjust settings">settings</mat-icon>
+          </button>
+          <button mat-icon-button (click)="onDeployApp(element.name)">
+            <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></mat-spinner>
+  </div>
+
 </div>