Merge pull request #13075 from SORMAS-Foundation/#13074-Fix_relevance…

…_status_filter_and_flickerin_on_environments_page #13074 - Fix the relevanceStatusFilter and the flickering on Environments Page
SORMAS-Foundation · Apr 17, 2024 · c843555 · c843555
2 parents 80be6e4 + 523cc6d
commit c843555
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/environment/EnvironmentGrid.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/environment/EnvironmentGrid.java
@@ -21,6 +21,7 @@
 
 import com.vaadin.ui.renderers.DateRenderer;
 
+import de.symeda.sormas.api.EntityRelevanceStatus;
 import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.environment.EnvironmentCriteria;
 import de.symeda.sormas.api.environment.EnvironmentIndexDto;
@@ -56,15 +57,15 @@ public EnvironmentGrid(EnvironmentCriteria criteria, ViewConfiguration viewConfi
 			setCriteria(criteria);
 		}
 
-		initColumns();
+		initColumns(criteria);
 
 		addItemClickListener(
 			new ShowDetailsListener<>(
 				EnvironmentIndexDto.UUID,
 				e -> ControllerProvider.getEnvironmentController().navigateToEnvironment(e.getUuid())));
 	}
 
-	protected void initColumns() {
+	protected void initColumns(EnvironmentCriteria criteria) {
 		Column<EnvironmentIndexDto, String> deleteColumn = addColumn(entry -> {
 			if (entry.getDeletionReason() != null) {
 				return entry.getDeletionReason() + (entry.getOtherDeletionReason() != null ? ": " + entry.getOtherDeletionReason() : "");
@@ -75,7 +76,7 @@ protected void initColumns() {
 		deleteColumn.setId(DELETE_REASON_COLUMN);
 		deleteColumn.setSortable(false);
 		deleteColumn.setCaption(I18nProperties.getCaption(Captions.deletionReason));
-		deleteColumn.setHidden(true);
+		deleteColumn.setHidden(!criteria.getRelevanceStatus().equals(EntityRelevanceStatus.DELETED));
 
 		setColumns(getGridColumns().toArray(String[]::new));
 

diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/environment/EnvironmentGridComponent.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/environment/EnvironmentGridComponent.java
@@ -112,6 +112,7 @@ private HorizontalLayout buildStatusFilterBar(EnvironmentCriteria criteria, Runn
 		statusFilterBar.addComponent(buttonFilterLayout);
 
 		HorizontalLayout actionButtonsLayout = new HorizontalLayout();
+		actionButtonsLayout.setSpacing(true);
 		actionButtonsLayout.addComponent(
 			RelevanceStatusFilter.createRelevanceStatusFilter(
 				Captions.environmentActiveEnvironments,

diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/environment/EnvironmentsView.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/environment/EnvironmentsView.java
@@ -63,7 +63,7 @@ public EnvironmentsView() {
 		gridCriteria = ViewModelProviders.of(getClass())
 			.getOrDefault(EnvironmentCriteria.class, () -> new EnvironmentCriteria().relevanceStatus(EntityRelevanceStatus.ACTIVE));
 
-		gridComponent = new EnvironmentGridComponent(gridCriteria, viewConfiguration, () -> navigateTo(gridCriteria, false), () -> {
+		gridComponent = new EnvironmentGridComponent(gridCriteria, viewConfiguration, () -> navigateTo(gridCriteria, true), () -> {
 			ViewModelProviders.of(getClass()).remove(EnvironmentCriteria.class);
 			navigateTo(null, true);
 		});

diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/RelevanceStatusFilter.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/RelevanceStatusFilter.java
@@ -41,7 +41,7 @@ public static ComboBox createRelevanceStatusFilter(
 
 		ComboBox relevanceStatusFilter = ComboBoxHelper.createComboBoxV7();
 		relevanceStatusFilter.setId("relevanceStatus");
-		relevanceStatusFilter.setWidth(210, Sizeable.Unit.PIXELS);
+		relevanceStatusFilter.setWidth(260, Sizeable.Unit.PIXELS);
 		relevanceStatusFilter.setNullSelectionAllowed(false);
 		relevanceStatusFilter.addItems((Object[]) EntityRelevanceStatus.values());
 		relevanceStatusFilter.setItemCaption(EntityRelevanceStatus.ACTIVE, I18nProperties.getCaption(activeCaption));