DYN-6493: reset page order when discarding publish package form (#14695)

* reset page order - goes back to the first page when navigating away from the tab (on cancel only) * revert namespaces * revert namespaces
DynamoDS · Dec 6, 2023 · 0450cc0 · 0450cc0
1 parent 3dbe2e1
commit 0450cc0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml.cs
@@ -329,5 +329,21 @@ private void CancelButton_Click(object sender, RoutedEventArgs e)
                 PublishPackageViewModel.CancelCommand.Execute();
             }
         }
+
+        /// <summary>
+        /// Navigates back to the starting page 
+        /// </summary>
+        internal void ResetPageOrder()
+        {
+            currentPage = 0;
+            int stepIndex = Breadcrumbs.IndexOf((string)PublishPages[0].Tag);
+            for (int i = Breadcrumbs.Count - 1; i > stepIndex; i--)
+            {
+                Breadcrumbs.RemoveAt(i);
+            }
+            this.mainFrame.NavigationService.Navigate(PublishPages[currentPage]);
+            this.breadcrumbsNavigation.Visibility = Visibility.Collapsed;
+            ToggleButtonRowVisibility(0);
+        }
     }
 }
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml.cs b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerView.xaml.cs
@@ -228,6 +228,11 @@ private void tab_PreviewMouseDown(object sender, MouseButtonEventArgs e)
                 {
                     PackageManagerViewModel.PublishPackageViewModel.CancelCommand.Execute();
                     selectedTab.IsSelected = true;
+                    var pmPublishControl = this.packageManagerPublish as PackageManagerPublishControl;
+                    if (pmPublishControl != null)
+                    {
+                        pmPublishControl.ResetPageOrder();
+                    }
                 }
                 else
                 {