improvements (#14497)

DynamoDS · Oct 20, 2023 · 172d7a5 · 172d7a5
1 parent afb6b39
commit 172d7a5
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 33 deletions.
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -1721,13 +1721,13 @@ Next assemblies were loaded several times:
   </data>
   <data name="PackageFilterUpdatedTooltip" xml:space="preserve">
     <value>Updated in the last 30 days</value>
-  </data>    
+  </data>
   <data name="PackageFilterDeprecatedTooltip" xml:space="preserve">
     <value>Discontinued packages</value>
   </data>
   <data name="PackageFilterByDependency" xml:space="preserve">
     <value>DEPENDENCY</value>
-  </data> 
+  </data>
   <data name="PackageFilterHasDependenciesTooltip" xml:space="preserve">
     <value>Packages that require other packages to be installed</value>
   </data>
@@ -3450,10 +3450,10 @@ You can manage this in Preferences -&gt; Security.</value>
     <value>Node Autocomplete</value>
     <comment>Preferences | Features | Node Autocomplete</comment>
   </data>
-  <data name="HideNodesBelowSpecificConfidenceLevel" xml:space="preserve">
-    <value>Hide nodes below a specified confidence level</value>
+  <data name="PreferredConfidenceLevel" xml:space="preserve">
+    <value>Preferred confidence level</value>
   </data>
-  <data name="HideNodesBelowSpecificConfidenceLevelInfo" xml:space="preserve">
+  <data name="PreferredConfidenceLevelInfo" xml:space="preserve">
     <value>Confidence level appears next to each recommended node and represents estimated probability that the node is a good choice. When toggled on, this setting hides recommended nodes that don’t meet the specified confidence level. You can click the Low Confidence header to show the nodes.</value>
   </data>
   <data name="MLRecommendationNumberOfResults" xml:space="preserve">

diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -3437,10 +3437,10 @@ You can manage this in Preferences -&gt; Security.</value>
     <value>Node Autocomplete</value>
     <comment>Preferences | Features | Node Autocomplete</comment>
   </data>
-  <data name="HideNodesBelowSpecificConfidenceLevel" xml:space="preserve">
-    <value>Hide nodes below a specified confidence level</value>
+  <data name="PreferredConfidenceLevel" xml:space="preserve">
+    <value>Preferred confidence level</value>
   </data>
-  <data name="HideNodesBelowSpecificConfidenceLevelInfo" xml:space="preserve">
+  <data name="PreferredConfidenceLevelInfo" xml:space="preserve">
     <value>Confidence level appears next to each recommended node and represents estimated probability that the node is a good choice. When toggled on, this setting hides recommended nodes that don’t meet the specified confidence level. You can click the Low Confidence header to show the nodes.</value>
   </data>
   <data name="MLRecommendationNumberOfResults" xml:space="preserve">

diff --git a/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs
@@ -157,12 +157,13 @@ internal NodeAutoCompleteSearchViewModel(DynamoViewModel dynamoViewModel) : base
         internal void ResetAutoCompleteSearchViewState()
         {
             DisplayAutocompleteMLStaticPage = false;
-            DisplayLowConfidence = false;
+            DisplayLowConfidence = PreferenceSettings.Instance.HideNodesBelowSpecificConfidenceLevel;
             AutocompleteMLMessage = string.Empty;
             AutocompleteMLTitle = string.Empty;
             FilteredResults = new List<NodeSearchElementViewModel>();
             FilteredHighConfidenceResults = new List<NodeSearchElementViewModel>();
             FilteredLowConfidenceResults = new List<NodeSearchElementViewModel>();
+            searchElementsCache = new List<NodeSearchElementViewModel>();
         }
 
         private void InitializeDefaultAutoCompleteCandidates()
@@ -410,10 +411,10 @@ internal void DisplayMachineLearningResults()
                     }
                 }
 
-                // Show low confidence section if there are some results under threshold.
-                DisplayLowConfidence = FilteredLowConfidenceResults.Count() > 0;
+                // Show low confidence section if there are some results under threshold and feature enabled
+                DisplayLowConfidence = FilteredLowConfidenceResults.Any() && PreferenceSettings.Instance.HideNodesBelowSpecificConfidenceLevel;
 
-                if (FilteredHighConfidenceResults.Count() == 0)
+                if (!FilteredHighConfidenceResults.Any())
                 {
                     DisplayAutocompleteMLStaticPage = true;
                     AutocompleteMLTitle = Resources.AutocompleteLowConfidenceTitle;
@@ -422,7 +423,7 @@ internal void DisplayMachineLearningResults()
                 }
 
                 // By default, show only the results which are above the threshold
-                FilteredResults = FilteredHighConfidenceResults;
+                FilteredResults = PreferenceSettings.Instance.HideNodesBelowSpecificConfidenceLevel? FilteredHighConfidenceResults : results    ;
             }
         }
 

diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
@@ -956,7 +956,7 @@
                                                         IsChecked="{Binding Path=HideNodesBelowSpecificConfidenceLevelIsChecked}"
                                                         Style="{StaticResource EllipseToggleButton1}"
                                                         IsEnabled="{Binding Path=EnableHideNodesToggle}"/>
-                                                    <Label Content="{x:Static p:Resources.HideNodesBelowSpecificConfidenceLevel}" 
+                                                    <Label Content="{x:Static p:Resources.PreferredConfidenceLevel}" 
                                                         Margin="10,0,0,0"
                                                         VerticalAlignment="Center"
                                                         Foreground="{StaticResource PreferencesWindowFontColor}"
@@ -970,7 +970,7 @@
                                                         Style="{StaticResource QuestionIcon}"
                                                         ToolTipService.ShowDuration="30000">
                                                         <Image.ToolTip>
-                                                            <ToolTip Content="{x:Static p:Resources.HideNodesBelowSpecificConfidenceLevelInfo}" Style="{StaticResource GenericToolTipLight}"/>
+                                                            <ToolTip Content="{x:Static p:Resources.PreferredConfidenceLevelInfo}" Style="{StaticResource GenericToolTipLight}"/>
                                                         </Image.ToolTip>
                                                     </Image>
                                                 </StackPanel>