DYN-9107: Make Undo Redo Work As Expected (#16366)

johnpierson · Copilot · web-flow · commit 352a23bae239 · 2025-07-11T11:32:09.000-06:00
Co-authored-by: Copilot &lt;175728472+Copilot@users.noreply.github.com&gt;
diff --git a/src/DynamoCore/Graph/Workspaces/UndoRedo.cs b/src/DynamoCore/Graph/Workspaces/UndoRedo.cs
@@ -37,7 +37,7 @@ public bool CanUndo
         {
             get
             {
-                return (null != undoRecorder && undoRecorder.CanUndo) && !IsUndoRedoLocked;
+                return (null != undoRecorder && undoRecorder.CanUndo);
             }
         }
 
@@ -48,16 +48,10 @@ public bool CanRedo
         {
             get
             {
-                return (null != undoRecorder && undoRecorder.CanRedo) && !IsUndoRedoLocked;
+                return (null != undoRecorder && undoRecorder.CanRedo);
             }
         }
 
-        internal bool IsUndoRedoLocked
-        {
-            get;
-            set;
-        }
-
         internal void Undo()
         {
             if (null != undoRecorder)
diff --git a/src/DynamoCore/Models/DynamoModelCommands.cs b/src/DynamoCore/Models/DynamoModelCommands.cs
@@ -38,7 +38,7 @@ public void ExecuteCommand(RecordableCommand command)
             if (CommandCompleted != null)
                 CommandCompleted(command);
         }
-        
+
         private PortModel[] activeStartPorts;
         private PortModel firstStartPort;
 
diff --git a/src/NodeAutoCompleteViewExtension/ViewModels/NodeAutoCompleteBarViewModel.cs b/src/NodeAutoCompleteViewExtension/ViewModels/NodeAutoCompleteBarViewModel.cs
@@ -317,16 +317,8 @@ internal void ConsolidateTransientNodes()
 
             (node.WorkspaceViewModel.Model as HomeWorkspaceModel)?.MarkNodesAsModifiedAndRequestRun(transientNodes.Select(x => x.NodeModel));
 
-            ToggleUndoRedoLocked(false);
-        }
-
-        internal void ToggleUndoRedoLocked(bool toggle = true)
-        {
-            var node = PortViewModel.NodeViewModel;
-            //unlock undo/redo
-            node.WorkspaceViewModel.Model.IsUndoRedoLocked = toggle;
-            //allow for undo/redo again
-            node.DynamoViewModel.RaiseCanExecuteUndoRedo();
+            //add the new items to the undo recorder (this ensures the elements are valid at this point in time before any other manipulation occurs)
+            DynamoModel.RecordUndoModels(node.WorkspaceViewModel.Model, createdClusterItems);
         }
 
         /// <summary>
@@ -803,13 +795,24 @@ internal void DeleteTransientNodes()
             var wsViewModel = node.WorkspaceViewModel;
 
             var transientNodes = wsViewModel.Nodes.Where(x => x.IsTransient).ToList();
+            var transientConnectors = wsViewModel.Connectors.Where(c => c.IsTransient).ToList();
+
+            if (transientConnectors.Any())
+            {
+                foreach (var connector in transientConnectors)
+                {
+                    connector.ConnectorModel.Delete();
+                    connector.ConnectorModel.Dispose();
+                    wsViewModel.Connectors.Remove(connector);
+                }
+            }
+
             if (transientNodes.Any())
             {
-                dynamoViewModel.Model.ExecuteCommand(new DynamoModel.DeleteModelCommand(transientNodes.Select(x => x.Id), true));
-                //remove the deletion of the elements from the undo stack
-                wsViewModel.Model.UndoRecorder.PopFromUndoGroup();
-                //remove the layout of the elements from the undo stack
-                wsViewModel.Model.UndoRecorder.PopFromUndoGroup();
+                foreach (var transientNode in transientNodes)
+                {
+                    wsViewModel.Model.RemoveAndDisposeNode(transientNode.NodeModel);
+                }
             }
         }
 
@@ -826,8 +829,11 @@ internal void AddCluster(int filterredIndex)
         }
 
         // Add Cluster from server result into the workspace
+        private List<ModelBase> createdClusterItems = new List<ModelBase>();
         internal void AddCluster(ClusterResultItem clusterResultItem)
         {
+            createdClusterItems.Clear();
+
             if (clusterResultItem == null || clusterResultItem.Topology == null)
                 return;
             var nextCluster = JsonConvert.SerializeObject(clusterResultItem);
@@ -837,16 +843,11 @@ internal void AddCluster(ClusterResultItem clusterResultItem)
             }
             lastSerializedAddedCluster = nextCluster;
 
-            List<ModelBase> createdClusterItems = new List<ModelBase>();
-
             var workspaceViewModel = PortViewModel.NodeViewModel.WorkspaceViewModel;
             var workspaceModel = workspaceViewModel.Model;
             var dynamoModel = PortViewModel.NodeViewModel.DynamoViewModel.Model;
             var entryNodeId = clusterResultItem.Topology.Nodes.ElementAtOrDefault(clusterResultItem.EntryNodeIndex)?.Id;
 
-            // Lock undo/redo
-            ToggleUndoRedoLocked(true);
-
             // Delete any existing transient nodes
             DeleteTransientNodes();
 
@@ -866,7 +867,7 @@ internal void AddCluster(ClusterResultItem clusterResultItem)
                     var typeInfo = new NodeModelTypeId(nodeItem.Type.Id);
 
                     NodeModel newNode = dynamoModel.CreateNodeFromNameOrType(Guid.NewGuid(), typeInfo.FullName, true);
-
+                    
                     if (newNode != null)
                     {
                         newNode.X = offset; // Adjust X position
@@ -950,9 +951,6 @@ internal void AddCluster(ClusterResultItem clusterResultItem)
                 }
             }
 
-            //add the new items to the undo recorder (this ensures the elements are valid at this point in time before any other manipulation occurs)
-            DynamoModel.RecordUndoModels(workspaceModel, createdClusterItems);
-
             // Perform auto-layout for the newly added nodes
             NodeAutoCompleteUtilities.PostAutoLayoutNodes(
                 workspaceViewModel.DynamoViewModel.CurrentSpace,
diff --git a/src/NodeAutoCompleteViewExtension/Views/NodeAutoCompleteBarView.xaml.cs b/src/NodeAutoCompleteViewExtension/Views/NodeAutoCompleteBarView.xaml.cs
@@ -202,7 +202,6 @@ internal void CloseAutoComplete()
             Dispatcher.BeginInvoke(new Action(() =>
             {
                 ViewModel?.DeleteTransientNodes();
-                ViewModel?.ToggleUndoRedoLocked(false);
             }), DispatcherPriority.Loaded);
 
             Close();

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public bool CanUndo`
`37`	`37`	`{`
`38`	`38`	`get`
`39`	`39`	`{`
`40`		`- return (null != undoRecorder && undoRecorder.CanUndo) && !IsUndoRedoLocked;`
	`40`	`+ return (null != undoRecorder && undoRecorder.CanUndo);`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`@@ -48,16 +48,10 @@ public bool CanRedo`
`48`	`48`	`{`
`49`	`49`	`get`
`50`	`50`	`{`
`51`		`- return (null != undoRecorder && undoRecorder.CanRedo) && !IsUndoRedoLocked;`
	`51`	`+ return (null != undoRecorder && undoRecorder.CanRedo);`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- internal bool IsUndoRedoLocked`
`56`		`- {`
`57`		`- get;`
`58`		`- set;`
`59`		`- }`
`60`		`-`
`61`	`55`	`internal void Undo()`
`62`	`56`	`{`
`63`	`57`	`if (null != undoRecorder)`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public void ExecuteCommand(RecordableCommand command)`
`38`	`38`	`if (CommandCompleted != null)`
`39`	`39`	`CommandCompleted(command);`
`40`	`40`	`}`
`41`		`-`
	`41`	`+`
`42`	`42`	`private PortModel[] activeStartPorts;`
`43`	`43`	`private PortModel firstStartPort;`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,6 @@ internal void CloseAutoComplete()`
`202`	`202`	`Dispatcher.BeginInvoke(new Action(() =>`
`203`	`203`	`{`
`204`	`204`	`ViewModel?.DeleteTransientNodes();`
`205`		`- ViewModel?.ToggleUndoRedoLocked(false);`
`206`	`205`	`}), DispatcherPriority.Loaded);`
`207`	`206`
`208`	`207`	`Close();`