From 610eabd3f5c5f64ecac77b871ec7f29e1dca3be7 Mon Sep 17 00:00:00 2001
From: holgerhagen <holger.hagen@novatec-gmbh.de>
Date: Tue, 23 Nov 2021 12:45:37 +0100
Subject: [PATCH] TSK-1773: make routing-rest-enabled endpoint use the
 configured env

---
 .../administration-overview.component.html    | 28 +++++---
 .../administration-overview.component.ts      | 14 ++--
 .../sidenav-list/sidenav-list.component.html  | 67 +++++++++++--------
 .../sidenav-list.component.spec.ts            |  4 +-
 .../sidenav-list/sidenav-list.component.ts    |  9 ++-
 .../app/shared/guards/task-routing.guard.ts   |  2 +-
 .../taskana-engine/taskana-engine.service.ts  | 11 +--
 7 files changed, 77 insertions(+), 58 deletions(-)

diff --git a/web/src/app/administration/components/administration-overview/administration-overview.component.html b/web/src/app/administration/components/administration-overview/administration-overview.component.html
index 9944abb88a..e6fe01a06a 100644
--- a/web/src/app/administration/components/administration-overview/administration-overview.component.html
+++ b/web/src/app/administration/components/administration-overview/administration-overview.component.html
@@ -1,20 +1,26 @@
 <div class="administration-overview">
-  <nav mat-tab-nav-bar class="administration-overview__navbar" backgroundColor="#f5f5f5" >
-    <a mat-tab-link class="administration-overview__navbar-links" routerLink="/taskana/administration/workbaskets" [active]="selectedTab == 'workbaskets'"
-       (click)="selectedTab = 'workbaskets'">Workbaskets</a>
-    <a mat-tab-link class="administration-overview__navbar-links" routerLink="/taskana/administration/classifications" [active]="selectedTab == 'classifications'"
-       (click)="selectedTab = 'classifications'">Classifications</a>
-    <a mat-tab-link class="administration-overview__navbar-links" routerLink="/taskana/administration/access-items-management"
-       [active]="selectedTab == 'access-items-management'" (click)="selectedTab = 'access-items-management'">Access Items
+  <nav backgroundColor="#f5f5f5" class="administration-overview__navbar" mat-tab-nav-bar>
+    <a (click)="selectedTab = 'workbaskets'" [active]="selectedTab == 'workbaskets'"
+       class="administration-overview__navbar-links" mat-tab-link
+       routerLink="/taskana/administration/workbaskets">Workbaskets</a>
+    <a (click)="selectedTab = 'classifications'" [active]="selectedTab == 'classifications'"
+       class="administration-overview__navbar-links" mat-tab-link
+       routerLink="/taskana/administration/classifications">Classifications</a>
+    <a (click)="selectedTab = 'access-items-management'"
+       [active]="selectedTab == 'access-items-management'"
+       class="administration-overview__navbar-links"
+       mat-tab-link routerLink="/taskana/administration/access-items-management">Access Items
       Management</a>
-    <a mat-tab-link class="administration-overview__navbar-links" routerLink="/taskana/administration/task-routing"
-       [active]="selectedTab == 'task-routing'" (click)="selectedTab = 'task-routing'" *ngIf="(routingAccess$ | async)">Task Routing</a>
+    <a (click)="selectedTab = 'task-routing'" *ngIf="(routingAccess)"
+       [active]="selectedTab == 'task-routing'"
+       class="administration-overview__navbar-links" mat-tab-link
+       routerLink="/taskana/administration/task-routing">Task Routing</a>
   </nav>
   <div class="administration-overview__domain">
     <mat-form-field appearance="legacy">
       <mat-select [value]="selectedDomain" matTooltip="Select domain">
-        <mat-option *ngFor="let domain of domains" [value]="domain" (click)="switchDomain(domain)">
-          {{domain? domain : 'MASTER DOMAIN'}}
+        <mat-option (click)="switchDomain(domain)" *ngFor="let domain of domains" [value]="domain">
+          {{domain ? domain : 'MASTER DOMAIN'}}
         </mat-option>
       </mat-select>
     </mat-form-field>
diff --git a/web/src/app/administration/components/administration-overview/administration-overview.component.ts b/web/src/app/administration/components/administration-overview/administration-overview.component.ts
index 02aee15050..dd7085a21e 100644
--- a/web/src/app/administration/components/administration-overview/administration-overview.component.ts
+++ b/web/src/app/administration/components/administration-overview/administration-overview.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
-import { Observable, of, Subject } from 'rxjs';
+import { Router } from '@angular/router';
+import { Observable, Subject } from 'rxjs';
 import { DomainService } from '../../../shared/services/domain/domain.service';
 import { takeUntil } from 'rxjs/operators';
 import { TaskanaEngineService } from '../../../shared/services/taskana-engine/taskana-engine.service';
@@ -17,7 +17,7 @@ export class AdministrationOverviewComponent implements OnInit {
 
   destroy$ = new Subject<void>();
   url$: Observable<any>;
-  routingAccess$: Observable<boolean> = of(false);
+  routingAccess = false;
 
   constructor(
     private router: Router,
@@ -35,8 +35,12 @@ export class AdministrationOverviewComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.routingAccess$ = this.taskanaEngineService.isCustomRoutingRulesEnabled$;
-    this.routingAccess$.pipe(takeUntil(this.destroy$)).subscribe();
+    this.taskanaEngineService
+      .isCustomRoutingRulesEnabled()
+      .pipe(takeUntil(this.destroy$))
+      .subscribe((value) => {
+        this.routingAccess = value;
+      });
     this.domainService
       .getDomains()
       .pipe(takeUntil(this.destroy$))
diff --git a/web/src/app/shared/components/sidenav-list/sidenav-list.component.html b/web/src/app/shared/components/sidenav-list/sidenav-list.component.html
index 354ff27ebc..5401663f76 100644
--- a/web/src/app/shared/components/sidenav-list/sidenav-list.component.html
+++ b/web/src/app/shared/components/sidenav-list/sidenav-list.component.html
@@ -1,31 +1,40 @@
 <mat-nav-list class="navlist">
-    <a mat-list-item class="navlist__item navlist__admin" [routerLink]=[administrationsUrl]
-        [routerLinkActive]="['active']" *ngIf="administrationAccess" (click)="toggleSidenav()">Administration</a>
-    <div class="navlist__admin-item">
-        <a mat-list-item class="navlist__item  navlist__admin-workbaskets" [routerLink]=[workbasketsUrl]
-            [routerLinkActive]="['active__sub']" *ngIf="administrationAccess" (click)="toggleSidenav()">Workbaskets</a>
-        <a mat-list-item class="navlist__item  navlist__admin-classifications" [routerLink]=[classificationUrl]
-            [routerLinkActive]="['active__sub']" *ngIf="administrationAccess"
-            (click)="toggleSidenav()">Classifications</a>
-        <a mat-list-item class="navlist__item  navlist__admin-access-items" [routerLink]=[accessUrl]
-            [routerLinkActive]="['active__sub']" (click)="toggleSidenav()" *ngIf="administrationAccess">Access Items</a>
-      <a mat-list-item class="navlist__item  navlist__admin-task-routing" [routerLink]=[routingUrl]
-         [routerLinkActive]="['active__sub']" (click)="toggleSidenav()" *ngIf="(routingAccess$ | async)">Task Routing</a>
-    </div>
-    <a mat-list-item class="navlist__item navlist__monitor" [routerLink]=[monitorUrl] [routerLinkActive]="['active']"
-        *ngIf="monitorAccess" (click)="toggleSidenav()">Monitor</a>
-    <a mat-list-item class="navlist__item navlist__workplace" [routerLink]=[workplaceUrl]
-        [routerLinkActive]="['active']" *ngIf="workplaceAccess" (click)="toggleSidenav()">Workplace</a>
-    <div class="navlist__admin-item">
-      <a mat-list-item class="navlist__item  navlist__workplace--workbaskets"
-         [routerLinkActive]="['active__sub']" *ngIf="workplaceAccess" [routerLink]=[workplaceUrl] [queryParams]="{component: 'workbaskets'}"
-         (click)="toggleSidenav()">Workbaskets</a>
-      <a mat-list-item class="navlist__item  navlist__workplace--task-search"
-         [routerLinkActive]="['active__sub']" *ngIf="workplaceAccess" [routerLink]=[workplaceUrl] [queryParams]="{component: 'task-search'}"
-         (click)="toggleSidenav()">Task Search</a>
-    </div>
-    <a mat-list-item class="navlist__item navlist__history" [routerLink]=[historyUrl] [routerLinkActive]="['active']"
-        *ngIf="historyAccess" (click)="toggleSidenav()">History</a>
-  <a mat-list-item class="navlist__item navlist__setting" [routerLink]=[settingsURL] [routerLinkActive]="['active']"
-     *ngIf="settingsAccess" (click)="toggleSidenav()">Settings</a>
+  <a (click)="toggleSidenav()" *ngIf="administrationAccess" [routerLinkActive]="['active']"
+     [routerLink]=[administrationsUrl] class="navlist__item navlist__admin" mat-list-item>Administration</a>
+  <div class="navlist__admin-item">
+    <a (click)="toggleSidenav()" *ngIf="administrationAccess" [routerLinkActive]="['active__sub']"
+       [routerLink]=[workbasketsUrl] class="navlist__item  navlist__admin-workbaskets"
+       mat-list-item>Workbaskets</a>
+    <a (click)="toggleSidenav()" *ngIf="administrationAccess" [routerLinkActive]="['active__sub']"
+       [routerLink]=[classificationUrl] class="navlist__item  navlist__admin-classifications"
+       mat-list-item>Classifications</a>
+    <a (click)="toggleSidenav()" *ngIf="administrationAccess" [routerLinkActive]="['active__sub']"
+       [routerLink]=[accessUrl] class="navlist__item  navlist__admin-access-items" mat-list-item>Access
+      Items</a>
+    <a (click)="toggleSidenav()" *ngIf="(routingAccess)" [routerLinkActive]="['active__sub']"
+       [routerLink]=[routingUrl] class="navlist__item  navlist__admin-task-routing" mat-list-item>Task
+      Routing</a>
+  </div>
+  <a (click)="toggleSidenav()" *ngIf="monitorAccess" [routerLinkActive]="['active']"
+     [routerLink]=[monitorUrl]
+     class="navlist__item navlist__monitor" mat-list-item>Monitor</a>
+  <a (click)="toggleSidenav()" *ngIf="workplaceAccess" [routerLinkActive]="['active']"
+     [routerLink]=[workplaceUrl] class="navlist__item navlist__workplace"
+     mat-list-item>Workplace</a>
+  <div class="navlist__admin-item">
+    <a (click)="toggleSidenav()" *ngIf="workplaceAccess"
+       [queryParams]="{component: 'workbaskets'}" [routerLinkActive]="['active__sub']"
+       [routerLink]=[workplaceUrl] class="navlist__item  navlist__workplace--workbaskets"
+       mat-list-item>Workbaskets</a>
+    <a (click)="toggleSidenav()" *ngIf="workplaceAccess"
+       [queryParams]="{component: 'task-search'}" [routerLinkActive]="['active__sub']"
+       [routerLink]=[workplaceUrl] class="navlist__item  navlist__workplace--task-search"
+       mat-list-item>Task Search</a>
+  </div>
+  <a (click)="toggleSidenav()" *ngIf="historyAccess" [routerLinkActive]="['active']"
+     [routerLink]=[historyUrl]
+     class="navlist__item navlist__history" mat-list-item>History</a>
+  <a (click)="toggleSidenav()" *ngIf="settingsAccess" [routerLinkActive]="['active']"
+     [routerLink]=[settingsURL]
+     class="navlist__item navlist__setting" mat-list-item>Settings</a>
 </mat-nav-list>
diff --git a/web/src/app/shared/components/sidenav-list/sidenav-list.component.spec.ts b/web/src/app/shared/components/sidenav-list/sidenav-list.component.spec.ts
index 8c875caf5a..5f4eb6fd6d 100644
--- a/web/src/app/shared/components/sidenav-list/sidenav-list.component.spec.ts
+++ b/web/src/app/shared/components/sidenav-list/sidenav-list.component.spec.ts
@@ -15,7 +15,7 @@ import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatGridListModule } from '@angular/material/grid-list';
 import { MatListModule } from '@angular/material/list';
 import { MatIconModule } from '@angular/material/icon';
-import { EMPTY, of } from 'rxjs';
+import { EMPTY } from 'rxjs';
 
 const SidenavServiceSpy: Partial<SidenavService> = {
   toggleSidenav: jest.fn().mockReturnValue(EMPTY)
@@ -24,7 +24,7 @@ const SidenavServiceSpy: Partial<SidenavService> = {
 const TaskanaEngineServiceSpy: Partial<TaskanaEngineService> = {
   hasRole: jest.fn().mockReturnValue(EMPTY),
   isHistoryProviderEnabled: jest.fn().mockReturnValue(EMPTY),
-  isCustomRoutingRulesEnabled$: EMPTY
+  isCustomRoutingRulesEnabled: jest.fn().mockReturnValue(EMPTY)
 };
 
 describe('SidenavListComponent', () => {
diff --git a/web/src/app/shared/components/sidenav-list/sidenav-list.component.ts b/web/src/app/shared/components/sidenav-list/sidenav-list.component.ts
index e52a5c1105..fe4c602270 100644
--- a/web/src/app/shared/components/sidenav-list/sidenav-list.component.ts
+++ b/web/src/app/shared/components/sidenav-list/sidenav-list.component.ts
@@ -4,8 +4,6 @@ import { MonitorGuard } from 'app/shared/guards/monitor.guard';
 import { UserGuard } from 'app/shared/guards/user.guard';
 import { TaskanaEngineService } from '../../services/taskana-engine/taskana-engine.service';
 import { SidenavService } from '../../services/sidenav/sidenav.service';
-import { Observable, of } from 'rxjs';
-import { takeUntil } from 'rxjs/operators';
 
 @Component({
   selector: 'taskana-sidenav-list',
@@ -29,7 +27,7 @@ export class SidenavListComponent implements OnInit {
   monitorAccess = false;
   workplaceAccess = false;
   historyAccess = false;
-  routingAccess$: Observable<boolean> = of(false);
+  routingAccess = false;
   settingsAccess = false;
 
   constructor(private taskanaEngineService: TaskanaEngineService, private sidenavService: SidenavService) {}
@@ -41,8 +39,9 @@ export class SidenavListComponent implements OnInit {
     this.taskanaEngineService.isHistoryProviderEnabled().subscribe((value) => {
       this.historyAccess = value;
     });
-    this.routingAccess$ = this.taskanaEngineService.isCustomRoutingRulesEnabled$;
-    this.routingAccess$.subscribe();
+    this.taskanaEngineService.isCustomRoutingRulesEnabled().subscribe((value) => {
+      this.routingAccess = value;
+    });
     this.settingsAccess = this.administrationAccess;
   }
 
diff --git a/web/src/app/shared/guards/task-routing.guard.ts b/web/src/app/shared/guards/task-routing.guard.ts
index 2e291a03d9..38570a4eb0 100644
--- a/web/src/app/shared/guards/task-routing.guard.ts
+++ b/web/src/app/shared/guards/task-routing.guard.ts
@@ -14,7 +14,7 @@ export class TaskRoutingGuard implements CanActivate {
     next: ActivatedRouteSnapshot,
     state: RouterStateSnapshot
   ): Observable<boolean> | Promise<boolean> | boolean {
-    return this.taskanaEngineService.isCustomRoutingRulesEnabled$.pipe(
+    return this.taskanaEngineService.isCustomRoutingRulesEnabled().pipe(
       map((value) => {
         if (value) {
           return value;
diff --git a/web/src/app/shared/services/taskana-engine/taskana-engine.service.ts b/web/src/app/shared/services/taskana-engine/taskana-engine.service.ts
index c5a1bb878a..5eb1ce5f5a 100644
--- a/web/src/app/shared/services/taskana-engine/taskana-engine.service.ts
+++ b/web/src/app/shared/services/taskana-engine/taskana-engine.service.ts
@@ -4,11 +4,12 @@ import { environment } from 'environments/environment';
 import { UserInfo } from 'app/shared/models/user-info';
 import { Version } from 'app/shared/models/version';
 import { Observable } from 'rxjs';
-import { map, shareReplay } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 
 @Injectable()
 export class TaskanaEngineService {
   currentUserInfo: UserInfo;
+
   constructor(private httpClient: HttpClient) {}
 
   // GET
@@ -38,14 +39,14 @@ export class TaskanaEngineService {
     return this.httpClient.post<string>(`${environment.taskanaLogoutUrl}`, '');
   }
 
+  isCustomRoutingRulesEnabled(): Observable<boolean> {
+    return this.httpClient.get<boolean>(`${environment.taskanaRestUrl}/v1/routing-rules/routing-rest-enabled`);
+  }
+
   isHistoryProviderEnabled(): Observable<boolean> {
     return this.httpClient.get<boolean>(`${environment.taskanaRestUrl}/v1/history-provider-enabled`);
   }
 
-  isCustomRoutingRulesEnabled$ = this.httpClient
-    .get<boolean>(`${environment.taskanaRestUrl}/v1/routing-rules/routing-rest-enabled`)
-    .pipe(shareReplay(1));
-
   private findRole(roles2Find: string[]) {
     return this.currentUserInfo.roles.find((role) => roles2Find.some((roleLookingFor) => role === roleLookingFor));
   }