Hide All context menu in workspace when displaying node context menu (#12565)

QilongTang · web-flow · commit 738ab89f9b82 · 2022-01-22T13:40:15.000-05:00
* Hide All context menu in workspace when displaying node context menu

* Fix the crash for lacing menu

* fix unit tests
diff --git a/src/DynamoCore/Models/DynamoModelCommands.cs b/src/DynamoCore/Models/DynamoModelCommands.cs
@@ -597,12 +597,15 @@ private void UpdateModelValueImpl(UpdateModelValueCommand command)
             WorkspaceModel targetWorkspace = CurrentWorkspace;
             if (!command.WorkspaceGuid.Equals(Guid.Empty))
                 targetWorkspace = Workspaces.FirstOrDefault(w => w.Guid.Equals(command.WorkspaceGuid));
-
-            if (targetWorkspace != null)
+            try
             {
-                targetWorkspace.UpdateModelValue(command.ModelGuids,
+                targetWorkspace?.UpdateModelValue(command.ModelGuids,
                     command.Name, command.Value);
             }
+            catch (Exception ex)
+            {
+                Logger.LogError(ex.Message);
+            }
         }
 
         private void ConvertNodesToCodeImpl(ConvertNodesToCodeCommand command)
diff --git a/src/DynamoCoreWpf/Commands/WorkspaceCommands.cs b/src/DynamoCoreWpf/Commands/WorkspaceCommands.cs
@@ -26,6 +26,7 @@ public partial class WorkspaceViewModel
         private DelegateCommand showHideAllGeometryPreviewCommand;
         private DelegateCommand showInCanvasSearchCommand;
         private DelegateCommand pasteCommand;
+        private DelegateCommand hideAllPopupCommand;
 
         #endregion
 
@@ -214,6 +215,21 @@ public DelegateCommand ShowInCanvasSearchCommand
                 return showInCanvasSearchCommand;
             }
         }
+
+        /// <summary>
+        /// View Command to hide all popup in special cases
+        /// </summary>
+        [JsonIgnore]
+        public DelegateCommand HideAllPopupCommand
+        {
+            get
+            {
+                if (hideAllPopupCommand == null)
+                    hideAllPopupCommand = new DelegateCommand(OnRequestHideAllPopup);
+
+                return hideAllPopupCommand;
+            }
+        }
         #endregion
 
         #region Properties for Command Data Binding
diff --git a/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/WorkspaceViewModel.cs
@@ -162,6 +162,12 @@ private void OnRequestShowInCanvasSearch(object param)
             RequestShowInCanvasSearch?.Invoke(flag);
         }
 
+        internal event Action<object> RequestHideAllPopup;
+        private void OnRequestHideAllPopup(object param)
+        {
+            RequestHideAllPopup?.Invoke(param);
+        }
+
         internal event Action<ShowHideFlags> RequestNodeAutoCompleteSearch;
         internal event Action<ShowHideFlags, PortViewModel> RequestPortContextMenu;
 
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -1005,7 +1005,7 @@ private void DynamoView_Loaded(object sender, EventArgs e)
             // will not work. Instead, we have to check if the Owner Window (DynamoView) is deactivated or not.  
             if (Application.Current == null)
             {
-                this.Deactivated += (s, args) => { HidePopupWhenWindowDeactivated(); };
+                this.Deactivated += (s, args) => { HidePopupWhenWindowDeactivated(null); };
             }
             loaded = true;
         }
@@ -1014,11 +1014,11 @@ private void DynamoView_Loaded(object sender, EventArgs e)
         /// Close Popup when the Dynamo window is not in the foreground.
         /// </summary>
 
-        private void HidePopupWhenWindowDeactivated()
+        private void HidePopupWhenWindowDeactivated(object obj)
         {
             var workspace = this.ChildOfType<WorkspaceView>();
             if (workspace != null)
-                workspace.HidePopUp();
+                workspace.HideAllPopUp(obj);
         }
 
         private void TrackStartupAnalytics()
@@ -2368,7 +2368,7 @@ private void Window_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs
             //if original sender was scroll bar(i.e Thumb) don't close the popup.
             if(!(e.OriginalSource is Thumb))
             {
-                HidePopupWhenWindowDeactivated();
+                HidePopupWhenWindowDeactivated(sender);
             }
         }
 
diff --git a/src/DynamoCoreWpf/Views/Core/NodeView.xaml.cs b/src/DynamoCoreWpf/Views/Core/NodeView.xaml.cs
@@ -735,6 +735,7 @@ private void StashNodeViewCustomizationMenuItems()
         private void DisplayNodeContextMenu(object sender, RoutedEventArgs e)
         {
             Guid nodeGuid = ViewModel.NodeModel.GUID;
+            ViewModel.WorkspaceViewModel.HideAllPopupCommand.Execute(sender);
             ViewModel.DynamoViewModel.ExecuteCommand(
                 new DynCmd.SelectModelCommand(nodeGuid, Keyboard.Modifiers.AsDynamoType()));
 
diff --git a/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs b/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml.cs
@@ -124,16 +124,17 @@ void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
         private void RemoveViewModelsubscriptions(WorkspaceViewModel ViewModel)
         {
             ViewModel.RequestShowInCanvasSearch -= ShowHideInCanvasControl;
+            ViewModel.RequestHideAllPopup -= HideAllPopUp;
             ViewModel.RequestNodeAutoCompleteSearch -= ShowHideNodeAutoCompleteControl;
             ViewModel.RequestPortContextMenu -= ShowHidePortContextMenu;
             ViewModel.DynamoViewModel.PropertyChanged -= ViewModel_PropertyChanged;
-           
+
             ViewModel.ZoomChanged -= vm_ZoomChanged;
             ViewModel.RequestZoomToViewportCenter -= vm_ZoomAtViewportCenter;
             ViewModel.RequestZoomToViewportPoint -= vm_ZoomAtViewportPoint;
             ViewModel.RequestZoomToFitView -= vm_ZoomToFitView;
             ViewModel.RequestCenterViewOnElement -= CenterViewOnElement;
-         
+
             ViewModel.RequestAddViewToOuterCanvas -= vm_RequestAddViewToOuterCanvas;
             ViewModel.WorkspacePropertyEditRequested -= VmOnWorkspacePropertyEditRequested;
             ViewModel.RequestSelectionBoxUpdate -= VmOnRequestSelectionBoxUpdate;
@@ -151,6 +152,7 @@ private void RemoveViewModelsubscriptions(WorkspaceViewModel ViewModel)
         private void AttachViewModelsubscriptions(WorkspaceViewModel ViewModel)
         {
             ViewModel.RequestShowInCanvasSearch += ShowHideInCanvasControl;
+            ViewModel.RequestHideAllPopup += HideAllPopUp;
             ViewModel.RequestNodeAutoCompleteSearch += ShowHideNodeAutoCompleteControl;
             ViewModel.RequestPortContextMenu += ShowHidePortContextMenu;
             ViewModel.DynamoViewModel.PropertyChanged += ViewModel_PropertyChanged;
@@ -172,7 +174,7 @@ private void AttachViewModelsubscriptions(WorkspaceViewModel ViewModel)
         }
 
         private void ShowHideNodeAutoCompleteControl(ShowHideFlags flag)
-        {            
+        {
             ShowHidePopup(flag, NodeAutoCompleteSearchBar);
         }
 
@@ -239,7 +241,7 @@ private void ShowHidePopup(ShowHideFlags flag, Popup popup)
                     // If the dispatcher is not used in this scenario when switching
                     // from inputPort context menu to Output port context menu,
                     // the popup will display before the new content is fully rendered
-                    this.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Background, new Action(() =>{
+                    this.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Background, new Action(() => {
                         popup.Child.Visibility = Visibility.Visible;
                         popup.Child.UpdateLayout();
                         popup.IsOpen = displayPopup;
@@ -253,15 +255,23 @@ private void ShowHidePopup(ShowHideFlags flag, Popup popup)
         }
 
         /// <summary>
-        /// Hides Context Menu as well as InCanvasControl (Right Click PopUp)
+        /// Hides all popups in the view, the amount of popup hidden will be different depending on
+        /// if the hide view command is triggered on node level or workspace level
         /// </summary>
-        public void HidePopUp()
+        public void HideAllPopUp(object sender)
         {
+            // First make sure workspace level popups are hidden
             if (InCanvasSearchBar.IsOpen || ContextMenuPopup.IsOpen)
             {
                 ShowHideContextMenu(ShowHideFlags.Hide);
                 ShowHideInCanvasControl(ShowHideFlags.Hide);
             }
+            // If triggered on node level, make sure node popups are also hidden
+            if(sender is NodeView && (PortContextMenu.IsOpen || NodeAutoCompleteSearchBar.IsOpen) )
+            {
+                ShowHidePopup(ShowHideFlags.Hide, PortContextMenu);
+                ShowHidePopup(ShowHideFlags.Hide, NodeAutoCompleteSearchBar);
+            }
         }
 
         internal Point GetCenterPoint()
diff --git a/test/DynamoCoreTests/CoreTests.cs b/test/DynamoCoreTests/CoreTests.cs
@@ -431,15 +431,17 @@ public void UpdateModelValue_MissingNode_ThrowsException()
             CurrentDynamoModel.CurrentWorkspace.RemoveAndDisposeNode(addNode);
 
             var command = new DynCmd.UpdateModelValueCommand(Guid.Empty, addNode.GUID, "Code", "");
-            Assert.Throws<InvalidOperationException>(() => CurrentDynamoModel.ExecuteCommand(command));
+            Assert.Throws<InvalidOperationException>(() => CurrentDynamoModel.CurrentWorkspace.UpdateModelValue(command.ModelGuids,
+                    command.Name, command.Value));
         }
 
         [Test]
         [Category("UnitTests")]
         public void UpdateModelValue_EmptyList_ThrowsException()
         {
             var command = new DynCmd.UpdateModelValueCommand(Guid.Empty, new Guid[] { }, "", "");
-            Assert.Throws<ArgumentNullException>(() => CurrentDynamoModel.ExecuteCommand(command));
+            Assert.Throws<ArgumentNullException>(() => CurrentDynamoModel.CurrentWorkspace.UpdateModelValue(command.ModelGuids,
+                    command.Name, command.Value));
         }
 
         [Test]

Original file line number	Diff line number	Diff line change
`@@ -597,12 +597,15 @@ private void UpdateModelValueImpl(UpdateModelValueCommand command)`
`597`	`597`	`WorkspaceModel targetWorkspace = CurrentWorkspace;`
`598`	`598`	`if (!command.WorkspaceGuid.Equals(Guid.Empty))`
`599`	`599`	`targetWorkspace = Workspaces.FirstOrDefault(w => w.Guid.Equals(command.WorkspaceGuid));`
`600`		`-`
`601`		`- if (targetWorkspace != null)`
	`600`	`+ try`
`602`	`601`	`{`
`603`		`- targetWorkspace.UpdateModelValue(command.ModelGuids,`
	`602`	`+ targetWorkspace?.UpdateModelValue(command.ModelGuids,`
`604`	`603`	`command.Name, command.Value);`
`605`	`604`	`}`
	`605`	`+ catch (Exception ex)`
	`606`	`+ {`
	`607`	`+ Logger.LogError(ex.Message);`
	`608`	`+ }`
`606`	`609`	`}`
`607`	`610`
`608`	`611`	`private void ConvertNodesToCodeImpl(ConvertNodesToCodeCommand command)`
Original file line number	Diff line number	Diff line change
`@@ -1005,7 +1005,7 @@ private void DynamoView_Loaded(object sender, EventArgs e)`
`1005`	`1005`	`// will not work. Instead, we have to check if the Owner Window (DynamoView) is deactivated or not.`
`1006`	`1006`	`if (Application.Current == null)`
`1007`	`1007`	`{`
`1008`		`- this.Deactivated += (s, args) => { HidePopupWhenWindowDeactivated(); };`
	`1008`	`+ this.Deactivated += (s, args) => { HidePopupWhenWindowDeactivated(null); };`
`1009`	`1009`	`}`
`1010`	`1010`	`loaded = true;`
`1011`	`1011`	`}`
`@@ -1014,11 +1014,11 @@ private void DynamoView_Loaded(object sender, EventArgs e)`
`1014`	`1014`	`/// Close Popup when the Dynamo window is not in the foreground.`
`1015`	`1015`	`/// </summary>`
`1016`	`1016`
`1017`		`- private void HidePopupWhenWindowDeactivated()`
	`1017`	`+ private void HidePopupWhenWindowDeactivated(object obj)`
`1018`	`1018`	`{`
`1019`	`1019`	`var workspace = this.ChildOfType<WorkspaceView>();`
`1020`	`1020`	`if (workspace != null)`
`1021`		`- workspace.HidePopUp();`
	`1021`	`+ workspace.HideAllPopUp(obj);`
`1022`	`1022`	`}`
`1023`	`1023`
`1024`	`1024`	`private void TrackStartupAnalytics()`
`@@ -2368,7 +2368,7 @@ private void Window_PreviewMouseLeftButtonUp(object sender, MouseButtonEventArgs`
`2368`	`2368`	`//if original sender was scroll bar(i.e Thumb) don't close the popup.`
`2369`	`2369`	`if(!(e.OriginalSource is Thumb))`
`2370`	`2370`	`{`
`2371`		`- HidePopupWhenWindowDeactivated();`
	`2371`	`+ HidePopupWhenWindowDeactivated(sender);`
`2372`	`2372`	`}`
`2373`	`2373`	`}`
`2374`	`2374`
Original file line number	Diff line number	Diff line change
`@@ -735,6 +735,7 @@ private void StashNodeViewCustomizationMenuItems()`
`735`	`735`	`private void DisplayNodeContextMenu(object sender, RoutedEventArgs e)`
`736`	`736`	`{`
`737`	`737`	`Guid nodeGuid = ViewModel.NodeModel.GUID;`
	`738`	`+ ViewModel.WorkspaceViewModel.HideAllPopupCommand.Execute(sender);`
`738`	`739`	`ViewModel.DynamoViewModel.ExecuteCommand(`
`739`	`740`	`new DynCmd.SelectModelCommand(nodeGuid, Keyboard.Modifiers.AsDynamoType()));`
`740`	`741`
Original file line number	Diff line number	Diff line change
`@@ -431,15 +431,17 @@ public void UpdateModelValue_MissingNode_ThrowsException()`
`431`	`431`	`CurrentDynamoModel.CurrentWorkspace.RemoveAndDisposeNode(addNode);`
`432`	`432`
`433`	`433`	`var command = new DynCmd.UpdateModelValueCommand(Guid.Empty, addNode.GUID, "Code", "");`
`434`		`- Assert.Throws<InvalidOperationException>(() => CurrentDynamoModel.ExecuteCommand(command));`
	`434`	`+ Assert.Throws<InvalidOperationException>(() => CurrentDynamoModel.CurrentWorkspace.UpdateModelValue(command.ModelGuids,`
	`435`	`+ command.Name, command.Value));`
`435`	`436`	`}`
`436`	`437`
`437`	`438`	`[Test]`
`438`	`439`	`[Category("UnitTests")]`
`439`	`440`	`public void UpdateModelValue_EmptyList_ThrowsException()`
`440`	`441`	`{`
`441`	`442`	`var command = new DynCmd.UpdateModelValueCommand(Guid.Empty, new Guid[] { }, "", "");`
`442`		`- Assert.Throws<ArgumentNullException>(() => CurrentDynamoModel.ExecuteCommand(command));`
	`443`	`+ Assert.Throws<ArgumentNullException>(() => CurrentDynamoModel.CurrentWorkspace.UpdateModelValue(command.ModelGuids,`
	`444`	`+ command.Name, command.Value));`
`443`	`445`	`}`
`444`	`446`
`445`	`447`	`[Test]`