DYN-10313 - Python Port Copy Paste + Undo Redo Fixes (#17021)

johnpierson · claude · web-flow · commit ed026f7f51f8 · 2026-04-07T15:29:19.000-04:00
Co-authored-by: Claude &lt;claude@users.noreply.github.com&gt;
Co-authored-by: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/src/DynamoCore/Graph/Nodes/PortModel.cs b/src/DynamoCore/Graph/Nodes/PortModel.cs
@@ -38,6 +38,7 @@ public class PortModel : ModelBase, IEquatable<PortModel>
         private bool keepListStructure = false;
         private int level = 1;
         private string toolTip;
+        private string name;
 
         #endregion
 
@@ -74,8 +75,15 @@ public ObservableCollection<ConnectorModel> Connectors
         /// </summary>
         public string Name
         {
-            get;
-            internal set;
+            get => name;
+            internal set
+            {
+                if (name != value)
+                {
+                    name = value;
+                    RaisePropertyChanged(nameof(Name));
+                }
+            }
         }
 
         /// <summary>
diff --git a/src/DynamoCoreWpf/ViewModels/Core/InPortViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/InPortViewModel.cs
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
@@ -9,7 +7,6 @@
 using Dynamo.UI;
 using Dynamo.UI.Commands;
 using ProtoCore.Utils;
-using UI.Prompts;
 
 namespace Dynamo.ViewModels
 {
@@ -20,7 +17,7 @@ public partial class InPortViewModel : PortViewModel
         private DelegateCommand useLevelsCommand;
         private DelegateCommand keepListStructureCommand;
         private DelegateCommand portMouseLeftButtonOnLevelCommand;
-        private DelegateCommand editPortPropertiesCommand;
+
 
         private bool showUseLevelMenu;
         private bool isPythonNodePort;
@@ -306,53 +303,6 @@ private void ChangeLevel(int level)
             }
         }
 
-        /// <summary>
-        /// Used by the 'Edit Port Properties' button in the node output context menu.
-        /// Triggers the Port Properties Panel
-        /// </summary>
-        public DelegateCommand EditPortPropertiesCommand
-        {
-            get
-            {
-                return editPortPropertiesCommand ??
-                       (editPortPropertiesCommand = new DelegateCommand(EditPortProperties));
-            }
-        }
-        /// <summary>
-        /// Used by the 'Edit Port Properties' button in the node output context menu.
-        /// Triggers the Port Properties Panel
-        /// </summary>
-        private void EditPortProperties(object parameter)
-        {
-            var wsViewModel = node.WorkspaceViewModel;
-
-            // Hide the popup, we no longer need it
-            wsViewModel.OnRequestPortContextMenu(ShowHideFlags.Show, this);
-
-            var dialog = new PortPropertiesEditPrompt()
-            {
-                DescriptionInput = { Text = port.ToolTip },
-                nameBox = { Text = port.Name },
-                PortType = PortType.Output,
-                OutPortNames = ListOutportNames(this.NodeViewModel.InPorts),
-            };
-
-            if (dialog.ShowDialog() != true)
-            {
-                return;
-            }
-
-            port.Name = dialog.PortName;
-            port.ToolTip = dialog.Description;
-
-            RaisePropertyChanged(nameof(PortName));
-        }
-
-        private List<string> ListOutportNames(ObservableCollection<PortViewModel> outPorts)
-        {
-            return outPorts.Where(x => !x.PortName.Equals(this.PortName)).Select(x => x.PortName).ToList();
-        }
-
         /// <summary>
         /// Handles the Mouse left button down on the level.
         /// </summary>
diff --git a/src/DynamoCoreWpf/ViewModels/Core/OutPortViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/OutPortViewModel.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using System.Windows;
@@ -11,7 +9,6 @@
 using Dynamo.UI;
 using Dynamo.UI.Commands;
 using ProtoCore.Utils;
-using UI.Prompts;
 using Color = System.Windows.Media.Color;
 
 namespace Dynamo.ViewModels
@@ -22,7 +19,7 @@ public partial class OutPortViewModel : PortViewModel
 
         private DelegateCommand breakConnectionsCommand;
         private DelegateCommand hideConnectionsCommand;
-        private DelegateCommand editPortPropertiesCommand;
+
         private DelegateCommand portMouseLeftButtonOnContextCommand;
 
         private SolidColorBrush portValueMarkerColor = new SolidColorBrush(Color.FromArgb(255, 204, 204, 204));
@@ -278,19 +275,6 @@ public DelegateCommand HideConnectionsCommand
             get { return hideConnectionsCommand ?? (hideConnectionsCommand = new DelegateCommand(HideConnections)); }
         }
 
-        /// <summary>
-        /// Used by the 'Edit Port Properties' button in the node output context menu.
-        /// Triggers the Port Properties Panel
-        /// </summary>
-        public DelegateCommand EditPortPropertiesCommand
-        {
-            get
-            {
-                return editPortPropertiesCommand ??
-                       (editPortPropertiesCommand = new DelegateCommand(EditPortProperties)); 
-            }
-        }
-
         /// <summary>
         /// Used by the 'Break Connections' button in the node output context menu.
         /// Removes any current connections this port has.
@@ -340,41 +324,6 @@ private void HideConnections(object parameter)
             RefreshHideWiresState();
         }
 
-        /// <summary>
-        /// Used by the 'Edit Port Properties' button in the node output context menu.
-        /// Triggers the Port Properties Panel
-        /// </summary>
-        private void EditPortProperties(object parameter)
-        {
-            var wsViewModel = node.WorkspaceViewModel;
-
-            // Hide the popup, we no longer need it
-            wsViewModel.OnRequestPortContextMenu(ShowHideFlags.Show, this);
-
-            var dialog = new PortPropertiesEditPrompt()
-            {
-                DescriptionInput = { Text = port.ToolTip },
-                nameBox = { Text = port.Name },
-                PortType = PortType.Output,
-                OutPortNames = ListOutportNames(this.NodeViewModel.OutPorts),
-            };
-
-            if (dialog.ShowDialog() != true)
-            {
-                return;
-            }
-
-            port.Name = dialog.PortName;
-            port.ToolTip = dialog.Description;
-
-            RaisePropertyChanged(nameof(PortName));
-        }
-
-        private List<string> ListOutportNames(ObservableCollection<PortViewModel> outPorts)
-        {
-            return outPorts.Where(x => !x.PortName.Equals(this.PortName)).Select(x => x.PortName).ToList();
-        }
-
         /// <summary>
         /// Returns true if they are hidden.
         /// </summary>
diff --git a/src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/PortViewModel.cs
@@ -9,6 +9,7 @@
 using System.Windows.Threading;
 using Dynamo.Graph.Nodes;
 using Dynamo.Graph.Workspaces;
+using UI.Prompts;
 using Dynamo.Models;
 using Dynamo.Search.SearchElements;
 using Dynamo.UI.Commands;
@@ -27,6 +28,7 @@ public partial class PortViewModel : ViewModelBase
         protected readonly NodeViewModel node;
         private DelegateCommand useLevelsCommand;
         private DelegateCommand keepListStructureCommand;
+        private DelegateCommand editPortPropertiesCommand;
         private bool showUseLevelMenu;
         private const double autocompletePopupSpacing = 2.5;
         private const double proxyPortContextMenuOffset = 20;
@@ -500,7 +502,7 @@ private void PortPropertyChanged(object sender, System.ComponentModel.PropertyCh
                 case nameof(PortType):
                     RaisePropertyChanged(nameof(PortType));
                     break;
-                case nameof(PortName):
+                case nameof(PortModel.Name):
                     RaisePropertyChanged(nameof(PortName));
                     break;
                 case nameof(IsConnected):
@@ -740,5 +742,59 @@ private string GetPortDisplayName(string value)
             }
             return ">";
         }
+
+        /// <summary>
+        /// Used by the 'Edit Port Properties' button in the node port context menu.
+        /// Opens the Port Properties dialog to rename the port and edit its description.
+        /// </summary>
+        public DelegateCommand EditPortPropertiesCommand
+        {
+            get
+            {
+                return editPortPropertiesCommand ??
+                       (editPortPropertiesCommand = new DelegateCommand(EditPortProperties));
+            }
+        }
+
+        /// <summary>
+        /// Opens the Port Properties dialog and, on confirmation, records the owning node
+        /// for undo before applying the new name and description.
+        /// </summary>
+        private void EditPortProperties(object parameter)
+        {
+            var wsViewModel = node.WorkspaceViewModel;
+
+            // Hide the popup, we no longer need it
+            wsViewModel.OnRequestPortContextMenu(ShowHideFlags.Hide, this);
+
+            // Collect sibling port names (same port type) to prevent duplicates.
+            var siblingPorts = port.PortType == PortType.Input ? node.InPorts : node.OutPorts;
+
+            var dialog = new PortPropertiesEditPrompt()
+            {
+                DescriptionInput = { Text = port.ToolTip },
+                nameBox = { Text = port.Name },
+                PortType = port.PortType,
+                OutPortNames = siblingPorts.Where(p => !p.PortName.Equals(PortName))
+                                           .Select(p => p.PortName)
+                                           .ToList(),
+            };
+
+            if (dialog.ShowDialog() != true)
+            {
+                return;
+            }
+
+            var workspaceModel = node.WorkspaceViewModel.Model;
+            using (workspaceModel.UndoRecorder.BeginActionGroup())
+            {
+                WorkspaceModel.RecordModelForModification(port.Owner, workspaceModel.UndoRecorder);
+                port.Name = dialog.PortName;
+                port.ToolTip = dialog.Description;
+            }
+            workspaceModel.HasUnsavedChanges = true;
+
+            RaisePropertyChanged(nameof(PortName));
+        }
     }
 }
diff --git a/src/Libraries/PythonNodeModels/PythonNode.cs b/src/Libraries/PythonNodeModels/PythonNode.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -173,6 +174,88 @@ protected override bool UpdateValueCore(UpdateValueParams updateValueParams)
             return base.UpdateValueCore(updateValueParams);
         }
 
+        #region SerializeCore/DeserializeCore
+
+        /// <summary>
+        /// Preserves custom input and output port names and tooltips during XML serialization.
+        /// The base NodeModel serialization writes PortInfo elements for input ports;
+        /// this override adds "portName" and "portToolTip" attributes to each of those
+        /// elements and appends OutPortInfo elements for output ports.
+        /// These fields are emitted and consumed for all SaveContext values (Copy, Undo, Save, etc.).
+        /// </summary>
+        protected override void SerializeCore(XmlElement element, SaveContext context)
+        {
+            base.SerializeCore(element, context);
+
+            // Add portName and portToolTip attributes to each PortInfo element written by NodeModel.SerializeCore.
+            foreach (XmlNode child in element.ChildNodes)
+            {
+                if (child.Name == "PortInfo" && child is XmlElement portInfo)
+                {
+                    var indexAttr = portInfo.GetAttribute("index");
+                    if (int.TryParse(indexAttr, NumberStyles.Integer, CultureInfo.InvariantCulture, out int index)
+                        && index >= 0 && index < InPorts.Count)
+                    {
+                        portInfo.SetAttribute("portName", InPorts[index].Name);
+                        portInfo.SetAttribute("portToolTip", InPorts[index].ToolTip);
+                    }
+                }
+            }
+
+            // Write output port names and tooltips as separate elements (NodeModel does not serialize output PortInfo).
+            for (int i = 0; i < OutPorts.Count; i++)
+            {
+                XmlElement outPortInfo = element.OwnerDocument.CreateElement("OutPortInfo");
+                outPortInfo.SetAttribute("index", i.ToString(CultureInfo.InvariantCulture));
+                outPortInfo.SetAttribute("portName", OutPorts[i].Name);
+                outPortInfo.SetAttribute("portToolTip", OutPorts[i].ToolTip);
+                element.AppendChild(outPortInfo);
+            }
+        }
+
+        /// <summary>
+        /// Restores custom input and output port names after base deserialization has
+        /// recreated the ports with their default names.
+        /// </summary>
+        protected override void DeserializeCore(XmlElement nodeElement, SaveContext context)
+        {
+            base.DeserializeCore(nodeElement, context);
+
+            // After base.DeserializeCore, all ports exist with default names and tooltips.
+            // Re-apply any custom values that were serialized.
+            foreach (XmlNode child in nodeElement.ChildNodes)
+            {
+                if (child.Name == "PortInfo" && child is XmlElement portInfo)
+                {
+                    var indexAttr = portInfo.GetAttribute("index");
+                    if (int.TryParse(indexAttr, NumberStyles.Integer, CultureInfo.InvariantCulture, out int index)
+                        && index >= 0 && index < InPorts.Count)
+                    {
+                        if (portInfo.HasAttribute("portName"))
+                            InPorts[index].Name = portInfo.GetAttribute("portName");
+
+                        if (portInfo.HasAttribute("portToolTip"))
+                            InPorts[index].ToolTip = portInfo.GetAttribute("portToolTip");
+                    }
+                }
+                else if (child.Name == "OutPortInfo" && child is XmlElement outPortInfo)
+                {
+                    var indexAttr = outPortInfo.GetAttribute("index");
+                    if (int.TryParse(indexAttr, NumberStyles.Integer, CultureInfo.InvariantCulture, out int outIndex)
+                        && outIndex >= 0 && outIndex < OutPorts.Count)
+                    {
+                        if (outPortInfo.HasAttribute("portName"))
+                            OutPorts[outIndex].Name = outPortInfo.GetAttribute("portName");
+
+                        if (outPortInfo.HasAttribute("portToolTip"))
+                            OutPorts[outIndex].ToolTip = outPortInfo.GetAttribute("portToolTip");
+                    }
+                }
+            }
+        }
+
+        #endregion
+
     }
 
     [NodeName("Python Script")]
diff --git a/test/Libraries/DynamoPythonTests/PythonEditTests.cs b/test/Libraries/DynamoPythonTests/PythonEditTests.cs
