Dynamo 2.16.2 Hotfix

src/DynamoCore/Configuration/PreferenceSettings.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -900,6 +900,52 @@ public bool IsTrustedLocation(string location)
             }
 
         }
+
+        /// <summary>
+        /// Different ways to ask the user about display the Trusted location
+        /// </summary>
+        public enum AskForTrustedLocationResult
+        {
+            /// <summary>
+            /// Ask for the Trusted location
+            /// </summary>
+            Ask,
+            /// <summary>
+            /// Don't ask about the Trusted location
+            /// </summary>
+            DontAsk,
+            /// <summary>
+            /// Unable to ask about the Trusted location
+            /// </summary>
+            UnableToAsk
+        }
+
+        /// <summary>
+        /// AskForTrustedLocation function
+        /// </summary>
+        /// <param name="isOpenedFile"></param>
+        /// <param name="isHomeSpace"></param>
+        /// <param name="isShowStartPage"></param>
+        /// <param name="isDisableTrustWarnings"></param>
+        /// <param name="isFileInTrustedLocation"></param>
+        /// <returns></returns>
+        public static AskForTrustedLocationResult AskForTrustedLocation(bool isOpenedFile, bool isFileInTrustedLocation, bool isHomeSpace, bool isShowStartPage, bool isDisableTrustWarnings)
+        {
+            AskForTrustedLocationResult result = AskForTrustedLocationResult.UnableToAsk;
+            if (isOpenedFile)
+            {
+                if (isHomeSpace && !isShowStartPage && !isDisableTrustWarnings && !isFileInTrustedLocation)
+                {
+                    result = AskForTrustedLocationResult.Ask;
+                }
+                else
+                {
+                    result = AskForTrustedLocationResult.DontAsk;
+                }
+            }
+            return result;
+        }
+
         #endregion
 
         #region ILogSource
@@ -915,4 +961,4 @@ internal void OnMessageLogged(ILogMessage msg)
         }
         #endregion
     }
-}
+}

src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs

@@ -1,4 +1,4 @@
-using System.Collections.ObjectModel;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -39,15 +39,15 @@ public ObservableCollection<ShortcutBarItem> ShortcutBarRightSideItems
         /// Construct a ShortcutToolbar.
         /// </summary>
         /// <param name="updateManager"></param>
-        public ShortcutToolbar(IUpdateManager updateManager)
+        public ShortcutToolbar(DynamoViewModel dynamoViewModel)
         {
             shortcutBarItems = new ObservableCollection<ShortcutBarItem>();
             shortcutBarRightSideItems = new ObservableCollection<ShortcutBarItem>();    
 
             InitializeComponent();
-            UpdateControl.DataContext = updateManager;
+            UpdateControl.DataContext = dynamoViewModel.Model.UpdateManager;            
 
-            var shortcutToolbar = new ShortcutToolbarViewModel();
+            var shortcutToolbar = new ShortcutToolbarViewModel(dynamoViewModel);
             DataContext = shortcutToolbar;
         }
 

src/DynamoCoreWpf/DynamoCoreWpf.csproj

@@ -287,6 +287,7 @@
     </Compile>
     <Compile Include="UI\SharedResourceDictionary.cs" />
     <Compile Include="Utilities\PreferencesPanelUtilities.cs" />
+    <Compile Include="Utilities\WebView2Utilities.cs" />
     <Compile Include="ViewModels\Core\AnnotationExtension.cs" />
     <Compile Include="ViewModels\Core\AnnotationViewModel.cs" />
     <Compile Include="Utilities\ResourceUtilities.cs" />

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

@@ -3296,4 +3296,10 @@ You can manage this in Preferences -&gt; Security.</value>
   <data name="PrePackagePublishTitle" xml:space="preserve">
     <value>Package Upload Scan</value>
   </data>
+  <data name="WebView2RequiredMessage" xml:space="preserve">
+    <value>Dynamo requires WebView2 Evergreen Runtime, which is not installed on your computer. Please use the link below to download the Evergreen Standalone Installer and install the program. Then relaunch Dynamo. \n\n#WebView2 Runtime Installer=https://developer.microsoft.com/en-us/microsoft-edge/webview2/#download-sectionedge/webview2/#download-section</value>
+  </data>
+  <data name="WebView2RequiredTitle" xml:space="preserve">
+    <value>WebView2 Required</value>
+  </data>
 </root>

src/DynamoCoreWpf/Properties/Resources.resx

@@ -3283,4 +3283,10 @@ You can manage this in Preferences -&gt; Security.</value>
   <data name="PrePackagePublishTitle" xml:space="preserve">
     <value>Package Upload Scan</value>
   </data>
-</root>
+  <data name="WebView2RequiredMessage" xml:space="preserve">
+    <value>Dynamo requires WebView2 Evergreen Runtime, which is not installed on your computer. Please use the link below to download the Evergreen Standalone Installer and install the program. Then relaunch Dynamo. \n\n#WebView2 Runtime Installer=https://developer.microsoft.com/en-us/microsoft-edge/webview2/#download-sectionedge/webview2/#download-section</value>
+  </data>
+  <data name="WebView2RequiredTitle" xml:space="preserve">
+    <value>WebView2 Required</value>
+  </data>
+</root>

src/DynamoCoreWpf/Rendering/HelixRenderPackage.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Autodesk.DesignScript.Interfaces;

src/DynamoCoreWpf/UI/Prompts/DynamoMessageBox.xaml

@@ -1,8 +1,9 @@
-<Window x:Class="Dynamo.UI.Prompts.DynamoMessageBox"
+<Window x:Class="Dynamo.UI.Prompts.DynamoMessageBox"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:p="clr-namespace:Dynamo.Wpf.Properties;assembly=DynamoCoreWpf"
         xmlns:ui="clr-namespace:Dynamo.UI"
+        xmlns:localui="clr-namespace:Dynamo.Wpf.UI.GuidedTour"
         xmlns:w="clr-namespace:System.Windows;assembly=PresentationCore"
         Title="{x:Static p:Resources.GenericTaskDialogTitle}"
         MinWidth="400"
@@ -115,6 +116,15 @@
                            Foreground="#3C3C3C"
                            Text="{Binding BodyText, UpdateSourceTrigger=PropertyChanged}"
                            TextWrapping="Wrap" />
+                <localui:CustomRichTextBox x:Name="ContentRichTextBox" 
+                                           IsDocumentEnabled="True"
+                                           Visibility="Collapsed"
+                                           DockPanel.Dock="Left"
+                                           Grid.Row="1"
+                                           Margin="20"
+                                           CustomText="{Binding BodyText}"
+                                           Style="{StaticResource CustomRichTextBoxStyle}">
+                </localui:CustomRichTextBox>
 
                 <!--  Buttons  -->
                 <DockPanel Name="ButtonsDockPanel"

src/DynamoCoreWpf/UI/Prompts/DynamoMessageBox.xaml.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -122,6 +122,37 @@ public static MessageBoxResult Show(string messageBoxText, string caption, Messa
             dynamoMessageBox.ShowDialog();
             return dynamoMessageBox.CustomDialogResult;
         }
+
+
+        /// <summary>
+        /// Displays a dialog to the user and returns their choice as a MessageBoxResult.
+        /// </summary>
+        /// <param name="messageBoxText">Content of the message</param>
+        /// <param name="caption">MessageBox title</param>
+        /// <param name="showRichTextBox">True if we will be using the RichTextBox instead of the usual one</param>
+        /// <param name="button">OK button shown in the MessageBox</param>
+        /// <param name="icon">Type of message: Warning, Error</param>
+        /// <returns></returns>
+        public static MessageBoxResult Show(string messageBoxText, string caption, bool showRichTextBox, MessageBoxButton button,
+           MessageBoxImage icon)
+        {
+            var dynamoMessageBox = new DynamoMessageBox
+            {
+                BodyText = messageBoxText,
+                TitleText = caption,
+                MessageBoxButton = button,
+                MessageBoxImage = icon
+            };
+
+            if (showRichTextBox)
+            {
+                dynamoMessageBox.BodyTextBlock.Visibility = Visibility.Collapsed;
+                dynamoMessageBox.ContentRichTextBox.Visibility = Visibility.Visible;
+            }             
+            dynamoMessageBox.ConfigureButtons(button);
+            dynamoMessageBox.ShowDialog();
+            return dynamoMessageBox.CustomDialogResult;
+        }
         /// <summary>
         /// Displays a dialog to the user and returns their choice as a MessageBoxResult.
         /// </summary>

src/DynamoCoreWpf/Utilities/MessageBoxUtilities.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Windows;
 using Dynamo.UI.Prompts;
 
@@ -10,6 +10,7 @@ public class MessageBoxService {
         internal interface IMessageBox
         {
             MessageBoxResult Show(string msg, string title, MessageBoxButton button, MessageBoxImage img);
+            MessageBoxResult Show(string msg, string title, bool showRichTextBox, MessageBoxButton button, MessageBoxImage img);
             MessageBoxResult Show(Window owner,string msg, string title, MessageBoxButton button, MessageBoxImage img);
             MessageBoxResult Show(string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img);
         }
@@ -23,6 +24,11 @@ MessageBoxResult IMessageBox.Show(string msg, string title, MessageBoxButton but
                 return DynamoMessageBox.Show(msg, title, button, img);
             }
 
+            MessageBoxResult IMessageBox.Show(string msg, string title, bool showRichTextBox, MessageBoxButton button, MessageBoxImage img)
+            {
+                return DynamoMessageBox.Show(msg, title, showRichTextBox, button, img);
+            }
+
             public MessageBoxResult Show(Window owner, string msg, string title, MessageBoxButton button, MessageBoxImage img)
             {
                 return DynamoMessageBox.Show(owner,msg, title, button, img);
@@ -43,6 +49,10 @@ public static MessageBoxResult Show(string msg, string title, MessageBoxButton b
         {
             return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(msg, title, button, img);
         }
+        public static MessageBoxResult Show(string msg, string title, bool showRichTextBox, MessageBoxButton button, MessageBoxImage img)
+        {
+            return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(msg, title, showRichTextBox, button, img);
+        }
         public static MessageBoxResult Show(Window owner,string msg, string title, MessageBoxButton button, MessageBoxImage img)
         {
             return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(owner,msg, title, button, img);

src/DynamoCoreWpf/Utilities/WebView2Utilities.cs

@@ -0,0 +1,40 @@
+using System.Windows;
+using Dynamo.Wpf.Properties;
+using Dynamo.Wpf.Utilities;
+using Microsoft.Web.WebView2.Core;
+
+namespace Dynamo.Utilities
+{
+    /// <summary>
+    /// This class will contain several utility functions that will be used for the WebView2 component
+    /// </summary>
+    public static class WebView2Utilities
+    {
+        /// <summary>
+        /// Validate if the WebView2 Evergreen Runtime is installed in the computer, otherwise it will show a MessageBox about installing the Runtime and then exit Dynamo
+        /// </summary>
+        /// <returns></returns>
+        public static bool ValidateWebView2RuntimeInstalled()
+        {
+            try
+            {
+                string availableVersion = CoreWebView2Environment.GetAvailableBrowserVersionString();
+                return true;
+            }
+            //We reach the catch section only when the Webview2 Runtime is not installed
+            catch (WebView2RuntimeNotFoundException)
+            {
+                var messageStr = Resources.ResourceManager.GetString("WebView2RequiredMessage");
+                if(messageStr.IndexOf("\\n") >= 0)
+                    messageStr = messageStr.Replace("\\n", "\n");
+
+                MessageBoxService.Show(messageStr,
+                                       Resources.WebView2RequiredTitle,
+                                       true,
+                                       MessageBoxButton.OK,
+                                       MessageBoxImage.Error);
+                return false;
+            }
+        }
+    }
+}

src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs

@@ -3097,6 +3097,24 @@ private bool AskUserToSaveWorkspacesOrCancel(bool allowCancel = true)
             return true;
         }
 
+        /// <summary>
+        /// Check if the current file is located in a Trusted Location in order to display to the User the proper message
+        /// </summary>
+        public void CheckCurrentFileInTrustedLocation()
+        {
+            PreferenceSettings.AskForTrustedLocationResult askToTheUser =
+                PreferenceSettings.AskForTrustedLocation(CurrentSpaceViewModel.FileName.Length > 0,
+                CurrentSpaceViewModel.FileName.Length > 0 ? PreferenceSettings.IsTrustedLocation(Path.GetDirectoryName(CurrentSpaceViewModel.FileName)) : false,
+                (currentWorkspaceViewModel?.IsHomeSpace ?? false),
+                ShowStartPage,
+                model.PreferenceSettings.DisableTrustWarnings);
+
+            if (askToTheUser == PreferenceSettings.AskForTrustedLocationResult.Ask) {
+
+                FileTrustViewModel.AllowOneTimeTrust = false;
+            }
+        }
+
         #endregion
     }
 }

src/DynamoCoreWpf/ViewModels/Core/ShortcutToolbarViewModel.cs

@@ -1,13 +1,16 @@
-using Dynamo.ViewModels;
+using Dynamo.UI.Commands;
+using Dynamo.ViewModels;
+using System;
 using System.Windows;
 
 namespace Dynamo.Wpf.ViewModels.Core
 {
     internal class ShortcutToolbarViewModel : ViewModelBase
     {
-        public ShortcutToolbarViewModel()
+        public ShortcutToolbarViewModel(DynamoViewModel dynamoViewModel)
         {
             NotificationsNumber = 0;
+            ShowSaveImageDialogAndSaveResultCommand = new DelegateCommand(dynamoViewModel.ShowSaveImageDialogAndSaveResult);
         }
 
         private int notificationsNumber;
@@ -36,5 +39,11 @@ public bool IsNotificationsCounterVisible
                 return true;
             }
         }
+
+
+        /// <summary>
+        /// Exports an image from the user's 3D background or workpace
+        /// </summary>
+        public DelegateCommand ShowSaveImageDialogAndSaveResultCommand { get; set; }
     }
 }

src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs

@@ -611,6 +611,14 @@ internal void Save(string filePath, bool isBackup = false, EngineController engi
                     Model.FileName = filePath;
                     Model.OnSaved();
                 }
+
+                // If a new CustomNodeWorkspaceModel is created, store that info in CustomNodeManager without creating an instance of the custom node.
+                if (this.Model is CustomNodeWorkspaceModel customNodeWorkspaceModel)
+                {
+                    //If the custom node Name is already set and the FileName is already set then we don't need to change the Name with "backup"
+                    if(string.IsNullOrEmpty(customNodeWorkspaceModel.Name) && string.IsNullOrEmpty(customNodeWorkspaceModel.FileName))
+                        customNodeWorkspaceModel.SetInfo(Path.GetFileNameWithoutExtension(filePath));
+                }
             }
             catch (Exception ex)
             {