X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fcatalog%2Fcatalog.component.ts;h=a2e3cd1d6d02242f2fd1a76a0a9e7a0b2f8575bb;hb=80f26bbeef6caea8f9946e8a0e1a5e0319dacc38;hp=f0fcbce8de7ac8f716ef3218764b5c3bc778713e;hpb=480b67bbc8accad983e84d8d0e4e74b3fae2802d;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..a2e3cd1d 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,69 +17,53 @@
  * 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 { ConfirmDialogService } from './../services/ui/confirm-dialog.service'
-import { NotificationService } from './../services/ui/notification.service'
+import { Component, OnInit, ViewChild } from '@angular/core';
+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',
   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', 'action'];
+  dataSource: CatalogDataSource;
+  @ViewChild(MatSort) sort: MatSort;
 
   constructor(
-    private service: CatalogService,
+    private appMgrSvc: AppMgrService,
     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.appMgrSvc, this.sort );
+    this.dataSource.loadTable();
+  }
+
+  onConfigurexApp(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?')
+  onDeployxApp(name: string): void {
+    this.confirmDialogService.openConfirmDialog('Deploy application ' + name + '?')
       .afterClosed().subscribe(res => {
         if (res) {
-          this.service.deployXapp(event.data.name).subscribe(
+          this.appMgrSvc.deployXapp(name).subscribe(
             response => {
               switch (response.status) {
                 case 200:
-                  this.notification.success('xApp deploy succeeded!');
+                  this.notification.success('Deploy succeeded!');
                   break;
                 default:
-                  this.notification.warn('xApp deploy failed.');
+                  this.notification.warn('Deploy failed.');
               }
             }
           );
@@ -87,4 +71,4 @@ export class CatalogComponent {
       });
 
   }
-}
\ No newline at end of file
+}