* ========================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 { 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';
+import { XMDeployableApp } from '../interfaces/app-mgr.types';
+import { MatDialog } from '@angular/material/dialog';
+import { AppConfigurationComponent } from './../app-configuration/app-configuration.component';
@Component({
- selector: 'app-catalog',
+ selector: 'rd-app-catalog',
templateUrl: './catalog.component.html',
- styleUrls: ['./catalog.component.css'],
+ styleUrls: ['./catalog.component.scss'],
})
export class CatalogComponent implements OnInit {
displayedColumns: string[] = ['name', 'version', 'action'];
dataSource: CatalogDataSource;
- @ViewChild(MatSort) sort: MatSort;
+ @ViewChild(MatSort, {static: true}) sort: MatSort;
constructor(
- private appMgrSvc: AppMgrService,
+ private appMgrService: AppMgrService,
private confirmDialogService: ConfirmDialogService,
- private errorService: ErrorDialogService,
- private notification: NotificationService) { }
+ private dialog: MatDialog,
+ private errorDiaglogService: ErrorDialogService,
+ private notificationService: NotificationService) { }
ngOnInit() {
- this.dataSource = new CatalogDataSource(this.appMgrSvc, this.sort );
+ this.dataSource = new CatalogDataSource(this.appMgrService, this.sort, this.notificationService );
this.dataSource.loadTable();
}
- onConfigurexApp(name: string): void {
- const aboutError = 'Configure not implemented (yet)';
- this.errorService.displayError(aboutError);
+ onConfigureApp(xapp: XMDeployableApp): void {
+ const dialogRef = this.dialog.open(AppConfigurationComponent, {
+ width: '40%',
+ maxHeight:'500px',
+ position: {
+ top:'10%'
+ },
+ data: xapp
+ });
+
}
- onDeployxApp(name: string): void {
- this.confirmDialogService.openConfirmDialog('Deploy application ' + name + '?')
- .afterClosed().subscribe(res => {
+ onDeployApp(app: XMDeployableApp): void {
+ this.confirmDialogService.openConfirmDialog('Deploy application ' + app.name + '?')
+ .afterClosed().subscribe( (res: boolean) => {
if (res) {
- this.appMgrSvc.deployXapp(name).subscribe(
- response => {
- switch (response.status) {
- case 200:
- this.notification.success('Deploy succeeded!');
- break;
- default:
- this.notification.warn('Deploy failed.');
+ this.appMgrService.deployXapp(app.name).subscribe(
+ (response: HttpResponse<Object>) => {
+ this.notificationService.success('App deploy succeeded!');
+ },
+ ( (her: HttpErrorResponse) => {
+ // the error field should have an ErrorTransport object
+ let msg = her.message;
+ if (her.error && her.error.message) {
+ msg = her.error.message;
}
- }
+ this.notificationService.warn('App deploy failed: ' + msg);
+ })
);
}
- });
-
+ }
+ );
}
+
}