Fix guided tour crash (#13097)

reddyashish · web-flow · commit bde665eb52e2 · 2022-07-12T03:55:55.000+05:30
* Close the file trust dialog when the workspace is closed by the user.

This will fix the guided tour crash when trust dialog was open.

* Update FileTrustWarning.xaml.cs

* Update FileTrustWarning.xaml.cs

* Remove CanExecute check when user tries to close the workspace manually

* Add ForceBlockRun check to validate close workspace command.

* Add test
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -2362,7 +2362,7 @@ private void CloseHomeWorkspace(object parameter)
 
         private bool CanCloseHomeWorkspace(object parameter)
         {
-            return HomeSpace.RunSettings.RunEnabled;
+            return HomeSpace.RunSettings.RunEnabled || RunSettings.ForceBlockRun;
         }
 
         /// <summary>
diff --git a/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs
@@ -1281,7 +1281,7 @@ private void Hide(object parameters)
             // if there are no other custom workspace that is opened.
             // 
 
-            if (this.IsHomeSpace)
+            if (IsHomeSpace)
             {
                 if (DynamoViewModel.CloseHomeWorkspaceCommand.CanExecute(null))
                     DynamoViewModel.CloseHomeWorkspaceCommand.Execute(null);
diff --git a/src/DynamoCoreWpf/Views/FileTrust/FileTrustWarning.xaml.cs b/src/DynamoCoreWpf/Views/FileTrust/FileTrustWarning.xaml.cs
@@ -3,6 +3,7 @@
 using System.Windows.Controls.Primitives;
 using System.Windows.Threading;
 using Dynamo.Controls;
+using Dynamo.Graph.Workspaces;
 using Dynamo.Models;
 using Dynamo.ViewModels;
 using Dynamo.Wpf.Utilities;
@@ -40,16 +41,18 @@ public FileTrustWarning(DynamoView dynamoViewWindow)
             DataContext = fileTrustWarningViewModel;
 
             if (dynamoViewWindow == null) return;
-          
+
             //Creating the background of the Popup
             BackgroundRectangle.Rect = new Rect(fileTrustWarningViewModel.PopupBordersOffSet, fileTrustWarningViewModel.PopupBordersOffSet, fileTrustWarningViewModel.PopupRectangleWidth, fileTrustWarningViewModel.PopupRectangleHeight);
             SetUpPopup();
+
+            HomeWorkspaceModel.WorkspaceClosed += CloseWarningPopup;
         }
 
         private void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
             //When the ShowWarningPopup property is changed we need to enable or disable the Dynamo Run section
-            if (e.PropertyName == nameof(FileTrustWarningViewModel.ShowWarningPopup) )
+            if (e.PropertyName == nameof(FileTrustWarningViewModel.ShowWarningPopup))
             {
                 var fileTrustWarningViewModel = sender as FileTrustWarningViewModel;
                 if (fileTrustWarningViewModel == null) return;
@@ -59,12 +62,11 @@ private void ViewModel_PropertyChanged(object sender, System.ComponentModel.Prop
                     //Force to run all the drawing events in the Dispatcher so later we can disable the button/combobox in the Run section
                     mainWindow.Dispatcher.Invoke(DispatcherPriority.Background, new Action(delegate { }));
                     DisableRunInteractivity();
-                }                   
+                }
                 else
                 {
                     EnableRunInteractivity();
                 }
-                    
             }
         }
 
@@ -126,11 +128,11 @@ private void YesButton_Click(object sender, RoutedEventArgs e)
         {
             fileTrustWarningViewModel.AllowOneTimeTrust = true;
             fileTrustWarningViewModel.ShowWarningPopup = false;
-            
+
             RunSettings.ForceBlockRun = false;
             if (FileTrustWarningCheckBox.IsChecked.Value == true)
             {
-                if(dynViewModel.PreferenceSettings.AddTrustedLocation(fileTrustWarningViewModel.DynFileDirectoryName))
+                if (dynViewModel.PreferenceSettings.AddTrustedLocation(fileTrustWarningViewModel.DynFileDirectoryName))
                     dynViewModel.MainGuideManager.CreateRealTimeInfoWindow(string.Format(Properties.Resources.TrustLocationAddedNotification, fileTrustWarningViewModel.DynFileDirectoryName));
             }
             if (dynViewModel.CurrentSpaceViewModel.RunSettingsViewModel.Model.RunType != RunType.Manual)
@@ -162,10 +164,12 @@ internal void UpdatePopupLocation()
         internal void CleanPopup()
         {
             if (fileTrustWarningViewModel != null)
-            { 
+            {
                 fileTrustWarningViewModel.PropertyChanged -= ViewModel_PropertyChanged;
                 fileTrustWarningViewModel.DynFileDirectoryName = string.Empty;
             }
+
+            HomeWorkspaceModel.WorkspaceClosed -= CloseWarningPopup;
         }
 
         /// <summary>
@@ -186,5 +190,14 @@ private void SetUpPopup()
                 fileTrustWarningViewModel.PropertyChanged += ViewModel_PropertyChanged;
             }
         }
+
+        /// <summary>
+        /// Close the warning popup
+        /// </summary>
+        internal void CloseWarningPopup()
+        {
+            fileTrustWarningViewModel.ShowWarningPopup = false;
+            fileTrustWarningViewModel.DynFileDirectoryName = string.Empty;
+        }
     }
 }
diff --git a/test/DynamoCoreWpfTests/DynamoViewTests.cs b/test/DynamoCoreWpfTests/DynamoViewTests.cs
@@ -105,5 +105,23 @@ public void FooterNotificationControlTest()
             // After deleting all Warning nodes, the counter should get to 0 
             Assert.AreEqual((items[1] as FooterNotificationItem).NotificationCount, 0);
         }
+
+        [Test]
+        public void OpeningWorkspaceWithTrustWarning()
+        {
+            // Open workspace with test mode as false, to verify trust warning.
+            DynamoModel.IsTestMode = false;
+            Open(@"core\CustomNodes\TestAdd.dyn");
+
+            Assert.IsTrue(ViewModel.FileTrustViewModel.ShowWarningPopup);
+
+            // Close workspace
+            Assert.IsTrue(ViewModel.CloseHomeWorkspaceCommand.CanExecute(null));
+            ViewModel.CloseHomeWorkspaceCommand.Execute(null);
+
+            // Asert that the warning popup is closed, when the workspace is closed.
+            Assert.IsFalse(ViewModel.FileTrustViewModel.ShowWarningPopup);
+            DynamoModel.IsTestMode = true;
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2362,7 +2362,7 @@ private void CloseHomeWorkspace(object parameter)`
`2362`	`2362`
`2363`	`2363`	`private bool CanCloseHomeWorkspace(object parameter)`
`2364`	`2364`	`{`
`2365`		`- return HomeSpace.RunSettings.RunEnabled;`
	`2365`	`+ return HomeSpace.RunSettings.RunEnabled \|\| RunSettings.ForceBlockRun;`
`2366`	`2366`	`}`
`2367`	`2367`
`2368`	`2368`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -1281,7 +1281,7 @@ private void Hide(object parameters)`
`1281`	`1281`	`// if there are no other custom workspace that is opened.`
`1282`	`1282`	`//`
`1283`	`1283`
`1284`		`- if (this.IsHomeSpace)`
	`1284`	`+ if (IsHomeSpace)`
`1285`	`1285`	`{`
`1286`	`1286`	`if (DynamoViewModel.CloseHomeWorkspaceCommand.CanExecute(null))`
`1287`	`1287`	`DynamoViewModel.CloseHomeWorkspaceCommand.Execute(null);`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Windows.Controls.Primitives;`
`4`	`4`	`using System.Windows.Threading;`
`5`	`5`	`using Dynamo.Controls;`
	`6`	`+using Dynamo.Graph.Workspaces;`
`6`	`7`	`using Dynamo.Models;`
`7`	`8`	`using Dynamo.ViewModels;`
`8`	`9`	`using Dynamo.Wpf.Utilities;`
`@@ -40,16 +41,18 @@ public FileTrustWarning(DynamoView dynamoViewWindow)`
`40`	`41`	`DataContext = fileTrustWarningViewModel;`
`41`	`42`
`42`	`43`	`if (dynamoViewWindow == null) return;`
`43`		`-`
	`44`	`+`
`44`	`45`	`//Creating the background of the Popup`
`45`	`46`	`BackgroundRectangle.Rect = new Rect(fileTrustWarningViewModel.PopupBordersOffSet, fileTrustWarningViewModel.PopupBordersOffSet, fileTrustWarningViewModel.PopupRectangleWidth, fileTrustWarningViewModel.PopupRectangleHeight);`
`46`	`47`	`SetUpPopup();`
	`48`	`+`
	`49`	`+ HomeWorkspaceModel.WorkspaceClosed += CloseWarningPopup;`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`private void ViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)`
`50`	`53`	`{`
`51`	`54`	`//When the ShowWarningPopup property is changed we need to enable or disable the Dynamo Run section`
`52`		`- if (e.PropertyName == nameof(FileTrustWarningViewModel.ShowWarningPopup) )`
	`55`	`+ if (e.PropertyName == nameof(FileTrustWarningViewModel.ShowWarningPopup))`
`53`	`56`	`{`
`54`	`57`	`var fileTrustWarningViewModel = sender as FileTrustWarningViewModel;`
`55`	`58`	`if (fileTrustWarningViewModel == null) return;`
`@@ -59,12 +62,11 @@ private void ViewModel_PropertyChanged(object sender, System.ComponentModel.Prop`
`59`	`62`	`//Force to run all the drawing events in the Dispatcher so later we can disable the button/combobox in the Run section`
`60`	`63`	`mainWindow.Dispatcher.Invoke(DispatcherPriority.Background, new Action(delegate { }));`
`61`	`64`	`DisableRunInteractivity();`
`62`		`- }`
	`65`	`+ }`
`63`	`66`	`else`
`64`	`67`	`{`
`65`	`68`	`EnableRunInteractivity();`
`66`	`69`	`}`
`67`		`-`
`68`	`70`	`}`
`69`	`71`	`}`
`70`	`72`
`@@ -126,11 +128,11 @@ private void YesButton_Click(object sender, RoutedEventArgs e)`
`126`	`128`	`{`
`127`	`129`	`fileTrustWarningViewModel.AllowOneTimeTrust = true;`
`128`	`130`	`fileTrustWarningViewModel.ShowWarningPopup = false;`
`129`		`-`
	`131`	`+`
`130`	`132`	`RunSettings.ForceBlockRun = false;`
`131`	`133`	`if (FileTrustWarningCheckBox.IsChecked.Value == true)`
`132`	`134`	`{`
`133`		`- if(dynViewModel.PreferenceSettings.AddTrustedLocation(fileTrustWarningViewModel.DynFileDirectoryName))`
	`135`	`+ if (dynViewModel.PreferenceSettings.AddTrustedLocation(fileTrustWarningViewModel.DynFileDirectoryName))`
`134`	`136`	`dynViewModel.MainGuideManager.CreateRealTimeInfoWindow(string.Format(Properties.Resources.TrustLocationAddedNotification, fileTrustWarningViewModel.DynFileDirectoryName));`
`135`	`137`	`}`
`136`	`138`	`if (dynViewModel.CurrentSpaceViewModel.RunSettingsViewModel.Model.RunType != RunType.Manual)`
`@@ -162,10 +164,12 @@ internal void UpdatePopupLocation()`
`162`	`164`	`internal void CleanPopup()`
`163`	`165`	`{`
`164`	`166`	`if (fileTrustWarningViewModel != null)`
`165`		`- {`
	`167`	`+ {`
`166`	`168`	`fileTrustWarningViewModel.PropertyChanged -= ViewModel_PropertyChanged;`
`167`	`169`	`fileTrustWarningViewModel.DynFileDirectoryName = string.Empty;`
`168`	`170`	`}`
	`171`	`+`
	`172`	`+ HomeWorkspaceModel.WorkspaceClosed -= CloseWarningPopup;`
`169`	`173`	`}`
`170`	`174`
`171`	`175`	`/// <summary>`
`@@ -186,5 +190,14 @@ private void SetUpPopup()`
`186`	`190`	`fileTrustWarningViewModel.PropertyChanged += ViewModel_PropertyChanged;`
`187`	`191`	`}`
`188`	`192`	`}`
	`193`	`+`
	`194`	`+ /// <summary>`
	`195`	`+ /// Close the warning popup`
	`196`	`+ /// </summary>`
	`197`	`+ internal void CloseWarningPopup()`
	`198`	`+ {`
	`199`	`+ fileTrustWarningViewModel.ShowWarningPopup = false;`
	`200`	`+ fileTrustWarningViewModel.DynFileDirectoryName = string.Empty;`
	`201`	`+ }`
`189`	`202`	`}`
`190`	`203`	`}`