X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fcatalog%2Fcatalog.component.ts;h=57814803b99f41caa1613a79098a4facdfe3a90e;hb=1379dce23d47c42d169ed13a337bbee827714830;hp=fd28f0a38595a0c562392966e5dbd094b4add0a3;hpb=3e69af1763ea2ce5f9485ab1cb5a39b089b109a7;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 fd28f0a3..57814803 100644
--- a/webapp-frontend/src/app/catalog/catalog.component.ts
+++ b/webapp-frontend/src/app/catalog/catalog.component.ts
@@ -7,9 +7,9 @@
  * 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.
@@ -17,77 +17,57 @@
  * limitations under the License.
  * ========================LICENSE_END===================================
  */
-import { Component, OnInit } from '@angular/core';
-import { LocalDataSource } from 'ng2-smart-table';
-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 { XMXapp } from '../interfaces/xapp-mgr.types';
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
+import { MatSort } from '@angular/material/sort';
+import { ErrorDialogService } from '../services/ui/error-dialog.service';
+import { AppMgrService } from '../services/app-mgr/app-mgr.service';
+import { ConfirmDialogService } from './../services/ui/confirm-dialog.service';
+import { NotificationService } from './../services/ui/notification.service';
+import { CatalogDataSource } from './catalog.datasource';
 
 @Component({
-  selector: 'app-catalog',
+  selector: 'rd-app-catalog',
   templateUrl: './catalog.component.html',
-  styleUrls: ['./catalog.component.css']
+  styleUrls: ['./catalog.component.css'],
 })
-export class CatalogComponent implements OnInit{
+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', 'action'];
+  dataSource: CatalogDataSource;
+  @ViewChild(MatSort, {static: true}) sort: MatSort;
 
   constructor(
-    private xappMgrSvc: XappMgrService,
+    private appMgrSvc: AppMgrService,
     private confirmDialogService: ConfirmDialogService,
+    private errorService: ErrorDialogService,
     private notification: NotificationService) { }
 
   ngOnInit() {
-    this.xappMgrSvc.getAll().subscribe((xapps: XMXapp[]) => this.source.load(xapps));
+    this.dataSource = new CatalogDataSource(this.appMgrSvc, this.sort );
+    this.dataSource.loadTable();
+  }
+
+  onConfigureApp(name: string): void {
+    const aboutError = 'Configure not implemented (yet)';
+    this.errorService.displayError(aboutError);
   }
 
-  onDeployxApp(event): void {
-    this.confirmDialogService.openConfirmDialog('Are you sure you want to deploy this xApp?')
-      .afterClosed().subscribe(res => {
+  onDeployApp(name: string): void {
+    this.confirmDialogService.openConfirmDialog('Deploy application ' + name + '?')
+      .afterClosed().subscribe( (res: any) => {
         if (res) {
-          this.xappMgrSvc.deployXapp(event.data.name).subscribe(
-            response => {
-              switch (response.status) {
-                case 200:
-                  this.notification.success('xApp deploy succeeded!');
-                  break;
-                default:
-                  this.notification.warn('xApp deploy failed.');
-              }
+          this.appMgrSvc.deployXapp(name).subscribe(
+            (response: HttpResponse<object>) => {
+              this.notification.success('Deploy succeeded!');
+            },
+            (error: HttpErrorResponse) => {
+              this.notification.warn('Deploy failed: ' + error.message);
             }
           );
         }
-      });
-
+      }
+    );
   }
-}
\ No newline at end of file
+
+}