X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=webapp-frontend%2Fsrc%2Fapp%2Fapp-control%2Fapp-control.component.ts;fp=webapp-frontend%2Fsrc%2Fapp%2Fapp-control%2Fapp-control.component.ts;h=d68fe7d7894e6627c2f40b222736127d2454f14e;hb=8d590e9e52984c2fd4ea4da2a015cdf0cf88b7d2;hp=159d33dd912c7097a56d8e4b51e6ced15f414c25;hpb=dfa4f23a94fcbf31deab33abde4c6a8318fd4186;p=portal%2Fric-dashboard.git diff --git a/webapp-frontend/src/app/app-control/app-control.component.ts b/webapp-frontend/src/app/app-control/app-control.component.ts index 159d33dd..d68fe7d7 100644 --- a/webapp-frontend/src/app/app-control/app-control.component.ts +++ b/webapp-frontend/src/app/app-control/app-control.component.ts @@ -53,11 +53,14 @@ export class AppControlComponent implements OnInit { } 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 acAppPattern = /[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)) { 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)');