Merge pull request #253 from ds-wizard/release/4.14.1

Release 4.14.1

Author: vknaisl

registry-public/package.yaml

@@ -1,5 +1,5 @@
 name: registry-public
-version: '4.14.0'
+version: '4.14.1'
 synopsis: Registry Public
 description: Registry Public
 category: Web

registry-server/package.yaml

@@ -1,5 +1,5 @@
 name: registry-server
-version: '4.14.0'
+version: '4.14.1'
 synopsis: Engine Registry
 description: Engine Registry
 category: Web

registry-server/src/Registry/Api/Handler/Swagger/Api.hs

@@ -38,7 +38,7 @@ swagger =
             s._swaggerInfo
               { _infoTitle = "Registry API"
               , _infoDescription = Just "API specification for Registry"
-              , _infoVersion = "4.14.0"
+              , _infoVersion = "4.14.1"
               , _infoLicense =
                   Just $
                     License

shared-common/package.yaml

@@ -1,5 +1,5 @@
 name: shared-common
-version: '4.14.0'
+version: '4.14.1'
 synopsis: Engine Shared
 description: Engine Shared
 category: Web

wizard-common/package.yaml

@@ -1,5 +1,5 @@
 name: wizard-common
-version: '4.14.0'
+version: '4.14.1'
 synopsis: Wizard Engine
 description: Wizard Engine
 category: Web

wizard-public/package.yaml

@@ -1,5 +1,5 @@
 name: wizard-public
-version: '4.14.0'
+version: '4.14.1'
 synopsis: Wizard Public
 description: Wizard Public
 category: Web

wizard-server/package.yaml

@@ -1,5 +1,5 @@
 name: wizard-server
-version: '4.14.0'
+version: '4.14.1'
 synopsis: Engine Wizard
 description: Engine Wizard
 category: Web

wizard-server/src/Wizard/Api/Handler/Swagger/Api.hs

@@ -140,7 +140,7 @@ swagger =
             s._swaggerInfo
               { _infoTitle = "Wizard API"
               , _infoDescription = Just "API specification for Wizard"
-              , _infoVersion = "4.14.0"
+              , _infoVersion = "4.14.1"
               , _infoLicense =
                   Just $
                     License

wizard-server/src/Wizard/Service/Document/DocumentService.hs

@@ -129,7 +129,7 @@ createDocumentPreviewForQtn qtnUuid =
         tml <- getDocumentTemplateByUuidAndPackageId tmlId (Just qtn.packageId)
         pkg <- getPackageById qtn.packageId
         qtnCtn <- compileQuestionnaire qtn
-        createDocumentPreview tml pkg [] qtn qtnCtn.phaseUuid qtnCtn.replies formatUuid
+        createDocumentPreview tml pkg [] qtn qtnCtn.phaseUuid qtnCtn.replies formatUuid False
       _ -> throwError $ UserError _ERROR_SERVICE_DOCUMENT__TEMPLATE_OR_FORMAT_NOT_SET_UP
 
 createDocumentPreviewForDocTmlDraft :: String -> AppContextM (Document, TemporaryFileDTO)
@@ -143,7 +143,7 @@ createDocumentPreviewForDocTmlDraft tmlId =
         pkg <- getPackageById qtn.packageId
         checkViewPermissionToQtn qtn.visibility qtn.sharing qtn.permissions
         qtnCtn <- compileQuestionnaire qtn
-        createDocumentPreview draft pkg [] qtn qtnCtn.phaseUuid qtnCtn.replies formatUuid
+        createDocumentPreview draft pkg [] qtn qtnCtn.phaseUuid qtnCtn.replies formatUuid False
       (_, Just branchUuid, Just formatUuid) -> do
         draft <- findDraftById tmlId
         let pkg = toTemporaryPackage draft.tenantUuid draft.createdAt
@@ -152,11 +152,11 @@ createDocumentPreviewForDocTmlDraft tmlId =
         checkPermission _KM_PERM
         mCurrentUser <- asks currentUser
         let qtn = toTemporaryQuestionnaire branch pkg mCurrentUser
-        createDocumentPreview draft pkg branchData.events qtn Nothing branchData.replies formatUuid
+        createDocumentPreview draft pkg branchData.events qtn Nothing branchData.replies formatUuid True
       _ -> throwError $ UserError _ERROR_SERVICE_DOCUMENT__QUESTIONNAIRE_OR_FORMAT_NOT_SET_UP
 
-createDocumentPreview :: DocumentTemplate -> Package -> [Event] -> Questionnaire -> Maybe U.UUID -> M.Map String Reply -> U.UUID -> AppContextM (Document, TemporaryFileDTO)
-createDocumentPreview tml pkg branchEvents qtn phaseUuid replies formatUuid = do
+createDocumentPreview :: DocumentTemplate -> Package -> [Event] -> Questionnaire -> Maybe U.UUID -> M.Map String Reply -> U.UUID -> Bool -> AppContextM (Document, TemporaryFileDTO)
+createDocumentPreview tml pkg branchEvents qtn phaseUuid replies formatUuid fromBranch = do
   docs <- findDocumentsForCurrentTenantFiltered [("questionnaire_uuid", U.toString qtn.uuid), ("durability", "TemporallyDocumentDurability")]
   tenantConfig <- getCurrentTenantConfig
   mCurrentUser <- asks currentUser
@@ -184,7 +184,8 @@ createDocumentPreview tml pkg branchEvents qtn phaseUuid replies formatUuid = do
           now <- liftIO getCurrentTime
           let doc = fromTemporallyCreateDTO dUuid qtn tml.tId formatUuid repliesHash mCurrentUser tenantConfig.uuid now
           insertDocument doc
-          publishToPersistentCommandQueue doc pkg branchEvents qtn (Just replies)
+          let mReplies = if fromBranch then Just replies else Nothing
+          publishToPersistentCommandQueue doc pkg branchEvents qtn mReplies
           return (doc, TemporaryFileMapper.emptyFileDTO)
 
 publishToPersistentCommandQueue :: Document -> Package -> [Event] -> Questionnaire -> Maybe (M.Map String Reply) -> AppContextM ()