Merge pull request #1142 from ds-wizard/release/4.6.0

Release 4.6.0

Author: janslifka

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

@@ -46,6 +46,7 @@ import Shared.Data.QuestionnaireSuggestion as QuestionnaireSuggestion exposing (
 import Shared.Data.QuestionnaireVersion as QuestionnaireVersion exposing (QuestionnaireVersion)
 import Shared.Data.SummaryReport as SummaryReport exposing (SummaryReport)
 import Shared.Data.UrlResponse as UrlResponse exposing (UrlResponse)
+import String.Extra as String
 import Uuid exposing (Uuid)
 
 
@@ -105,7 +106,7 @@ getQuestionnaireMigration uuid =
 
 getQuestionnaireEvents : Uuid -> AbstractAppState a -> ToMsg (List QuestionnaireEvent) msg -> Cmd msg
 getQuestionnaireEvents uuid =
-    jwtGet ("/questionnaires/" ++ Uuid.toString uuid ++ "/events") (D.list QuestionnaireEvent.decoder)
+    jwtOrHttpGet ("/questionnaires/" ++ Uuid.toString uuid ++ "/events") (D.list QuestionnaireEvent.decoder)
 
 
 getQuestionnaireEvent : Uuid -> Uuid -> AbstractAppState a -> ToMsg QuestionnaireEvent msg -> Cmd msg
@@ -174,8 +175,27 @@ getSummaryReport questionnaireUuid =
 
 
 websocket : Uuid -> AbstractAppState a -> String
-websocket questionnaireUuid =
-    wsUrl ("/questionnaires/" ++ Uuid.toString questionnaireUuid ++ "/websocket")
+websocket questionnaireUuid appState =
+    case appState.config.signalBridge.webSocketUrl of
+        Just webSocketUrl ->
+            let
+                token =
+                    Maybe.map ((++) "Authorization=Bearer%20") (String.toMaybe appState.session.token.token)
+
+                queryParams =
+                    List.filterMap identity
+                        [ token
+                        , Just "subscription=Questionnaire"
+                        , Just ("identifier=" ++ Uuid.toString questionnaireUuid)
+                        ]
+
+                queryString =
+                    String.join "&" queryParams
+            in
+            webSocketUrl ++ "?" ++ queryString
+
+        Nothing ->
+            wsUrl ("/questionnaires/" ++ Uuid.toString questionnaireUuid ++ "/websocket") appState
 
 
 getDocumentPreview : Uuid -> AbstractAppState a -> ToMsg ( Http.Metadata, Maybe UrlResponse ) msg -> Cmd msg

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

@@ -19,6 +19,7 @@ import Shared.Data.BootstrapConfig.OwlConfig as OwlConfig exposing (OwlConfig)
 import Shared.Data.BootstrapConfig.PrivacyAndSupportConfig as PrivacyAndSupportConfig exposing (PrivacyAndSupportConfig)
 import Shared.Data.BootstrapConfig.QuestionnaireConfig as QuestionnaireConfig exposing (QuestionnaireConfig)
 import Shared.Data.BootstrapConfig.RegistryConfig as RegistryConfig exposing (RegistryConfig)
+import Shared.Data.BootstrapConfig.SignalBridgeConfig as SignalBridgeConfig exposing (SignalBridgeConfig)
 import Shared.Data.BootstrapConfig.SubmissionConfig as SubmissionConfig exposing (SubmissionConfig)
 import Shared.Data.UserInfo as UserInfo exposing (UserInfo)
 
@@ -38,6 +39,7 @@ type alias BootstrapConfig =
     , owl : OwlConfig
     , locales : List LocaleConfig
     , modules : List AppSwitcherItem
+    , signalBridge : SignalBridgeConfig
     , user : Maybe UserInfo
     }
 
@@ -58,6 +60,7 @@ default =
     , owl = OwlConfig.default
     , locales = []
     , modules = []
+    , signalBridge = SignalBridgeConfig.default
     , user = Nothing
     }
 
@@ -79,4 +82,5 @@ 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)

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

@@ -0,0 +1,25 @@
+module Shared.Data.BootstrapConfig.SignalBridgeConfig exposing
+    ( SignalBridgeConfig
+    , decoder
+    , default
+    )
+
+import Json.Decode as D exposing (Decoder)
+import Json.Decode.Pipeline as D
+
+
+type alias SignalBridgeConfig =
+    { webSocketUrl : Maybe String
+    }
+
+
+default : SignalBridgeConfig
+default =
+    { webSocketUrl = Nothing
+    }
+
+
+decoder : Decoder SignalBridgeConfig
+decoder =
+    D.succeed SignalBridgeConfig
+        |> D.required "webSocketUrl" (D.maybe D.string)

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

@@ -3,7 +3,6 @@ module Shared.Data.QuestionnaireDetail exposing
     , QuestionnaireDetail
     , QuestionnaireWarning
     , addComment
-    , calculatePhasesAnsweredIndications
     , calculateUnansweredQuestionsForChapter
     , canComment
     , clearReplyValue
@@ -71,7 +70,6 @@ import Shared.Data.QuestionnaireDetail.Reply as Reply exposing (Reply)
 import Shared.Data.QuestionnaireDetail.Reply.ReplyValue as ReplyValue exposing (ReplyValue(..))
 import Shared.Data.QuestionnairePerm as QuestionnairePerm
 import Shared.Data.QuestionnaireVersion as QuestionnaireVersion exposing (QuestionnaireVersion)
-import Shared.Data.SummaryReport.AnsweredIndicationData exposing (AnsweredIndicationData)
 import Shared.Data.UserInfo as UserInfo
 import Shared.Data.WebSockets.QuestionnaireAction.SetQuestionnaireData exposing (SetQuestionnaireData)
 import Shared.Markdown as Markdown
@@ -348,6 +346,7 @@ addCommentThread path threadUuid private comment questionnaire =
             , resolved = False
             , comments = []
             , private = private
+            , createdAt = comment.createdAt
             , createdBy = comment.createdBy
             }
 
@@ -675,19 +674,6 @@ getItemTitle questionnaire itemPath itemTemplateQuestions =
 -- Evaluations
 
 
-calculatePhasesAnsweredIndications : QuestionnaireDetail -> AnsweredIndicationData
-calculatePhasesAnsweredIndications questionnaire =
-    let
-        ( unaswered, total ) =
-            KnowledgeModel.getChapters questionnaire.knowledgeModel
-                |> List.map (evaluateChapter questionnaire)
-                |> List.foldl Tuple.sum ( 0, 0 )
-    in
-    { answeredQuestions = total - unaswered
-    , unansweredQuestions = unaswered
-    }
-
-
 calculateUnansweredQuestionsForChapter : QuestionnaireDetail -> Chapter -> Int
 calculateUnansweredQuestionsForChapter questionnaire =
     Tuple.first << evaluateChapter questionnaire

engine-shared/elm/Shared/Data/QuestionnaireDetail/Comment.elm

@@ -1,5 +1,6 @@
 module Shared.Data.QuestionnaireDetail.Comment exposing
     ( Comment
+    , compare
     , decoder
     , isAuthor
     )
@@ -10,6 +11,7 @@ import Json.Decode.Pipeline as D
 import Maybe.Extra as Maybe
 import Shared.Data.UserSuggestion as UserSuggestion exposing (UserSuggestion)
 import Time
+import Time.Extra as Time
 import Uuid exposing (Uuid)
 
 
@@ -39,3 +41,8 @@ isAuthor user comment =
             Maybe.map .uuid
     in
     Maybe.isJust user && toUserUuid comment.createdBy == toUserUuid user
+
+
+compare : Comment -> Comment -> Order
+compare a b =
+    Time.compare a.createdAt b.createdAt

engine-shared/elm/Shared/Data/QuestionnaireDetail/CommentThread.elm

@@ -1,10 +1,13 @@
-module Shared.Data.QuestionnaireDetail.CommentThread exposing (CommentThread, decoder, isAuthor)
+module Shared.Data.QuestionnaireDetail.CommentThread exposing (CommentThread, compare, decoder, isAuthor)
 
 import Json.Decode as D exposing (Decoder)
+import Json.Decode.Extra as D
 import Json.Decode.Pipeline as D
 import Maybe.Extra as Maybe
 import Shared.Data.QuestionnaireDetail.Comment as Comment exposing (Comment)
 import Shared.Data.UserSuggestion as UserSuggestion exposing (UserSuggestion)
+import Time
+import Time.Extra as Time
 import Uuid exposing (Uuid)
 
 
@@ -13,6 +16,7 @@ type alias CommentThread =
     , resolved : Bool
     , comments : List Comment
     , private : Bool
+    , createdAt : Time.Posix
     , createdBy : Maybe UserSuggestion
     }
 
@@ -24,6 +28,7 @@ decoder =
         |> D.required "resolved" D.bool
         |> D.required "comments" (D.list Comment.decoder)
         |> D.required "private" D.bool
+        |> D.required "createdAt" D.datetime
         |> D.required "createdBy" (D.maybe UserSuggestion.decoder)
 
 
@@ -34,3 +39,8 @@ isAuthor user commentThread =
             Maybe.map .uuid
     in
     Maybe.isJust user && toUserUuid commentThread.createdBy == toUserUuid user
+
+
+compare : CommentThread -> CommentThread -> Order
+compare a b =
+    Time.compare a.createdAt b.createdAt

engine-shared/elm/Shared/Data/QuestionnaireDetail/QuestionnaireEvent/ClearReplyData.elm

@@ -8,7 +8,6 @@ import Json.Decode as D exposing (Decoder)
 import Json.Decode.Extra as D
 import Json.Decode.Pipeline as D
 import Json.Encode as E
-import Shared.Data.SummaryReport.AnsweredIndicationData as AnsweredIndicationData exposing (AnsweredIndicationData)
 import Shared.Data.UserSuggestion as UserSuggestion exposing (UserSuggestion)
 import Time
 import Uuid exposing (Uuid)
@@ -19,7 +18,6 @@ type alias ClearReplyData =
     , path : String
     , createdAt : Time.Posix
     , createdBy : Maybe UserSuggestion
-    , phasesAnsweredIndication : AnsweredIndicationData
     }
 
 
@@ -29,7 +27,6 @@ encode data =
         [ ( "type", E.string "ClearReplyEvent" )
         , ( "uuid", Uuid.encode data.uuid )
         , ( "path", E.string data.path )
-        , ( "phasesAnsweredIndication", AnsweredIndicationData.encode data.phasesAnsweredIndication )
         ]
 
 
@@ -40,4 +37,3 @@ decoder =
         |> D.required "path" D.string
         |> D.required "createdAt" D.datetime
         |> D.required "createdBy" (D.maybe UserSuggestion.decoder)
-        |> D.hardcoded AnsweredIndicationData.empty

engine-shared/elm/Shared/Data/QuestionnaireDetail/QuestionnaireEvent/SetPhaseData.elm

@@ -9,7 +9,6 @@ import Json.Decode.Extra as D
 import Json.Decode.Pipeline as D
 import Json.Encode as E
 import Json.Encode.Extra as E
-import Shared.Data.SummaryReport.AnsweredIndicationData as AnsweredIndicationData exposing (AnsweredIndicationData)
 import Shared.Data.UserSuggestion as UserSuggestion exposing (UserSuggestion)
 import Time
 import Uuid exposing (Uuid)
@@ -20,7 +19,6 @@ type alias SetPhaseData =
     , phaseUuid : Maybe Uuid
     , createdAt : Time.Posix
     , createdBy : Maybe UserSuggestion
-    , phasesAnsweredIndication : AnsweredIndicationData
     }
 
 
@@ -30,7 +28,6 @@ encode data =
         [ ( "type", E.string "SetPhaseEvent" )
         , ( "uuid", Uuid.encode data.uuid )
         , ( "phaseUuid", E.maybe Uuid.encode data.phaseUuid )
-        , ( "phasesAnsweredIndication", AnsweredIndicationData.encode data.phasesAnsweredIndication )
         ]
 
 
@@ -41,4 +38,3 @@ decoder =
         |> D.required "phaseUuid" (D.maybe Uuid.decoder)
         |> D.required "createdAt" D.datetime
         |> D.required "createdBy" (D.maybe UserSuggestion.decoder)
-        |> D.hardcoded AnsweredIndicationData.empty

engine-shared/elm/Shared/Data/QuestionnaireDetail/QuestionnaireEvent/SetReplyData.elm

@@ -11,7 +11,6 @@ import Json.Decode.Pipeline as D
 import Json.Encode as E
 import Shared.Data.QuestionnaireDetail.Reply exposing (Reply)
 import Shared.Data.QuestionnaireDetail.Reply.ReplyValue as ReplyValue exposing (ReplyValue)
-import Shared.Data.SummaryReport.AnsweredIndicationData as AnsweredIndicationData exposing (AnsweredIndicationData)
 import Shared.Data.UserSuggestion as UserSuggestion exposing (UserSuggestion)
 import Time
 import Uuid exposing (Uuid)
@@ -23,7 +22,6 @@ type alias SetReplyData =
     , value : ReplyValue
     , createdAt : Time.Posix
     , createdBy : Maybe UserSuggestion
-    , phasesAnsweredIndication : AnsweredIndicationData
     }
 
 
@@ -34,7 +32,6 @@ encode data =
         , ( "uuid", Uuid.encode data.uuid )
         , ( "path", E.string data.path )
         , ( "value", ReplyValue.encode data.value )
-        , ( "phasesAnsweredIndication", AnsweredIndicationData.encode data.phasesAnsweredIndication )
         ]
 
 
@@ -46,7 +43,6 @@ decoder =
         |> D.required "value" ReplyValue.decoder
         |> D.required "createdAt" D.datetime
         |> D.required "createdBy" (D.maybe UserSuggestion.decoder)
-        |> D.hardcoded AnsweredIndicationData.empty
 
 
 toReply : SetReplyData -> Reply

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

@@ -6,6 +6,7 @@ import Json.Decode.Pipeline as D
 import Shared.Data.Submission.SubmissionState as SubmissionState exposing (SubmissionState)
 import Shared.Data.UserSuggestion as UserSuggestion exposing (UserSuggestion)
 import Time
+import Time.Extra as Time
 import Uuid exposing (Uuid)
 
 
@@ -45,7 +46,7 @@ visibleName submission =
 
 compare : Submission -> Submission -> Order
 compare a b =
-    Basics.compare (Time.posixToMillis b.updatedAt) (Time.posixToMillis a.updatedAt)
+    Time.compare b.updatedAt a.updatedAt
 
 
 getReturnedData : Submission -> String