Merge pull request #1178 from ds-wizard/release/4.8.0

Release 4.8.0

.github/workflows/registry.yml

@@ -59,7 +59,7 @@ jobs:
             type=sha
 
       - name: '[docker] Build'
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ${{ env.DOCKER_META_CONTEXT }}
           file: ${{ env.DOCKER_META_FILE }}
@@ -88,7 +88,7 @@ jobs:
             suffix=${{ env.DOCKER_META_SUFFIX }}
 
       - name: '[docker-dev] Build + Push'
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         if: github.event_name != 'pull_request' && steps.meta-dev.outputs.tags != '' && env.DOCKER_HUB_USERNAME != ''
         with:
           context: ${{ env.DOCKER_META_CONTEXT }}
@@ -114,7 +114,7 @@ jobs:
             suffix=${{ env.DOCKER_META_SUFFIX }}
 
       - name: '[docker-public] Build + Push'
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         if: github.event_name != 'pull_request' && steps.meta-public.outputs.tags != '' && env.DOCKER_HUB_USERNAME != ''
         with:
           context: ${{ env.DOCKER_META_CONTEXT }}

.github/workflows/wizard.yml

@@ -62,7 +62,7 @@ jobs:
             suffix=${{ env.DOCKER_META_SUFFIX }}
 
       - name: '[docker] Build (default)'
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ${{ env.DOCKER_META_CONTEXT }}
           file: ${{ env.DOCKER_META_FILE }}
@@ -91,7 +91,7 @@ jobs:
             suffix=${{ env.DOCKER_META_SUFFIX }}
 
       - name: '[docker-dev] Build + Push (default)'
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         if: github.event_name != 'pull_request' && steps.meta-dev-default.outputs.tags != '' && env.DOCKER_HUB_USERNAME != ''
         with:
           context: ${{ env.DOCKER_META_CONTEXT }}
@@ -117,7 +117,7 @@ jobs:
             suffix=${{ env.DOCKER_META_SUFFIX }}
 
       - name: '[docker-public] Build + Push (default)'
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         if: github.event_name != 'pull_request' && steps.meta-public-default.outputs.tags != '' && env.DOCKER_HUB_USERNAME != ''
         with:
           context: ${{ env.DOCKER_META_CONTEXT }}

engine-registry/elm/Registry/Components/SidebarRow.elm

@@ -94,7 +94,7 @@ viewOtherVersions appState props =
 viewMetamodelVersion : AppState -> Int -> Html msg
 viewMetamodelVersion appState metamodelVersion =
     view
-        { title = gettext "Version" appState.locale
+        { title = gettext "Metamodel Version" appState.locale
         , content =
             [ text (String.fromInt metamodelVersion) ]
         }

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

@@ -22,7 +22,7 @@ import Registry.Data.AppState exposing (AppState)
 import Registry.Data.Forms.LoginForm as LoginForm exposing (LoginForm)
 import Registry.Data.Session as Session exposing (Session)
 import Registry.Routes as Routes
-import Shared.Error.ApiError exposing (ApiError)
+import Shared.Error.ApiError as ApiError exposing (ApiError)
 import Shared.Form.FormError exposing (FormError)
 import Shared.Utils as Task
 
@@ -78,8 +78,8 @@ update cfg appState msg model =
                     , Task.dispatch (cfg.setSessionMsg <| Just <| Session.fromOrganization organization)
                     )
 
-                Err _ ->
-                    ( { model | loggingIn = ActionResult.Error (gettext "Login failed." appState.locale) }
+                Err err ->
+                    ( { model | loggingIn = ApiError.toActionResult appState (gettext "Login failed." appState.locale) err }
                     , Cmd.none
                     )
 

engine-shared/elm/Shared/Api.elm

@@ -309,6 +309,7 @@ resolve toResult response =
             Err (BadStatus metadata.statusCode body)
 
         Http.GoodStatus_ _ body ->
+            --Result.mapError (always OtherError) (Debug.log "result" (toResult body))
             Result.mapError (always OtherError) (toResult body)
 
 

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

@@ -10,23 +10,30 @@ module Shared.Api.Questionnaires exposing
     , getDocuments
     , getProjectTagsSuggestions
     , getQuestionnaire
+    , getQuestionnaireComments
     , getQuestionnaireEvent
     , getQuestionnaireEvents
     , getQuestionnaireMigration
+    , getQuestionnairePreview
+    , getQuestionnaireQuestionnaire
+    , getQuestionnaireSettings
     , getQuestionnaireSuggestions
+    , getQuestionnaireVersions
     , getQuestionnaires
     , getSummaryReport
     , postQuestionnaire
     , postQuestionnaireFromTemplate
     , postRevert
     , postVersion
-    , putQuestionnaire
     , putQuestionnaireContent
     , putQuestionnaireMigration
+    , putQuestionnaireSettings
+    , putQuestionnaireShare
     , putVersion
     , websocket
     )
 
+import Dict exposing (Dict)
 import Http
 import Json.Decode as D
 import Json.Encode as E exposing (Value)
@@ -38,10 +45,15 @@ import Shared.Data.PaginationQueryFilters as PaginationQueryFilters exposing (Pa
 import Shared.Data.PaginationQueryFilters.FilterOperator as FilterOperator
 import Shared.Data.PaginationQueryString as PaginationQueryString exposing (PaginationQueryString)
 import Shared.Data.Questionnaire as Questionnaire exposing (Questionnaire)
+import Shared.Data.QuestionnaireCommon as QuestionnaireCommon exposing (QuestionnaireCommon)
 import Shared.Data.QuestionnaireContent as QuestionnaireContent exposing (QuestionnaireContent)
-import Shared.Data.QuestionnaireDetail as QuestionnaireDetail exposing (QuestionnaireDetail)
+import Shared.Data.QuestionnaireDetail.CommentThread as CommentThread exposing (CommentThread)
 import Shared.Data.QuestionnaireDetail.QuestionnaireEvent as QuestionnaireEvent exposing (QuestionnaireEvent)
+import Shared.Data.QuestionnaireDetailWrapper as QuestionnaireDetailWrapper exposing (QuestionnaireDetailWrapper)
 import Shared.Data.QuestionnaireMigration as QuestionnaireMigration exposing (QuestionnaireMigration)
+import Shared.Data.QuestionnairePreview as QuestionnairePreview exposing (QuestionnairePreview)
+import Shared.Data.QuestionnaireQuestionnaire as QuestionnaireDetail exposing (QuestionnaireQuestionnaire)
+import Shared.Data.QuestionnaireSettings as QuestionnaireSettings exposing (QuestionnaireSettings)
 import Shared.Data.QuestionnaireSuggestion as QuestionnaireSuggestion exposing (QuestionnaireSuggestion)
 import Shared.Data.QuestionnaireVersion as QuestionnaireVersion exposing (QuestionnaireVersion)
 import Shared.Data.SummaryReport as SummaryReport exposing (SummaryReport)
@@ -94,16 +106,51 @@ createListExtraParams filters =
         ]
 
 
-getQuestionnaire : Uuid -> AbstractAppState a -> ToMsg QuestionnaireDetail msg -> Cmd msg
+getQuestionnaire : Uuid -> AbstractAppState a -> ToMsg QuestionnaireCommon msg -> Cmd msg
 getQuestionnaire uuid =
-    jwtOrHttpGet ("/questionnaires/" ++ Uuid.toString uuid) QuestionnaireDetail.decoder
+    jwtOrHttpGet ("/questionnaires/" ++ Uuid.toString uuid) QuestionnaireCommon.decoder
+
+
+getQuestionnaireQuestionnaire : Uuid -> AbstractAppState a -> ToMsg (QuestionnaireDetailWrapper QuestionnaireQuestionnaire) msg -> Cmd msg
+getQuestionnaireQuestionnaire uuid =
+    jwtOrHttpGet ("/questionnaires/" ++ Uuid.toString uuid ++ "/questionnaire") (QuestionnaireDetailWrapper.decoder QuestionnaireDetail.decoder)
+
+
+getQuestionnaireComments : Uuid -> String -> AbstractAppState a -> ToMsg (Dict String (List CommentThread)) msg -> Cmd msg
+getQuestionnaireComments questionnaireUuid path =
+    jwtOrHttpGet ("/questionnaires/" ++ Uuid.toString questionnaireUuid ++ "/comments?path=" ++ path) (D.dict (D.list CommentThread.decoder))
+
+
+getQuestionnairePreview : Uuid -> AbstractAppState a -> ToMsg (QuestionnaireDetailWrapper QuestionnairePreview) msg -> Cmd msg
+getQuestionnairePreview uuid =
+    jwtOrHttpGet ("/questionnaires/" ++ Uuid.toString uuid ++ "/preview") (QuestionnaireDetailWrapper.decoder QuestionnairePreview.decoder)
+
+
+getQuestionnaireSettings : Uuid -> AbstractAppState a -> ToMsg (QuestionnaireDetailWrapper QuestionnaireSettings) msg -> Cmd msg
+getQuestionnaireSettings uuid =
+    jwtOrHttpGet ("/questionnaires/" ++ Uuid.toString uuid ++ "/settings") (QuestionnaireDetailWrapper.decoder QuestionnaireSettings.decoder)
+
+
+putQuestionnaireSettings : Uuid -> Value -> AbstractAppState a -> ToMsg () msg -> Cmd msg
+putQuestionnaireSettings uuid =
+    jwtPut ("/questionnaires/" ++ Uuid.toString uuid ++ "/settings")
+
+
+putQuestionnaireShare : Uuid -> Value -> AbstractAppState a -> ToMsg () msg -> Cmd msg
+putQuestionnaireShare uuid =
+    jwtPut ("/questionnaires/" ++ Uuid.toString uuid ++ "/share")
 
 
 getQuestionnaireMigration : Uuid -> AbstractAppState a -> ToMsg QuestionnaireMigration msg -> Cmd msg
 getQuestionnaireMigration uuid =
     jwtGet ("/questionnaires/" ++ Uuid.toString uuid ++ "/migrations/current") QuestionnaireMigration.decoder
 
 
+getQuestionnaireVersions : Uuid -> AbstractAppState a -> ToMsg (List QuestionnaireVersion) msg -> Cmd msg
+getQuestionnaireVersions uuid =
+    jwtOrHttpGet ("/questionnaires/" ++ Uuid.toString uuid ++ "/versions") (D.list QuestionnaireVersion.decoder)
+
+
 getQuestionnaireEvents : Uuid -> AbstractAppState a -> ToMsg (List QuestionnaireEvent) msg -> Cmd msg
 getQuestionnaireEvents uuid =
     jwtOrHttpGet ("/questionnaires/" ++ Uuid.toString uuid ++ "/events") (D.list QuestionnaireEvent.decoder)
@@ -134,11 +181,6 @@ fetchQuestionnaireMigration uuid =
     jwtFetch ("/questionnaires/" ++ Uuid.toString uuid ++ "/migrations") QuestionnaireMigration.decoder
 
 
-putQuestionnaire : Uuid -> Value -> AbstractAppState a -> ToMsg () msg -> Cmd msg
-putQuestionnaire uuid =
-    jwtPut ("/questionnaires/" ++ Uuid.toString uuid)
-
-
 putQuestionnaireContent : Uuid -> List QuestionnaireEvent -> AbstractAppState a -> ToMsg () msg -> Cmd msg
 putQuestionnaireContent uuid events =
     let
@@ -169,9 +211,9 @@ deleteQuestionnaire uuid =
     jwtDelete ("/questionnaires/" ++ Uuid.toString uuid)
 
 
-getSummaryReport : Uuid -> AbstractAppState a -> ToMsg SummaryReport msg -> Cmd msg
+getSummaryReport : Uuid -> AbstractAppState a -> ToMsg (QuestionnaireDetailWrapper SummaryReport) msg -> Cmd msg
 getSummaryReport questionnaireUuid =
-    jwtOrHttpGet ("/questionnaires/" ++ Uuid.toString questionnaireUuid ++ "/report") SummaryReport.decoder
+    jwtOrHttpGet ("/questionnaires/" ++ Uuid.toString questionnaireUuid ++ "/report") (QuestionnaireDetailWrapper.decoder SummaryReport.decoder)
 
 
 websocket : Uuid -> AbstractAppState a -> String

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

@@ -11,7 +11,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.FeatureConfig as FeatureConfig exposing (FeatureConfig)
 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)
@@ -34,7 +33,6 @@ type alias BootstrapConfig =
     , privacyAndSupport : PrivacyAndSupportConfig
     , questionnaire : QuestionnaireConfig
     , submission : SubmissionConfig
-    , feature : FeatureConfig
     , cloud : CloudConfig
     , owl : OwlConfig
     , locales : List LocaleConfig
@@ -55,7 +53,6 @@ default =
     , privacyAndSupport = PrivacyAndSupportConfig.default
     , questionnaire = QuestionnaireConfig.default
     , submission = SubmissionConfig.default
-    , feature = FeatureConfig.default
     , cloud = CloudConfig.default
     , owl = OwlConfig.default
     , locales = []
@@ -77,7 +74,6 @@ decoder =
         |> D.required "privacyAndSupport" PrivacyAndSupportConfig.decoder
         |> D.required "questionnaire" QuestionnaireConfig.decoder
         |> D.required "submission" SubmissionConfig.decoder
-        |> D.required "feature" FeatureConfig.decoder
         |> D.required "cloud" CloudConfig.decoder
         |> D.required "owl" OwlConfig.decoder
         |> D.required "locales" (D.list LocaleConfig.decoder)

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

@@ -22,6 +22,8 @@ type alias Document =
     , createdAt : Time.Posix
     , questionnaire : Maybe QuestionnaireInfo
     , questionnaireEventUuid : Maybe Uuid
+    , questionnaireVersion : Maybe String
+    , documentTemplateId : String
     , documentTemplateName : String
     , format : Maybe DocumentTemplateFormat
     , state : DocumentState
@@ -47,6 +49,8 @@ decoder =
         |> D.required "createdAt" D.datetime
         |> D.optional "questionnaire" (D.maybe QuestionnaireInfo.decoder) Nothing
         |> D.required "questionnaireEventUuid" (D.maybe Uuid.decoder)
+        |> D.required "questionnaireVersion" (D.maybe D.string)
+        |> D.required "documentTemplateId" D.string
         |> D.required "documentTemplateName" D.string
         |> D.required "format" (D.maybe DocumentTemplateFormat.decoder)
         |> D.required "state" DocumentState.decoder

engine-shared/elm/Shared/Data/DocumentTemplate/DocumentTemplateFormat.elm

@@ -12,7 +12,6 @@ type alias DocumentTemplateFormat =
     { uuid : Uuid
     , name : String
     , icon : String
-    , isPdf : Bool
     }
 
 
@@ -22,4 +21,3 @@ decoder =
         |> D.required "uuid" Uuid.decoder
         |> D.required "name" D.string
         |> D.required "icon" D.string
-        |> D.optional "isPdf" D.bool False

engine-shared/elm/Shared/Data/DocumentTemplate/DocumentTemplateFormatSimple.elm

@@ -12,7 +12,6 @@ type alias DocumentTemplateFormatSimple =
     { uuid : Uuid
     , name : String
     , icon : String
-    , isPdf : Bool
     }
 
 
@@ -22,4 +21,3 @@ decoder =
         |> D.required "uuid" Uuid.decoder
         |> D.required "name" D.string
         |> D.required "icon" D.string
-        |> D.optional "isPdf" D.bool False

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

@@ -4,6 +4,7 @@ module Shared.Data.Member exposing
     , decoder
     , getUuid
     , imageUrl
+    , isUserMember
     , toQuestionnaireEditFormMemberType
     , toUserGroupSuggestion
     , toUserSuggestion
@@ -16,7 +17,7 @@ import Shared.Data.User as User
 import Shared.Data.UserGroupSuggestion as UserGroupSuggestion exposing (UserGroupSuggestion)
 import Shared.Data.UserSuggestion as UserSuggestion exposing (UserSuggestion)
 import Uuid exposing (Uuid)
-import Wizard.Projects.Common.QuestionnaireEditFormMemberType exposing (QuestionnaireEditFormMemberType(..))
+import Wizard.Projects.Common.QuestionnaireShareFormMemberType exposing (QuestionnaireShareFormMemberType(..))
 
 
 type Member
@@ -29,6 +30,16 @@ userMember =
     UserMember
 
 
+isUserMember : Member -> Bool
+isUserMember member =
+    case member of
+        UserMember _ ->
+            True
+
+        UserGroupMember _ ->
+            False
+
+
 getUuid : Member -> Uuid
 getUuid member =
     case member of
@@ -112,7 +123,7 @@ toUserGroupSuggestion member =
             Nothing
 
 
-toQuestionnaireEditFormMemberType : Member -> QuestionnaireEditFormMemberType
+toQuestionnaireEditFormMemberType : Member -> QuestionnaireShareFormMemberType
 toQuestionnaireEditFormMemberType member =
     case member of
         UserMember _ ->