implement new config attr in frontend and rename attr

puzzle · Nov 19, 2024 · e74c6c9 · e74c6c9
1 parent bf840a0
commit e74c6c9
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 7 deletions.
diff --git a/backend/src/main/java/ch/puzzle/okr/dto/ClientConfigDto.java b/backend/src/main/java/ch/puzzle/okr/dto/ClientConfigDto.java
@@ -3,6 +3,6 @@
 import java.util.Map;
 
 public record ClientConfigDto(String activeProfile, String issuer, String clientId, String favicon, String logo,
-        String triangles, String backgroundLogo, String title, String supportSiteURL,
+        String triangles, String backgroundLogo, String title, String supportSiteUrl,
         Map<String, String> customStyles) {
 }
diff --git a/...end/src/main/java/ch/puzzle/okr/multitenancy/customization/TenantClientCustomization.java b/...end/src/main/java/ch/puzzle/okr/multitenancy/customization/TenantClientCustomization.java
@@ -3,5 +3,5 @@
 import java.util.Map;
 
 public record TenantClientCustomization(String favicon, String logo, String triangles, String backgroundLogo,
-        String title, String supportSiteURL, Map<String, String> customStyles) {
+        String title, String supportSiteUrl, Map<String, String> customStyles) {
 }
diff --git a/...main/java/ch/puzzle/okr/multitenancy/customization/TenantClientCustomizationProvider.java b/...main/java/ch/puzzle/okr/multitenancy/customization/TenantClientCustomizationProvider.java
@@ -39,7 +39,7 @@ private TenantClientCustomization readClientCustomizationConfig(String tenantId)
                 env.getProperty(MessageFormat.format("okr.tenants.{0}.clientcustomization.triangles", tenantId)),
                 env.getProperty(MessageFormat.format("okr.tenants.{0}.clientcustomization.background-logo", tenantId)),
                 env.getProperty(MessageFormat.format("okr.tenants.{0}.clientcustomization.title", tenantId)),
-                env.getProperty(MessageFormat.format("okr.tenants.{0}.clientcustomization.supportSiteURL", tenantId)),
+                env.getProperty(MessageFormat.format("okr.tenants.{0}.clientcustomization.supportSiteUrl", tenantId)),
                 getCustomCssStyles(tenantId) //
         );
     }

diff --git a/backend/src/main/java/ch/puzzle/okr/service/clientconfig/ClientConfigService.java b/backend/src/main/java/ch/puzzle/okr/service/clientconfig/ClientConfigService.java
@@ -57,7 +57,7 @@ public ClientConfigDto getConfigBasedOnActiveEnv(String hostName) {
                 tenantClientCustomization.get().triangles(), //
                 tenantClientCustomization.get().backgroundLogo(), //
                 tenantClientCustomization.get().title(), //
-                tenantClientCustomization.get().supportSiteURL(), //
+                tenantClientCustomization.get().supportSiteUrl(), //
                 tenantClientCustomization.get().customStyles()); //
     }
 

diff --git a/backend/src/main/resources/application-dev.properties b/backend/src/main/resources/application-dev.properties
@@ -48,6 +48,7 @@ okr.tenants.pitc.clientcustomization.triangles=assets/images/triangles-okr-heade
 okr.tenants.pitc.clientcustomization.background-logo=assets/images/puzzle-p.svg
 okr.tenants.pitc.clientcustomization.favicon=assets/favicon.png
 okr.tenants.pitc.clientcustomization.title=Puzzle OKR
+okr.tenants.pitc.clientcustomization.supportSiteUrl=https://wiki.puzzle.ch/Puzzle/OKRs
 okr.tenants.pitc.clientcustomization.customstyles.okr-topbar-background-color=#1e5a96
 okr.tenants.pitc.clientcustomization.customstyles.okr-banner-background-color=#dcedf9
 
@@ -57,5 +58,6 @@ okr.tenants.acme.clientcustomization.triangles=assets/images/triangles-okr-acme-
 okr.tenants.acme.clientcustomization.background-logo=assets/images/acme.svg
 okr.tenants.acme.clientcustomization.favicon=assets/favicon-acme.png
 okr.tenants.acme.clientcustomization.title=ACME OKR
+okr.tenants.acme.clientcustomization.supportSiteUrl=https://google.com 
 okr.tenants.acme.clientcustomization.customstyles.okr-topbar-background-color=#738290
 okr.tenants.acme.clientcustomization.customstyles.okr-banner-background-color=#F2F2F2
diff --git a/frontend/src/app/components/application-top-bar/application-top-bar.component.html b/frontend/src/app/components/application-top-bar/application-top-bar.component.html
@@ -22,9 +22,11 @@
       </button>
 
       <button
+        *ngIf="this.supportSiteUrl$ | async as supportSiteUrl"
         id="hilfeButton"
+        [attr.data-testId]="'help-button'"
         class="topBarEntry btn"
-        onclick="window.open('https://wiki.puzzle.ch/Puzzle/OKRs', '_blank')"
+        onclick="window.open(supportSiteUrl, '_blank')"
       >
         <mat-icon aria-hidden="false" aria-label="Help icon" fontIcon="help_outline"></mat-icon>
         <span class="d-none d-md-flex"> Hilfe </span>

diff --git a/frontend/src/app/components/application-top-bar/application-top-bar.component.ts b/frontend/src/app/components/application-top-bar/application-top-bar.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 import { OAuthService } from 'angular-oauth2-oidc';
-import { BehaviorSubject, filter, Observable, of, Subscription, switchMap } from 'rxjs';
+import { BehaviorSubject, Subscription } from 'rxjs';
 import { ConfigService } from '../../services/config.service';
 import { NavigationEnd, Router } from '@angular/router';
 import { UserService } from '../../services/user.service';
@@ -16,6 +16,7 @@ export class ApplicationTopBarComponent implements OnInit, OnDestroy {
   userFullName: string = '';
   menuIsOpen = false;
   logoSrc$ = new BehaviorSubject<String>('assets/images/empty.svg');
+  supportSiteUrl$ = new BehaviorSubject<string>('https://en.wikipedia.org/wiki/Objectives_and_key_results');
   private subscription?: Subscription;
 
   constructor(
@@ -32,6 +33,9 @@ export class ApplicationTopBarComponent implements OnInit, OnDestroy {
         if (config.logo) {
           this.logoSrc$.next(config.logo);
         }
+        if (config.supportSiteUrl) {
+          this.supportSiteUrl$.next(config.supportSiteUrl);
+        }
       },
     });
     this.initUserFullName();

diff --git a/frontend/src/app/shared/types/model/ClientConfig.ts b/frontend/src/app/shared/types/model/ClientConfig.ts
@@ -14,7 +14,7 @@ export interface CustomizationConfig {
   logo: string;
   triangles: string;
   backgroundLogo: string;
-  supportSiteURL: string;
+  supportSiteUrl: string;
   customStyles: CustomStyles;
 }
 export interface ClientConfig extends AuthConfig, CustomizationConfig {}