Merge pull request #1120 from ds-wizard/hotfix/4.5.1

Hotfix 4.5.1
ds-wizard · Apr 5, 2024 · a0a2842 · a0a2842
2 parents ed3cbd7 + 6e18ee0
commit a0a2842
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 15 deletions.
diff --git a/engine-shared/elm/Shared/Data/BootstrapConfig/LookAndFeelConfig.elm b/engine-shared/elm/Shared/Data/BootstrapConfig/LookAndFeelConfig.elm
@@ -10,9 +10,9 @@ module Shared.Data.BootstrapConfig.LookAndFeelConfig exposing
     , defaultRegistryUrl
     , getAppTitle
     , getAppTitleShort
-    , getIllustrationsColor
     , getLogoUrl
-    , getPrimaryColor
+    , getTheme
+    , isCustomTheme
     )
 
 import Color exposing (Color)
@@ -22,6 +22,7 @@ import Json.Decode.Color as D
 import Json.Decode.Pipeline as D
 import Maybe.Extra as Maybe
 import Shared.Data.BootstrapConfig.LookAndFeelConfig.CustomMenuLink as CustomMenuLink exposing (CustomMenuLink)
+import Shared.Utils.Theme exposing (Theme)
 
 
 type alias LookAndFeelConfig =
@@ -104,6 +105,18 @@ getIllustrationsColor config =
         |> Maybe.withDefault defaultIllustrationsColor
 
 
+isCustomTheme : LookAndFeelConfig -> Bool
+isCustomTheme config =
+    config.primaryColor /= Nothing || config.illustrationsColor /= Nothing
+
+
+getTheme : LookAndFeelConfig -> Theme
+getTheme config =
+    Theme
+        (getPrimaryColor config)
+        (getIllustrationsColor config)
+
+
 getLogoUrl : LookAndFeelConfig -> String
 getLogoUrl config =
     Maybe.withDefault defaultLogoUrl config.logoUrl

diff --git a/engine-wizard/docker/start.sh b/engine-wizard/docker/start.sh
@@ -35,7 +35,8 @@ echo -n "};" >>${config}
 headExtraFile=/src/head-extra.html
 if [ -f "$headExtraFile" ]; then
   headExtraBlock=$(cat $headExtraFile)
-  sed -i "s~</head>~$headExtraBlock</head>~g" /usr/share/nginx/html/wizard/index.html
+  index=/usr/share/nginx/html/wizard/index.html
+  awk -v r="$headExtraBlock" '{gsub(/<\/head>/, r"</head>")}1' /usr/share/nginx/html/wizard/index.html > $index.tmp && mv $index.tmp $index
 fi
 
 # start nginx

diff --git a/engine-wizard/elm/Wizard.elm b/engine-wizard/elm/Wizard.elm
@@ -41,10 +41,18 @@ init flags location key =
 
                     route =
                         routeIfAllowed appState originalRoute
+
+                    setThemeCmd =
+                        case appState.theme of
+                            Just theme ->
+                                Theme.setTheme theme
+
+                            Nothing ->
+                                Cmd.none
                 in
                 Cmd.batch
                     [ decideInitialRoute model location route originalRoute
-                    , Theme.setTheme appState.theme
+                    , setThemeCmd
                     , Time.getTime
                     , Time.getTimeZone
                     ]

diff --git a/engine-wizard/elm/Wizard/Common/AppState.elm b/engine-wizard/elm/Wizard/Common/AppState.elm
@@ -22,7 +22,7 @@ import Shared.Common.Navigator exposing (Navigator)
 import Shared.Data.BootstrapConfig exposing (BootstrapConfig)
 import Shared.Data.BootstrapConfig.LookAndFeelConfig as LookAndFeelConfig
 import Shared.Provisioning as Provisioning exposing (Provisioning)
-import Shared.Utils.Theme as Theme exposing (Theme)
+import Shared.Utils.Theme exposing (Theme)
 import Time
 import Wizard.Common.Flags as Flags
 import Wizard.Common.Provisioning.DefaultIconSet as DefaultIconSet
@@ -54,7 +54,7 @@ type alias AppState =
     , locale : Gettext.Locale
     , selectedLocale : Maybe String
     , sessionExpiresSoonModalHidden : Bool
-    , theme : Theme
+    , theme : Maybe Theme
     }
 
 
@@ -96,9 +96,11 @@ init flagsValue key =
                 ]
 
         theme =
-            Theme.Theme
-                (LookAndFeelConfig.getPrimaryColor flags.config.lookAndFeel)
-                (LookAndFeelConfig.getIllustrationsColor flags.config.lookAndFeel)
+            if LookAndFeelConfig.isCustomTheme flags.config.lookAndFeel then
+                Just <| LookAndFeelConfig.getTheme flags.config.lookAndFeel
+
+            else
+                Nothing
     in
     ( { route = Routes.NotFoundRoute
       , seed = Random.initialSeed flags.seed

diff --git a/engine-wizard/elm/Wizard/Common/Components/Questionnaire.elm b/engine-wizard/elm/Wizard/Common/Components/Questionnaire.elm
@@ -54,6 +54,7 @@ import Shared.Api.TypeHints as TypeHintsApi
 import Shared.Common.TimeUtils as TimeUtils
 import Shared.Components.Badge as Badge
 import Shared.Copy as Copy
+import Shared.Data.BootstrapConfig.LookAndFeelConfig as LookAndFeel
 import Shared.Data.Event exposing (Event)
 import Shared.Data.KnowledgeModel as KnowledgeModel exposing (KnowledgeModel)
 import Shared.Data.KnowledgeModel.Answer exposing (Answer)
@@ -692,7 +693,7 @@ update msg wrapMsg mbSetFullscreenMsg appState ctx model =
                 ( model
                 , Integrations.openIntegrationWidget
                     { url = requestUrl
-                    , theme = appState.theme
+                    , theme = Maybe.withDefault (LookAndFeel.getTheme appState.config.lookAndFeel) appState.theme
                     , data = { path = path }
                     }
                 )
@@ -906,7 +907,7 @@ update msg wrapMsg mbSetFullscreenMsg appState ctx model =
                 ( model
                 , Integrations.openAction
                     { url = questionnaireAction.url
-                    , theme = appState.theme
+                    , theme = Maybe.withDefault (LookAndFeel.getTheme appState.config.lookAndFeel) appState.theme
                     , data =
                         { projectUuid = model.uuid
                         , userToken = String.toMaybe appState.session.token.token

diff --git a/engine-wizard/elm/Wizard/Projects/Import/Update.elm b/engine-wizard/elm/Wizard/Projects/Import/Update.elm
@@ -6,6 +6,7 @@ import Random exposing (Seed)
 import Shared.Api.KnowledgeModels as KnowledgeModelsApi
 import Shared.Api.QuestionnaireImporters as QuestionnaireImportersApi
 import Shared.Api.Questionnaires as QuestionnairesApi
+import Shared.Data.BootstrapConfig.LookAndFeelConfig as LookAndFeel
 import Shared.Data.QuestionnaireDetail.QuestionnaireEvent as QuestionnaireEvent
 import Shared.Data.QuestionnaireDetail.QuestionnaireEvent.SetReplyData as SetReplyData
 import Shared.Error.ApiError as ApiError
@@ -43,7 +44,7 @@ update wrapMsg msg appState model =
                 ( Success knowledgeModelString, Success importer ) ->
                     Integrations.openImporter
                         { url = importer.url
-                        , theme = appState.theme
+                        , theme = Maybe.withDefault (LookAndFeel.getTheme appState.config.lookAndFeel) appState.theme
                         , data =
                             { knowledgeModel = knowledgeModelString
                             }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "engine-frontend",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "repository": "https://github.com/ds-wizard/engine-frontend",
   "license": "Apache-2.0",
   "scripts": {