controlApp(app: XappControlRow): void {
// TODO: identify apps without hardcoding to names
- const acAppPattern = /[Aa][Dd][Mm][Ii][Ss]{2}[Ii][Oo][Nn]/;
+ 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 (acAppPattern.test(app.xapp)) {
+ if (acAppPattern0.test(app.xapp) || acAppPattern1.test(app.xapp)) {
this.router.navigate(['/ac']);
} else if (anrAppPattern0.test(app.xapp) || (anrAppPattern1.test(app.xapp) && anrAppPattern2.test(app.xapp))) {
this.router.navigate(['/anr']);
if (res) {
this.appMgrSvc.undeployXapp(app.xapp).subscribe(
( httpResponse: HttpResponse<Object>) => {
+ // Answers 204/No content on success
+ this.notificationService.success('App undeployed successfully!');
this.dataSource.loadTable();
- switch (httpResponse.status) {
- case 200:
- this.notificationService.success('App undeployed successfully!');
- break;
- default:
- this.notificationService.warn('App undeploy failed.');
- }
},
( (her: HttpErrorResponse) => {
// the error field should have an ErrorTransport object