* 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.
* ========================LICENSE_END===================================
*/
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 { 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';
@Component({
- selector: 'app-catalog',
+ selector: 'rd-app-catalog',
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;
+ @ViewChild(MatSort, {static: true}) 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';
+ onConfigureApp(name: string): void {
+ 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?')
- .afterClosed().subscribe(res => {
+ onDeployApp(name: string): void {
+ this.confirmDialogService.openConfirmDialog('Deploy application ' + name + '?')
+ .afterClosed().subscribe( (res: any) => {
if (res) {
- this.xappMgrSvc.deployXapp(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
+
+}