Merge pull request SORMAS-Foundation#3229 from hzi-braunschweig/bugfix-3221-NullableOptionGroupFix

MateStrysewske · web-flow · commit 3bc8989723a7 · 2020-10-20T12:20:05.000+02:00
SORMAS-Foundation#3221 (and SORMAS-Foundation#3214) - fix issues created by nullableoptiongroup
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/action/ActionEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/action/ActionEditForm.java
@@ -24,6 +24,7 @@
 import static de.symeda.sormas.ui.utils.LayoutUtil.locs;
 
 import com.vaadin.v7.ui.ComboBox;
+import com.vaadin.v7.ui.Field;
 import com.vaadin.v7.ui.Label;
 import com.vaadin.v7.ui.RichTextArea;
 import com.vaadin.v7.ui.TextField;
@@ -161,7 +162,8 @@ private void updateByCreating() {
 	}
 
 	private void updateByActionContext() {
-		ActionContext actionContext = (ActionContext) getFieldGroup().getField(ActionDto.ACTION_CONTEXT).getValue();
+		NullableOptionGroup field = (NullableOptionGroup) getFieldGroup().getField(ActionDto.ACTION_CONTEXT);
+		ActionContext actionContext = (ActionContext) field.getNullableValue();
 
 		// context reference depending on action context
 		// ready for adding new context
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignFormBuilder.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigndata/CampaignFormBuilder.java
@@ -309,8 +309,8 @@ private boolean fieldValueMatchesDependingOnValues(Field<?> dependingOnField, Li
 		}
 
 		if (dependingOnField instanceof NullableOptionGroup) {
-			String booleanValue = Boolean.TRUE.equals(dependingOnField.getValue()) ? "true" : "false";
-			String stringValue = Boolean.TRUE.equals(dependingOnField.getValue()) ? "yes" : "no";
+			String booleanValue = Boolean.TRUE.equals(((NullableOptionGroup) dependingOnField).getNullableValue()) ? "true" : "false";
+			String stringValue = Boolean.TRUE.equals(((NullableOptionGroup) dependingOnField).getNullableValue()) ? "yes" : "no";
 
 			return dependingOnValuesList.stream()
 				.anyMatch(v -> v.toString().equalsIgnoreCase(booleanValue) || v.toString().equalsIgnoreCase(stringValue));
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/BulkCaseDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/BulkCaseDataForm.java
@@ -310,7 +310,7 @@ protected void addFields() {
 		warningLayout = VaadinUiUtil.createWarningComponent(I18nProperties.getString(Strings.pseudonymizedCasesSelectedWarning));
 		facilityOrHome.addValueChangeListener(e -> {
 			FieldHelper.removeItems(facility);
-			if (TypeOfPlace.FACILITY.equals(facilityOrHome.getValue())) {
+			if (TypeOfPlace.FACILITY.equals(facilityOrHome.getNullableValue())) {
 				if (facilityTypeGroup.getValue() == null) {
 					facilityTypeGroup.setValue(FacilityTypeGroup.MEDICAL_FACILITY);
 				}
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseCreateForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseCreateForm.java
@@ -205,7 +205,7 @@ protected void addFields() {
 				.updateItems(district, regionDto != null ? FacadeProvider.getDistrictFacade().getAllActiveByRegion(regionDto.getUuid()) : null);
 		});
 		district.addValueChangeListener(e -> {
-			if (!TypeOfPlace.HOME.equals(facilityOrHome.getValue())) {
+			if (!TypeOfPlace.HOME.equals(facilityOrHome.getNullableValue())) {
 				FieldHelper.removeItems(facility);
 			}
 			FieldHelper.removeItems(community);
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseDataForm.java
@@ -475,7 +475,7 @@ protected void addFields() {
 				facility));
 		facilityOrHome.addValueChangeListener(e -> {
 			FieldHelper.removeItems(facility);
-			if (TypeOfPlace.FACILITY.equals(facilityOrHome.getValue())) {
+			if (TypeOfPlace.FACILITY.equals(facilityOrHome.getNullableValue())) {
 
 				// default values
 				if (facilityTypeGroup.getValue() == null && !facilityTypeGroup.isReadOnly()) {
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactCreateForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactCreateForm.java
@@ -152,7 +152,7 @@ protected void addFields() {
 		contactProximity = addField(ContactDto.CONTACT_PROXIMITY, NullableOptionGroup.class);
 		contactProximity.removeStyleName(ValoTheme.OPTIONGROUP_HORIZONTAL);
 		if (isConfiguredServer("de")) {
-			contactProximity.addValueChangeListener(e -> updateContactCategory((ContactProximity) contactProximity.getValue()));
+			contactProximity.addValueChangeListener(e -> updateContactCategory((ContactProximity) contactProximity.getNullableValue()));
 			contactProximityDetails = addField(ContactDto.CONTACT_PROXIMITY_DETAILS, TextField.class);
 			contactCategory = addField(ContactDto.CONTACT_CATEGORY, NullableOptionGroup.class);
 		}
@@ -343,7 +343,7 @@ protected void updateLastContactDateValidator() {
 
 	private void updateContactProximity() {
 
-		ContactProximity value = (ContactProximity) contactProximity.getValue();
+		ContactProximity value = (ContactProximity) contactProximity.getNullableValue();
 		FieldHelper.updateEnumData(
 			contactProximity,
 			Arrays.asList(ContactProximity.getValues(disease, FacadeProvider.getConfigFacade().getCountryLocale())));
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactDataForm.java
@@ -222,7 +222,7 @@ protected void addFields() {
 
 			contactProximity.addValueChangeListener(e -> {
 				if (getInternalValue().getContactProximity() != e.getProperty().getValue() || contactCategory.isModified()) {
-					updateContactCategory((ContactProximity) contactProximity.getValue());
+					updateContactCategory((ContactProximity) contactProximity.getNullableValue());
 				}
 			});
 		}
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/epidata/EpiDataForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/epidata/EpiDataForm.java
@@ -351,7 +351,7 @@ private void updateAnimalExposureFields() {
 	}
 
 	private void updateBurialsHint(NullableOptionGroup burialAttendedField, EpiDataBurialsField burialsField) {
-		YesNoUnknown value = (YesNoUnknown) burialAttendedField.getValue();
+		YesNoUnknown value = (YesNoUnknown) burialAttendedField.getNullableValue();
 		if (UserProvider.getCurrent().hasUserRight(UserRight.CASE_EDIT)
 			&& value == YesNoUnknown.YES
 			&& (burialsField == null || burialsField.getValue() == null || burialsField.getValue().size() == 0)) {
@@ -362,7 +362,7 @@ private void updateBurialsHint(NullableOptionGroup burialAttendedField, EpiDataB
 	}
 
 	private void updateGatheringsHint(NullableOptionGroup gatheringAttendedField, EpiDataGatheringsField gatheringsField) {
-		YesNoUnknown value = (YesNoUnknown) gatheringAttendedField.getValue();
+		YesNoUnknown value = (YesNoUnknown) gatheringAttendedField.getNullableValue();
 		if (UserProvider.getCurrent().hasUserRight(UserRight.CASE_EDIT)
 			&& value == YesNoUnknown.YES
 			&& (gatheringsField == null || gatheringsField.getValue() == null || gatheringsField.getValue().size() == 0)) {
@@ -373,7 +373,7 @@ private void updateGatheringsHint(NullableOptionGroup gatheringAttendedField, Ep
 	}
 
 	private void updateTravelsHint(NullableOptionGroup traveledField, EpiDataTravelsField travelsField) {
-		YesNoUnknown value = (YesNoUnknown) traveledField.getValue();
+		YesNoUnknown value = (YesNoUnknown) traveledField.getNullableValue();
 		if (UserProvider.getCurrent().hasUserRight(UserRight.CASE_EDIT)
 			&& value == YesNoUnknown.YES
 			&& (travelsField == null || travelsField.getValue() == null || travelsField.getValue().size() == 0)) {
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/hospitalization/HospitalizationForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/hospitalization/HospitalizationForm.java
@@ -229,14 +229,14 @@ protected void addFields() {
 
 	private void setDateFieldVisibilties() {
 
-		boolean visible = YesNoUnknown.YES.equals(intensiveCareUnit.getValue());
+		boolean visible = YesNoUnknown.YES.equals(intensiveCareUnit.getNullableValue());
 		intensiveCareUnitStart.setVisible(visible);
 		intensiveCareUnitEnd.setVisible(visible);
 	}
 
 	private void updatePrevHospHint(NullableOptionGroup hospitalizedPreviouslyField, PreviousHospitalizationsField previousHospitalizationsField) {
 
-		YesNoUnknown value = (YesNoUnknown) hospitalizedPreviouslyField.getValue();
+		YesNoUnknown value = (YesNoUnknown) hospitalizedPreviouslyField.getNullableValue();
 		Collection<PreviousHospitalizationDto> previousHospitalizations = previousHospitalizationsField.getValue();
 		if (UserProvider.getCurrent().hasUserRight(UserRight.CASE_EDIT)
 			&& value == YesNoUnknown.YES
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/AbstractSampleForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/samples/AbstractSampleForm.java
@@ -21,6 +21,7 @@
 import com.vaadin.v7.ui.ComboBox;
 import com.vaadin.v7.ui.DateField;
 import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.OptionGroup;
 import com.vaadin.v7.ui.TextArea;
 import com.vaadin.v7.ui.TextField;
 
@@ -358,14 +359,14 @@ protected void initializeRequestedTestFields() {
 		additionalTestingRequestedField.addValueChangeListener(e -> updateRequestedTestFields());
 
 		// CheckBox groups to select the requested pathogen/additional tests
-		NullableOptionGroup requestedPathogenTestsField = addField(SampleDto.REQUESTED_PATHOGEN_TESTS, NullableOptionGroup.class);
+		OptionGroup requestedPathogenTestsField = addField(SampleDto.REQUESTED_PATHOGEN_TESTS, OptionGroup.class);
 		CssStyles.style(requestedPathogenTestsField, CssStyles.OPTIONGROUP_CHECKBOXES_HORIZONTAL);
 		requestedPathogenTestsField.setMultiSelect(true);
 		requestedPathogenTestsField.addItems((Object[]) PathogenTestType.values());
 		requestedPathogenTestsField.removeItem(PathogenTestType.OTHER);
 		requestedPathogenTestsField.setCaption(null);
 
-		NullableOptionGroup requestedAdditionalTestsField = addField(SampleDto.REQUESTED_ADDITIONAL_TESTS, NullableOptionGroup.class);
+		OptionGroup requestedAdditionalTestsField = addField(SampleDto.REQUESTED_ADDITIONAL_TESTS, OptionGroup.class);
 		CssStyles.style(requestedAdditionalTestsField, CssStyles.OPTIONGROUP_CHECKBOXES_HORIZONTAL);
 		requestedAdditionalTestsField.setMultiSelect(true);
 		requestedAdditionalTestsField.addItems((Object[]) AdditionalTestType.values());
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/symptoms/SymptomsForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/symptoms/SymptomsForm.java
@@ -902,7 +902,7 @@ private void addSoftRequiredStyleWhenSymptomaticAndCooperative(
 		}
 
 		if (visitStatusField != null) {
-			if (isAnySymptomSetToYes(fieldGroup, sourcePropertyIds, sourceValues) && visitStatusField.getValue() == VisitStatus.COOPERATIVE) {
+			if (isAnySymptomSetToYes(fieldGroup, sourcePropertyIds, sourceValues) && visitStatusField.getNullableValue() == VisitStatus.COOPERATIVE) {
 				FieldHelper.addSoftRequiredStyle(targetField);
 			} else {
 				FieldHelper.removeSoftRequiredStyle(targetField);
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/AbstractEditForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/AbstractEditForm.java
@@ -306,7 +306,9 @@ protected void setRequired(boolean required, String... fieldOrPropertyIds) {
 		for (String propertyId : fieldOrPropertyIds) {
 			if (!required || isEditableAllowed(propertyId)) {
 				Field<?> field = getField(propertyId);
-				field.setRequired(required);
+				if (!field.isReadOnly()) {
+					field.setRequired(required);
+				}
 			}
 		}
 	}
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/NullableOptionGroup.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/NullableOptionGroup.java
@@ -20,6 +20,8 @@
 import java.util.Collection;
 import java.util.Set;
 
+import org.apache.commons.lang3.ObjectUtils;
+
 import com.vaadin.v7.data.Container;
 import com.vaadin.v7.data.util.converter.Converter;
 import com.vaadin.v7.ui.OptionGroup;
@@ -50,7 +52,7 @@ private void setup() {
 		if (isRequired()) {
 			setConverter((Converter<Object, ?>) null);
 		} else {
-			setConverter(new NullableOptionGroupConverter(((Set) getValue()).stream().findFirst().orElse(null)));
+			setConverter(new NullableOptionGroupConverter(getFirstValue((Set) getValue())));
 		}
 	}
 
@@ -59,9 +61,18 @@ public void setMultiSelect(boolean multiSelect) {
 		throw new UnsupportedOperationException();
 	}
 
+	public Object getNullableValue() {
+		final Object value = super.getValue();
+		return ObjectUtils.isNotEmpty(value) ? getFirstValue((Set) value) : null;
+	}
+
 	@Override
 	public void setRequired(boolean required) {
 		super.setRequired(required);
 		setup();
 	}
+
+	private Object getFirstValue(Set value) {
+		return value.stream().findFirst().orElse(null);
+	}
 }
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/SormasFieldGroupFieldFactory.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/SormasFieldGroupFieldFactory.java
@@ -144,6 +144,14 @@ public <T extends Field> T createField(Class<?> type, Class<T> fieldType) {
 		return super.createField(type, fieldType);
 	}
 
+	@Override
+	protected AbstractSelect createCompatibleSelect(Class<? extends AbstractSelect> fieldType) {
+		if (NullableOptionGroup.class.isAssignableFrom(fieldType)) {
+			return new NullableOptionGroup();
+		}
+		return super.createCompatibleSelect(fieldType);
+	}
+
 	@Override
 	protected <T extends AbstractTextField> T createAbstractTextField(Class<T> fieldType) {
 		T textField = super.createAbstractTextField(fieldType);
@@ -157,7 +165,7 @@ protected <T extends AbstractTextField> T createAbstractTextField(Class<T> field
 	@Override
 	protected <T extends Field> T createBooleanField(Class<T> fieldType) {
 		if (NullableOptionGroup.class.isAssignableFrom(fieldType)) {
-			AbstractSelect s = createCompatibleSelect(NullableOptionGroup.class);
+			final AbstractSelect s = new NullableOptionGroup();;
 			s.addItem(Boolean.TRUE);
 			s.setItemCaption(Boolean.TRUE, I18nProperties.getEnumCaption(YesNoUnknown.YES));
 			s.addItem(Boolean.FALSE);

Original file line number	Diff line number	Diff line change
`@@ -309,8 +309,8 @@ private boolean fieldValueMatchesDependingOnValues(Field<?> dependingOnField, Li`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`if (dependingOnField instanceof NullableOptionGroup) {`
`312`		`- String booleanValue = Boolean.TRUE.equals(dependingOnField.getValue()) ? "true" : "false";`
`313`		`- String stringValue = Boolean.TRUE.equals(dependingOnField.getValue()) ? "yes" : "no";`
	`312`	`+ String booleanValue = Boolean.TRUE.equals(((NullableOptionGroup) dependingOnField).getNullableValue()) ? "true" : "false";`
	`313`	`+ String stringValue = Boolean.TRUE.equals(((NullableOptionGroup) dependingOnField).getNullableValue()) ? "yes" : "no";`
`314`	`314`
`315`	`315`	`return dependingOnValuesList.stream()`
`316`	`316`	`.anyMatch(v -> v.toString().equalsIgnoreCase(booleanValue) \|\| v.toString().equalsIgnoreCase(stringValue));`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ protected void addFields() {`
`310`	`310`	`warningLayout = VaadinUiUtil.createWarningComponent(I18nProperties.getString(Strings.pseudonymizedCasesSelectedWarning));`
`311`	`311`	`facilityOrHome.addValueChangeListener(e -> {`
`312`	`312`	`FieldHelper.removeItems(facility);`
`313`		`- if (TypeOfPlace.FACILITY.equals(facilityOrHome.getValue())) {`
	`313`	`+ if (TypeOfPlace.FACILITY.equals(facilityOrHome.getNullableValue())) {`
`314`	`314`	`if (facilityTypeGroup.getValue() == null) {`
`315`	`315`	`facilityTypeGroup.setValue(FacilityTypeGroup.MEDICAL_FACILITY);`
`316`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ protected void addFields() {`
`205`	`205`	`.updateItems(district, regionDto != null ? FacadeProvider.getDistrictFacade().getAllActiveByRegion(regionDto.getUuid()) : null);`
`206`	`206`	`});`
`207`	`207`	`district.addValueChangeListener(e -> {`
`208`		`- if (!TypeOfPlace.HOME.equals(facilityOrHome.getValue())) {`
	`208`	`+ if (!TypeOfPlace.HOME.equals(facilityOrHome.getNullableValue())) {`
`209`	`209`	`FieldHelper.removeItems(facility);`
`210`	`210`	`}`
`211`	`211`	`FieldHelper.removeItems(community);`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ protected void addFields() {`
`222`	`222`
`223`	`223`	`contactProximity.addValueChangeListener(e -> {`
`224`	`224`	`if (getInternalValue().getContactProximity() != e.getProperty().getValue() \|\| contactCategory.isModified()) {`
`225`		`- updateContactCategory((ContactProximity) contactProximity.getValue());`
	`225`	`+ updateContactCategory((ContactProximity) contactProximity.getNullableValue());`
`226`	`226`	`}`
`227`	`227`	`});`
`228`	`228`	`}`