Python engine property should copy/paste and undo correctly. (#11006)

mjkkirschner · web-flow · commit 3a355399491c · 2020-08-17T17:20:01.000-04:00
merging this in and will cp to 2.8
diff --git a/src/DynamoCore/Graph/Nodes/NodeModel.cs b/src/DynamoCore/Graph/Nodes/NodeModel.cs
@@ -2094,6 +2094,30 @@ protected override bool UpdateValueCore(UpdateValueParams updateValueParams)
                         }
                     }
                     return true;
+
+                case nameof(DisplayLabels):
+                    bool newDisplayLabels;
+                    if (bool.TryParse(value, out newDisplayLabels))
+                    {
+                        DisplayLabels = newDisplayLabels;
+                    }
+                    return true;
+
+                case nameof(IsSetAsInput):
+                    bool newIsSetAsInput;
+                    if (bool.TryParse(value, out newIsSetAsInput))
+                    {
+                        IsSetAsInput = newIsSetAsInput;
+                    }
+                    return true;
+
+                case nameof(IsSetAsOutput):
+                    bool newIsSetAsOutput;
+                    if (bool.TryParse(value, out newIsSetAsOutput))
+                    {
+                        IsSetAsOutput = newIsSetAsOutput;
+                    }
+                    return true;
             }
 
             return base.UpdateValueCore(updateValueParams);
@@ -2143,6 +2167,7 @@ protected override void SerializeCore(XmlElement element, SaveContext context)
             helper.SetAttribute("x", X);
             helper.SetAttribute("y", Y);
             helper.SetAttribute("isVisible", IsVisible);
+            helper.SetAttribute(nameof(DisplayLabels), DisplayLabels);
             helper.SetAttribute("lacing", ArgumentLacing.ToString());
             helper.SetAttribute("isSelectedInput", IsSetAsInput.ToString());
             helper.SetAttribute("isSelectedOutput", IsSetAsOutput.ToString());
@@ -2201,6 +2226,7 @@ protected override void DeserializeCore(XmlElement nodeElement, SaveContext cont
             X = helper.ReadDouble("x", 0.0);
             Y = helper.ReadDouble("y", 0.0);
             isVisible = helper.ReadBoolean("isVisible", true);
+            displayLabels = helper.ReadBoolean(nameof(DisplayLabels), false);
             argumentLacing = helper.ReadEnum("lacing", LacingStrategy.Disabled);
             IsSetAsInput = helper.ReadBoolean("isSelectedInput", false);
             IsSetAsOutput = helper.ReadBoolean("isSelectedOutput", false);
diff --git a/src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs
@@ -162,8 +162,10 @@ public bool IsSetAsInput
             {
                 if (nodeLogic.IsSetAsInput != value)
                 {
-                    nodeLogic.IsSetAsInput = value;
-                    RaisePropertyChanged("IsSetAsInput");
+                    DynamoViewModel.ExecuteCommand(new DynamoModel.UpdateModelValueCommand(
+                        Guid.Empty, NodeModel.GUID, nameof(IsSetAsInput), value.ToString()));
+
+                    RaisePropertyChanged(nameof(IsSetAsInput));
                 }
             }
         }
@@ -187,8 +189,10 @@ public bool IsSetAsOutput
             {
                 if (nodeLogic.IsSetAsOutput != value)
                 {
-                    nodeLogic.IsSetAsOutput = value;
-                    RaisePropertyChanged("IsSetAsOutput");
+                    DynamoViewModel.ExecuteCommand(new DynamoModel.UpdateModelValueCommand(
+                        Guid.Empty, NodeModel.GUID, nameof(IsSetAsOutput), value.ToString()));
+
+                    RaisePropertyChanged(nameof(IsSetAsOutput));
                 }
             }
         }
@@ -198,10 +202,10 @@ public bool IsSetAsOutput
         /// </summary>
         public string Name
         {
-            get 
+            get
             {
                 IsRenamed = OriginalName != nodeLogic.Name;
-                return nodeLogic.Name; 
+                return nodeLogic.Name;
             }
             set { nodeLogic.Name = value; }
         }
@@ -324,7 +328,7 @@ public bool IsVisible
             }
         }
 
-    
+
         [JsonIgnore]
         public Visibility PeriodicUpdateVisibility
         {
@@ -370,8 +374,13 @@ public bool IsDisplayingLabels
             get { return nodeLogic.DisplayLabels; }
             set
             {
-                nodeLogic.DisplayLabels = value;
-                RaisePropertyChanged("IsDisplayingLabels");
+                if (nodeLogic.DisplayLabels != value)
+                {
+                    DynamoViewModel.ExecuteCommand(new DynamoModel.UpdateModelValueCommand(
+                    Guid.Empty, NodeModel.GUID, nameof(nodeLogic.DisplayLabels), value.ToString()));
+
+                    RaisePropertyChanged(nameof(IsDisplayingLabels));
+                }
             }
         }
 
@@ -897,7 +906,7 @@ private void SetLacingType(object param)
         {
             DynamoViewModel.ExecuteCommand(
                 new DynamoModel.UpdateModelValueCommand(
-                    Guid.Empty, NodeModel.GUID, "ArgumentLacing", param.ToString()));
+                    Guid.Empty, NodeModel.GUID, nameof(ArgumentLacing), param.ToString()));
 
             DynamoViewModel.RaiseCanExecuteUndoRedo();
         }
diff --git a/src/Libraries/PythonNodeModels/PythonNode.cs b/src/Libraries/PythonNodeModels/PythonNode.cs
@@ -109,6 +109,24 @@ internal void RequestCodeMigration(EventArgs e)
             MigrationAssistantRequested?.Invoke(this, e);
         }
 
+        protected override bool UpdateValueCore(UpdateValueParams updateValueParams)
+        {
+            string name = updateValueParams.PropertyName;
+            string value = updateValueParams.PropertyValue;
+
+            if (name == nameof(Engine))
+            {
+                PythonEngineVersion result;
+                if (Enum.TryParse<PythonEngineVersion>(value, out result))
+                {
+                    Engine = result;
+                    return true;
+                }
+
+            }
+            return base.UpdateValueCore(updateValueParams);
+        }
+
     }
 
     [NodeName("Python Script")]
@@ -252,6 +270,10 @@ protected override void SerializeCore(XmlElement element, SaveContext context)
             XmlElement script = element.OwnerDocument.CreateElement("Script");
             script.InnerText = this.script;
             element.AppendChild(script);
+            XmlElement engine = element.OwnerDocument.CreateElement(nameof(Engine));
+            engine.InnerText = Enum.GetName(typeof(PythonEngineVersion), Engine);
+            element.AppendChild(engine);
+
         }
 
         [Obsolete]
@@ -266,6 +288,13 @@ protected override void DeserializeCore(XmlElement nodeElement, SaveContext cont
             {
                 script = scriptNode.InnerText;
             }
+            var engineNode =
+              nodeElement.ChildNodes.Cast<XmlNode>().FirstOrDefault(x => x.Name == nameof(Engine));
+
+            if (engineNode != null)
+            {
+                this.Engine = (PythonEngineVersion)Enum.Parse(typeof(PythonEngineVersion),engineNode.InnerText);
+            }
         }
 
         #endregion
diff --git a/src/Libraries/PythonNodeModelsWpf/PythonNode.cs b/src/Libraries/PythonNodeModelsWpf/PythonNode.cs
@@ -5,6 +5,7 @@
 using System.Windows.Input;
 using Dynamo.Controls;
 using Dynamo.Graph.Workspaces;
+using Dynamo.Models;
 using Dynamo.ViewModels;
 using Dynamo.Wpf;
 using Dynamo.Wpf.Windows;
@@ -156,7 +157,9 @@ private void EditScriptContent(object sender, EventArgs e)
         /// </summary>
         private void UpdateToPython2Engine(object sender, EventArgs e)
         {
-            pythonNodeModel.Engine = PythonEngineVersion.IronPython2;
+            dynamoViewModel.ExecuteCommand(
+            new DynamoModel.UpdateModelValueCommand(
+                Guid.Empty, pythonNodeModel.GUID, nameof(pythonNodeModel.Engine), PythonEngineVersion.IronPython2.ToString()));
             pythonNodeModel.OnNodeModified();
         }
 
@@ -165,7 +168,9 @@ private void UpdateToPython2Engine(object sender, EventArgs e)
         /// </summary>
         private void UpdateToPython3Engine(object sender, EventArgs e)
         {
-            pythonNodeModel.Engine = PythonEngineVersion.CPython3;
+            dynamoViewModel.ExecuteCommand(
+           new DynamoModel.UpdateModelValueCommand(
+               Guid.Empty, pythonNodeModel.GUID, nameof(pythonNodeModel.Engine), PythonEngineVersion.CPython3.ToString()));
             pythonNodeModel.OnNodeModified();
         }
     }
diff --git a/src/Libraries/PythonNodeModelsWpf/PythonStringNode.cs b/src/Libraries/PythonNodeModelsWpf/PythonStringNode.cs
@@ -3,6 +3,7 @@
 using System.Windows.Controls;
 using System.Windows.Data;
 using Dynamo.Controls;
+using Dynamo.Models;
 using Dynamo.ViewModels;
 using Dynamo.Wpf;
 using PythonNodeModels;
@@ -65,15 +66,6 @@ private void NodeModel_Disposed(Dynamo.Graph.ModelBase obj)
             learnMoreItem.Click -= OpenPythonLearningMaterial;
         }
 
-        /// <summary>
-        /// MenuItem click handler
-        /// </summary>
-        private void UpdateToPython2Engine(object sender, EventArgs e)
-        {
-            pythonStringNodeModel.Engine = PythonEngineVersion.IronPython2;
-            pythonStringNodeModel.OnNodeModified();
-        }
-
         /// <summary>
         /// Learn More button handler
         /// </summary>
@@ -85,12 +77,25 @@ private void OpenPythonLearningMaterial(object sender, RoutedEventArgs e)
                 new Uri(PythonNodeModels.Properties.Resources.PythonMigrationWarningUriString, UriKind.Relative)));
         }
 
+        /// <summary>
+        /// MenuItem click handler
+        /// </summary>
+        private void UpdateToPython2Engine(object sender, EventArgs e)
+        {
+            dynamoViewModel.ExecuteCommand(
+          new DynamoModel.UpdateModelValueCommand(
+              Guid.Empty, pythonStringNodeModel.GUID, nameof(pythonStringNodeModel.Engine), PythonEngineVersion.IronPython2.ToString()));
+            pythonStringNodeModel.OnNodeModified();
+        }
+
         /// <summary>
         /// MenuItem click handler
         /// </summary>
         private void UpdateToPython3Engine(object sender, EventArgs e)
         {
-            pythonStringNodeModel.Engine = PythonEngineVersion.CPython3;
+            dynamoViewModel.ExecuteCommand(
+        new DynamoModel.UpdateModelValueCommand(
+            Guid.Empty, pythonStringNodeModel.GUID, nameof(pythonStringNodeModel.Engine), PythonEngineVersion.CPython3.ToString()));
             pythonStringNodeModel.OnNodeModified();
         }
     }
diff --git a/test/DynamoCoreTests/CoreTests.cs b/test/DynamoCoreTests/CoreTests.cs
@@ -388,7 +388,112 @@ public void CanAdd100NodesToClipboardAndPaste()
 
         [Test]
         [Category("UnitTests")]
-        public void CanCopydAndPasteNodeWithRightOffset()
+        public void CanCopyAndPasteAndUndoShowLabels()
+        {
+            var addNode = new DSFunction(CurrentDynamoModel.LibraryServices.GetFunctionDescriptor("+"));
+         
+            CurrentDynamoModel.CurrentWorkspace.AddAndRegisterNode(addNode, false);
+            Assert.AreEqual(1, CurrentDynamoModel.CurrentWorkspace.Nodes.Count());
+
+            addNode.DisplayLabels = true;
+            CurrentDynamoModel.AddToSelection(addNode);
+            Assert.AreEqual(1, DynamoSelection.Instance.Selection.Count);
+
+            CurrentDynamoModel.Copy();
+            Assert.AreEqual(1, CurrentDynamoModel.ClipBoard.Count);
+
+            CurrentDynamoModel.Paste();
+            Assert.AreEqual(2, CurrentDynamoModel.CurrentWorkspace.Nodes.Count());
+
+            Assert.IsTrue(CurrentDynamoModel.CurrentWorkspace.Nodes.All(x => x.DisplayLabels));
+
+            CurrentDynamoModel.CurrentWorkspace.Undo();
+            Assert.AreEqual(1, CurrentDynamoModel.CurrentWorkspace.Nodes.Count());
+            addNode.DisplayLabels = false;
+
+            CurrentDynamoModel.ExecuteCommand(
+                 new DynCmd.UpdateModelValueCommand(
+                     Guid.Empty, addNode.GUID, nameof(NodeModel.DisplayLabels), "true"));
+           Assert.IsTrue(addNode.DisplayLabels);
+
+            CurrentDynamoModel.CurrentWorkspace.Undo();
+
+            Assert.IsFalse(addNode.DisplayLabels);
+        }
+
+        [Test]
+        [Category("UnitTests")]
+        public void CanCopyAndPasteAndUndoInputState()
+        {
+            var numberNode = new DoubleInput();
+
+            CurrentDynamoModel.CurrentWorkspace.AddAndRegisterNode(numberNode, false);
+            Assert.AreEqual(1, CurrentDynamoModel.CurrentWorkspace.Nodes.Count());
+
+            numberNode.IsSetAsInput = true;
+            CurrentDynamoModel.AddToSelection(numberNode);
+            Assert.AreEqual(1, DynamoSelection.Instance.Selection.Count);
+
+            CurrentDynamoModel.Copy();
+            Assert.AreEqual(1, CurrentDynamoModel.ClipBoard.Count);
+
+            CurrentDynamoModel.Paste();
+            Assert.AreEqual(2, CurrentDynamoModel.CurrentWorkspace.Nodes.Count());
+
+            Assert.IsTrue(CurrentDynamoModel.CurrentWorkspace.Nodes.All(x => x.IsSetAsInput));
+
+            CurrentDynamoModel.CurrentWorkspace.Undo();
+            Assert.AreEqual(1, CurrentDynamoModel.CurrentWorkspace.Nodes.Count());
+            numberNode.IsSetAsInput = false;
+
+            CurrentDynamoModel.ExecuteCommand(
+                 new DynCmd.UpdateModelValueCommand(
+                     Guid.Empty, numberNode.GUID, nameof(NodeModel.IsSetAsInput), "true"));
+            Assert.IsTrue(numberNode.IsSetAsInput);
+
+            CurrentDynamoModel.CurrentWorkspace.Undo();
+
+            Assert.IsFalse(numberNode.IsSetAsInput);
+        }
+
+        [Test]
+        [Category("UnitTests")]
+        public void CanCopyAndPasteAndUndoOutputState()
+        {
+            var addNode = new DSFunction(CurrentDynamoModel.LibraryServices.GetFunctionDescriptor("+"));
+
+            CurrentDynamoModel.CurrentWorkspace.AddAndRegisterNode(addNode, false);
+            Assert.AreEqual(1, CurrentDynamoModel.CurrentWorkspace.Nodes.Count());
+
+            addNode.IsSetAsOutput = true;
+            CurrentDynamoModel.AddToSelection(addNode);
+            Assert.AreEqual(1, DynamoSelection.Instance.Selection.Count);
+
+            CurrentDynamoModel.Copy();
+            Assert.AreEqual(1, CurrentDynamoModel.ClipBoard.Count);
+
+            CurrentDynamoModel.Paste();
+            Assert.AreEqual(2, CurrentDynamoModel.CurrentWorkspace.Nodes.Count());
+
+            Assert.IsTrue(CurrentDynamoModel.CurrentWorkspace.Nodes.All(x => x.IsSetAsOutput));
+
+            CurrentDynamoModel.CurrentWorkspace.Undo();
+            Assert.AreEqual(1, CurrentDynamoModel.CurrentWorkspace.Nodes.Count());
+            addNode.IsSetAsOutput = false;
+
+            CurrentDynamoModel.ExecuteCommand(
+                 new DynCmd.UpdateModelValueCommand(
+                     Guid.Empty, addNode.GUID, nameof(NodeModel.IsSetAsOutput), "true"));
+            Assert.IsTrue(addNode.IsSetAsOutput);
+
+            CurrentDynamoModel.CurrentWorkspace.Undo();
+
+            Assert.IsFalse(addNode.IsSetAsOutput);
+        }
+
+        [Test]
+        [Category("UnitTests")]
+        public void CanCopyAndPasteNodeWithRightOffset()
         {
             var addNode = new DSFunction(CurrentDynamoModel.LibraryServices.GetFunctionDescriptor("+"));
             addNode.Height = 2;
@@ -414,7 +519,7 @@ public void CanCopydAndPasteNodeWithRightOffset()
 
         [Test]
         [Category("UnitTests")]
-        public void CanCopydAndPaste2NodesWithRightOffset()
+        public void CanCopyAndPaste2NodesWithRightOffset()
         {
             var addNode = new DSFunction(CurrentDynamoModel.LibraryServices.GetFunctionDescriptor("+"));
             addNode.Height = 2;
diff --git a/test/DynamoCoreWpfTests/PythonNodeCustomizationTests.cs b/test/DynamoCoreWpfTests/PythonNodeCustomizationTests.cs
diff --git a/test/Libraries/DynamoPythonTests/PythonEngineSelectorTests.cs b/test/Libraries/DynamoPythonTests/PythonEngineSelectorTests.cs

Original file line number	Diff line number	Diff line change
`@@ -162,8 +162,10 @@ public bool IsSetAsInput`
`162`	`162`	`{`
`163`	`163`	`if (nodeLogic.IsSetAsInput != value)`
`164`	`164`	`{`
`165`		`- nodeLogic.IsSetAsInput = value;`
`166`		`- RaisePropertyChanged("IsSetAsInput");`
	`165`	`+ DynamoViewModel.ExecuteCommand(new DynamoModel.UpdateModelValueCommand(`
	`166`	`+ Guid.Empty, NodeModel.GUID, nameof(IsSetAsInput), value.ToString()));`
	`167`	`+`
	`168`	`+ RaisePropertyChanged(nameof(IsSetAsInput));`
`167`	`169`	`}`
`168`	`170`	`}`
`169`	`171`	`}`
`@@ -187,8 +189,10 @@ public bool IsSetAsOutput`
`187`	`189`	`{`
`188`	`190`	`if (nodeLogic.IsSetAsOutput != value)`
`189`	`191`	`{`
`190`		`- nodeLogic.IsSetAsOutput = value;`
`191`		`- RaisePropertyChanged("IsSetAsOutput");`
	`192`	`+ DynamoViewModel.ExecuteCommand(new DynamoModel.UpdateModelValueCommand(`
	`193`	`+ Guid.Empty, NodeModel.GUID, nameof(IsSetAsOutput), value.ToString()));`
	`194`	`+`
	`195`	`+ RaisePropertyChanged(nameof(IsSetAsOutput));`
`192`	`196`	`}`
`193`	`197`	`}`
`194`	`198`	`}`
`@@ -198,10 +202,10 @@ public bool IsSetAsOutput`
`198`	`202`	`/// </summary>`
`199`	`203`	`public string Name`
`200`	`204`	`{`
`201`		`- get`
	`205`	`+ get`
`202`	`206`	`{`
`203`	`207`	`IsRenamed = OriginalName != nodeLogic.Name;`
`204`		`- return nodeLogic.Name;`
	`208`	`+ return nodeLogic.Name;`
`205`	`209`	`}`
`206`	`210`	`set { nodeLogic.Name = value; }`
`207`	`211`	`}`
`@@ -324,7 +328,7 @@ public bool IsVisible`
`324`	`328`	`}`
`325`	`329`	`}`
`326`	`330`
`327`		`-`
	`331`	`+`
`328`	`332`	`[JsonIgnore]`
`329`	`333`	`public Visibility PeriodicUpdateVisibility`
`330`	`334`	`{`
`@@ -370,8 +374,13 @@ public bool IsDisplayingLabels`
`370`	`374`	`get { return nodeLogic.DisplayLabels; }`
`371`	`375`	`set`
`372`	`376`	`{`
`373`		`- nodeLogic.DisplayLabels = value;`
`374`		`- RaisePropertyChanged("IsDisplayingLabels");`
	`377`	`+ if (nodeLogic.DisplayLabels != value)`
	`378`	`+ {`
	`379`	`+ DynamoViewModel.ExecuteCommand(new DynamoModel.UpdateModelValueCommand(`
	`380`	`+ Guid.Empty, NodeModel.GUID, nameof(nodeLogic.DisplayLabels), value.ToString()));`
	`381`	`+`
	`382`	`+ RaisePropertyChanged(nameof(IsDisplayingLabels));`
	`383`	`+ }`
`375`	`384`	`}`
`376`	`385`	`}`
`377`	`386`
`@@ -897,7 +906,7 @@ private void SetLacingType(object param)`
`897`	`906`	`{`
`898`	`907`	`DynamoViewModel.ExecuteCommand(`
`899`	`908`	`new DynamoModel.UpdateModelValueCommand(`
`900`		`- Guid.Empty, NodeModel.GUID, "ArgumentLacing", param.ToString()));`
	`909`	`+ Guid.Empty, NodeModel.GUID, nameof(ArgumentLacing), param.ToString()));`
`901`	`910`
`902`	`911`	`DynamoViewModel.RaiseCanExecuteUndoRedo();`
`903`	`912`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using System.Windows.Input;`
`6`	`6`	`using Dynamo.Controls;`
`7`	`7`	`using Dynamo.Graph.Workspaces;`
	`8`	`+using Dynamo.Models;`
`8`	`9`	`using Dynamo.ViewModels;`
`9`	`10`	`using Dynamo.Wpf;`
`10`	`11`	`using Dynamo.Wpf.Windows;`
`@@ -156,7 +157,9 @@ private void EditScriptContent(object sender, EventArgs e)`
`156`	`157`	`/// </summary>`
`157`	`158`	`private void UpdateToPython2Engine(object sender, EventArgs e)`
`158`	`159`	`{`
`159`		`- pythonNodeModel.Engine = PythonEngineVersion.IronPython2;`
	`160`	`+ dynamoViewModel.ExecuteCommand(`
	`161`	`+ new DynamoModel.UpdateModelValueCommand(`
	`162`	`+ Guid.Empty, pythonNodeModel.GUID, nameof(pythonNodeModel.Engine), PythonEngineVersion.IronPython2.ToString()));`
`160`	`163`	`pythonNodeModel.OnNodeModified();`
`161`	`164`	`}`
`162`	`165`
`@@ -165,7 +168,9 @@ private void UpdateToPython2Engine(object sender, EventArgs e)`
`165`	`168`	`/// </summary>`
`166`	`169`	`private void UpdateToPython3Engine(object sender, EventArgs e)`
`167`	`170`	`{`
`168`		`- pythonNodeModel.Engine = PythonEngineVersion.CPython3;`
	`171`	`+ dynamoViewModel.ExecuteCommand(`
	`172`	`+ new DynamoModel.UpdateModelValueCommand(`
	`173`	`+ Guid.Empty, pythonNodeModel.GUID, nameof(pythonNodeModel.Engine), PythonEngineVersion.CPython3.ToString()));`
`169`	`174`	`pythonNodeModel.OnNodeModified();`
`170`	`175`	`}`
`171`	`176`	`}`