Ensure changes to IsInput & IsOutput mark the node/graph as modified (#9257)

alfarok · web-flow · commit 1d6cd027f416 · 2018-11-27T14:04:25.000-05:00
* Ensure changes to `Is Input` &amp; `Is Output` mark the node/graph as modified

* mark workspace as modified when input/output gets set

* remove new handler

* switch to nameof

* add testing coverage verifying modifications to IsSetAsInput or IsSetAsOutput marks graph as modified
diff --git a/src/DynamoCore/Graph/Nodes/NodeModel.cs b/src/DynamoCore/Graph/Nodes/NodeModel.cs
@@ -35,6 +35,8 @@ public abstract class NodeModel : ModelBase, IRenderPackageSource<NodeModel>, ID
         private LacingStrategy argumentLacing = LacingStrategy.Auto;
         private bool displayLabels;
         private bool isVisible;
+        private bool isSetAsInput = false;
+        private bool isSetAsOutput = false;
         private bool canUpdatePeriodically;
         private string name;
         private ElementState state;
@@ -210,7 +212,6 @@ public virtual bool IsInputNode
             }
         }
 
-        private bool isSetAsInput = false;
         /// <summary>
         /// This property is user-controllable via a checkbox and is set to true when a user wishes to include
         /// this node in a Customizer as an interactive control.
@@ -228,7 +229,11 @@ public bool IsSetAsInput
 
             set
             {
-                isSetAsInput = value;
+                if (isSetAsInput != value)
+                {
+                    isSetAsInput = value;
+                    RaisePropertyChanged(nameof(IsSetAsInput));
+                }
             }
         }
 
@@ -246,8 +251,6 @@ public virtual bool IsOutputNode
             }
         }
 
-        private bool isSetAsOutput = false;
-
         /// <summary>
         /// This property is user-controllable via a checkbox and is set to true when a user wishes to include
         /// this node in the OutputData block of the Dyn file.
@@ -265,7 +268,11 @@ public bool IsSetAsOutput
 
             set
             {
-                isSetAsOutput = value;
+                if (isSetAsOutput != value)
+                {
+                    isSetAsOutput = value;
+                    RaisePropertyChanged(nameof(IsSetAsOutput));
+                }
             }
         }
 
diff --git a/src/DynamoCoreWpf/Views/Core/NodeView.xaml.cs b/src/DynamoCoreWpf/Views/Core/NodeView.xaml.cs
@@ -237,6 +237,14 @@ void NodeLogic_PropertyChanged(object sender, System.ComponentModel.PropertyChan
                 case "CachedValue":
                     CachedValueChanged();
                     break;
+
+                case "IsSetAsInput":
+                    (this.DataContext as NodeViewModel).DynamoViewModel.CurrentSpace.HasUnsavedChanges = true;
+                    break;
+
+                case "IsSetAsOutput":
+                    (this.DataContext as NodeViewModel).DynamoViewModel.CurrentSpace.HasUnsavedChanges = true;
+                    break;
             }
         }
 
diff --git a/test/DynamoCoreWpfTests/NodeViewTests.cs b/test/DynamoCoreWpfTests/NodeViewTests.cs
@@ -1,5 +1,9 @@
 ﻿using System;
+using System.IO;
 using System.Linq;
+using Dynamo.Controls;
+using Dynamo.Graph.Workspaces;
+using Dynamo.ViewModels;
 using Dynamo.Selection;
 using DynamoCoreWpfTests.Utility;
 using NUnit.Framework;
@@ -170,5 +174,60 @@ public void NodesHaveCorrectLocationsIndpendentOfCulture()
 
             Thread.CurrentThread.CurrentCulture = CultureInfo.GetCultureInfo("en-US");
         }
+
+        [Test]
+        public void SettingNodeAsInputOrOutputMarksGraphAsModified()
+        {
+            Open(@"core\isInput_isOutput\IsInput.dyn");
+
+            // Get the node view for a specific node in the graph
+            NodeView nodeView = NodeViewWithGuid("c275ece0-2316-4e27-8d51-915257374c1e");
+
+            // Get a reference to the current workspace
+            NodeViewModel nodeViewModel = (nodeView.DataContext as NodeViewModel);
+            WorkspaceModel ws = nodeViewModel.DynamoViewModel.CurrentSpace;
+
+            // Verify IsSetAsInput is set to true
+            Assert.AreEqual(nodeViewModel.IsSetAsInput, true);
+            // Verify IsSetAsOutput is set to false
+            Assert.AreEqual(nodeViewModel.IsSetAsOutput, false);
+            // Verify the graph is not marked as modified
+            Assert.AreEqual(ws.HasUnsavedChanges, false);
+
+            // Set IsSetAsInput to false
+            nodeViewModel.IsSetAsInput = false;
+            // Verify graph is marked as modified
+            Assert.AreEqual(nodeViewModel.IsSetAsInput, false);
+            Assert.AreEqual(ws.HasUnsavedChanges, true);
+
+            // Save the graph
+            string tempPath = Path.Combine(Path.GetTempPath(), "IsInput.dyn");
+            ws.Save(tempPath);
+
+            // Verify graph is no longer marked as modified
+            Assert.AreEqual(nodeViewModel.IsSetAsInput, false);
+            Assert.AreEqual(ws.HasUnsavedChanges, false);
+
+            // Repeat process for IsSetAsOutput //
+
+            // Verify IsSetAsOutput is set to false
+            Assert.AreEqual(nodeViewModel.IsSetAsOutput, false);
+            // Set IsSetAsOutput to true
+            nodeViewModel.IsSetAsOutput = true;
+
+            // Verify graph is marked as modified
+            Assert.AreEqual(nodeViewModel.IsSetAsOutput, true);
+            Assert.AreEqual(ws.HasUnsavedChanges, true);
+
+            // Save the graph
+            ws.Save(tempPath);
+
+            // Verify graph is no longer marked as modified
+            Assert.AreEqual(nodeViewModel.IsSetAsOutput, true);
+            Assert.AreEqual(ws.HasUnsavedChanges, false);
+
+            // Delete temp file
+            File.Delete(tempPath);
+        }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ public abstract class NodeModel : ModelBase, IRenderPackageSource<NodeModel>, ID`
`35`	`35`	`private LacingStrategy argumentLacing = LacingStrategy.Auto;`
`36`	`36`	`private bool displayLabels;`
`37`	`37`	`private bool isVisible;`
	`38`	`+ private bool isSetAsInput = false;`
	`39`	`+ private bool isSetAsOutput = false;`
`38`	`40`	`private bool canUpdatePeriodically;`
`39`	`41`	`private string name;`
`40`	`42`	`private ElementState state;`
`@@ -210,7 +212,6 @@ public virtual bool IsInputNode`
`210`	`212`	`}`
`211`	`213`	`}`
`212`	`214`
`213`		`- private bool isSetAsInput = false;`
`214`	`215`	`/// <summary>`
`215`	`216`	`/// This property is user-controllable via a checkbox and is set to true when a user wishes to include`
`216`	`217`	`/// this node in a Customizer as an interactive control.`
`@@ -228,7 +229,11 @@ public bool IsSetAsInput`
`228`	`229`
`229`	`230`	`set`
`230`	`231`	`{`
`231`		`- isSetAsInput = value;`
	`232`	`+ if (isSetAsInput != value)`
	`233`	`+ {`
	`234`	`+ isSetAsInput = value;`
	`235`	`+ RaisePropertyChanged(nameof(IsSetAsInput));`
	`236`	`+ }`
`232`	`237`	`}`
`233`	`238`	`}`
`234`	`239`
`@@ -246,8 +251,6 @@ public virtual bool IsOutputNode`
`246`	`251`	`}`
`247`	`252`	`}`
`248`	`253`
`249`		`- private bool isSetAsOutput = false;`
`250`		`-`
`251`	`254`	`/// <summary>`
`252`	`255`	`/// This property is user-controllable via a checkbox and is set to true when a user wishes to include`
`253`	`256`	`/// this node in the OutputData block of the Dyn file.`
`@@ -265,7 +268,11 @@ public bool IsSetAsOutput`
`265`	`268`
`266`	`269`	`set`
`267`	`270`	`{`
`268`		`- isSetAsOutput = value;`
	`271`	`+ if (isSetAsOutput != value)`
	`272`	`+ {`
	`273`	`+ isSetAsOutput = value;`
	`274`	`+ RaisePropertyChanged(nameof(IsSetAsOutput));`
	`275`	`+ }`
`269`	`276`	`}`
`270`	`277`	`}`
`271`	`278`
Original file line number	Diff line number	Diff line change
`@@ -237,6 +237,14 @@ void NodeLogic_PropertyChanged(object sender, System.ComponentModel.PropertyChan`
`237`	`237`	`case "CachedValue":`
`238`	`238`	`CachedValueChanged();`
`239`	`239`	`break;`
	`240`	`+`
	`241`	`+ case "IsSetAsInput":`
	`242`	`+ (this.DataContext as NodeViewModel).DynamoViewModel.CurrentSpace.HasUnsavedChanges = true;`
	`243`	`+ break;`
	`244`	`+`
	`245`	`+ case "IsSetAsOutput":`
	`246`	`+ (this.DataContext as NodeViewModel).DynamoViewModel.CurrentSpace.HasUnsavedChanges = true;`
	`247`	`+ break;`
`240`	`248`	`}`
`241`	`249`	`}`
`242`	`250`