DYN-9104 : reuse node autocomplete bar plus other fixes (#16359)

BogdanZavu · zavub · web-flow · commit 1d99407876ed · 2025-07-11T16:28:24.000-04:00
Co-authored-by: Bogdan Zavu &lt;bogdan.zavu@autodesk.com&gt;
diff --git a/src/NodeAutoCompleteViewExtension/NodeAutoCompleteViewExtension.cs b/src/NodeAutoCompleteViewExtension/NodeAutoCompleteViewExtension.cs
@@ -25,7 +25,6 @@ public class NodeAutoCompleteViewExtension : ViewExtensionBase, IViewExtension,
         private const String extensionName = "Node Auto Complete";
         private ViewLoadedParams viewLoadedParamsReference;
         private NodeAutoCompletePanelViewModel nodeAutoCompleteViewModel;
-        private NodeAutoCompleteBarView nodeAutoCompleteBarView;
 
         internal MenuItem nodeAutocompleteMenuItem;
 
@@ -168,6 +167,7 @@ internal void ShowClusterNodeAutocompleteResults(MLNodeClusterAutoCompletionResp
         }
 
         private static NodeAutoCompleteBarViewModel nodeAutoCompleteBarViewModel;
+        private static Guid lastWorkspaceId;
 
         private void OnNodeAutoCompleteBarRequested(Window parentWindow, ViewModelBase viewModelBase)
         {
@@ -177,35 +177,15 @@ private void OnNodeAutoCompleteBarRequested(Window parentWindow, ViewModelBase v
                 return;
             }
 
-            if (nodeAutoCompleteBarViewModel is null)
+            DynamoViewModel dynamoViewModel = portViewModel?.NodeViewModel?.WorkspaceViewModel?.DynamoViewModel;
+            if (nodeAutoCompleteBarViewModel is null || lastWorkspaceId != dynamoViewModel.CurrentSpace.Guid)
             {
-                DynamoViewModel dynamoViewModel = portViewModel?.NodeViewModel?.WorkspaceViewModel?.DynamoViewModel;
                 nodeAutoCompleteBarViewModel = new NodeAutoCompleteBarViewModel(dynamoViewModel);
             }
 
-            if (nodeAutoCompleteBarViewModel.PortViewModel != null)
-            {
-                nodeAutoCompleteBarViewModel.PortViewModel.Highlight = Visibility.Collapsed;
-            }
-
-            nodeAutoCompleteBarViewModel.PortViewModel = portViewModel;
-            portViewModel.Highlight = Visibility.Visible;
-
-            if (nodeAutoCompleteBarViewModel.IsOpen)
-            {
-                if (nodeAutoCompleteBarView == null)
-                {
-                    nodeAutoCompleteBarView = new NodeAutoCompleteBarView(parentWindow, nodeAutoCompleteBarViewModel);
-                    nodeAutoCompleteBarView.Show();
-                }
-                nodeAutoCompleteBarView.ReloadDataContext(nodeAutoCompleteBarViewModel);
-                portViewModel.SetupNodeAutoCompleteClusterWindowPlacement(nodeAutoCompleteBarView);
-                return;
-            }
+            lastWorkspaceId = dynamoViewModel.CurrentSpace.Guid;
 
-            nodeAutoCompleteBarView = new NodeAutoCompleteBarView(parentWindow, nodeAutoCompleteBarViewModel);
-            nodeAutoCompleteBarView.Show();
-            portViewModel.SetupNodeAutoCompleteClusterWindowPlacement(nodeAutoCompleteBarView);
+            NodeAutoCompleteBarView.PrepareAndShowNodeAutoCompleteBar(parentWindow, nodeAutoCompleteBarViewModel, portViewModel);
         }
     }
 }
diff --git a/src/NodeAutoCompleteViewExtension/ViewModels/NodeAutoCompleteBarViewModel.cs b/src/NodeAutoCompleteViewExtension/ViewModels/NodeAutoCompleteBarViewModel.cs
@@ -188,10 +188,20 @@ public bool IsOpen
             }
             set
             {
-                if (isOpen == value) return;
+                if (isOpen == value)
+                {
+                    return;
+                }
+
                 isOpen = value;
-                if (isOpen) SubscribeWindowEvents();
-                else UnsubscribeWindowEvents();
+                if (isOpen)
+                {
+                    SubscribeWindowEvents();
+                }
+                else
+                {
+                    UnsubscribeWindowEvents();
+                }
             }
         }
 
@@ -791,8 +801,8 @@ internal IEnumerable<SingleResultItem> GetSingleAutocompleteResults()
         // Delete all transient nodes in the workspace
         internal void DeleteTransientNodes()
         {
-            var node = PortViewModel.NodeViewModel;
-            var wsViewModel = node.WorkspaceViewModel;
+            var node = PortViewModel?.NodeViewModel;
+            var wsViewModel = node?.WorkspaceViewModel;
 
             var transientNodes = wsViewModel.Nodes.Where(x => x.IsTransient).ToList();
             var transientConnectors = wsViewModel.Connectors.Where(c => c.IsTransient).ToList();
diff --git a/src/NodeAutoCompleteViewExtension/Views/NodeAutoCompleteBarView.xaml.cs b/src/NodeAutoCompleteViewExtension/Views/NodeAutoCompleteBarView.xaml.cs
