From f77fd014ffcea3a218df510f15ec5eb09e9ecbd1 Mon Sep 17 00:00:00 2001 From: Deyan Nenov Date: Tue, 5 Dec 2023 21:05:37 +0000 Subject: [PATCH 1/3] clear keywords on reset - now correctly clears the keyword pills on reset --- .../PackageManager/PublishPackageViewModel.cs | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs index f1aeab43e50..7ce1a48614a 100644 --- a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs @@ -1,16 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Runtime.InteropServices; -using System.Text.RegularExpressions; -using System.Windows; -using System.Windows.Forms; using Dynamo.Core; using Dynamo.Graph.Nodes.ZeroTouch; using Dynamo.Graph.Workspaces; @@ -24,6 +11,19 @@ using Greg.Requests; using Prism.Commands; using PythonNodeModels; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Collections.Specialized; +using System.ComponentModel; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Runtime.InteropServices; +using System.Text.RegularExpressions; +using System.Windows; +using System.Windows.Forms; using Double = System.Double; using NotificationObject = Dynamo.Core.NotificationObject; using String = System.String; @@ -1115,6 +1115,7 @@ private void ClearAllEntries() this.RootFolder = string.Empty; this.ClearMarkdownDirectory(); this.ClearPackageContents(); + this.KeywordsCollection?.Clear(); } /// From 97914c82fe1d7a38778a28735feeea54b9482d3c Mon Sep 17 00:00:00 2001 From: Deyan Nenov Date: Wed, 6 Dec 2023 12:32:41 +0000 Subject: [PATCH 2/3] namespace revert --- .../PackageManager/PublishPackageViewModel.cs | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs index 7ce1a48614a..389d47af70d 100644 --- a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs @@ -1,29 +1,7 @@ -using Dynamo.Core; -using Dynamo.Graph.Nodes.ZeroTouch; -using Dynamo.Graph.Workspaces; -using Dynamo.Models; using Dynamo.PackageManager.UI; -using Dynamo.Utilities; using Dynamo.ViewModels; using Dynamo.Wpf.Properties; using Dynamo.Wpf.Utilities; -using DynamoUtilities; -using Greg.Requests; -using Prism.Commands; -using PythonNodeModels; -using System; -using System.Collections.Generic; -using System.Collections.ObjectModel; -using System.Collections.Specialized; -using System.ComponentModel; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Runtime.InteropServices; -using System.Text.RegularExpressions; -using System.Windows; -using System.Windows.Forms; using Double = System.Double; using NotificationObject = Dynamo.Core.NotificationObject; using String = System.String; From 50bfee77ff9823b145c663c39d0c79c62ac8a548 Mon Sep 17 00:00:00 2001 From: Deyan Nenov Date: Wed, 6 Dec 2023 12:44:37 +0000 Subject: [PATCH 3/3] revert namespaces --- .../PackageManager/PublishPackageViewModel.cs | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs index 389d47af70d..428742113f0 100644 --- a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs +++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs @@ -1,7 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Collections.Specialized; +using System.ComponentModel; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Runtime.InteropServices; +using System.Text.RegularExpressions; +using System.Windows; +using System.Windows.Forms; +using Dynamo.Core; +using Dynamo.Graph.Nodes.ZeroTouch; +using Dynamo.Graph.Workspaces; +using Dynamo.Models; using Dynamo.PackageManager.UI; +using Dynamo.Utilities; using Dynamo.ViewModels; using Dynamo.Wpf.Properties; using Dynamo.Wpf.Utilities; +using DynamoUtilities; +using Greg.Requests; +using Prism.Commands; +using PythonNodeModels; using Double = System.Double; using NotificationObject = Dynamo.Core.NotificationObject; using String = System.String;