Update filter options property whenever an option is changed (#613)

Co-authored-by: Carl Dea <carl.dea@gmail.com>

Author: jperedadnr

kview/src/main/java/dev/ikm/komet/kview/controls/skin/DateFilterTitledPaneSkin.java

@@ -1,10 +1,10 @@
 package dev.ikm.komet.kview.controls.skin;
 
-import dev.ikm.komet.kview.controls.FilterOptions;
-import dev.ikm.komet.kview.controls.RangeCalendarControl;
 import dev.ikm.komet.kview.controls.DateFilterTitledPane;
 import dev.ikm.komet.kview.controls.DateRange;
+import dev.ikm.komet.kview.controls.FilterOptions;
 import dev.ikm.komet.kview.controls.IconRegion;
+import dev.ikm.komet.kview.controls.RangeCalendarControl;
 import dev.ikm.komet.kview.controls.TruncatedTextFlow;
 import javafx.collections.FXCollections;
 import javafx.css.PseudoClass;
@@ -194,7 +194,7 @@ private void setupTitledPane() {
                             .filter(DateRange::exclude)
                             .forEach(dr -> currentOption.excludedOptions().add(dr.toString()));
                 }
-                control.setOption(currentOption);
+                control.setOption(currentOption.copy());
             }
         }));
 

kview/src/main/java/dev/ikm/komet/kview/controls/skin/FilterOptionsPopupSkin.java

@@ -55,14 +55,19 @@ public class FilterOptionsPopupSkin implements Skin<FilterOptionsPopup> {
 
     private Subscription subscription;
     private Subscription filterSubscription;
+    private boolean updating;
 
     private final FilterOptions defaultFilterOptions = new FilterOptions();
     private final ObjectProperty<FilterOptions> currentFilterOptionsProperty = new SimpleObjectProperty<>() {
         @Override
         protected void invalidated() {
             FilterOptions filterOptions = get();
             if (filterOptions != null) {
-                applyButton.setDisable(control.getFilterOptions().equals(filterOptions));
+                if (!updating) {
+                    control.setFilterOptions(filterOptions);
+                }
+                // Keep button always enabled, though it won't do anything, since filterOptions are already passed to the control
+//                applyButton.setDisable(control.getFilterOptions().equals(filterOptions));
                 revertButton.setDisable(defaultFilterOptions.equals(filterOptions));
             }
         }
@@ -157,6 +162,7 @@ private void setupFilter(FilterOptions filterOptions) {
             return;
         }
         // changes from titledPane control:
+        updating = true;
         filterSubscription = Subscription.EMPTY;
         accordion.getPanes().stream()
                 .filter(FilterTitledPane.class::isInstance)
@@ -179,6 +185,7 @@ private void setupFilter(FilterOptions filterOptions) {
                 });
         updateCurrentFilterOptions();
         control.getProperties().put(DEFAULT_OPTIONS_KEY, defaultFilterOptions.equals(control.getFilterOptions()));
+        updating = false;
     }
 
     @Override
@@ -203,8 +210,11 @@ public void dispose() {
 
     private void revertFilterOptions() {
         accordion.setExpandedPane(null);
-        control.setFilterOptions(null);
+        updating = true;
+        currentFilterOptionsProperty.set(null);
+        setupFilter(null);
         setOptionsFromNavigator(control.getNavigator());
+        updating = false;
         updateCurrentFilterOptions();
     }
 
@@ -316,7 +326,8 @@ private void setOptionsFromNavigator(Navigator navigator) {
         }
 
         // initially, set default options
-        control.setFilterOptions(defaultFilterOptions);
+        currentFilterOptionsProperty.set(defaultFilterOptions);
+        setupFilter(defaultFilterOptions);
         updateCurrentFilterOptions();
     }
 

kview/src/main/java/dev/ikm/komet/kview/controls/skin/FilterTitledPaneSkin.java

@@ -241,7 +241,7 @@ private void setupTitledPane() {
         subscription = subscription.and(control.optionProperty().subscribe((_, _) -> setupTitledPane()));
         subscription = subscription.and(control.expandedProperty().subscribe((_, expanded) -> {
             if (!expanded) {
-                control.setOption(currentOption);
+                control.setOption(currentOption.copy());
                 selectedOption.setText(getOptionText(currentOption));
             }
         }));