X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-frontend%2Fsrc%2Fapp%2Fapp-control%2Fapp-control.component.ts;h=0e2c06a2dbf1eef6b379c786aa1590d0d731d8a7;hb=5b686151904e2582ea9ce9d2f1c6abb7a400afa5;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..0e2c06a2 100644
--- a/webapp-frontend/src/app/app-control/app-control.component.ts
+++ b/webapp-frontend/src/app/app-control/app-control.component.ts
@@ -38,7 +38,7 @@ 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,
@@ -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)');