From 896147422e15e686c7c1c7e4b6979cfade32ae40 Mon Sep 17 00:00:00 2001
From: Jorden_Reuter <jorden.reuter@capgemini.com>
Date: Thu, 28 Mar 2024 15:22:12 +0100
Subject: [PATCH] feat: theme properties as string

---
 .../onecx/shell/bff/rs/mappers/WorkspaceConfigMapper.java   | 1 +
 src/main/openapi/openapi-bff.yaml                           | 3 ++-
 src/main/resources/application.properties                   | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/tkit/onecx/shell/bff/rs/mappers/WorkspaceConfigMapper.java b/src/main/java/org/tkit/onecx/shell/bff/rs/mappers/WorkspaceConfigMapper.java
index 109f75c..73077ce 100644
--- a/src/main/java/org/tkit/onecx/shell/bff/rs/mappers/WorkspaceConfigMapper.java
+++ b/src/main/java/org/tkit/onecx/shell/bff/rs/mappers/WorkspaceConfigMapper.java
@@ -27,6 +27,7 @@ public interface WorkspaceConfigMapper {
     @Mapping(target = "baseUrl", source = "requestDTO.baseUrl")
     WorkspaceDTO map(WorkspaceAbstract workspaceInfo, GetWorkspaceConfigRequestDTO requestDTO);
 
+    @Mapping(expression = "java( String.valueOf(themeInfo.getProperties()) )", target = "properties")
     ThemeDTO mapTheme(Theme themeInfo);
 
     @Mapping(target = "productNames", source = "products")
diff --git a/src/main/openapi/openapi-bff.yaml b/src/main/openapi/openapi-bff.yaml
index f3702f6..aa9c3f6 100644
--- a/src/main/openapi/openapi-bff.yaml
+++ b/src/main/openapi/openapi-bff.yaml
@@ -185,6 +185,7 @@ components:
     Theme:
       required:
       - name
+      - properties
       type: object
       properties:
         name:
@@ -205,7 +206,7 @@ components:
         assetsUpdateDate:
           type: string
         properties:
-          type: object
+          type: string
 
     Route:
       type: object
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index f872095..58d3947 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -19,6 +19,8 @@ org.eclipse.microprofile.rest.client.propagateHeaders=apm-principal-token
 %prod.quarkus.rest-client.onecx_permission_svc.url=http://onecx-permission-svc:8080
 %prod.quarkus.rest-client.onecx_user_profile_svc.url=http://onecx-user-profile-svc:8080
 
+#MOCK FOR REMOTE COMPONENTS => should be removed when implemented
+onecx.component.mock.keys[0]=portalmenu
 
 %prod.quarkus.oidc-client.client-id=${quarkus.application.name}
 
@@ -79,11 +81,11 @@ quarkus.test.integration-test-profile=test
 
 # TEST
 %test.quarkus.http.test-port=0
-%test.tkit.log.json.enabled=true
+%test.tkit.log.json.enabled=false
 %test.quarkus.mockserver.devservices.config-class-path=true
 %test.quarkus.mockserver.devservices.config-file=/mockserver.properties
 %test.quarkus.mockserver.devservices.config-dir=/mockserver
-%test.quarkus.mockserver.devservices.log=true
+%test.quarkus.mockserver.devservices.log=false
 %test.quarkus.mockserver.devservices.reuse=true
 %test.quarkus.rest-client.onecx_workspace_svc.url=${quarkus.mockserver.endpoint}
 %test.quarkus.rest-client.onecx_theme_svc.url=${quarkus.mockserver.endpoint}