FIXES: #13473: Wrapper showed buttons when not needed in Case/Therapy tab.

Author: Pa-Touche

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseController.java

@@ -1423,8 +1423,7 @@ public CommitDiscardWrapperComponent<TherapyForm> getTherapyEditComponent(final
 			new TherapyForm(caseDataDto, caseDataDto.getDisease(), caseDataDto.isPseudonymized(), caseDataDto.isInJurisdiction(), isEditAllowed);
 		therapyForm.setValue(caseDataDto.getTherapy());
 
-		CommitDiscardWrapperComponent<TherapyForm> editView =
-			new CommitDiscardWrapperComponent<TherapyForm>(therapyForm, UiUtil.permitted(UserRight.CASE_EDIT), therapyForm.getFieldGroup());
+		CommitDiscardWrapperComponent<TherapyForm> editView = CommitDiscardWrapperComponent.withoutButtons(therapyForm, therapyForm.getFieldGroup());
 
 		editView.addCommitListener(() -> {
 			CaseDataDto cazeDto = FacadeProvider.getCaseFacade().getCaseDataByUuid(caseUuid);
@@ -1614,14 +1613,14 @@ private PresentCondition getNewPresentConditionFromOutcome(CaseOutcome outcome)
 			return PresentCondition.UNKNOWN;
 		}
 		switch (outcome) {
-			case DECEASED:
-				return PresentCondition.DEAD;
-			case RECOVERED:
-				return PresentCondition.ALIVE;
-			case NO_OUTCOME:
-			case UNKNOWN:
-			default:
-				return PresentCondition.UNKNOWN;
+		case DECEASED:
+			return PresentCondition.DEAD;
+		case RECOVERED:
+			return PresentCondition.ALIVE;
+		case NO_OUTCOME:
+		case UNKNOWN:
+		default:
+			return PresentCondition.UNKNOWN;
 		}
 	}
 

sormas-ui/src/main/java/de/symeda/sormas/ui/therapy/PrescriptionGrid.java

@@ -33,9 +33,10 @@
 public class PrescriptionGrid extends Grid implements V7AbstractGrid<PrescriptionCriteria> {
 
 	private static final String ACTION_BTN_ID = "edit";
-	private static final String VIEW_BTN_ID = "view";
 	private static final String DOCUMENT_TREATMENT_BTN_ID = "documentTreatment";
 
+	public static final String MIN_ROW_HEIGHT_STYLE_NAME = "min-row-height";
+
 	private PrescriptionCriteria prescriptionCriteria = new PrescriptionCriteria();
 
 	public PrescriptionGrid(TherapyForm parentView, boolean isPseudonymized, boolean isEditAllowed, boolean isDeleteAllowed) {
@@ -115,6 +116,9 @@ public Class<String> getType() {
 					.openPrescriptionEditForm((PrescriptionIndexDto) e.getItemId(), this::reload, isEditAllowed, isDeleteAllowed);
 			}
 		});
+
+		// without this the first time new elements are added they will not be correctly displayed
+		setStyleName(MIN_ROW_HEIGHT_STYLE_NAME);
 	}
 
 	@SuppressWarnings("unchecked")

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

@@ -141,6 +141,9 @@ public static interface DeleteWithDetailsListener {
 	private boolean dirty = false;
 
 	private boolean shortcutsEnabled = false;
+
+	private boolean hideButtons = false;
+
 	protected transient List<ClickShortcut> actions;
 
 	protected CommitDiscardWrapperComponent() {
@@ -152,12 +155,32 @@ public CommitDiscardWrapperComponent(C component, FieldGroup... fieldGroups) {
 	}
 
 	public CommitDiscardWrapperComponent(C component, Boolean isEditingAllowed, FieldGroup... fieldGroups) {
+		this(component, isEditingAllowed, false, fieldGroups);
+	}
+
+	public CommitDiscardWrapperComponent(C component, Boolean isEditingAllowed, boolean hideButtons, FieldGroup... fieldGroups) {
+		this.hideButtons = hideButtons;
 		setWrappedComponent(component, fieldGroups);
 		if (isEditingAllowed != null) {
 			setEnabled(isEditingAllowed);
 		}
 	}
 
+	/**
+	 * Meant to be used when the wrapper is required due to used API but the inner component(s) already contains the discard/save/delete UI.
+	 * 
+	 * @param component
+	 *            that will be integrated within the wrapper.
+	 * @param fieldGroups
+	 *            additional fields
+	 * @return invisible wrapper: no buttons
+	 * @param <C>
+	 *            component type.
+	 */
+	public static <C extends Component> CommitDiscardWrapperComponent<C> withoutButtons(C component, FieldGroup... fieldGroups) {
+		return new CommitDiscardWrapperComponent<>(component, true, true, fieldGroups);
+	}
+
 	protected void setWrappedComponent(C component, FieldGroup... fieldGroups) {
 
 		this.wrappedComponent = component;
@@ -178,23 +201,25 @@ protected void setWrappedComponent(C component, FieldGroup... fieldGroups) {
 		addComponent(contentPanel);
 		setExpandRatio(contentPanel, 1);
 
-		buttonsPanel = new HorizontalLayout();
-		buttonsPanel.setMargin(false);
-		buttonsPanel.setSpacing(true);
-		buttonsPanel.setWidth(100, Unit.PERCENTAGE);
+		if (!hideButtons) {
+			buttonsPanel = new HorizontalLayout();
+			buttonsPanel.setMargin(false);
+			buttonsPanel.setSpacing(true);
+			buttonsPanel.setWidth(100, Unit.PERCENTAGE);
 
-		Button discardButton = getDiscardButton();
-		buttonsPanel.addComponent(discardButton);
-		buttonsPanel.setComponentAlignment(discardButton, Alignment.BOTTOM_RIGHT);
-		buttonsPanel.setExpandRatio(discardButton, 1);
+			Button discardButton = getDiscardButton();
+			buttonsPanel.addComponent(discardButton);
+			buttonsPanel.setComponentAlignment(discardButton, Alignment.BOTTOM_RIGHT);
+			buttonsPanel.setExpandRatio(discardButton, 1);
 
-		Button commitButton = getCommitButton();
-		buttonsPanel.addComponent(commitButton);
-		buttonsPanel.setComponentAlignment(commitButton, Alignment.BOTTOM_RIGHT);
-		buttonsPanel.setExpandRatio(commitButton, 0);
+			Button commitButton = getCommitButton();
+			buttonsPanel.addComponent(commitButton);
+			buttonsPanel.setComponentAlignment(commitButton, Alignment.BOTTOM_RIGHT);
+			buttonsPanel.setExpandRatio(commitButton, 0);
 
-		addComponent(buttonsPanel);
-		setComponentAlignment(buttonsPanel, Alignment.BOTTOM_RIGHT);
+			addComponent(buttonsPanel);
+			setComponentAlignment(buttonsPanel, Alignment.BOTTOM_RIGHT);
+		}
 
 		setShortcutsEnabled(shortcutsEnabled);