fix watchTree silent crash (#12975)

pinzart90 · pinzart · mjkkirschner · web-flow · commit 11c560e28107 · 2022-06-13T16:06:09.000-04:00
* fix watchTree silent crash

* Update WatchTree.xaml.cs

* add test

* Update DynamoViewTests.cs

* Update DynamoViewTests.cs

* remove test

* Delete BiggestRectangle.dyn

Co-authored-by: pinzart &lt;tiberiu.pinzariu@autodesk.com&gt;
Co-authored-by: Michael Kirschner &lt;mjk.kirschner@gmail.com&gt;
diff --git a/src/DynamoCoreWpf/Views/Preview/PreviewControl.xaml.cs b/src/DynamoCoreWpf/Views/Preview/PreviewControl.xaml.cs
@@ -393,10 +393,7 @@ private void RefreshExpandedDisplay(Action refreshDisplay)
 
                     if (largeContentGrid.Children.Count == 0)
                     {
-                        var tree = new WatchTree
-                        {
-                            DataContext = new WatchViewModel(nodeViewModel.DynamoViewModel.BackgroundPreviewViewModel.AddLabelForPath)
-                        };
+                        var tree = new WatchTree(new WatchViewModel(nodeViewModel.DynamoViewModel.BackgroundPreviewViewModel.AddLabelForPath));
                         tree.treeView1.ItemContainerGenerator.StatusChanged += WatchContainer_StatusChanged;
                         largeContentGrid.Children.Add(tree);
                     }
diff --git a/src/DynamoCoreWpf/Views/Preview/WatchTree.xaml.cs b/src/DynamoCoreWpf/Views/Preview/WatchTree.xaml.cs
@@ -22,9 +22,13 @@ public partial class WatchTree : UserControl
         private readonly int minWidthSize = 100;
         private readonly int minHeightSize = 38;
 
-        public WatchTree()
+        public WatchTree(WatchViewModel vm)
         {
+            _vm = vm;
+
             InitializeComponent();
+
+            DataContext = vm;
             this.Loaded += WatchTree_Loaded;
             this.Unloaded += WatchTree_Unloaded;
         }
@@ -42,8 +46,7 @@ private void WatchTree_Unloaded(object sender, RoutedEventArgs e)
 
         void WatchTree_Loaded(object sender, RoutedEventArgs e)
         {
-            _vm = this.DataContext as WatchViewModel;
-            _vm.PropertyChanged += _vm_PropertyChanged;            
+            _vm.PropertyChanged += _vm_PropertyChanged;
         }
 
         private void _vm_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
diff --git a/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/Watch.cs b/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/Watch.cs
@@ -39,15 +39,15 @@ public void CustomizeView(Watch nodeModel, NodeView nodeView)
             this.watch = nodeModel;
             this.syncContext = new DispatcherSynchronizationContext(nodeView.Dispatcher);
 
-            var watchTree = new WatchTree();
+            // make empty watchViewModel
+            rootWatchViewModel = new WatchViewModel(dynamoViewModel.BackgroundPreviewViewModel.AddLabelForPath);
+
+            var watchTree = new WatchTree(rootWatchViewModel);
             watchTree.BorderThickness = new Thickness(1, 1, 1, 1);
             watchTree.BorderBrush = new SolidColorBrush(Color.FromRgb(220,220,220));
 
             watchTree.SetWatchNodeProperties();
 
-            // make empty watchViewModel
-            rootWatchViewModel = new WatchViewModel(dynamoViewModel.BackgroundPreviewViewModel.AddLabelForPath);
-
             nodeView.PresentationGrid.Children.Add(watchTree);
             nodeView.PresentationGrid.Visibility = Visibility.Visible;
             // disable preview control
@@ -61,9 +61,6 @@ public void CustomizeView(Watch nodeModel, NodeView nodeView)
 
         private void Bind(WatchTree watchTree, NodeView nodeView)
         {
-            // The WatchTree Control is bound to the WatchViewModel
-            watchTree.DataContext = rootWatchViewModel;
-
             // Add binding for TreeView
             var sourceBinding = new Binding("Children")
             {
diff --git a/test/DynamoCoreWpfTests/DynamoViewTests.cs b/test/DynamoCoreWpfTests/DynamoViewTests.cs
@@ -24,7 +24,7 @@
 
 
 namespace DynamoCoreWpfTests
-{        
+{
     public class DynamoViewTests : DynamoTestUIBase
     {
         // adapted from: NodeViewTests.cs
@@ -58,11 +58,11 @@ public void FooterNotificationControlTest()
 
             var workspace = ViewModel.Model.CurrentWorkspace as HomeWorkspaceModel;
             Debug.Assert(workspace != null, nameof(workspace) + " != null");
-            workspace.Run();            
+            workspace.Run();
 
             List<NodeModel> errorNodes = ViewModel.Model.CurrentWorkspace.Nodes.ToList().FindAll(n => n.State == ElementState.Error);
             List<NodeModel> warningNodes = ViewModel.Model.CurrentWorkspace.Nodes.ToList().FindAll(n => n.State == ElementState.Warning || n.State == ElementState.PersistentWarning);
-            
+
             // We should have 3 nodes in Error state and 3 nodes in Warning state
             Assert.AreEqual(3, warningNodes.Count());
             Assert.AreEqual(3, errorNodes.Count());
@@ -92,7 +92,7 @@ public void FooterNotificationControlTest()
 
             // Check if the run message indicates warning
             Assert.AreEqual(notificationsControl.runNotificationTextBlock.Text, "Run completed with warnings.");
-            
+
             // After deleting all Error nodes, the counter should get to 0 
             Assert.AreEqual((items[0] as FooterNotificationItem).NotificationCount, 0);
 

Original file line number	Diff line number	Diff line change
`@@ -393,10 +393,7 @@ private void RefreshExpandedDisplay(Action refreshDisplay)`
`393`	`393`
`394`	`394`	`if (largeContentGrid.Children.Count == 0)`
`395`	`395`	`{`
`396`		`- var tree = new WatchTree`
`397`		`- {`
`398`		`- DataContext = new WatchViewModel(nodeViewModel.DynamoViewModel.BackgroundPreviewViewModel.AddLabelForPath)`
`399`		`- };`
	`396`	`+ var tree = new WatchTree(new WatchViewModel(nodeViewModel.DynamoViewModel.BackgroundPreviewViewModel.AddLabelForPath));`
`400`	`397`	`tree.treeView1.ItemContainerGenerator.StatusChanged += WatchContainer_StatusChanged;`
`401`	`398`	`largeContentGrid.Children.Add(tree);`
`402`	`399`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,13 @@ public partial class WatchTree : UserControl`
`22`	`22`	`private readonly int minWidthSize = 100;`
`23`	`23`	`private readonly int minHeightSize = 38;`
`24`	`24`
`25`		`- public WatchTree()`
	`25`	`+ public WatchTree(WatchViewModel vm)`
`26`	`26`	`{`
	`27`	`+ _vm = vm;`
	`28`	`+`
`27`	`29`	`InitializeComponent();`
	`30`	`+`
	`31`	`+ DataContext = vm;`
`28`	`32`	`this.Loaded += WatchTree_Loaded;`
`29`	`33`	`this.Unloaded += WatchTree_Unloaded;`
`30`	`34`	`}`
`@@ -42,8 +46,7 @@ private void WatchTree_Unloaded(object sender, RoutedEventArgs e)`
`42`	`46`
`43`	`47`	`void WatchTree_Loaded(object sender, RoutedEventArgs e)`
`44`	`48`	`{`
`45`		`- _vm = this.DataContext as WatchViewModel;`
`46`		`- _vm.PropertyChanged += _vm_PropertyChanged;`
	`49`	`+ _vm.PropertyChanged += _vm_PropertyChanged;`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`private void _vm_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)`