Merge branch 'next-minor' into fix/fixed-search-field-management-endp…

…oints
valtimo-platform · Dec 19, 2024 · 03adf2e · 03adf2e
2 parents 3de9758 + 53bc101
commit 03adf2e
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 19 deletions.
diff --git a/...-valtimo/src/main/kotlin/com/ritense/valtimo/formflow/FormFlowTaskOpenResultProperties.kt b/...-valtimo/src/main/kotlin/com/ritense/valtimo/formflow/FormFlowTaskOpenResultProperties.kt
@@ -26,5 +26,5 @@ class FormFlowTaskOpenResultProperties(
     val formFlowInstanceId: UUID,
     val formDisplayType: FormDisplayType? = null,
     val formSize: FormSizes? = null,
-    val subtitles: List<String> = emptyList(),
+    val subtitles: List<String>? = null,
 )
diff --git a/form-flow-valtimo/src/main/kotlin/com/ritense/valtimo/formflow/domain/FormFlowProcessLink.kt b/form-flow-valtimo/src/main/kotlin/com/ritense/valtimo/formflow/domain/FormFlowProcessLink.kt
@@ -39,8 +39,8 @@ class FormFlowProcessLink(
     activityType: ActivityTypeWithEventName,
 
     @Type(value = JsonType::class)
-    @Column(name = "subtitles", columnDefinition = "JSON")
-    val subtitles: List<String> = listOf(),
+    @Column(name = "subtitles", columnDefinition = "JSON", nullable = true)
+    val subtitles: List<String>? = null,
 
     @Column(name = "form_flow_definition_id", nullable = false)
     val formFlowDefinitionId: String,
@@ -78,7 +78,7 @@ class FormFlowProcessLink(
         formFlowDefinitionId: String = this.formFlowDefinitionId,
         formDisplayType: FormDisplayType = this.formDisplayType,
         formSize: FormSizes = this.formSize,
-        subtitles: List<String> = this.subtitles,
+        subtitles: List<String>? = this.subtitles,
     ) = FormFlowProcessLink(
         id = id,
         processDefinitionId = processDefinitionId,

diff --git a/.../main/kotlin/com/ritense/valtimo/formflow/processlink/dto/FormFlowProcessLinkDeployDto.kt b/.../main/kotlin/com/ritense/valtimo/formflow/processlink/dto/FormFlowProcessLinkDeployDto.kt
@@ -31,7 +31,7 @@ data class FormFlowProcessLinkDeployDto(
     val formFlowDefinitionId: String,
     val formDisplayType: FormDisplayType = FormDisplayType.modal,
     val formSize: FormSizes = FormSizes.medium,
-    val subtitles: List<String> = emptyList(),
+    val subtitles: List<String>?
 ) : ProcessLinkDeployDto {
     override val processLinkType: String
         get() = PROCESS_LINK_TYPE_FORM_FLOW

diff --git a/...n/kotlin/com/ritense/valtimo/formflow/web/rest/dto/FormFlowProcessLinkCreateRequestDto.kt b/...n/kotlin/com/ritense/valtimo/formflow/web/rest/dto/FormFlowProcessLinkCreateRequestDto.kt
@@ -31,7 +31,7 @@ data class FormFlowProcessLinkCreateRequestDto(
     val formFlowDefinitionId: String,
     val formDisplayType: FormDisplayType? = FormDisplayType.modal,
     val formSize: FormSizes? = FormSizes.medium,
-    val subtitles: List<String>? = emptyList(),
+    val subtitles: List<String>? = null
 ) : ProcessLinkCreateRequestDto {
     override val processLinkType: String
         get() = PROCESS_LINK_TYPE_FORM_FLOW

diff --git a/.../kotlin/com/ritense/valtimo/formflow/web/rest/dto/FormFlowProcessLinkExportResponseDto.kt b/.../kotlin/com/ritense/valtimo/formflow/web/rest/dto/FormFlowProcessLinkExportResponseDto.kt
@@ -30,7 +30,7 @@ data class FormFlowProcessLinkExportResponseDto(
     val formFlowDefinitionId: String,
     val formDisplayType: FormDisplayType,
     val formSize: FormSizes,
-    val subtitles: List<String> = emptyList(),
+    val subtitles: List<String>? = null
 ) : ProcessLinkExportResponseDto {
     override val processLinkType: String
         get() = PROCESS_LINK_TYPE_FORM_FLOW

diff --git a/...c/main/kotlin/com/ritense/valtimo/formflow/web/rest/dto/FormFlowProcessLinkResponseDto.kt b/...c/main/kotlin/com/ritense/valtimo/formflow/web/rest/dto/FormFlowProcessLinkResponseDto.kt
@@ -32,5 +32,5 @@ data class FormFlowProcessLinkResponseDto(
     val formFlowDefinitionId: String,
     val formDisplayType: FormDisplayType,
     val formSize: FormSizes,
-    val subtitles: List<String> = emptyList(),
+    val subtitles: List<String>? = null
 ) : ProcessLinkResponseDto
diff --git a/...n/kotlin/com/ritense/valtimo/formflow/web/rest/dto/FormFlowProcessLinkUpdateRequestDto.kt b/...n/kotlin/com/ritense/valtimo/formflow/web/rest/dto/FormFlowProcessLinkUpdateRequestDto.kt
@@ -29,7 +29,7 @@ data class FormFlowProcessLinkUpdateRequestDto(
     val formFlowDefinitionId: String,
     val formDisplayType: FormDisplayType? = FormDisplayType.modal,
     val formSize: FormSizes? = FormSizes.medium,
-    val subtitles: List<String>? = emptyList(),
+    val subtitles: List<String>? = null
 ) : ProcessLinkUpdateRequestDto {
     override val processLinkType: String
         get() = PROCESS_LINK_TYPE_FORM_FLOW

diff --git a/form/src/main/kotlin/com/ritense/form/domain/FormProcessLink.kt b/form/src/main/kotlin/com/ritense/form/domain/FormProcessLink.kt
@@ -37,8 +37,8 @@ class FormProcessLink(
     activityType: ActivityTypeWithEventName,
 
     @Type(value = JsonType::class)
-    @Column(name = "subtitles", columnDefinition = "JSON")
-    val subtitles: List<String> = listOf(),
+    @Column(name = "subtitles", columnDefinition = "JSON", nullable = true)
+    val subtitles: List<String>? = null,
 
     @Column(name = "form_definition_id")
     val formDefinitionId: UUID,
@@ -81,7 +81,7 @@ class FormProcessLink(
         viewModelEnabled: Boolean = this.viewModelEnabled,
         formDisplayType: FormDisplayType = this.formDisplayType,
         formSize: FormSizes = this.formSize,
-        subtitles: List<String> = this.subtitles,
+        subtitles: List<String>? = this.subtitles,
     ) = FormProcessLink(
         id = id,
         processDefinitionId = processDefinitionId,

diff --git a/form/src/main/kotlin/com/ritense/form/domain/FormTaskOpenResultProperties.kt b/form/src/main/kotlin/com/ritense/form/domain/FormTaskOpenResultProperties.kt
@@ -26,5 +26,5 @@ data class FormTaskOpenResultProperties(
     val prefilledForm: JsonNode,
     val formDisplayType: FormDisplayType? = null,
     val formSize: FormSizes? = null,
-    val subtitles: List<String> = emptyList(),
+    val subtitles: List<String>? = null
 )
diff --git a/form/src/main/kotlin/com/ritense/form/mapper/FormProcessLinkMapper.kt b/form/src/main/kotlin/com/ritense/form/mapper/FormProcessLinkMapper.kt
@@ -132,7 +132,7 @@ class FormProcessLinkMapper(
             viewModelEnabled = createRequestDto.viewModelEnabled ?: false,
             formDisplayType = createRequestDto.formDisplayType ?: FormDisplayType.modal,
             formSize = createRequestDto.formSize ?: FormSizes.medium,
-            subtitles = createRequestDto.subtitles ?: emptyList(),
+            subtitles = createRequestDto.subtitles,
         )
     }
 

diff --git a/form/src/main/kotlin/com/ritense/form/processlink/dto/FormProcessLinkDeployDto.kt b/form/src/main/kotlin/com/ritense/form/processlink/dto/FormProcessLinkDeployDto.kt
@@ -32,7 +32,7 @@ data class FormProcessLinkDeployDto(
     val viewModelEnabled: Boolean = false,
     val formDisplayType: FormDisplayType = FormDisplayType.modal,
     val formSize: FormSizes = FormSizes.medium,
-    val subtitles: List<String> = emptyList(),
+    val subtitles: List<String>?
 ) : ProcessLinkDeployDto {
     override val processLinkType: String
         get() = PROCESS_LINK_TYPE_FORM

diff --git a/form/src/main/kotlin/com/ritense/form/web/rest/dto/FormProcessLinkCreateRequestDto.kt b/form/src/main/kotlin/com/ritense/form/web/rest/dto/FormProcessLinkCreateRequestDto.kt
@@ -33,7 +33,7 @@ data class FormProcessLinkCreateRequestDto(
     val viewModelEnabled: Boolean? = false,
     val formDisplayType: FormDisplayType? = FormDisplayType.modal,
     val formSize: FormSizes? = FormSizes.medium,
-    val subtitles: List<String>? = emptyList(),
+    val subtitles: List<String>? = null
 ) : ProcessLinkCreateRequestDto {
     override val processLinkType: String
         get() = PROCESS_LINK_TYPE_FORM

diff --git a/form/src/main/kotlin/com/ritense/form/web/rest/dto/FormProcessLinkExportResponseDto.kt b/form/src/main/kotlin/com/ritense/form/web/rest/dto/FormProcessLinkExportResponseDto.kt
@@ -31,7 +31,7 @@ data class FormProcessLinkExportResponseDto(
     val viewModelEnabled: Boolean,
     val formDisplayType: FormDisplayType,
     val formSize: FormSizes,
-    val subtitles: List<String>
+    val subtitles: List<String>? = null
 ) : ProcessLinkExportResponseDto {
     override val processLinkType: String
         get() = PROCESS_LINK_TYPE_FORM

diff --git a/form/src/main/kotlin/com/ritense/form/web/rest/dto/FormProcessLinkResponseDto.kt b/form/src/main/kotlin/com/ritense/form/web/rest/dto/FormProcessLinkResponseDto.kt
@@ -33,5 +33,5 @@ data class FormProcessLinkResponseDto(
     val viewModelEnabled: Boolean,
     val formDisplayType: FormDisplayType,
     val formSize: FormSizes,
-    val subtitles: List<String>
+    val subtitles: List<String>? = null
 ) : ProcessLinkResponseDto
diff --git a/form/src/main/kotlin/com/ritense/form/web/rest/dto/FormProcessLinkUpdateRequestDto.kt b/form/src/main/kotlin/com/ritense/form/web/rest/dto/FormProcessLinkUpdateRequestDto.kt
@@ -30,7 +30,7 @@ data class FormProcessLinkUpdateRequestDto(
     val viewModelEnabled: Boolean? = false,
     val formDisplayType: FormDisplayType? = FormDisplayType.modal,
     val formSize: FormSizes? = FormSizes.medium,
-    val subtitles: List<String>? = emptyList(),
+    val subtitles: List<String>? = null
 ) : ProcessLinkUpdateRequestDto {
     override val processLinkType: String
         get() = PROCESS_LINK_TYPE_FORM