change config and Tenant enitity to have new attribute supportSiteURL

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

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/.run/OkrApplication-Dev.run.xml b/.run/OkrApplication-Dev.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="OkrApplication-Dev" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <option name="ACTIVE_PROFILES" value="dev" />
-    <option name="ALTERNATIVE_JRE_PATH" value="$USER_HOME$/.sdkman/candidates/java/current" />
+    <option name="ALTERNATIVE_JRE_PATH" value="openjdk-21" />
     <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <module name="backend" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="ch.puzzle.okr.OkrApplication" />

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,5 +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, Map<String, String> customStyles) {
+        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, 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,6 +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)),
                 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,6 +57,7 @@ public ClientConfigDto getConfigBasedOnActiveEnv(String hostName) {
                 tenantClientCustomization.get().triangles(), //
                 tenantClientCustomization.get().backgroundLogo(), //
                 tenantClientCustomization.get().title(), //
+                tenantClientCustomization.get().supportSiteURL(), //
                 tenantClientCustomization.get().customStyles()); //
     }
 

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