Skip to content

Commit 42a7e62

Browse files
mbritenseThomasMinkeRitense
authored andcommitted
fix if field widget config if no resolved value (#1510)
1 parent 61b1f11 commit 42a7e62

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

case/src/main/kotlin/com/ritense/case_/widget/fields/FieldsCaseWidgetDataProvider.kt

+8-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@ class FieldsCaseWidgetDataProvider(
2828

2929
override fun supportedWidgetType() = FieldsCaseWidget::class.java
3030

31-
override fun getData(documentId: UUID, widgetTab: CaseWidgetTab, widget: FieldsCaseWidget, pageable: Pageable): Any {
31+
override fun getData(
32+
documentId: UUID,
33+
widgetTab: CaseWidgetTab,
34+
widget: FieldsCaseWidget,
35+
pageable: Pageable
36+
): Any {
3237
val valueKeyMap = widget.properties.columns.flatMap { column ->
3338
column.map { field ->
3439
field.value to field.key
@@ -38,8 +43,8 @@ class FieldsCaseWidgetDataProvider(
3843
val resolvedValues = valueResolverService.resolveValues(documentId.toString(), valueKeyMap.keys)
3944

4045
return widget.properties.columns.flatMap { column ->
41-
column.mapNotNull { field ->
42-
resolvedValues[field.value]?.let { field.key to it }
46+
column.map { field ->
47+
field.key to (resolvedValues[field.value] ?: null)
4348
}
4449
}.toMap()
4550
}

0 commit comments

Comments
 (0)