From 3be51461f34e40daf925787ac22bd8a281591650 Mon Sep 17 00:00:00 2001 From: Carina Paul Date: Wed, 17 Apr 2024 10:40:57 +0300 Subject: [PATCH 1/2] #13074 - Fix the flickering on Environments Page --- .../symeda/sormas/ui/environment/EnvironmentGridComponent.java | 1 + .../java/de/symeda/sormas/ui/utils/RelevanceStatusFilter.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 index b53034b005d..7f7add6e660 100644 --- 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/utils/RelevanceStatusFilter.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/utils/RelevanceStatusFilter.java index 5f9909bf470..beeac31907a 100644 --- 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)); From 523cc6d3207c18542c5a2781036ef0018586d371 Mon Sep 17 00:00:00 2001 From: Carina Paul Date: Wed, 17 Apr 2024 12:21:52 +0300 Subject: [PATCH 2/2] #13074 - Fix the relevanceStatusFilter --- .../de/symeda/sormas/ui/environment/EnvironmentGrid.java | 7 ++++--- .../de/symeda/sormas/ui/environment/EnvironmentsView.java | 2 +- 2 files changed, 5 insertions(+), 4 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 index 67fe2adbe68..184235dde2c 100644 --- 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,7 +57,7 @@ public EnvironmentGrid(EnvironmentCriteria criteria, ViewConfiguration viewConfi setCriteria(criteria); } - initColumns(); + initColumns(criteria); addItemClickListener( new ShowDetailsListener<>( @@ -64,7 +65,7 @@ public EnvironmentGrid(EnvironmentCriteria criteria, ViewConfiguration viewConfi e -> ControllerProvider.getEnvironmentController().navigateToEnvironment(e.getUuid()))); } - protected void initColumns() { + protected void initColumns(EnvironmentCriteria criteria) { Column 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/EnvironmentsView.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/environment/EnvironmentsView.java index 7dc60c371ca..44d7308ac5b 100644 --- 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); });