Filter with default configuration is not applied if the link was open…

…ed in a new browser tab #4018 (cherry picked from commit 391d077)
jmix-framework · Jan 13, 2025 · d063735 · d063735
1 parent 592f022
commit d063735
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/...lowui/flowui/src/main/java/io/jmix/flowui/component/filter/SingleFilterComponentBase.java b/...lowui/flowui/src/main/java/io/jmix/flowui/component/filter/SingleFilterComponentBase.java
@@ -107,7 +107,10 @@ protected void initComponent() {
 
     protected void onFilterValueChanged(ComponentValueChangeEvent<CustomField<V>, V> event) {
         updateQueryCondition(event.getValue());
-        apply();
+
+        if (event.isFromClient()) {
+            apply();
+        }
     }
 
     protected HorizontalLayout createRootComponent() {

diff --git a/jmix-flowui/flowui/src/main/java/io/jmix/flowui/component/genericfilter/GenericFilter.java b/jmix-flowui/flowui/src/main/java/io/jmix/flowui/component/genericfilter/GenericFilter.java
@@ -582,14 +582,13 @@ public void setCurrentConfiguration(Configuration currentConfiguration) {
     protected void setCurrentConfigurationInternal(Configuration currentConfiguration, boolean fromClient) {
         if (configurations.contains(currentConfiguration)
                 || getEmptyConfiguration().equals(currentConfiguration)) {
+            if (this.currentConfiguration != currentConfiguration) {
+                clearValues();
+            }
 
             Configuration previousConfiguration = this.currentConfiguration;
             this.currentConfiguration = currentConfiguration;
 
-            if (previousConfiguration != currentConfiguration) {
-                clearValues();
-            }
-
             refreshCurrentConfigurationLayout();
             updateSelectConfigurationDropdown();
 
@@ -977,7 +976,7 @@ protected void clearValues() {
             return;
         }
 
-        for (FilterComponent component : getCurrentConfiguration().getRootLogicalFilterComponent().getFilterComponents()) {
+        for (FilterComponent component : rootLogicalFilterComponent.getFilterComponents()) {
             if (component instanceof SingleFilterComponentBase singleFilterComponent) {
                 singleFilterComponent.setValue(getCurrentConfiguration()
                         .getFilterComponentDefaultValue(singleFilterComponent.getParameterName()));

diff --git a/...wui/flowui/src/main/java/io/jmix/flowui/component/genericfilter/GenericFilterSupport.java b/...wui/flowui/src/main/java/io/jmix/flowui/component/genericfilter/GenericFilterSupport.java
@@ -98,6 +98,7 @@ public Map<String, Object> initConfigurationValuesMap(Configuration configuratio
                 SingleFilterComponentBase singleFilterComponent = ((SingleFilterComponentBase<?>) filterComponent);
                 String parameterName = singleFilterComponent.getParameterName();
                 valuesMap.put(parameterName, singleFilterComponent.getValue());
+                singleFilterComponent.setValue(configuration.getFilterComponentDefaultValue(parameterName));
             }
         }