* ========================LICENSE_END===================================
*/
import { Component, OnInit, ViewChild } from '@angular/core';
+import { HttpResponse, HttpErrorResponse } from '@angular/common/http';
import { MatSort } from '@angular/material/sort';
import { Router } from '@angular/router';
import { XappControlRow } from '../interfaces/app-mgr.types';
import { AppControlDataSource } from './app-control.datasource';
@Component({
- selector: 'control-app-control',
+ selector: 'rd-app-control',
templateUrl: './app-control.component.html',
- styleUrls: ['./app-control.component.css'],
+ styleUrls: ['./app-control.component.scss'],
animations: [AppControlAnimations.messageTrigger]
})
export class AppControlComponent implements OnInit {
displayedColumns: string[] = ['xapp', 'name', 'status', 'ip', 'port', 'action'];
dataSource: AppControlDataSource;
- @ViewChild(MatSort) sort: MatSort;
+ @ViewChild(MatSort, {static: true}) sort: MatSort;
constructor(
private appMgrSvc: AppMgrService,
private router: Router,
private confirmDialogService: ConfirmDialogService,
private errorDialogService: ErrorDialogService,
- private notification: NotificationService) { }
+ private notificationService: NotificationService) { }
ngOnInit() {
- this.dataSource = new AppControlDataSource(this.appMgrSvc, this.sort);
+ this.dataSource = new AppControlDataSource(this.appMgrSvc, this.sort, this.notificationService);
this.dataSource.loadTable();
}
controlApp(app: XappControlRow): void {
- const acXappPattern = /[Aa][Dd][Mm][Ii][Ss]{2}[Ii][Oo][Nn]/;
- const anrXappPattern = /[Aa][Nn][Rr]/;
- if (acXappPattern.test(app.xapp)) {
+ // TODO: identify apps without hardcoding to names
+ const acAppPattern0 = /[Aa][Dd][Mm][Ii][Nn]/;
+ const acAppPattern1 = /[Aa][Dd][Mm][Ii][Ss]{2}[Ii][Oo][Nn]/;
+ const anrAppPattern0 = /ANR/;
+ const anrAppPattern1 = /[Aa][Uu][Tt][Oo][Mm][Aa][Tt][Ii][Cc]/;
+ const anrAppPattern2 = /[Nn][Ee][Ii][Gg][Hh][Bb][Oo][Rr]/;
+ if (acAppPattern0.test(app.xapp) || acAppPattern1.test(app.xapp)) {
this.router.navigate(['/ac']);
- } else if (anrXappPattern.test(app.xapp)) {
+ } else if (anrAppPattern0.test(app.xapp) || (anrAppPattern1.test(app.xapp) && anrAppPattern2.test(app.xapp))) {
this.router.navigate(['/anr']);
} else {
this.errorDialogService.displayError('No control available for ' + app.xapp + ' (yet)');
}
}
- undeployApp(app: XappControlRow): void {
- this.confirmDialogService.openConfirmDialog('Are you sure you want to undeploy xApp ' + app.xapp + '?')
- .afterClosed().subscribe(res => {
+ onUndeployApp(app: XappControlRow): void {
+ this.confirmDialogService.openConfirmDialog('Are you sure you want to undeploy App ' + app.xapp + '?')
+ .afterClosed().subscribe( (res: boolean) => {
if (res) {
this.appMgrSvc.undeployXapp(app.xapp).subscribe(
- response => {
+ ( httpResponse: HttpResponse<Object>) => {
+ // Answers 204/No content on success
+ this.notificationService.success('App undeployed successfully!');
this.dataSource.loadTable();
- switch (response.status) {
- case 200:
- this.notification.success('xApp undeployed successfully!');
- break;
- default:
- this.notification.warn('xApp undeploy failed.');
+ },
+ ( (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 undeploy failed: ' + msg);
+ })
);
}
});