DYN-5861: Reopening python editor should restore the editor window (#15931)

zeusongit · web-flow · commit d287c2328014 · 2025-03-17T11:15:26.000-04:00
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -601,6 +601,7 @@ internal TabItem DockWindowInSideBar(Window window, NodeModel nodeModel = null,
             if (tabItem != null)
             {
                 tabDynamic.SelectedItem = tabItem;
+                if (ExtensionsCollapsed) ToggleExtensionBarCollapseStatus();
                 return tabItem;
             }
 
diff --git a/src/Libraries/PythonNodeModelsWpf/PythonNode.cs b/src/Libraries/PythonNodeModelsWpf/PythonNode.cs
@@ -230,6 +230,10 @@ private void EditScriptContent(object sender, EventArgs e)
                     {
                         editWindow.Activate();
                         dynamoView = editWindow.Owner as DynamoView;
+                        if (editWindow.WindowState == WindowState.Minimized)
+                        {
+                            editWindow.WindowState = WindowState.Normal;
+                        }
                     }
                     else
                     {
diff --git a/test/DynamoCoreWpf3Tests/PythonNodeCustomizationTests.cs b/test/DynamoCoreWpf3Tests/PythonNodeCustomizationTests.cs
@@ -262,6 +262,49 @@ public void OnSaveRunRevertEventsTest()
             Assert.That(watchOUT.CachedValue, Is.EqualTo("Autodesk,1982"));
         }
 
+        /// <summary>
+        /// The next test validate that the script editor is
+        /// restored from a minimized state, when triggered again.
+        /// </summary>
+        [Test]
+        public void RestoreWindowOnEditorOpenTest()
+        {
+            Open(@"core\python\python_check_output.dyn");
+            ViewModel.HomeSpace.Run();
+
+            var nodeView = NodeViewWithGuid("3bcad14e-d086-4278-9e08-ed2759ef92f3");
+            var nodeModel = nodeView.ViewModel.NodeModel as PythonNodeBase;
+            Assert.NotNull(nodeModel);
+
+            var scriptWindow = EditPythonCode(nodeView, View);
+            Assert.IsTrue(scriptWindow.WindowState == WindowState.Normal);
+
+            //minimize editor
+            scriptWindow.WindowState = WindowState.Minimized;
+            Assert.IsTrue(scriptWindow.WindowState == WindowState.Minimized);
+
+            //reopen editor
+            EditPythonCode(nodeView, View);
+
+            //assert that window was restored
+            Assert.IsTrue(scriptWindow.WindowState == WindowState.Normal);
+
+            //dock editor
+            scriptWindow.DockWindow();
+            Assert.IsTrue(ViewModel.DockedNodeWindows.Contains(nodeModel.GUID.ToString()));
+            Assert.IsFalse(this.View.ExtensionsCollapsed);
+
+            //collapse right sidebar
+            this.View.ToggleExtensionBarCollapseStatus();
+            Assert.IsTrue(this.View.ExtensionsCollapsed);
+
+            //reopen editor
+            EditPythonCode(nodeView, View);
+
+            //assert that docked sidebar was restored
+            Assert.IsFalse(this.View.ExtensionsCollapsed);
+        }
+
         /// <summary>
         /// The test to validate that the editor window will not retain changes
         /// and revert to the last saved state when the editor is closed without saving.
@@ -593,7 +636,7 @@ private static ScriptEditorWindow EditPythonCode(NodeView nodeView, DynamoView w
 
             editMenuItem.RaiseEvent(new RoutedEventArgs(MenuItem.ClickEvent));
             DispatcherUtil.DoEvents();
-            return window.GetChildrenWindowsOfType<ScriptEditorWindow>().First();
+            return window.GetChildrenWindowsOfType<ScriptEditorWindow>().FirstOrDefault();
         }
 
         private static void SetTextEditorText(ScriptEditorWindow view,string code)

Original file line number	Diff line number	Diff line change
`@@ -601,6 +601,7 @@ internal TabItem DockWindowInSideBar(Window window, NodeModel nodeModel = null,`
`601`	`601`	`if (tabItem != null)`
`602`	`602`	`{`
`603`	`603`	`tabDynamic.SelectedItem = tabItem;`
	`604`	`+ if (ExtensionsCollapsed) ToggleExtensionBarCollapseStatus();`
`604`	`605`	`return tabItem;`
`605`	`606`	`}`
`606`	`607`
Original file line number	Diff line number	Diff line change
`@@ -230,6 +230,10 @@ private void EditScriptContent(object sender, EventArgs e)`
`230`	`230`	`{`
`231`	`231`	`editWindow.Activate();`
`232`	`232`	`dynamoView = editWindow.Owner as DynamoView;`
	`233`	`+ if (editWindow.WindowState == WindowState.Minimized)`
	`234`	`+ {`
	`235`	`+ editWindow.WindowState = WindowState.Normal;`
	`236`	`+ }`
`233`	`237`	`}`
`234`	`238`	`else`
`235`	`239`	`{`