From dbad27e97df35b0b7a0fc288960e95fa4be0d4c8 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 16 Sep 2019 14:19:49 -0500 Subject: [PATCH] discrete values filter tableupdate impl was selecting lazy items twice --- src/client/spark/core/Collections/KeyedItemSelector.cs | 9 ++++++--- .../DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/client/spark/core/Collections/KeyedItemSelector.cs b/src/client/spark/core/Collections/KeyedItemSelector.cs index cac1a32fd..e93b48697 100644 --- a/src/client/spark/core/Collections/KeyedItemSelector.cs +++ b/src/client/spark/core/Collections/KeyedItemSelector.cs @@ -200,17 +200,20 @@ namespace mbts.collections { public ObservableCollectionEx selected_items { get; } = new ObservableCollectionEx(); public IEnumerable selected_keys => selected_items.Select(_key_selector); - public bool try_select(TKey key) { + public bool try_select(TKey key) => + try_select(key, true); + + public bool try_select(TKey key, bool reattempt_on_collection_change) { if (items.TryGetFirst(i => _key_selector(i).Equals(key), out T result)) { selected_items.Add(result); return true; - } else { + } else if (reattempt_on_collection_change) { if (_desired_keys.Count == 0) { items.CollectionChanged += _on_items_CollectionChanged; } _desired_keys.Add(key); - return false; } + return false; } void _on_items_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e) { diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs index 053babc81..dbe2f5666 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs @@ -313,7 +313,7 @@ namespace mbts.spark.filters { _items.Replace(_key(ch.Old), ch.New); foreach (var v in table.added) _items.Add(v); - var newly_selected_keys = _desired_keys.Where(_selection_model.try_select).ToList(); + var newly_selected_keys = _desired_keys.Where(k => _selection_model.try_select(k, false)).ToList(); if (newly_selected_keys.Count > 0) { _selected_keys.AddRange(newly_selected_keys); _desired_keys.removeRange(newly_selected_keys); @@ -339,7 +339,7 @@ namespace mbts.spark.filters { protected override bool _filter(TValue value) => _selected_keys.Contains(_key(value)); protected override void _load_state_internal(TState state) { foreach (var k in _load_state(state).empty_if_null()) { - if (!_selection_model.try_select(k)) + if (!_selection_model.try_select(k, false)) _desired_keys.Add(k); } }