X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fcatalog%2Fcatalog.component.ts;h=96e040e25fafe81203588d24ea41918b9e4ceb0f;hb=4347fbc44c279856d5b83a1768638fe571daf4d5;hp=f0fcbce8de7ac8f716ef3218764b5c3bc778713e;hpb=3c6dec3133de760191c89a01884acc0614460699;p=portal%2Fric-dashboard.git

diff --git a/webapp-frontend/src/app/catalog/catalog.component.ts b/webapp-frontend/src/app/catalog/catalog.component.ts
index f0fcbce8..96e040e2 100644
--- a/webapp-frontend/src/app/catalog/catalog.component.ts
+++ b/webapp-frontend/src/app/catalog/catalog.component.ts
@@ -17,62 +17,44 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-import { Component, Inject } from '@angular/core';
-import { LocalDataSource } from 'ng2-smart-table';
-import { CatalogService } from '../services/catalog/catalog.service';
+import { Component, OnInit} from '@angular/core';
+import { XappMgrService } from '../services/xapp-mgr/xapp-mgr.service';
 import { ConfirmDialogService } from './../services/ui/confirm-dialog.service'
 import { NotificationService } from './../services/ui/notification.service'
+import { ErrorDialogService } from '../services/ui/error-dialog.service';
+import { CatalogDataSource } from './catalog.datasource';
 
 @Component({
   selector: 'app-catalog',
   templateUrl: './catalog.component.html',
-  styleUrls: ['./catalog.component.css']
+  styleUrls: ['./catalog.component.css'],
 })
-export class CatalogComponent {
+export class CatalogComponent implements OnInit{
 
-  settings = {
-    hideSubHeader: true,
-    actions: {
-      columnTitle: 'Actions',
-      add: false,
-      edit: false,
-      delete: false,
-      custom: [
-        { name: 'deployxApp', title: 'Deploy' },
-      ],
-      position: 'right'
-
-    },
-    columns: {
-      name: {
-        title: 'xApp Name',
-        type: 'string',
-      },
-      version: {
-        title: 'xApp Version',
-        type: 'string',
-      },
-      status: {
-        title: 'Status',
-        type: 'string',
-      },
-    },
-  };
-
-  source: LocalDataSource = new LocalDataSource();
+  displayedColumns: string[] = ['name', 'version', 'status', 'action'];
+  dataSource: CatalogDataSource;
 
   constructor(
-    private service: CatalogService,
+    private xappMgrSvc: XappMgrService,
     private confirmDialogService: ConfirmDialogService,
-    private notification: NotificationService) {
-    this.service.getAll().subscribe((val: any[]) => this.source.load(val));
+    private errorService: ErrorDialogService,
+    private notification: NotificationService) { }
+
+  ngOnInit() {
+    this.dataSource = new CatalogDataSource(this.xappMgrSvc);
+    this.dataSource.loadTable();
+  }
+
+  onConfigurexApp(name: string): void {
+    const aboutError = 'Not implemented yet';
+    this.errorService.displayError(aboutError);
   }
 
-  onDeployxApp(event): void {
+  onDeployxApp(name: string): void {
     this.confirmDialogService.openConfirmDialog('Are you sure you want to deploy this xApp?')
       .afterClosed().subscribe(res => {
         if (res) {
-          this.service.deployXapp(event.data.name).subscribe(
+          this.xappMgrSvc.deployXapp(name).subscribe(
             response => {
               switch (response.status) {
                 case 200: