Merge pull request #1407 from ds-wizard/release/4.21.0

Release 4.21.0

Author: janslifka

.dockerignore

@@ -7,4 +7,4 @@ scripts
 src
 !src/scss
 tests
-vendor
+shared/vendor

.gitignore

@@ -19,3 +19,6 @@ engine-wizard/static/wizard/config.js
 
 # guide links
 guide-links.json
+
+# temporary files
+tmp

elm.json

@@ -4,7 +4,8 @@
         "engine-registry/elm",
         "engine-shared/elm",
         "engine-wizard/elm",
-        "vendor"
+        "shared/common/elm",
+        "shared/vendor"
     ],
     "elm-version": "0.19.1",
     "dependencies": {
@@ -45,11 +46,9 @@
             "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",
             "truqu/elm-md5": "1.1.0"
         },
         "indirect": {
-            "danfishgold/base64-bytes": "1.1.0",
             "elm/bytes": "1.0.8",
             "elm/parser": "1.1.0",
             "elm/virtual-dom": "1.0.2",
@@ -65,12 +64,6 @@
         "direct": {
             "elm-explorations/test": "2.2.0"
         },
-        "indirect": {
-            "BrianHicks/elm-trend": "2.1.3",
-            "elm-explorations/benchmark": "1.0.2",
-            "mdgriffith/style-elements": "5.0.2",
-            "robinheghan/murmur3": "1.0.0",
-            "truqu/elm-base64": "2.0.4"
-        }
+        "indirect": {}
     }
 }

engine-registry/elm/Registry.elm

@@ -26,8 +26,8 @@ import Registry.Pages.SignupConfirmation as SignupConfirmation
 import Registry.Ports as Ports
 import Registry.Routes as Routes
 import Shared.Undraw as Undraw
-import Shared.Utils exposing (dispatch)
 import Task
+import Task.Extra as Task
 import Time
 import Url exposing (Url)
 
@@ -90,7 +90,7 @@ init flags url key =
                                     Routes.parse appStateWithoutRoute.config url
                             in
                             ( { appStateWithoutRoute | route = routeIfAllowed appStateWithoutRoute originalRoute }
-                            , dispatch (OnUrlChange url)
+                            , Task.dispatch (OnUrlChange url)
                             )
 
                 Nothing ->

engine-registry/elm/Registry/Api/ActionKeys.elm

@@ -1,9 +1,8 @@
 module Registry.Api.ActionKeys exposing (postForgottenTokenActionKey)
 
-import Registry.Api.Requests as Requests
-import Registry.Data.AppState exposing (AppState)
+import Registry.Data.AppState as AppState exposing (AppState)
 import Registry.Data.Forms.ForgottenTokenForm as ForgottenTokenForm exposing (ForgottenTokenForm)
-import Shared.Api exposing (ToMsg)
+import Shared.Api.Request as Requests exposing (ToMsg)
 
 
 postForgottenTokenActionKey : AppState -> ForgottenTokenForm -> ToMsg () msg -> Cmd msg
@@ -12,4 +11,4 @@ postForgottenTokenActionKey appState forgottenTokenForm toMsg =
         body =
             ForgottenTokenForm.encode forgottenTokenForm
     in
-    Requests.postWhatever appState "/action-keys" body toMsg
+    Requests.postWhatever (AppState.toServerInfo appState) "/action-keys" body toMsg

engine-registry/elm/Registry/Api/BuildInfo.elm

@@ -1,11 +1,10 @@
 module Registry.Api.BuildInfo exposing (getBuildInfo)
 
-import Registry.Api.Requests as Requests
-import Registry.Data.AppState exposing (AppState)
-import Shared.Api exposing (ToMsg)
+import Registry.Data.AppState as AppState exposing (AppState)
+import Shared.Api.Request as Requests exposing (ToMsg)
 import Shared.Data.BuildInfo as BuildInfo exposing (BuildInfo)
 
 
 getBuildInfo : AppState -> ToMsg BuildInfo msg -> Cmd msg
 getBuildInfo appState =
-    Requests.get appState "" BuildInfo.decoder
+    Requests.get (AppState.toServerInfo appState) "" BuildInfo.decoder

engine-registry/elm/Registry/Api/DocumentTemplates.elm

@@ -3,16 +3,15 @@ module Registry.Api.DocumentTemplates exposing (getDocumentTemplate, getDocument
 import Json.Decode as D
 import Registry.Api.Models.DocumentTemplate as DocumentTemplate exposing (DocumentTemplate)
 import Registry.Api.Models.DocumentTemplateDetail as DocumentTemplateDetail exposing (DocumentTemplateDetail)
-import Registry.Api.Requests as Requests
-import Registry.Data.AppState exposing (AppState)
-import Shared.Api exposing (ToMsg)
+import Registry.Data.AppState as AppState exposing (AppState)
+import Shared.Api.Request as Requests exposing (ToMsg)
 
 
 getDocumentTemplates : AppState -> ToMsg (List DocumentTemplate) msg -> Cmd msg
 getDocumentTemplates appState =
-    Requests.get appState "/document-templates" (D.list DocumentTemplate.decoder)
+    Requests.get (AppState.toServerInfo appState) "/document-templates" (D.list DocumentTemplate.decoder)
 
 
 getDocumentTemplate : AppState -> String -> ToMsg DocumentTemplateDetail msg -> Cmd msg
 getDocumentTemplate appState documentTemplateId =
-    Requests.get appState ("/document-templates/" ++ documentTemplateId) DocumentTemplateDetail.decoder
+    Requests.get (AppState.toServerInfo appState) ("/document-templates/" ++ documentTemplateId) DocumentTemplateDetail.decoder

engine-registry/elm/Registry/Api/KnowledgeModels.elm

@@ -3,16 +3,15 @@ module Registry.Api.KnowledgeModels exposing (getKnowledgeModel, getKnowledgeMod
 import Json.Decode as D
 import Registry.Api.Models.KnowledgeModel as KnowledgeModel exposing (KnowledgeModel)
 import Registry.Api.Models.KnowledgeModelDetail as KnowledgeModelDetail exposing (KnowledgeModelDetail)
-import Registry.Api.Requests as Requests
-import Registry.Data.AppState exposing (AppState)
-import Shared.Api exposing (ToMsg)
+import Registry.Data.AppState as AppState exposing (AppState)
+import Shared.Api.Request as Requests exposing (ToMsg)
 
 
 getKnowledgeModels : AppState -> ToMsg (List KnowledgeModel) msg -> Cmd msg
 getKnowledgeModels appState =
-    Requests.get appState "/packages" (D.list KnowledgeModel.decoder)
+    Requests.get (AppState.toServerInfo appState) "/packages" (D.list KnowledgeModel.decoder)
 
 
 getKnowledgeModel : AppState -> String -> ToMsg KnowledgeModelDetail msg -> Cmd msg
 getKnowledgeModel appState packageId =
-    Requests.get appState ("/packages/" ++ packageId) KnowledgeModelDetail.decoder
+    Requests.get (AppState.toServerInfo appState) ("/packages/" ++ packageId) KnowledgeModelDetail.decoder

engine-registry/elm/Registry/Api/Locales.elm

@@ -3,16 +3,15 @@ module Registry.Api.Locales exposing (getLocale, getLocales)
 import Json.Decode as D
 import Registry.Api.Models.Locale as Locale exposing (Locale)
 import Registry.Api.Models.LocaleDetail as LocaleDetail exposing (LocaleDetail)
-import Registry.Api.Requests as Requests
-import Registry.Data.AppState exposing (AppState)
-import Shared.Api exposing (ToMsg)
+import Registry.Data.AppState as AppState exposing (AppState)
+import Shared.Api.Request as Requests exposing (ToMsg)
 
 
 getLocales : AppState -> ToMsg (List Locale) msg -> Cmd msg
 getLocales appState =
-    Requests.get appState "/locales" (D.list Locale.decoder)
+    Requests.get (AppState.toServerInfo appState) "/locales" (D.list Locale.decoder)
 
 
 getLocale : AppState -> String -> ToMsg LocaleDetail msg -> Cmd msg
 getLocale appState localeId =
-    Requests.get appState ("/locales/" ++ localeId) LocaleDetail.decoder
+    Requests.get (AppState.toServerInfo appState) ("/locales/" ++ localeId) LocaleDetail.decoder

engine-registry/elm/Registry/Api/Organizations.elm

@@ -8,21 +8,20 @@ module Registry.Api.Organizations exposing
 
 import Json.Encode as E
 import Registry.Api.Models.Organization as Organization exposing (Organization)
-import Registry.Api.Requests as Requests
-import Registry.Data.AppState exposing (AppState)
+import Registry.Data.AppState as AppState exposing (AppState)
 import Registry.Data.Forms.OrganizationForm as OrganizationForm exposing (OrganizationForm)
 import Registry.Data.Forms.SignupForm as SignupForm exposing (SignupForm)
-import Shared.Api exposing (ToMsg)
+import Shared.Api.Request as Requests exposing (ToMsg)
 
 
 getOrganization : AppState -> String -> ToMsg Organization msg -> Cmd msg
 getOrganization appState organizationId =
-    Requests.get appState ("/organizations/" ++ organizationId) Organization.decoder
+    Requests.get (AppState.toServerInfo appState) ("/organizations/" ++ organizationId) Organization.decoder
 
 
 postOrganization : AppState -> SignupForm -> ToMsg () msg -> Cmd msg
 postOrganization appState form =
-    Requests.postWhatever appState "/organizations" (SignupForm.encode form)
+    Requests.postWhatever (AppState.toServerInfo appState) "/organizations" (SignupForm.encode form)
 
 
 putOrganization : AppState -> String -> OrganizationForm -> ToMsg Organization msg -> Cmd msg
@@ -31,7 +30,7 @@ putOrganization appState organizationId formData =
         body =
             OrganizationForm.encode formData
     in
-    Requests.put appState ("/organizations/" ++ organizationId) Organization.decoder body
+    Requests.put (AppState.toServerInfo appState) ("/organizations/" ++ organizationId) Organization.decoder body
 
 
 putOrganizationState : AppState -> { organizationId : String, hash : String, active : Bool } -> ToMsg Organization msg -> Cmd msg
@@ -40,9 +39,9 @@ putOrganizationState appState { organizationId, hash, active } =
         body =
             E.object [ ( "active", E.bool active ) ]
     in
-    Requests.put appState ("/organizations/" ++ organizationId ++ "/state?hash=" ++ hash) Organization.decoder body
+    Requests.put (AppState.toServerInfo appState) ("/organizations/" ++ organizationId ++ "/state?hash=" ++ hash) Organization.decoder body
 
 
 putOrganizationToken : AppState -> { organizationId : String, hash : String } -> ToMsg Organization msg -> Cmd msg
 putOrganizationToken appState { organizationId, hash } =
-    Requests.putEmpty appState ("/organizations/" ++ organizationId ++ "/token?hash=" ++ hash) Organization.decoder
+    Requests.putEmptyBody (AppState.toServerInfo appState) ("/organizations/" ++ organizationId ++ "/token?hash=" ++ hash) Organization.decoder