SORMAS-Foundation#2993 add reset filters button in countries view

Author: [email protected]

sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/infrastructure/CountriesView.java

@@ -3,6 +3,7 @@
 import java.util.Date;
 
 import com.vaadin.icons.VaadinIcons;
+import com.vaadin.navigator.ViewChangeListener;
 import com.vaadin.server.FileDownloader;
 import com.vaadin.server.StreamResource;
 import com.vaadin.ui.Alignment;
@@ -184,6 +185,7 @@ private HorizontalLayout createFilterBar() {
 				relevanceStatusFilter.setId("relevanceStatus");
 				relevanceStatusFilter.setWidth(220, Unit.PERCENTAGE);
 				relevanceStatusFilter.setNullSelectionAllowed(false);
+				relevanceStatusFilter.addItems((Object[]) EntityRelevanceStatus.values());
 				relevanceStatusFilter.setItemCaption(EntityRelevanceStatus.ACTIVE, I18nProperties.getCaption(Captions.countryActiveCountries));
 				relevanceStatusFilter.setItemCaption(EntityRelevanceStatus.ARCHIVED, I18nProperties.getCaption(Captions.countryArchivedCountries));
 				relevanceStatusFilter.setItemCaption(EntityRelevanceStatus.ALL, I18nProperties.getCaption(Captions.countryAllCountries));
@@ -227,4 +229,31 @@ private HorizontalLayout createFilterBar() {
 		return filterLayout;
 	}
 
+	@Override
+	public void enter(ViewChangeListener.ViewChangeEvent event) {
+
+		super.enter(event);
+		String params = event.getParameters().trim();
+		if (params.startsWith("?")) {
+			params = params.substring(1);
+			criteria.fromUrlParams(params);
+		}
+		updateFilterComponents();
+		grid.reload();
+	}
+
+	public void updateFilterComponents() {
+
+		// TODO replace with Vaadin 8 databinding
+		applyingCriteria = true;
+
+		resetButton.setVisible(criteria.hasAnyFilterActive());
+
+		if (relevanceStatusFilter != null) {
+			relevanceStatusFilter.setValue(criteria.getRelevanceStatus());
+		}
+		searchField.setValue(criteria.getNameCodeLike());
+
+		applyingCriteria = false;
+	}
 }