diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/ComparableMinMaxFilterVM.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/ComparableMinMaxFilterVM.cs index c86b84f5d..5ea21643a 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/ComparableMinMaxFilterVM.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/ComparableMinMaxFilterVM.cs @@ -21,6 +21,7 @@ namespace mbts.spark.filters { public T? maximum { get => state.maximum.value; set => state.maximum.value = value; } protected override void _clear() { + _close(); state.minimum.value = null; state.maximum.value = null; RaisePropertyChanged(nameof(minimum), nameof(maximum)); diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/FilterVMBase.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/FilterVMBase.cs index f3ad470ed..dc157b6aa 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/FilterVMBase.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/FilterVMBase.cs @@ -31,6 +31,7 @@ namespace mbts.spark.filters { public ICommand clear { get; } public abstract TState get_state(); + public void load_state(TState state) { _load_state_internal(state); _snapshot = detect_property_changes(); @@ -41,6 +42,7 @@ namespace mbts.spark.filters { protected abstract bool _get_active(); protected abstract bool _filter(TValue value); protected abstract void _load_state_internal(TState state); + protected virtual void _apply() { request_clear_focus?.Invoke((true, true)); Disposable.dispose(ref _snapshot); @@ -52,6 +54,7 @@ namespace mbts.spark.filters { } _raise_filter_changed(true); } + protected virtual void _cancel() { if (_snapshot != null) _snapshot.revert = true; @@ -60,8 +63,10 @@ namespace mbts.spark.filters { open = false; RaisePropertyChanged(nameof(open)); } + protected virtual void _clear() { } - protected IDisposable _clear_properties() { + + protected IDisposable _clear_properties(bool close=true) { _snapshot = null; var dpc = detect_property_changes(); return Disposable.Create(() => { @@ -71,10 +76,17 @@ namespace mbts.spark.filters { _snapshot = detect_property_changes(); }); } - protected virtual void _validate() { } + + protected void _close() { + open = false; + RaisePropertyChanged(nameof(open)); + } + protected void _raise_filter_changed(bool notify_active_property_changed = true) { if (notify_active_property_changed) _active.refresh(); filter_changed?.Invoke(); } + + protected virtual void _validate() { } } } \ No newline at end of file diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/RegexFilterVM.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/RegexFilterVM.cs index 9da165842..4ca7c75d7 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/RegexFilterVM.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/RegexFilterVM.cs @@ -27,6 +27,7 @@ namespace mbts.spark.filters { protected override bool _filter(string value) => _regex != null && _regex.IsMatch(value); protected override void _load_state_internal(string state) => text = state; protected override void _clear() { + _close(); _text = string.Empty; _regex = null; RaisePropertyChanged(nameof(text)); diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/SecurityCriteriaFilterVM.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/SecurityCriteriaFilterVM.cs index 407ab6aa0..666b7ce4d 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/SecurityCriteriaFilterVM.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/SecurityCriteriaFilterVM.cs @@ -18,6 +18,7 @@ namespace mbts.spark.filters { model.security_criteria_clause_changed -= _on_security_criteria_clause_changed; protected override void _clear() { + _close(); using (_clear_properties()) _set_default_values(); } diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/TimeFilterVM.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/TimeFilterVM.cs index 40ccdd0bb..107896fbd 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/TimeFilterVM.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/TimeFilterVM.cs @@ -45,6 +45,7 @@ namespace mbts.spark.filters { } protected override void _clear() { + _close(); using (_clear_properties()) _set_default_values(); }