DYN-7332: improvements after comments (#15534)

ivaylo-matov · web-flow · commit 436d4620b1ed · 2024-10-09T12:54:23.000-04:00
diff --git a/src/DynamoCoreWpf/ViewModels/Core/ConnectorPinViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/ConnectorPinViewModel.cs
@@ -6,6 +6,8 @@
 using Dynamo.UI.Commands;
 using Dynamo.Wpf.ViewModels.Core;
 using Newtonsoft.Json;
+using Dynamo.Graph.Connectors;
+using Dynamo.Selection;
 
 namespace Dynamo.ViewModels
 {
@@ -282,6 +284,9 @@ private void RemovePinFromGroupCommandExecute(object parameter)
         {
             WorkspaceViewModel.DynamoViewModel.UngroupModelCommand.Execute(null);
             Analytics.TrackEvent(Actions.RemovedFrom, Categories.NodeContextMenuOperations, "ConnectorPin");
+
+            // Update the command's state after the pin is removed from the group
+            RemovePinFromGroupCommand.RaiseCanExecuteChanged();
         }
 
         /// <summary>
@@ -317,14 +322,24 @@ public ConnectorPinViewModel(WorkspaceViewModel workspaceViewModel, ConnectorPin
             InitializeCommands();
             model.PropertyChanged += OnPinPropertyChanged;
             ZIndex = ++StaticZIndex; // places the pin on top of all nodes/notes
+
+            DynamoSelection.Instance.Selection.CollectionChanged += SelectionOnCollectionChanged;
+
+            AddPinToGroupIfConnectedNodesInSameGroup();
         }
 
         public override void Dispose()
         {
             model.PropertyChanged -= OnPinPropertyChanged;
+            DynamoSelection.Instance.Selection.CollectionChanged -= SelectionOnCollectionChanged;
             base.Dispose();
         }
 
+        private void SelectionOnCollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            RemovePinFromGroupCommand.RaiseCanExecuteChanged();
+        }
+
         //respond to changes on the model's properties
         void OnPinPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
@@ -346,5 +361,40 @@ void OnPinPropertyChanged(object sender, System.ComponentModel.PropertyChangedEv
                     break;
             }
         }
+
+        /// <summary>
+        /// Adds the connector pin to a group if both connected nodes are part of the same group.
+        /// </summary>
+        private void AddPinToGroupIfConnectedNodesInSameGroup()
+        {
+            var workspace = WorkspaceViewModel.Model;
+            if (workspace == null)
+            {
+                return;
+            }
+
+            var groups = workspace.Annotations;
+            var connector = WorkspaceViewModel.Model.Connectors.FirstOrDefault(c => c.GUID == model.ConnectorId);
+            if (connector == null)
+            {
+                return;
+            }
+
+            // Get the start and end nodes of the connector associated with the pin
+            var startNode = connector.Start.Owner;
+            var endNode = connector.End.Owner;
+
+            foreach (var group in groups)
+            {
+                // Check if both nodes (start and end) are part of the same group
+                if (group.Nodes.Contains(startNode) && group.Nodes.Contains(endNode))
+                {
+                    // If both nodes are part of the same group, add the pin to that group
+                    group.AddToTargetAnnotationModel(model);
+                    break;
+                }
+            }
+        }
+
     }
 }
diff --git a/src/DynamoCoreWpf/Views/Core/ConnectorPinView.xaml.cs b/src/DynamoCoreWpf/Views/Core/ConnectorPinView.xaml.cs
@@ -94,6 +94,22 @@ private void OnPinMouseDown(object sender, MouseButtonEventArgs e)
         private void OnPinRightMouseButtonDown(object sender, MouseButtonEventArgs e)
         {
             ViewModel.IsHoveredOver = true;
+
+            if (!ViewModel.Model.IsSelected)
+            {
+                if (!Keyboard.IsKeyDown(Key.LeftShift) && !Keyboard.IsKeyDown(Key.RightShift))
+                {
+                    DynamoSelection.Instance.ClearSelection();
+                }
+                DynamoSelection.Instance.Selection.AddUnique(ViewModel.Model);
+            }
+            else
+            {
+                if (Keyboard.IsKeyDown(Key.LeftShift) || Keyboard.IsKeyDown(Key.RightShift))
+                {
+                    DynamoSelection.Instance.Selection.Remove(ViewModel.Model);
+                }
+            }
         }
 
         private void OnPinRightMouseButtonUp(object sender, MouseButtonEventArgs e)
