RC2.19.5 CherryPicks

src/AssemblySharedInfoGenerator/AssemblySharedInfo.cs

@@ -45,7 +45,7 @@
 // to distinguish one build from another. AssemblyFileVersion is specified
 // in AssemblyVersionInfo.cs so that it can be easily incremented by the
 // automated build process.
-[assembly: AssemblyVersion("2.19.5.7826")]
+[assembly: AssemblyVersion("2.19.5.7897")]
 
 
 // By default, the "Product version" shown in the file properties window is
@@ -64,4 +64,4 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("2.19.5.7826")]
+[assembly: AssemblyFileVersion("2.19.5.7897")]

src/DynamoCore/Models/DynamoModel.cs

@@ -161,8 +161,8 @@ internal LuceneSearchUtility LuceneUtility
 
         /// <summary>
         /// Flag to indicate that there is no UI on this process, and things
-        /// like the update manager and the analytics collection should be
-        /// disabled.
+        /// like the node index process, update manager and the analytics collection 
+        /// should be disabled.
         /// </summary>
         public static bool IsHeadless { get; set; }
 

src/DynamoCore/Utilities/LuceneSearchUtility.cs

@@ -60,6 +60,8 @@ internal LuceneSearchUtility(DynamoModel model)
         /// </summary>
         internal void InitializeLuceneConfig(string dirName, LuceneStorage storageType = LuceneStorage.FILE_SYSTEM)
         {
+            if (DynamoModel.IsHeadless) return;
+
             addedFields = new List<string>();
 
             DirectoryInfo luceneUserDataFolder;

src/DynamoCoreWpf/Properties/Resources.en-US.resx

@@ -3342,10 +3342,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">

src/DynamoCoreWpf/Properties/Resources.resx

@@ -3329,10 +3329,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">

src/DynamoCoreWpf/ViewModels/Preview/WatchViewModel.cs

@@ -190,8 +190,11 @@ public bool IsCollection
             get { return isCollection; }
             set
             {
-                isCollection = value;
-                RaisePropertyChanged("IsCollection");
+                if (isCollection != value)
+                {
+                    isCollection = value;
+                    RaisePropertyChanged(nameof(IsCollection));
+                }
             }
         }
 
@@ -203,8 +206,11 @@ public IEnumerable<int> Levels
             get { return levels; }
             set
             {
-                levels = value;
-                RaisePropertyChanged("Levels");
+                if (levels != value)
+                {
+                    levels = value;
+                    RaisePropertyChanged(nameof(Levels));
+                }
             }
         }
 

src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs

@@ -156,12 +156,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()
@@ -359,7 +360,7 @@ internal void DisplayMachineLearningResults()
 
                         if (viewModelElement != null)
                         {
-                            viewModelElement.AutoCompletionNodeMachineLearningInfo = new AutoCompletionNodeMachineLearningInfo(true, true, result.Score * 100);
+                            viewModelElement.AutoCompletionNodeMachineLearningInfo = new AutoCompletionNodeMachineLearningInfo(true, true, Math.Round(result.Score * 100));
                             results.Add(viewModelElement);
                         }
                     }
@@ -392,7 +393,7 @@ internal void DisplayMachineLearningResults()
 
                         if (viewModelElement != null)
                         {
-                            viewModelElement.AutoCompletionNodeMachineLearningInfo = new AutoCompletionNodeMachineLearningInfo(true, true, result.Score * 100);
+                            viewModelElement.AutoCompletionNodeMachineLearningInfo = new AutoCompletionNodeMachineLearningInfo(true, true, Math.Round(result.Score * 100));
                             results.Add(viewModelElement);
                         }
                     }
@@ -409,10 +410,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;
@@ -421,7 +422,7 @@ internal void DisplayMachineLearningResults()
                 }
 
                 // By default, show only the results which are above the threshold
-                FilteredResults = FilteredHighConfidenceResults;
+                FilteredResults = PreferenceSettings.Instance.HideNodesBelowSpecificConfidenceLevel? FilteredHighConfidenceResults : results    ;
             }
         }
 

src/DynamoCoreWpf/Views/Core/DynamoView.xaml

@@ -382,11 +382,11 @@
                                   Tag="NoDownArrow"
                                   IsEnabled="False">
                             <MenuItem Header="{x:Static p:Resources.DynamoViewFileMenuExportAsImage}"
-                                      Command="{Binding ValidateSaveImageResultCommand}"
+                                      Command="{Binding ValidateWorkSpaceBeforeToExportAsImageCommand }"
                                       Name="saveImage">
                             </MenuItem>
                             <MenuItem Header="{x:Static p:Resources.DynamoViewFileMenuExport3DAsImage}"
-                                      Command="{Binding ValidateSaveImageResultCommand}"
+                                      Command="{Binding ValidateWorkSpaceBeforeToExportAsImageCommand }"
                                       CommandParameter="{x:Static p:Resources.ScreenShotFrom3DParameter}"
                                       Name="save3DImage">
                             </MenuItem>

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>

src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml.cs

@@ -96,7 +96,6 @@ public PreferencesView(DynamoView dynamoView)
             stylesCustomColors = new ObservableCollection<CustomColorItem>();
             UpdateZoomScaleValueLabel(LibraryZoomScalingSlider, lblZoomScalingValue);
             UpdateZoomScaleValueLabel(PythonZoomScalingSlider, lblPythonScalingValue);
-            dynamoView.EnableEnvironment(false);
         }
 
         /// <summary>
@@ -170,7 +169,6 @@ private void CloseButton_Click(object sender, RoutedEventArgs e)
 
             dynViewModel.PreferencesViewModel.TrustedPathsViewModel.PropertyChanged -= TrustedPathsViewModel_PropertyChanged;
             dynViewModel.CheckCustomGroupStylesChanges(originalCustomGroupStyles);
-            (this.Owner as DynamoView).EnableEnvironment(true);
 
             Close();
         }

src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml.cs

@@ -41,8 +41,6 @@ public PackageManagerView(DynamoView dynamoView, PackageManagerViewModel package
             Dynamo.Logging.Analytics.TrackEvent(
                 Actions.Open,
                 Categories.PackageManager);
-
-            dynamoView.EnableEnvironment(false);
         }
 
         private void OnRequestShowFileDialog(object sender, PackagePathEventArgs e)
@@ -105,7 +103,6 @@ private void PackageManagerPanel_MouseDown(object sender, MouseButtonEventArgs e
         private void CloseButton_Click(object sender, RoutedEventArgs e)
         {
             Analytics.TrackEvent(Actions.Close, Categories.PackageManager);
-            (this.Owner as DynamoView).EnableEnvironment(true);
 
             Close();
         }

src/DynamoCoreWpf/Views/Preview/WatchTree.xaml

@@ -389,24 +389,17 @@
                 BorderBrush="#D3D3D3"
                 CornerRadius="0,0,2,2"
                 BorderThickness="0">
-
-            <DockPanel Name="ListLevelsDisplay" Height="27px" Visibility="{Binding IsCollection, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
-
-                <!--  A draggable control to resize the Watch window  -->
-                <Thumb Name="resizeThumb"
-                       DockPanel.Dock="Right"
-                       Margin="1,3,5,3"
-                       HorizontalAlignment="Right"
-                       VerticalAlignment="Center"
-                       Cursor="SizeNWSE"
-                       DragDelta="ThumbResizeThumbOnDragDeltaHandler"
-                       Visibility="Hidden">
-                    <Thumb.Template>
-                        <ControlTemplate>
-                            <Polygon Fill="#AFAFAF" Points="0,8 8,8 8,0" />
-                        </ControlTemplate>
-                    </Thumb.Template>
-                </Thumb>
+            <Grid Name="ListLevelsGrid">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <!--  Left Column display List Levels  -->
+                <DockPanel Name="ListLevelsDisplay"
+                       Height="27px"
+                       Grid.Column="0"
+                       Visibility="{Binding IsCollection, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
 
                 <!--  Shows counts of all items in List  -->
                 <TextBlock Name="ListItems"
@@ -466,7 +459,25 @@
                     </ListView.ItemTemplate>
                 </ListView>
 
-            </DockPanel>
+                </DockPanel>
+
+                <!--  Left Column display a draggable control to resize the Watch window  -->
+                <Thumb Name="resizeThumb"
+                       Grid.Column="1"
+                       DockPanel.Dock="Right"
+                       Margin="1,3,5,3"
+                       HorizontalAlignment="Right"
+                       VerticalAlignment="Center"
+                       Cursor="SizeNWSE"
+                       DragDelta="ThumbResizeThumbOnDragDeltaHandler"
+                       Visibility="Collapsed">
+                    <Thumb.Template>
+                        <ControlTemplate>
+                            <Polygon Fill="#AFAFAF" Points="0,8 8,8 8,0" />
+                        </ControlTemplate>
+                    </Thumb.Template>
+                </Thumb>
+            </Grid>
         </Border>
     </Grid>
 </UserControl>

src/DynamoCoreWpf/Views/Preview/WatchTree.xaml.cs

@@ -4,6 +4,7 @@
 using Dynamo.ViewModels;
 using System;
 using CoreNodeModels;
+using System.Linq;
 
 namespace Dynamo.Controls
 {
@@ -68,7 +69,7 @@ private void _vm_PropertyChanged(object sender, System.ComponentModel.PropertyCh
 
             if (e.PropertyName == nameof(WatchViewModel.IsCollection))
             {
-                // // The WatchTree controll will resize only if its role is a WatchNode (starts with an specific height), otherwise it won't resize (Bubble role).
+                // The WatchTree controll will resize only if its role is a WatchNode (starts with an specific height), otherwise it won't resize (Bubble role).
                 if (!Double.IsNaN(this.Height))
                 {
                     if (_vm.IsCollection)
@@ -100,10 +101,13 @@ private void _vm_PropertyChanged(object sender, System.ComponentModel.PropertyCh
                 {
                     if (!_vm.Children[0].IsCollection)
                     {
-                        // We will use 7.5 as width factor for each character.
+                        // if multiline string
+                        if (NodeLabel.Contains(Environment.NewLine) || NodeLabel.Contains("\n"))
+                            this.Height = defaultHeightSize;
 
-                        double requiredWidth = (NodeLabel.Length * widthPerCharacter);
-                        if (requiredWidth > (MaxWidthSize))
+                        // We will use 7.5 as width factor for each character.
+                        double requiredWidth = NodeLabel.Length * widthPerCharacter;
+                        if (requiredWidth > MaxWidthSize)
                         {
                             requiredWidth = MaxWidthSize;
                         }
@@ -123,6 +127,8 @@ private void _vm_PropertyChanged(object sender, System.ComponentModel.PropertyCh
                     // Forcing not to display the Levels content when is being used for display info from another node like the Color Range
                     this.ListLevelsDisplay.Visibility = Visibility.Hidden;
                     this.ListLevelsDisplay.Height = 0;
+                    // Hide resize grip
+                    resizeThumb.Visibility = Visibility.Collapsed;
                 }
             }
         }