DYN-6500: disable cancel button if no changes (#14692)

* disable cancel button of no changes - if there are no changes, disable the cancel button * revert namespaces * revert namespaces * rename button cancel to reset
DynamoDS · Dec 6, 2023 · 6b64aee · 6b64aee
1 parent 0450cc0
commit 6b64aee
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 1 deletion.
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -1843,6 +1843,9 @@ Next assemblies were loaded several times:
   <data name="PublishPackageLocally" xml:space="preserve">
     <value>Publish Locally</value>
   </data>
+  <data name="PublishPackageResetButton" xml:space="preserve">
+    <value>Reset</value>
+  </data>
   <data name="PublishPackageMessage" xml:space="preserve">
     <value>Package published successfully. 
 Want to publish a different package?</value>

diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -2322,6 +2322,9 @@ Do you want to install the latest Dynamo update?</value>
   <data name="PublishPackageLocally" xml:space="preserve">
     <value>Publish Locally</value>
   </data>
+  <data name="PublishPackageResetButton" xml:space="preserve">
+    <value>Reset</value>
+  </data>
   <data name="PublishPackageSelectPackageContentsMessage" xml:space="preserve">
     <value>Select package contents</value>
   </data>

diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
@@ -255,6 +255,7 @@ public string Group
                 {
                     _group = value;
                     RaisePropertyChanged("Group");
+                    RaisePropertyChanged(nameof(HasChanges));
                 }
             }
         }
@@ -273,6 +274,7 @@ public string Description
                 {
                     _Description = value;
                     RaisePropertyChanged("Description");
+                    RaisePropertyChanged(nameof(HasChanges));
                     BeginInvoke(() =>
                     {
                         SubmitCommand.RaiseCanExecuteChanged();
@@ -301,6 +303,7 @@ public string Keywords
 
                     _Keywords = value;
                     RaisePropertyChanged("Keywords");
+                    RaisePropertyChanged(nameof(HasChanges));
                     KeywordList = value.Split(' ').Where(x => x.Length > 0).ToList();
                 }
             }
@@ -354,6 +357,7 @@ public string MinorVersion
                     if (value.Length != 1) value = value.TrimStart(new char[] { '0' });
                     _MinorVersion = value;
                     RaisePropertyChanged("MinorVersion");
+                    RaisePropertyChanged(nameof(HasChanges));
                     BeginInvoke(() =>
                     {
                         SubmitCommand.RaiseCanExecuteChanged();
@@ -380,6 +384,7 @@ public string BuildVersion
                     if (value.Length != 1) value = value.TrimStart(new char[] { '0' });
                     _BuildVersion = value;
                     RaisePropertyChanged("BuildVersion");
+                    RaisePropertyChanged(nameof(HasChanges));
                     BeginInvoke(() =>
                     {
                         SubmitCommand.RaiseCanExecuteChanged();
@@ -406,6 +411,7 @@ public string MajorVersion
                     if (value.Length != 1) value = value.TrimStart(new char[] { '0' });
                     _MajorVersion = value;
                     RaisePropertyChanged("MajorVersion");
+                    RaisePropertyChanged(nameof(HasChanges));
                     BeginInvoke(() =>
                     {
                         SubmitCommand.RaiseCanExecuteChanged();
@@ -429,6 +435,7 @@ public string License
                 {
                     _license = value;
                     RaisePropertyChanged(nameof(License));
+                    RaisePropertyChanged(nameof(HasChanges));
                 }
             }
         }
@@ -444,6 +451,7 @@ public string CopyrightHolder
             {
                 copyrightHolder = value;
                 RaisePropertyChanged(nameof(CopyrightHolder));
+                RaisePropertyChanged(nameof(HasChanges));
             }
         }
 
@@ -458,6 +466,7 @@ public string CopyrightYear
             {
                 copyrightYear = value;
                 RaisePropertyChanged(nameof(CopyrightYear));
+                RaisePropertyChanged(nameof(HasChanges));
             }
         }
 
@@ -475,6 +484,7 @@ public string SiteUrl
                 {
                     _siteUrl = value;
                     RaisePropertyChanged("SiteUrl");
+                    RaisePropertyChanged(nameof(HasChanges));
                 }
             }
         }
@@ -493,6 +503,7 @@ public string RepositoryUrl
                 {
                     _repositoryUrl = value;
                     RaisePropertyChanged("RepositoryUrl");
+                    RaisePropertyChanged(nameof(HasChanges));
                 }
             }
         }
@@ -516,6 +527,8 @@ public string Name
                         SubmitCommand.RaiseCanExecuteChanged();
                         PublishLocallyCommand.RaiseCanExecuteChanged();
                     });
+
+                    RaisePropertyChanged(nameof(HasChanges));
                 }
             }
         }
@@ -581,6 +594,7 @@ public List<string> SelectedHosts
                     SelectedHostsString = SelectedHostsString.Trim().TrimEnd(',');
                     RaisePropertyChanged( nameof(SelectedHosts));
                     RaisePropertyChanged( nameof(SelectedHostsString));
+                    RaisePropertyChanged(nameof(HasChanges));
                 }
             }
         }
@@ -598,6 +612,7 @@ public string SelectedHostsString
                 {
                     selectedHostsString = value;
                     RaisePropertyChanged(nameof(SelectedHostsString));
+                    RaisePropertyChanged(nameof(HasChanges));
                 }
             }
         }
@@ -759,6 +774,7 @@ public ObservableCollection<string> AdditionalFiles
                 {
                     _additionalFiles = value;
                     RaisePropertyChanged("AdditionalFiles");
+                    RaisePropertyChanged(nameof(HasChanges));
                 }
             }
         }
@@ -784,6 +800,7 @@ public string DependencyNames
             {
                 dependencyNames = value; 
                 RaisePropertyChanged(nameof(DependencyNames));
+                RaisePropertyChanged(nameof(HasChanges));
             }
         }
 
@@ -892,9 +909,18 @@ public string RootFolder
             {
                 _rootFolder = value;
                 RaisePropertyChanged(nameof(RootFolder));
+                RaisePropertyChanged(nameof(HasChanges));
             }
         }
 
+        /// <summary>
+        /// Indicates if the user has made any changes to the current publish package form
+        /// </summary>
+        public bool HasChanges
+        {
+            get { return AnyUserChanges(); }
+        }
+
         #endregion
 
         internal PublishPackageViewModel()

diff --git a/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml b/src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml
@@ -364,7 +364,8 @@
 
                     <!--  Cancel  -->
                     <Button Click="CancelButton_Click"
-                            Content="{x:Static p:Resources.CancelButton}"
+                            Content="{x:Static p:Resources.PublishPackageResetButton}"
+                            IsEnabled="{Binding HasChanges}"
                             DockPanel.Dock="Right"
                             Background="Transparent"
                             Foreground="White"