Merge pull request #1367 from ds-wizard/release/4.18.0

Release 4.18.0

Author: janslifka

elm.json

@@ -42,7 +42,7 @@
             "leojpod/elm-keyboard-shortcut": "1.0.1",
             "myrho/elm-round": "1.0.5",
             "noahzgordon/elm-color-extra": "1.0.2",
-            "pablohirafuji/elm-syntax-highlight": "3.7.0",
+            "pablohirafuji/elm-syntax-highlight": "3.7.1",
             "rtfeldman/elm-iso8601-date-strings": "1.1.4",
             "rundis/elm-bootstrap": "5.2.0",
             "simonh1000/elm-jwt": "7.1.1",

engine-registry/elm/Registry/Api/Models/BootstrapConfig.elm

@@ -7,19 +7,24 @@ module Registry.Api.Models.BootstrapConfig exposing
 import Json.Decode as D exposing (Decoder)
 import Json.Decode.Pipeline as D
 import Registry.Api.Models.BootstrapConfig.AuthenticationConfig as AuthenticationConfig exposing (AuthenticationConfig)
+import Registry.Api.Models.BootstrapConfig.LocaleConfig as LocaleConfig exposing (LocaleConfig)
 
 
 type alias BootstrapConfig =
     { authentication : AuthenticationConfig
+    , locale : LocaleConfig
     }
 
 
 default : BootstrapConfig
 default =
-    { authentication = AuthenticationConfig.default }
+    { authentication = AuthenticationConfig.default
+    , locale = LocaleConfig.default
+    }
 
 
 decoder : Decoder BootstrapConfig
 decoder =
     D.succeed BootstrapConfig
         |> D.required "authentication" AuthenticationConfig.decoder
+        |> D.required "locale" LocaleConfig.decoder

engine-registry/elm/Registry/Api/Models/BootstrapConfig/LocaleConfig.elm

@@ -0,0 +1,19 @@
+module Registry.Api.Models.BootstrapConfig.LocaleConfig exposing (LocaleConfig, decoder, default)
+
+import Json.Decode as D exposing (Decoder)
+import Json.Decode.Pipeline as D
+
+
+type alias LocaleConfig =
+    { enabled : Bool }
+
+
+default : LocaleConfig
+default =
+    { enabled = True }
+
+
+decoder : Decoder LocaleConfig
+decoder =
+    D.succeed LocaleConfig
+        |> D.required "enabled" D.bool

engine-registry/elm/Registry/Layouts/AppLayout.elm

@@ -5,6 +5,7 @@ import Gettext exposing (gettext)
 import Html exposing (Html, a, div, header, img, li, main_, section, small, text, ul)
 import Html.Attributes exposing (class, classList, height, href, src)
 import Html.Events exposing (onClick)
+import Html.Extra as Html
 import Registry.Components.FontAwesome exposing (fas)
 import Registry.Data.AppState as AppState exposing (AppState)
 import Registry.Routes as Routes
@@ -101,16 +102,17 @@ viewHeader appState cfg appTitle =
                                     , text (gettext "Document Templates" appState.locale)
                                     ]
                                 ]
-                            , li [ class "nav-item" ]
-                                [ a
-                                    [ class "nav-link"
-                                    , classList [ ( "active", appState.route == Routes.Locales ) ]
-                                    , href (Routes.toUrl Routes.locales)
+                            , Html.viewIf appState.config.locale.enabled <|
+                                li [ class "nav-item" ]
+                                    [ a
+                                        [ class "nav-link"
+                                        , classList [ ( "active", appState.route == Routes.Locales ) ]
+                                        , href (Routes.toUrl Routes.locales)
+                                        ]
+                                        [ fas "fa-language"
+                                        , text (gettext "Locales" appState.locale)
+                                        ]
                                     ]
-                                    [ fas "fa-language"
-                                    , text (gettext "Locales" appState.locale)
-                                    ]
-                                ]
                             ]
                         ]
                     ]

engine-registry/elm/Registry/Pages/Homepage.elm

@@ -3,6 +3,7 @@ module Registry.Pages.Homepage exposing (view)
 import Gettext exposing (gettext)
 import Html exposing (Html, a, div, h1, p, span, text)
 import Html.Attributes exposing (class, href)
+import Html.Extra as Html
 import Registry.Components.FontAwesome exposing (fas)
 import Registry.Data.AppState as AppState exposing (AppState)
 import Registry.Routes as Routes
@@ -20,7 +21,7 @@ view appState =
                     [ text (gettext "Customize your experience with prepared content and translations." appState.locale)
                     ]
                 ]
-            , div [ class "row" ]
+            , div [ class "row justify-content-center" ]
                 [ viewLink
                     { route = Routes.KnowledgeModels
                     , icon = "fa-sitemap"
@@ -33,12 +34,13 @@ view appState =
                     , title = gettext "Document Templates" appState.locale
                     , description = gettext "Compose documents from questionnaires by selecting templates that handle the transformation of replies." appState.locale
                     }
-                , viewLink
-                    { route = Routes.Locales
-                    , icon = "fa-language"
-                    , title = gettext "Locales" appState.locale
-                    , description = gettext "Adapt the user interface to different languages for a more inclusive experience." appState.locale
-                    }
+                , Html.viewIf appState.config.locale.enabled <|
+                    viewLink
+                        { route = Routes.Locales
+                        , icon = "fa-language"
+                        , title = gettext "Locales" appState.locale
+                        , description = gettext "Adapt the user interface to different languages for a more inclusive experience." appState.locale
+                        }
                 ]
             ]
         ]

engine-registry/elm/Registry/Routes.elm

@@ -65,17 +65,24 @@ parsers config =
             else
                 []
 
+        localeRoutes =
+            if config.locale.enabled then
+                [ Parser.map Locales (Parser.s "locales")
+                , Parser.map LocalesDetail (Parser.s "locales" </> Parser.string)
+                ]
+
+            else
+                []
+
         publicRoutes =
             [ Parser.map Home Parser.top
             , Parser.map KnowledgeModels (Parser.s "knowledge-models")
             , Parser.map KnowledgeModelsDetail (Parser.s "knowledge-models" </> Parser.string)
             , Parser.map DocumentTemplates (Parser.s "document-templates")
             , Parser.map DocumentTemplatesDetail (Parser.s "document-templates" </> Parser.string)
-            , Parser.map Locales (Parser.s "locales")
-            , Parser.map LocalesDetail (Parser.s "locales" </> Parser.string)
             ]
     in
-    Parser.oneOf (publicRoutes ++ authRoutes)
+    Parser.oneOf (publicRoutes ++ localeRoutes ++ authRoutes)
 
 
 toUrl : Route -> String

engine-shared/elm/Shared/Api.elm

@@ -24,6 +24,7 @@ module Shared.Api exposing
     , jwtPostEmpty
     , jwtPostFile
     , jwtPostFileWithData
+    , jwtPostMultiPart
     , jwtPut
     , jwtPutString
     , wsUrl
@@ -120,6 +121,15 @@ jwtPostFileWithData url data file appState toMsg =
         }
 
 
+jwtPostMultiPart : String -> List Http.Part -> AbstractAppState b -> ToMsg () msg -> Cmd msg
+jwtPostMultiPart url data appState toMsg =
+    Jwt.Http.post appState.session.token.token
+        { url = appState.apiUrl ++ url
+        , body = Http.multipartBody data
+        , expect = expectWhatever toMsg
+        }
+
+
 jwtFetchFileWithData : String -> List Http.Part -> Decoder a -> File -> AbstractAppState b -> ToMsg a msg -> Cmd msg
 jwtFetchFileWithData url data decoder file appState toMsg =
     Jwt.Http.post appState.session.token.token

engine-shared/elm/Shared/Api/Locales.elm

@@ -5,6 +5,7 @@ module Shared.Api.Locales exposing
     , exportLocaleUrl
     , getLocale
     , getLocales
+    , getLocalesSuggestions
     , importLocale
     , pullLocale
     , setDefaultLocale
@@ -13,10 +14,12 @@ module Shared.Api.Locales exposing
 
 import File exposing (File)
 import Http
+import Json.Decode as D
 import Shared.AbstractAppState exposing (AbstractAppState)
-import Shared.Api exposing (ToMsg, jwtDelete, jwtGet, jwtPostEmpty, jwtPostFile, jwtPostFileWithData, jwtPut)
+import Shared.Api exposing (ToMsg, jwtDelete, jwtGet, jwtPostEmpty, jwtPostFile, jwtPostMultiPart, jwtPut)
 import Shared.Data.Locale as Locale exposing (Locale)
 import Shared.Data.LocaleDetail as LocaleDetail exposing (LocaleDetail)
+import Shared.Data.LocaleSuggestion as LocaleSuggestion exposing (LocaleSuggestion)
 import Shared.Data.Pagination as Pagination exposing (Pagination)
 import Shared.Data.PaginationQueryFilters exposing (PaginationQueryFilters)
 import Shared.Data.PaginationQueryString as PaginationQueryString exposing (PaginationQueryString)
@@ -34,6 +37,16 @@ getLocales _ qs =
     jwtGet url (Pagination.decoder "locales" Locale.decoder)
 
 
+getLocalesSuggestions : AbstractAppState a -> ToMsg (List LocaleSuggestion) msg -> Cmd msg
+getLocalesSuggestions =
+    let
+        decoder =
+            D.map .items <|
+                Pagination.decoder "locales" LocaleSuggestion.decoder
+    in
+    jwtGet "/locales/suggestions" decoder
+
+
 getLocale : String -> AbstractAppState a -> ToMsg LocaleDetail msg -> Cmd msg
 getLocale localeId =
     jwtGet ("/locales/" ++ localeId) LocaleDetail.decoder
@@ -57,13 +70,15 @@ setEnabled locale enabled =
     jwtPut ("/locales/" ++ locale.id) withDefault
 
 
-createFromPO : List ( String, String ) -> File -> AbstractAppState a -> ToMsg () msg -> Cmd msg
-createFromPO params =
+createFromPO : List ( String, String ) -> File -> File -> AbstractAppState a -> ToMsg () msg -> Cmd msg
+createFromPO params wizardContent mailContent =
     let
         httpParams =
-            List.map (\( k, v ) -> Http.stringPart k v) params
+            Http.filePart "wizardContent" wizardContent
+                :: Http.filePart "mailContent" mailContent
+                :: List.map (\( k, v ) -> Http.stringPart k v) params
     in
-    jwtPostFileWithData "/locales" httpParams
+    jwtPostMultiPart "/locales" httpParams
 
 
 deleteLocale : String -> String -> AbstractAppState a -> ToMsg () msg -> Cmd msg

engine-shared/elm/Shared/Api/Users.elm

@@ -1,12 +1,14 @@
 module Shared.Api.Users exposing
     ( deleteUser
+    , getCurrentUserLocale
     , getCurrentUserSubmissionProps
     , getUser
     , getUsers
     , getUsersSuggestions
     , getUsersSuggestionsWithOptions
     , postUser
     , postUserPublic
+    , putCurrentUserLocale
     , putCurrentUserSubmissionProps
     , putUser
     , putUserActivation
@@ -24,6 +26,7 @@ import Shared.Data.PaginationQueryFilters as PaginationQueryFilters exposing (Pa
 import Shared.Data.PaginationQueryString as PaginationQueryString exposing (PaginationQueryString)
 import Shared.Data.SubmissionProps as SubmissionProps exposing (SubmissionProps)
 import Shared.Data.User as User exposing (User)
+import Shared.Data.UserLocale as UserLocale exposing (UserLocale)
 import Shared.Data.UserSuggestion as UserSuggestion exposing (UserSuggestion)
 
 
@@ -82,6 +85,20 @@ getCurrentUserSubmissionProps =
     jwtGet "/users/current/submission-props" (D.list SubmissionProps.decoder)
 
 
+getCurrentUserLocale : AbstractAppState a -> ToMsg UserLocale msg -> Cmd msg
+getCurrentUserLocale =
+    jwtGet "/users/current/locale" UserLocale.decoder
+
+
+putCurrentUserLocale : AbstractAppState a -> UserLocale -> ToMsg () msg -> Cmd msg
+putCurrentUserLocale appState userLocale =
+    let
+        body =
+            UserLocale.encode userLocale
+    in
+    jwtPut "/users/current/locale" body appState
+
+
 postUser : E.Value -> AbstractAppState a -> ToMsg () msg -> Cmd msg
 postUser =
     jwtPost "/users"

engine-shared/elm/Shared/Data/BootstrapConfig.elm

@@ -12,7 +12,6 @@ import Shared.Data.BootstrapConfig.AppSwitcherItem as AppSwitcherItem exposing (
 import Shared.Data.BootstrapConfig.AuthenticationConfig as AuthenticationConfig exposing (AuthenticationConfig)
 import Shared.Data.BootstrapConfig.CloudConfig as CloudConfig exposing (CloudConfig)
 import Shared.Data.BootstrapConfig.DashboardAndLoginScreenConfig as DashboardAndLoginScreenConfig exposing (DashboardAndLoginScreenConfig)
-import Shared.Data.BootstrapConfig.LocaleConfig as LocaleConfig exposing (LocaleConfig)
 import Shared.Data.BootstrapConfig.LookAndFeelConfig as LookAndFeelConfig exposing (LookAndFeelConfig)
 import Shared.Data.BootstrapConfig.OrganizationConfig as OrganizationConfig exposing (OrganizationConfig)
 import Shared.Data.BootstrapConfig.OwlConfig as OwlConfig exposing (OwlConfig)
@@ -37,7 +36,6 @@ type alias BootstrapConfig =
     , submission : SubmissionConfig
     , cloud : CloudConfig
     , owl : OwlConfig
-    , locales : List LocaleConfig
     , modules : List AppSwitcherItem
     , signalBridge : SignalBridgeConfig
     , user : Maybe UserInfo
@@ -58,7 +56,6 @@ default =
     , submission = SubmissionConfig.default
     , cloud = CloudConfig.default
     , owl = OwlConfig.default
-    , locales = []
     , modules = []
     , signalBridge = SignalBridgeConfig.default
     , user = Nothing
@@ -80,7 +77,6 @@ decoder =
         |> D.required "submission" SubmissionConfig.decoder
         |> D.required "cloud" CloudConfig.decoder
         |> D.required "owl" OwlConfig.decoder
-        |> D.required "locales" (D.list LocaleConfig.decoder)
         |> D.required "modules" (D.list AppSwitcherItem.decoder)
         |> D.required "signalBridge" SignalBridgeConfig.decoder
         |> D.required "user" (D.maybe UserInfo.decoder)