From bdc7331cb59da96941c3250625af3cb5f9b12e15 Mon Sep 17 00:00:00 2001
From: Philip Gaber <gaber@b1-systems.de>
Date: Fri, 18 Jul 2025 08:32:15 +0200
Subject: [PATCH] feat(nextcloud): Enhance theming options for Nextcloud

---
 .../values-nextcloud-management.yaml.gotmpl   | 29 ++++++++++++++++++-
 .../images.yaml.gotmpl                        |  2 +-
 .../environments/default/charts.yaml.gotmpl   |  6 ++--
 .../environments/default/images.yaml.gotmpl   |  2 +-
 .../environments/default/theme.yaml.gotmpl    |  4 +++
 5 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl b/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl
index 041af3fe..11b973cc 100644
--- a/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl
+++ b/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl
@@ -232,6 +232,33 @@ serviceAccount:
     {{ .Values.annotations.nextcloudNextcloudMgmt.serviceAccount | toYaml | nindent 4 }}
 
 theme:
-  {{ .Values.theme | toYaml | nindent 2 }}
+  background:
+    # Static color background
+    # NOTE: Not available yet because of a bug in Nextcloud 31.X
+    # Ref: https://github.com/nextcloud/server/commit/da51459022d21a569ab8271c5456f69c9316cdad
+    color: {{ .Values.theme.colors.primary | quote }}
+    # PNG or JPEG image background. Overwrites `theme.background.color`
+    imgBase64: {{ .Values.theme.imagery.files.backgroudImg | quote }}
 
+  colors:
+    primary: {{ .Values.theme.colors.primary | quote }}
+
+  favicon:
+    pngBase64: {{ .Values.theme.imagery.files.faviconPng | quote }}
+
+  logo:
+    svgBase64: {{ .Values.theme.imagery.logoHeaderSvgB64 | quote }}
+
+  # Overwrites the header color of Nextcloud with the value set in the `integration_swp` app
+  # This can *intentionally* only be adjusted via customizing
+  swpOverrideHeaderColor: true
+
+  texts:
+    slogan: {{ .Values.theme.texts.slogan | quote }}
+    productName: {{ .Values.theme.texts.productName | quote }}
+
+  urls:
+    imprint: {{ .Values.functional.portal.linkLegalNotice | quote }}
+    privacy: {{ .Values.functional.portal.linkPrivacyStatement | quote }}
+    main: {{ printf "%s.%s" .Values.global.hosts.nubus .Values.global.domain }}
 ...
diff --git a/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl b/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl
index 94142d0e..0f53e64f 100644
--- a/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl
+++ b/helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl
@@ -13,7 +13,7 @@ images:
   nextcloud:
     registry: "registry.opencode.de"
     repository: "zendis/opendesk-enterprise/components/supplier/nextcloud/images/opendesk-nextcloud"
-    tag: "31.0.6@sha256:eb1fd84f39a9ff36bd1251ef4bc00b2a838bc2f9fb6df2b18b1a70ae72fac022"
+    tag: "31.0.6@sha256:035fc2c50f011194d1018ccc6c8f5b5266ffe1c41d033e04e65fec72d3a5093f"
   openxchangeCoreMW:
     registry: "registry.opencode.de"
     repository: "zendis/opendesk-enterprise/components/supplier/open-xchange/images-mirror/middleware-public-sector-pro"
diff --git a/helmfile/environments/default/charts.yaml.gotmpl b/helmfile/environments/default/charts.yaml.gotmpl
index 4b7f344b..67318207 100644
--- a/helmfile/environments/default/charts.yaml.gotmpl
+++ b/helmfile/environments/default/charts.yaml.gotmpl
@@ -251,7 +251,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
     name: "opendesk-nextcloud"
-    version: "4.2.0"
+    version: "4.3.0"
     verify: true
   nextcloudManagement:
     # providerCategory: "Platform"
@@ -261,7 +261,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
     name: "opendesk-nextcloud-management"
-    version: "4.2.0"
+    version: "4.3.0"
     verify: true
   nextcloudNotifyPush:
     # providerCategory: "Platform"
@@ -271,7 +271,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
     name: "opendesk-nextcloud-notifypush"
-    version: "4.2.0"
+    version: "4.3.0"
     verify: true
   nginx:
     # providerCategory: "Community"
diff --git a/helmfile/environments/default/images.yaml.gotmpl b/helmfile/environments/default/images.yaml.gotmpl
index 3c3826b2..ec8a5aad 100644
--- a/helmfile/environments/default/images.yaml.gotmpl
+++ b/helmfile/environments/default/images.yaml.gotmpl
@@ -320,7 +320,7 @@ images:
     # upstreamRepository: "bmi/opendesk/components/platform-development/images/opendesk-nextcloud"
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/images/opendesk-nextcloud"
-    tag: "31.0.6@sha256:760d0f1ff724d53faa757987e7068d09df0c603e3ac4fbb8aefe1bf13270c615"
+    tag: "31.0.6@sha256:18e5149b8bef70adb3f25d136c2a06b4bb8e1b38f10df6ddd053314b96794ab5"
   nextcloudExporter:
     # providerCategory: "Platform"
     # providerResponsible: "openDesk"
diff --git a/helmfile/environments/default/theme.yaml.gotmpl b/helmfile/environments/default/theme.yaml.gotmpl
index 12fa9213..cbc64453 100644
--- a/helmfile/environments/default/theme.yaml.gotmpl
+++ b/helmfile/environments/default/theme.yaml.gotmpl
@@ -11,6 +11,7 @@ theme:
   #
   texts:
     productName: "openDesk"
+    slogan: "Souverän gedacht. Flexibel gemacht."
 
   ## Define colors
   #
@@ -48,6 +49,9 @@ theme:
     files:
       faviconIco: {{ readFile "./../../files/theme/files/favicon.ico" | b64enc | quote }}
       faviconPng: {{ readFile "./../../files/theme/files/favicon.png" | b64enc | quote }}
+      # A base64 encoded background image that overwrites the solid color background from `theme.colors.primary`
+      # We tested the following file formats: PNG, JPEG and SVG
+      backgroudImg: ~
 
     login:
       faviconIco: {{ readFile "./../../files/theme/login/favicon.ico" | b64enc | quote }}