SORMAS-Foundation#3503 enabled buffered mode to workarround not working edit buttons (SORMAS-Foundation#3640)

Disabled selection for abstracteditablegrid
Changed dashboard elements grid form binding to the diagram id
Added refresh to CampaignFormsGridComponent to updated after value is picked

Author: Martin Wahnschaffe

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

@@ -36,23 +36,20 @@ protected Binder<CampaignDashboardElement> addColumnsBinder(List<CampaignDashboa
 		Binder<CampaignDashboardElement> binder = new Binder<>();
 
 		final List<CampaignDiagramDefinitionDto> campaignDiagramDefinitionDtos = FacadeProvider.getCampaignDiagramDefinitionFacade().getAll();
+		final Map<String, String> diagramIdCaptionMap = campaignDiagramDefinitionDtos.stream()
+				.collect(Collectors.toMap(CampaignDiagramDefinitionDto::getDiagramId, CampaignDiagramDefinitionDto::getDiagramCaption));
 
-		ComboBox<DiagramIdCaption> diagramIdCaptionCombo = new ComboBox<>(
-			Captions.campaignDashboardChart,
-			campaignDiagramDefinitionDtos.stream()
-				.map(cdd -> new DiagramIdCaption(cdd.getDiagramId(), cdd.getDiagramCaption()))
-				.collect(Collectors.toList()));
+		ComboBox<String> diagramIdCaptionCombo = new ComboBox<>(Captions.campaignDashboardChart, diagramIdCaptionMap.keySet());
+		diagramIdCaptionCombo.setItemCaptionGenerator(diagramId -> diagramIdCaptionMap.get(diagramId));
 		diagramIdCaptionCombo.setEmptySelectionAllowed(false);
 
-		final Map<String, String> diagramIdCaptionMap = campaignDiagramDefinitionDtos.stream()
-			.collect(Collectors.toMap(CampaignDiagramDefinitionDto::getDiagramId, CampaignDiagramDefinitionDto::getDiagramCaption));
-
-		Binder.Binding<CampaignDashboardElement, DiagramIdCaption> diagramIdCaptionBind = binder.bind(
+		Binder.Binding<CampaignDashboardElement, String> diagramIdCaptionBind = binder.bind(
 			diagramIdCaptionCombo,
-			cde -> new DiagramIdCaption(cde.getDiagramId(), diagramIdCaptionMap.get(cde.getDiagramId())),
+			CampaignDashboardElement::getDiagramId, CampaignDashboardElement::setDiagramId);
+			/*cde -> new DiagramIdCaption(cde.getDiagramId(), diagramIdCaptionMap.get(cde.getDiagramId())),
 			(campaignDashboardElement, diagramIdCaption) -> {
 				campaignDashboardElement.setDiagramId(diagramIdCaption.getDiagramId());
-			});
+			});*/
 
 		final Grid.Column<CampaignDashboardElement, String> diagramIdColumn =
 			grid.addColumn(campaignDashboardElement -> diagramIdCaptionMap.get(campaignDashboardElement.getDiagramId()))
@@ -155,7 +152,7 @@ protected void reorderGrid() {
 		gridItems.forEach(campaignDashboardElement -> campaignDashboardElement.setOrder(gridItems.indexOf(campaignDashboardElement)));
 	}
 
-	public static class DiagramIdCaption implements Serializable {
+	/*public static class DiagramIdCaption implements Serializable {
 
 		private String diagramId;
 		private String diagramCaption;
@@ -185,6 +182,6 @@ public void setDiagramCaption(String diagramCaption) {
 		public String toString() {
 			return this.diagramCaption;
 		}
-	}
+	}*/
 
 }

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

@@ -9,6 +9,7 @@
 import com.vaadin.ui.ComboBox;
 import com.vaadin.ui.Grid;
 
+import de.symeda.sormas.api.ReferenceDto;
 import de.symeda.sormas.api.campaign.form.CampaignFormMetaReferenceDto;
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
@@ -31,7 +32,7 @@ public CampaignFormsGridComponent(
 	protected Button.ClickListener newRowEvent() {
 		return event -> {
 			final ArrayList<CampaignFormMetaReferenceDto> gridItems = getItems();
-			gridItems.add(new CampaignFormMetaReferenceDto(UUID.randomUUID().toString(), ""));
+			gridItems.add(new CampaignFormMetaReferenceDto(null, ""));
 			grid.setItems(gridItems);
 		};
 	}
@@ -40,24 +41,32 @@ protected Button.ClickListener newRowEvent() {
 	protected Binder<CampaignFormMetaReferenceDto> addColumnsBinder(List<CampaignFormMetaReferenceDto> allElements) {
 		final Binder<CampaignFormMetaReferenceDto> binder = new Binder<>();
 
+		// This is a bit hacky: The grid is used here to "select" the whole item instead of editing properties
+		// This is done by replacing uuid and caption of the item
+
 		ComboBox<CampaignFormMetaReferenceDto> formCombo = new ComboBox<>(Strings.entityCampaignDataForm, allElements);
 
 		Binder.Binding<CampaignFormMetaReferenceDto, CampaignFormMetaReferenceDto> formBind = binder.forField(formCombo)
-			.withValidator(
-				campaignFormMetaReferenceDto -> campaignFormMetaReferenceDto != null && campaignFormMetaReferenceDto.getUuid() != null,
-				I18nProperties.getValidationError(Validations.campaignDashboardDataFormValueNull))
-			.withValidator(campaignFormMetaReferenceDto -> {
-				ArrayList<CampaignFormMetaReferenceDto> items = getItems();
-				return !items.contains(campaignFormMetaReferenceDto);
-			}, I18nProperties.getValidationError(Validations.campaignDashboardDataFormValueDuplicate))
-			.bind(campaignFormMetaReferenceDto -> campaignFormMetaReferenceDto, (bindedCampaignFormMeta, selectedCampaignFormMeta) -> {
-				bindedCampaignFormMeta.setUuid(selectedCampaignFormMeta.getUuid());
-				bindedCampaignFormMeta.setCaption(selectedCampaignFormMeta.getCaption());
-			});
+				.withValidator(
+						campaignFormMetaReferenceDto -> campaignFormMetaReferenceDto != null && campaignFormMetaReferenceDto.getUuid() != null,
+						I18nProperties.getValidationError(Validations.campaignDashboardDataFormValueNull))
+				.withValidator(campaignFormMetaReferenceDto -> {
+					ArrayList<CampaignFormMetaReferenceDto> items = getItems();
+					return !items.contains(campaignFormMetaReferenceDto);
+				}, I18nProperties.getValidationError(Validations.campaignDashboardDataFormValueDuplicate))
+				.bind(campaignFormMetaReferenceDto -> new CampaignFormMetaReferenceDto(campaignFormMetaReferenceDto.getUuid(), campaignFormMetaReferenceDto.getCaption()),
+						(bindedCampaignFormMeta, selectedCampaignFormMeta) -> {
+							bindedCampaignFormMeta.setUuid(selectedCampaignFormMeta.getUuid());
+							bindedCampaignFormMeta.setCaption(selectedCampaignFormMeta.getCaption());
+							// workarround: grid doesn't refresh itself for unknown reason
+							grid.getDataProvider().refreshAll();
+						});
 		formCombo.setEmptySelectionAllowed(false);
+
 		Grid.Column<CampaignFormMetaReferenceDto, String> formColumn =
-			grid.addColumn(campaignFormMetaReferenceDto -> campaignFormMetaReferenceDto.getCaption())
-				.setCaption(I18nProperties.getString(Strings.entityCampaignDataForm));
+				grid.addColumn(ReferenceDto::getCaption)
+						.setCaption(I18nProperties.getString(Strings.entityCampaignDataForm));
+
 		formColumn.setEditorBinding(formBind);
 		return binder;
 	}

sormas-ui/src/main/java/de/symeda/sormas/ui/utils/AbstractEditableGrid.java

@@ -67,7 +67,7 @@ public AbstractEditableGrid(List<T> savedElements, List<T> allElements) {
 		savedItems.addAll(savedElements);
 		grid.setItems(new ArrayList<>(savedElements));
 		reorderGrid();
-		grid.setSelectionMode(Grid.SelectionMode.SINGLE);
+		grid.setSelectionMode(Grid.SelectionMode.NONE);
 		setSizeFull();
 
 		final GridRowDragger<T> gridRowDragger = new GridRowDragger<>(grid);
@@ -98,7 +98,7 @@ public AbstractEditableGrid(List<T> savedElements, List<T> allElements) {
 		});
 
 		grid.getEditor().setBinder(binder);
-		grid.getEditor().setBuffered(false);
+		grid.getEditor().setBuffered(true);
 		grid.getEditor().setEnabled(true);
 
 		final HorizontalLayout buttonLayout = new HorizontalLayout();