Merge pull request SORMAS-Foundation#3269 from hzi-braunschweig/bigfix-3259-CampaignDashboardEditNullValidation

SORMAS-Foundation#3259 - validate campaign dashboard element fields are not null

Author: BarnaBartha

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Validations.java

@@ -15,6 +15,7 @@ public interface Validations {
 	String beforeDate = "beforeDate";
 	String beforeDateSoft = "beforeDateSoft";
 	String campaignDashboardChartPercentage = "campaignDashboardChartPercentage";
+	String campaignDashboardChartValueNull = "campaignDashboardChartValueNull";
 	String campaignFormDependingOnNotFound = "campaignFormDependingOnNotFound";
 	String campaignFormDependingOnValuesMissing = "campaignFormDependingOnValuesMissing";
 	String campaignFormElementDuplicateId = "campaignFormElementDuplicateId";

sormas-api/src/main/resources/validations.properties

@@ -110,6 +110,7 @@ campaignFormElementDuplicateId = Field IDs need to be unique, but the campaign f
 errorsInForm = There are errors in the form you tried to save. Please check the fields highlighted in red and make sure to only enter valid values.
 campaignFormInvalidIdInListElements = The ID %s in the campaign form list definition is not associated to any element of the form.
 campaignDashboardChartPercentage = Value must be a number that is multiple of 5!
+campaignDashboardChartValueNull = Campaign dashboard elements cannot be null!
 sormasToSormasCaseExists=This case already exists
 sormasToSormasContactExists=This contact already exists
 sormasToSormasContactCaseNotExists=The linked case does not exist

sormas-backend/src/main/java/de/symeda/sormas/backend/campaign/CampaignFacadeEjb.java

@@ -34,9 +34,11 @@
 import de.symeda.sormas.api.campaign.form.CampaignFormMetaReferenceDto;
 import de.symeda.sormas.api.i18n.I18nProperties;
 import de.symeda.sormas.api.i18n.Strings;
+import de.symeda.sormas.api.i18n.Validations;
 import de.symeda.sormas.api.user.UserRight;
 import de.symeda.sormas.api.user.UserRole;
 import de.symeda.sormas.api.utils.SortProperty;
+import de.symeda.sormas.api.utils.ValidationRuntimeException;
 import de.symeda.sormas.backend.campaign.form.CampaignFormMetaFacadeEjb;
 import de.symeda.sormas.backend.campaign.form.CampaignFormMetaService;
 import de.symeda.sormas.backend.common.AbstractAdoService;
@@ -173,6 +175,8 @@ public Campaign fromDto(@NotNull CampaignDto source) {
 		}
 		DtoHelper.validateDto(source, target);
 
+		validate(source);
+
 		target.setCreatingUser(userService.getByReferenceDto(source.getCreatingUser()));
 		target.setDescription(source.getDescription());
 		target.setEndDate(source.getEndDate());
@@ -190,6 +194,17 @@ public Campaign fromDto(@NotNull CampaignDto source) {
 		return target;
 	}
 
+	private void validate(CampaignDto campaignDto) {
+		final List<CampaignDashboardElement> campaignDashboardElements = campaignDto.getCampaignDashboardElements();
+		if (campaignDashboardElements != null) {
+			for (CampaignDashboardElement cde : campaignDashboardElements) {
+				if (cde.getDiagramId() == null || cde.getTabId() == null || cde.getWidth() == null || cde.getHeight() == null || cde.getOrder() == null) {
+					throw new ValidationRuntimeException(I18nProperties.getValidationError(Validations.campaignDashboardChartValueNull));
+				}
+			}
+		}
+	}
+
 	public CampaignDto toDto(Campaign source) {
 
 		if (source == null) {

sormas-ui/src/main/java/de/symeda/sormas/ui/campaign/campaigns/CampaignDashboardElementsGridComponent.java

@@ -37,6 +37,7 @@ protected Binder<CampaignDashboardElement> addColumnsBinder(List<CampaignDashboa
 				.map(campaignDiagramDefinitionDto -> campaignDiagramDefinitionDto.getDiagramId())
 				.distinct()
 				.collect(Collectors.toList()));
+		diagramIdCombo.setEmptySelectionAllowed(false);
 		Binder.Binding<CampaignDashboardElement, String> diagramIdBind =
 			binder.bind(diagramIdCombo, CampaignDashboardElement::getDiagramId, CampaignDashboardElement::setDiagramId);
 		Grid.Column<CampaignDashboardElement, String> diagramIdColumn =
@@ -51,6 +52,7 @@ protected Binder<CampaignDashboardElement> addColumnsBinder(List<CampaignDashboa
 				.distinct()
 				.collect(Collectors.toList()));
 
+		tabIdCombo.setEmptySelectionAllowed(false);
 		tabIdCombo.setTextInputAllowed(true);
 		tabIdCombo.setNewItemProvider((ComboBox.NewItemProvider<String>) s -> Optional.of(s));