dna filtering improvements

Author: zavub

src/NodeAutoCompleteViewExtension/ViewModels/NodeAutoCompleteBarViewModel.cs

@@ -191,7 +191,7 @@ public bool IsOpen
             }
         }
 
-        private int ClusterResultsCount => DropdownResults == null ? 0 : DropdownResults.Count();
+        private int ClusterResultsCount => FilteredView == null ? 0 : FilteredView.Cast<object>().ToList().Count;
 
         private int selectedIndex = 0;
 
@@ -231,6 +231,8 @@ public string SearchInput
                 {                    
                     FilteredView.Refresh();
                 }
+
+                RaisePropertyChanged(nameof(SearchInput));
             }
         }
 
@@ -245,30 +247,19 @@ public int SelectedIndex
             }
             set
             {
-                /*don't try to add a node if the index is out of range or a selection is not made yet (-1)
-                an index of -1 occurs when using the switch to change between modes.*/
-                if (selectedIndex != value && value >= 0 && selectedIndex != -1)
+                if (selectedIndex != value && value >= -1)
                 {
-                    ReAddNode(value);
-                }
-                selectedIndex = value;
-                RaisePropertyChanged(nameof(SelectedIndex));
-                RaisePropertyChanged(nameof(NthofTotal));
-                RaisePropertyChanged(nameof(PreviousSource));
-                RaisePropertyChanged(nameof(NextSource));
-            }
-        }
+                    selectedIndex = value;
+                    if (selectedIndex != -1)
+                    {
+                        AddCluster(selectedIndex);
+                    }
 
-        private void ReAddNode(int index)
-        {
-            if(FullResults == null)
-            {
-                return;
-            }
-            var results = QualifiedResults.ToList();
-            if(index >=  0 && index  < results.Count)
-            {
-                AddCluster(results[index]);
+                    RaisePropertyChanged(nameof(SelectedIndex));
+                    RaisePropertyChanged(nameof(NthofTotal));
+                    RaisePropertyChanged(nameof(PreviousSource));
+                    RaisePropertyChanged(nameof(NextSource));
+                }
             }
         }
 
@@ -426,6 +417,7 @@ internal void ResetAutoCompleteSearchViewState()
             FilteredResults = new List<NodeSearchElementViewModel>();
             FilteredHighConfidenceResults = new List<NodeSearchElementViewModel>();
             FilteredLowConfidenceResults = new List<NodeSearchElementViewModel>();
+            SearchInput = string.Empty;            
         }
 
         internal MLNodeAutoCompletionRequest GenerateRequestForMLAutocomplete()
@@ -796,6 +788,19 @@ internal void DeleteTransientNodes()
             }
         }
 
+
+        internal void AddCluster(int filterredIndex)
+        {
+            var currentFilter = FilteredView.Cast<DNADropdownViewModel>().ToList();
+            var currentItem = filterredIndex >= 0 && filterredIndex < currentFilter.Count ? currentFilter[filterredIndex] : null;
+
+            var realCluster = QualifiedResults.FirstOrDefault(x => x.Description.Equals(currentItem.Description));
+            if (realCluster != null)
+            {
+                AddCluster(realCluster);
+            }
+        }
+
         // Add Cluster from server result into the workspace
         internal void AddCluster(ClusterResultItem clusterResultItem)
         {
@@ -1040,8 +1045,6 @@ internal void PopulateAutoComplete()
                     if (comboboxResults.Any())
                     {
                         SelectedIndex = 0;
-                        var ClusterResultItem = QualifiedResults.First();
-                        AddCluster(ClusterResultItem);
                     }
 
                 });

src/NodeAutoCompleteViewExtension/Views/NodeAutoCompleteBarView.xaml

@@ -172,7 +172,7 @@
                                     CaretBrush="{Binding Foreground, RelativeSource={RelativeSource AncestorType=ComboBox}}"
                                     FontSize="14">
                                     <TextBox.Text>
-                                        <Binding Path="SearchInput" Mode="OneWayToSource" UpdateSourceTrigger="PropertyChanged" />
+                                        <Binding Path="SearchInput" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" />
                                     </TextBox.Text>
                                 </TextBox>
                             </ComboBox.Tag>

src/NodeAutoCompleteViewExtension/Views/NodeAutoCompleteBarView.xaml.cs

@@ -75,7 +75,7 @@ private void GripHandle_MouseLeftButtonDown(object sender, MouseButtonEventArgs
 
         private void MoveIndex(int step)
         {
-            ViewModel.SelectedIndex = Math.Min(ViewModel.DropdownResults.Count() - 1, Math.Max(0, ViewModel.SelectedIndex + step));
+            ViewModel.SelectedIndex = Math.Min(ViewModel.FilteredView.Cast<object>().Count() - 1, Math.Max(0, ViewModel.SelectedIndex + step));
         }
 
         private void PrevButton_OnClick(object sender, RoutedEventArgs e)