From: Lott, Christopher (cl778h) <cl778h@att.com>
Date: Tue, 25 Jun 2019 17:42:16 +0000 (-0400)
Subject: Update pattern to match ANR app by name
X-Git-Tag: R2~72
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F13%2F413%2F1;p=portal%2Fric-dashboard.git

Update pattern to match ANR app by name

Change-Id: I71c3290c2a017d8b82fa49ce0f1af49fc0497e75
Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
---

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)');