Merge pull request #1023 from ds-wizard/release/4.1.0

Release 4.1.0
ds-wizard · Dec 5, 2023 · 8220458 · 8220458
2 parents e0d6674 + dc4a3b0
commit 8220458
Show file tree

Hide file tree

Showing 78 changed files with 1,316 additions and 444 deletions.
diff --git a/.github/workflows/pot.yml b/.github/workflows/pot.yml
@@ -36,9 +36,9 @@ jobs:
         run: |
           GITHUB_TAG=`echo $GITHUB_REF | cut -d/ -f3`
           if [[ $GITHUB_TAG =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-            echo "::set-output name=is_prerelease::false"
+            echo "is_prerelease=false" >> "$GITHUB_OUTPUT"
           else
-            echo "::set-output name=is_prerelease::true"
+            echo "is_prerelease=true" >> "$GITHUB_OUTPUT"
           fi
 
       - name: '[release] Create & Upload Artifacts'

diff --git a/engine-registry/index.js b/engine-registry/index.js
@@ -2,7 +2,7 @@
 
 
 const axios = require('axios').default
-const axiosRetry = require('axios-retry')
+const axiosRetry = require('axios-retry').default
 
 const program = require('./elm/Registry.elm')
 

diff --git a/engine-shared/elm/Shared/Api/QuestionnaireActions.elm b/engine-shared/elm/Shared/Api/QuestionnaireActions.elm
@@ -0,0 +1,51 @@
+module Shared.Api.QuestionnaireActions exposing
+    ( getQuestionnaireActions
+    , getQuestionnaireActionsFor
+    , putQuestionnaireAction
+    )
+
+import Json.Decode as D
+import Shared.AbstractAppState exposing (AbstractAppState)
+import Shared.Api exposing (ToMsg, jwtGet, jwtPut)
+import Shared.Data.Pagination as Pagination exposing (Pagination)
+import Shared.Data.PaginationQueryFilters exposing (PaginationQueryFilters)
+import Shared.Data.PaginationQueryString as PaginationQueryString exposing (PaginationQueryString)
+import Shared.Data.QuestionnaireAction as QuestionnaireAction exposing (QuestionnaireAction)
+import Uuid exposing (Uuid)
+
+
+getQuestionnaireActions : PaginationQueryFilters -> PaginationQueryString -> AbstractAppState a -> ToMsg (Pagination QuestionnaireAction) msg -> Cmd msg
+getQuestionnaireActions _ qs =
+    let
+        queryString =
+            PaginationQueryString.toApiUrl qs
+
+        url =
+            "/questionnaire-actions" ++ queryString
+    in
+    jwtGet url (Pagination.decoder "questionnaireActions" QuestionnaireAction.decoder)
+
+
+putQuestionnaireAction : QuestionnaireAction -> AbstractAppState a -> ToMsg () msg -> Cmd msg
+putQuestionnaireAction questionnaireImporter =
+    let
+        body =
+            QuestionnaireAction.encode questionnaireImporter
+    in
+    jwtPut ("/questionnaire-actions/" ++ questionnaireImporter.id) body
+
+
+getQuestionnaireActionsFor : Uuid -> AbstractAppState a -> ToMsg (List QuestionnaireAction) msg -> Cmd msg
+getQuestionnaireActionsFor questionnaireUuid =
+    let
+        paginationQueryString =
+            PaginationQueryString.empty
+                |> PaginationQueryString.withSort (Just "name") PaginationQueryString.SortASC
+
+        queryString =
+            PaginationQueryString.toApiUrlWith [ ( "questionnaireUuid", Uuid.toString questionnaireUuid ), ( "enabled", "true" ) ] paginationQueryString
+
+        url =
+            "/questionnaire-actions/suggestions" ++ queryString
+    in
+    jwtGet url (D.map .items (Pagination.decoder "questionnaireActions" QuestionnaireAction.decoder))
diff --git a/engine-shared/elm/Shared/Auth/Permission.elm b/engine-shared/elm/Shared/Auth/Permission.elm
@@ -9,6 +9,7 @@ module Shared.Auth.Permission exposing
     , packageManagementRead
     , packageManagementWrite
     , questionnaire
+    , questionnaireAction
     , questionnaireImporter
     , questionnaireTemplate
     , settings
@@ -76,6 +77,11 @@ questionnaireTemplate =
     "QTN_TML_PERM"
 
 
+questionnaireAction : String
+questionnaireAction =
+    "QTN_ACTION_PERM"
+
+
 questionnaireImporter : String
 questionnaireImporter =
     "QTN_IMPORTER_PERM"

diff --git a/engine-shared/elm/Shared/Data/Event/AddIntegrationApiEventData.elm b/engine-shared/elm/Shared/Data/Event/AddIntegrationApiEventData.elm
@@ -9,6 +9,7 @@ module Shared.Data.Event.AddIntegrationApiEventData exposing
 import Json.Decode as D exposing (Decoder)
 import Json.Decode.Pipeline as D
 import Json.Encode as E
+import Json.Encode.Extra as E
 import Shared.Data.KnowledgeModel.Annotation as Annotation exposing (Annotation)
 import Shared.Data.KnowledgeModel.Integration exposing (Integration(..))
 import Shared.Data.KnowledgeModel.Integration.RequestHeader as RequestHeader exposing (RequestHeader)
@@ -18,16 +19,16 @@ type alias AddIntegrationApiEventData =
     { id : String
     , name : String
     , props : List String
-    , logo : String
-    , itemUrl : String
+    , logo : Maybe String
+    , itemUrl : Maybe String
     , annotations : List Annotation
     , requestMethod : String
     , requestUrl : String
     , requestHeaders : List RequestHeader
     , requestBody : String
     , requestEmptySearch : Bool
-    , responseListField : String
-    , responseItemId : String
+    , responseListField : Maybe String
+    , responseItemId : Maybe String
     , responseItemTemplate : String
     }
 
@@ -38,16 +39,16 @@ decoder =
         |> D.required "id" D.string
         |> D.required "name" D.string
         |> D.required "props" (D.list D.string)
-        |> D.required "logo" D.string
-        |> D.required "itemUrl" D.string
+        |> D.required "logo" (D.maybe D.string)
+        |> D.required "itemUrl" (D.maybe D.string)
         |> D.required "annotations" (D.list Annotation.decoder)
         |> D.required "requestMethod" D.string
         |> D.required "requestUrl" D.string
         |> D.required "requestHeaders" (D.list RequestHeader.decoder)
         |> D.required "requestBody" D.string
         |> D.required "requestEmptySearch" D.bool
-        |> D.required "responseListField" D.string
-        |> D.required "responseItemId" D.string
+        |> D.required "responseListField" (D.maybe D.string)
+        |> D.required "responseItemId" (D.maybe D.string)
         |> D.required "responseItemTemplate" D.string
 
 
@@ -57,16 +58,16 @@ encode data =
     , ( "id", E.string data.id )
     , ( "name", E.string data.name )
     , ( "props", E.list E.string data.props )
-    , ( "logo", E.string data.logo )
-    , ( "itemUrl", E.string data.itemUrl )
+    , ( "logo", E.maybe E.string data.logo )
+    , ( "itemUrl", E.maybe E.string data.itemUrl )
     , ( "annotations", E.list Annotation.encode data.annotations )
     , ( "requestMethod", E.string data.requestMethod )
     , ( "requestUrl", E.string data.requestUrl )
     , ( "requestHeaders", E.list RequestHeader.encode data.requestHeaders )
     , ( "requestBody", E.string data.requestBody )
     , ( "requestEmptySearch", E.bool data.requestEmptySearch )
-    , ( "responseListField", E.string data.responseListField )
-    , ( "responseItemId", E.string data.responseItemId )
+    , ( "responseListField", E.maybe E.string data.responseListField )
+    , ( "responseItemId", E.maybe E.string data.responseItemId )
     , ( "responseItemTemplate", E.string data.responseItemTemplate )
     ]
 
@@ -76,16 +77,16 @@ init =
     { id = ""
     , name = ""
     , props = []
-    , logo = ""
-    , itemUrl = ""
+    , logo = Nothing
+    , itemUrl = Nothing
     , annotations = []
     , requestMethod = ""
     , requestUrl = ""
     , requestHeaders = []
     , requestBody = ""
     , requestEmptySearch = True
-    , responseListField = ""
-    , responseItemId = ""
+    , responseListField = Nothing
+    , responseItemId = Nothing
     , responseItemTemplate = ""
     }
 

diff --git a/engine-shared/elm/Shared/Data/Event/AddIntegrationWidgetEventData.elm b/engine-shared/elm/Shared/Data/Event/AddIntegrationWidgetEventData.elm
@@ -8,6 +8,7 @@ module Shared.Data.Event.AddIntegrationWidgetEventData exposing
 import Json.Decode as D exposing (Decoder)
 import Json.Decode.Pipeline as D
 import Json.Encode as E
+import Json.Encode.Extra as E
 import Shared.Data.KnowledgeModel.Annotation as Annotation exposing (Annotation)
 import Shared.Data.KnowledgeModel.Integration exposing (Integration(..))
 
@@ -16,8 +17,8 @@ type alias AddIntegrationWidgetEventData =
     { id : String
     , name : String
     , props : List String
-    , logo : String
-    , itemUrl : String
+    , logo : Maybe String
+    , itemUrl : Maybe String
     , annotations : List Annotation
     , widgetUrl : String
     }
@@ -29,8 +30,8 @@ decoder =
         |> D.required "id" D.string
         |> D.required "name" D.string
         |> D.required "props" (D.list D.string)
-        |> D.required "logo" D.string
-        |> D.required "itemUrl" D.string
+        |> D.required "logo" (D.maybe D.string)
+        |> D.required "itemUrl" (D.maybe D.string)
         |> D.required "annotations" (D.list Annotation.decoder)
         |> D.required "widgetUrl" D.string
 
@@ -41,8 +42,8 @@ encode data =
     , ( "id", E.string data.id )
     , ( "name", E.string data.name )
     , ( "props", E.list E.string data.props )
-    , ( "logo", E.string data.logo )
-    , ( "itemUrl", E.string data.itemUrl )
+    , ( "logo", E.maybe E.string data.logo )
+    , ( "itemUrl", E.maybe E.string data.itemUrl )
     , ( "annotations", E.list Annotation.encode data.annotations )
     , ( "widgetUrl", E.string data.widgetUrl )
     ]

diff --git a/engine-shared/elm/Shared/Data/Event/EditIntegrationApiEventData.elm b/engine-shared/elm/Shared/Data/Event/EditIntegrationApiEventData.elm
@@ -8,6 +8,7 @@ module Shared.Data.Event.EditIntegrationApiEventData exposing
 import Json.Decode as D exposing (Decoder)
 import Json.Decode.Pipeline as D
 import Json.Encode as E
+import Json.Encode.Extra as E
 import Shared.Data.Event.EventField as EventField exposing (EventField)
 import Shared.Data.KnowledgeModel.Annotation as Annotation exposing (Annotation)
 import Shared.Data.KnowledgeModel.Integration.RequestHeader as RequestHeader exposing (RequestHeader)
@@ -17,16 +18,16 @@ type alias EditIntegrationApiEventData =
     { id : EventField String
     , name : EventField String
     , props : EventField (List String)
-    , logo : EventField String
-    , itemUrl : EventField String
+    , logo : EventField (Maybe String)
+    , itemUrl : EventField (Maybe String)
     , annotations : EventField (List Annotation)
     , requestMethod : EventField String
     , requestUrl : EventField String
     , requestHeaders : EventField (List RequestHeader)
     , requestBody : EventField String
     , requestEmptySearch : EventField Bool
-    , responseListField : EventField String
-    , responseItemId : EventField String
+    , responseListField : EventField (Maybe String)
+    , responseItemId : EventField (Maybe String)
     , responseItemTemplate : EventField String
     }
 
@@ -37,16 +38,16 @@ decoder =
         |> D.required "id" (EventField.decoder D.string)
         |> D.required "name" (EventField.decoder D.string)
         |> D.required "props" (EventField.decoder (D.list D.string))
-        |> D.required "logo" (EventField.decoder D.string)
-        |> D.required "itemUrl" (EventField.decoder D.string)
+        |> D.required "logo" (EventField.decoder (D.maybe D.string))
+        |> D.required "itemUrl" (EventField.decoder (D.maybe D.string))
         |> D.required "annotations" (EventField.decoder (D.list Annotation.decoder))
         |> D.required "requestMethod" (EventField.decoder D.string)
         |> D.required "requestUrl" (EventField.decoder D.string)
         |> D.required "requestHeaders" (EventField.decoder (D.list RequestHeader.decoder))
         |> D.required "requestBody" (EventField.decoder D.string)
         |> D.required "requestEmptySearch" (EventField.decoder D.bool)
-        |> D.required "responseListField" (EventField.decoder D.string)
-        |> D.required "responseItemId" (EventField.decoder D.string)
+        |> D.required "responseListField" (EventField.decoder (D.maybe D.string))
+        |> D.required "responseItemId" (EventField.decoder (D.maybe D.string))
         |> D.required "responseItemTemplate" (EventField.decoder D.string)
 
 
@@ -56,16 +57,16 @@ encode data =
     , ( "id", EventField.encode E.string data.id )
     , ( "name", EventField.encode E.string data.name )
     , ( "props", EventField.encode (E.list E.string) data.props )
-    , ( "logo", EventField.encode E.string data.logo )
-    , ( "itemUrl", EventField.encode E.string data.itemUrl )
+    , ( "logo", EventField.encode (E.maybe E.string) data.logo )
+    , ( "itemUrl", EventField.encode (E.maybe E.string) data.itemUrl )
     , ( "annotations", EventField.encode (E.list Annotation.encode) data.annotations )
     , ( "requestMethod", EventField.encode E.string data.requestMethod )
     , ( "requestUrl", EventField.encode E.string data.requestUrl )
     , ( "requestHeaders", EventField.encode (E.list RequestHeader.encode) data.requestHeaders )
     , ( "requestBody", EventField.encode E.string data.requestBody )
     , ( "requestEmptySearch", EventField.encode E.bool data.requestEmptySearch )
-    , ( "responseListField", EventField.encode E.string data.responseListField )
-    , ( "responseItemId", EventField.encode E.string data.responseItemId )
+    , ( "responseListField", EventField.encode (E.maybe E.string) data.responseListField )
+    , ( "responseItemId", EventField.encode (E.maybe E.string) data.responseItemId )
     , ( "responseItemTemplate", EventField.encode E.string data.responseItemTemplate )
     ]
 

diff --git a/engine-shared/elm/Shared/Data/Event/EditIntegrationEventData.elm b/engine-shared/elm/Shared/Data/Event/EditIntegrationEventData.elm
@@ -72,8 +72,8 @@ apply event integration =
                 , requestHeaders = EventField.getValueWithDefault eventData.requestHeaders (Maybe.withDefault [] (Integration.getRequestHeaders integration))
                 , requestBody = EventField.getValueWithDefault eventData.requestBody (Maybe.withDefault "" (Integration.getRequestBody integration))
                 , requestEmptySearch = EventField.getValueWithDefault eventData.requestEmptySearch (Maybe.withDefault True (Integration.getRequestEmptySearch integration))
-                , responseListField = EventField.getValueWithDefault eventData.responseListField (Maybe.withDefault "" (Integration.getResponseListField integration))
-                , responseItemId = EventField.getValueWithDefault eventData.responseItemId (Maybe.withDefault "" (Integration.getResponseItemId integration))
+                , responseListField = EventField.getValueWithDefault eventData.responseListField (Integration.getResponseListField integration)
+                , responseItemId = EventField.getValueWithDefault eventData.responseItemId (Integration.getResponseItemId integration)
                 , responseItemTemplate = EventField.getValueWithDefault eventData.responseItemTemplate (Maybe.withDefault "" (Integration.getResponseItemTemplate integration))
                 }
 

diff --git a/engine-shared/elm/Shared/Data/Event/EditIntegrationWidgetEventData.elm b/engine-shared/elm/Shared/Data/Event/EditIntegrationWidgetEventData.elm
@@ -8,6 +8,7 @@ module Shared.Data.Event.EditIntegrationWidgetEventData exposing
 import Json.Decode as D exposing (Decoder)
 import Json.Decode.Pipeline as D
 import Json.Encode as E
+import Json.Encode.Extra as E
 import Shared.Data.Event.EventField as EventField exposing (EventField)
 import Shared.Data.KnowledgeModel.Annotation as Annotation exposing (Annotation)
 
@@ -16,8 +17,8 @@ type alias EditIntegrationWidgetEventData =
     { id : EventField String
     , name : EventField String
     , props : EventField (List String)
-    , logo : EventField String
-    , itemUrl : EventField String
+    , logo : EventField (Maybe String)
+    , itemUrl : EventField (Maybe String)
     , annotations : EventField (List Annotation)
     , widgetUrl : EventField String
     }
@@ -29,8 +30,8 @@ decoder =
         |> D.required "id" (EventField.decoder D.string)
         |> D.required "name" (EventField.decoder D.string)
         |> D.required "props" (EventField.decoder (D.list D.string))
-        |> D.required "logo" (EventField.decoder D.string)
-        |> D.required "itemUrl" (EventField.decoder D.string)
+        |> D.required "logo" (EventField.decoder (D.maybe D.string))
+        |> D.required "itemUrl" (EventField.decoder (D.maybe D.string))
         |> D.required "annotations" (EventField.decoder (D.list Annotation.decoder))
         |> D.required "widgetUrl" (EventField.decoder D.string)
 
@@ -41,8 +42,8 @@ encode data =
     , ( "id", EventField.encode E.string data.id )
     , ( "name", EventField.encode E.string data.name )
     , ( "props", EventField.encode (E.list E.string) data.props )
-    , ( "logo", EventField.encode E.string data.logo )
-    , ( "itemUrl", EventField.encode E.string data.itemUrl )
+    , ( "logo", EventField.encode (E.maybe E.string) data.logo )
+    , ( "itemUrl", EventField.encode (E.maybe E.string) data.itemUrl )
     , ( "annotations", EventField.encode (E.list Annotation.encode) data.annotations )
     , ( "widgetUrl", EventField.encode E.string data.widgetUrl )
     ]