Upgrade App Manager to version 0.1.5

[portal/ric-dashboard.git] / webapp-frontend / src / app / catalog / catalog.component.ts

diff --git a/webapp-frontend/src/app/catalog/catalog.component.ts b/webapp-frontend/src/app/catalog/catalog.component.ts
index 04b8380..a2e3cd1 100644 (file)
--- 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.
@@ -20,7 +20,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { MatSort } from '@angular/material/sort';
 import { ErrorDialogService } from '../services/ui/error-dialog.service';
-import { XappMgrService } from '../services/xapp-mgr/xapp-mgr.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';
@@ -30,40 +30,40 @@ import { CatalogDataSource } from './catalog.datasource';
   templateUrl: './catalog.component.html',
   styleUrls: ['./catalog.component.css'],
 })
-export class CatalogComponent implements OnInit{
+export class CatalogComponent implements OnInit {
 
-  displayedColumns: string[] = ['name', 'version', 'status', 'action'];
+  displayedColumns: string[] = ['name', 'version', 'action'];
   dataSource: CatalogDataSource;
   @ViewChild(MatSort) sort: MatSort;
 
   constructor(
-    private xappMgrSvc: XappMgrService,
+    private appMgrSvc: AppMgrService,
     private confirmDialogService: ConfirmDialogService,
     private errorService: ErrorDialogService,
     private notification: NotificationService) { }
 
   ngOnInit() {
-    this.dataSource = new CatalogDataSource(this.xappMgrSvc, this.sort );
+    this.dataSource = new CatalogDataSource(this.appMgrSvc, this.sort );
     this.dataSource.loadTable();
   }
 
   onConfigurexApp(name: string): void {
-    const aboutError = 'Not implemented yet';
+    const aboutError = 'Configure not implemented (yet)';
     this.errorService.displayError(aboutError);
   }
 
   onDeployxApp(name: string): void {
-    this.confirmDialogService.openConfirmDialog('Are you sure you want to deploy this xApp?')
+    this.confirmDialogService.openConfirmDialog('Deploy application ' + name + '?')
       .afterClosed().subscribe(res => {
         if (res) {
-          this.xappMgrSvc.deployXapp(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.');
               }
             }
           );
@@ -71,4 +71,4 @@ export class CatalogComponent implements OnInit{
       });
 
   }
-}
\ No newline at end of file
+}