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

dnenov · web-flow · commit 6b64aee04fda · 2023-12-06T09:58:46.000-08:00
* disable cancel button of no changes

- if there are no changes, disable the cancel button

* revert namespaces

* revert namespaces

* rename button cancel to reset
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"

Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,7 @@ public string Group`
`255`	`255`	`{`
`256`	`256`	`_group = value;`
`257`	`257`	`RaisePropertyChanged("Group");`
	`258`	`+ RaisePropertyChanged(nameof(HasChanges));`
`258`	`259`	`}`
`259`	`260`	`}`
`260`	`261`	`}`
`@@ -273,6 +274,7 @@ public string Description`
`273`	`274`	`{`
`274`	`275`	`_Description = value;`
`275`	`276`	`RaisePropertyChanged("Description");`
	`277`	`+ RaisePropertyChanged(nameof(HasChanges));`
`276`	`278`	`BeginInvoke(() =>`
`277`	`279`	`{`
`278`	`280`	`SubmitCommand.RaiseCanExecuteChanged();`
`@@ -301,6 +303,7 @@ public string Keywords`
`301`	`303`
`302`	`304`	`_Keywords = value;`
`303`	`305`	`RaisePropertyChanged("Keywords");`
	`306`	`+ RaisePropertyChanged(nameof(HasChanges));`
`304`	`307`	`KeywordList = value.Split(' ').Where(x => x.Length > 0).ToList();`
`305`	`308`	`}`
`306`	`309`	`}`
`@@ -354,6 +357,7 @@ public string MinorVersion`
`354`	`357`	`if (value.Length != 1) value = value.TrimStart(new char[] { '0' });`
`355`	`358`	`_MinorVersion = value;`
`356`	`359`	`RaisePropertyChanged("MinorVersion");`
	`360`	`+ RaisePropertyChanged(nameof(HasChanges));`
`357`	`361`	`BeginInvoke(() =>`
`358`	`362`	`{`
`359`	`363`	`SubmitCommand.RaiseCanExecuteChanged();`
`@@ -380,6 +384,7 @@ public string BuildVersion`
`380`	`384`	`if (value.Length != 1) value = value.TrimStart(new char[] { '0' });`
`381`	`385`	`_BuildVersion = value;`
`382`	`386`	`RaisePropertyChanged("BuildVersion");`
	`387`	`+ RaisePropertyChanged(nameof(HasChanges));`
`383`	`388`	`BeginInvoke(() =>`
`384`	`389`	`{`
`385`	`390`	`SubmitCommand.RaiseCanExecuteChanged();`
`@@ -406,6 +411,7 @@ public string MajorVersion`
`406`	`411`	`if (value.Length != 1) value = value.TrimStart(new char[] { '0' });`
`407`	`412`	`_MajorVersion = value;`
`408`	`413`	`RaisePropertyChanged("MajorVersion");`
	`414`	`+ RaisePropertyChanged(nameof(HasChanges));`
`409`	`415`	`BeginInvoke(() =>`
`410`	`416`	`{`
`411`	`417`	`SubmitCommand.RaiseCanExecuteChanged();`
`@@ -429,6 +435,7 @@ public string License`
`429`	`435`	`{`
`430`	`436`	`_license = value;`
`431`	`437`	`RaisePropertyChanged(nameof(License));`
	`438`	`+ RaisePropertyChanged(nameof(HasChanges));`
`432`	`439`	`}`
`433`	`440`	`}`
`434`	`441`	`}`
`@@ -444,6 +451,7 @@ public string CopyrightHolder`
`444`	`451`	`{`
`445`	`452`	`copyrightHolder = value;`
`446`	`453`	`RaisePropertyChanged(nameof(CopyrightHolder));`
	`454`	`+ RaisePropertyChanged(nameof(HasChanges));`
`447`	`455`	`}`
`448`	`456`	`}`
`449`	`457`
`@@ -458,6 +466,7 @@ public string CopyrightYear`
`458`	`466`	`{`
`459`	`467`	`copyrightYear = value;`
`460`	`468`	`RaisePropertyChanged(nameof(CopyrightYear));`
	`469`	`+ RaisePropertyChanged(nameof(HasChanges));`
`461`	`470`	`}`
`462`	`471`	`}`
`463`	`472`
`@@ -475,6 +484,7 @@ public string SiteUrl`
`475`	`484`	`{`
`476`	`485`	`_siteUrl = value;`
`477`	`486`	`RaisePropertyChanged("SiteUrl");`
	`487`	`+ RaisePropertyChanged(nameof(HasChanges));`
`478`	`488`	`}`
`479`	`489`	`}`
`480`	`490`	`}`
`@@ -493,6 +503,7 @@ public string RepositoryUrl`
`493`	`503`	`{`
`494`	`504`	`_repositoryUrl = value;`
`495`	`505`	`RaisePropertyChanged("RepositoryUrl");`
	`506`	`+ RaisePropertyChanged(nameof(HasChanges));`
`496`	`507`	`}`
`497`	`508`	`}`
`498`	`509`	`}`
`@@ -516,6 +527,8 @@ public string Name`
`516`	`527`	`SubmitCommand.RaiseCanExecuteChanged();`
`517`	`528`	`PublishLocallyCommand.RaiseCanExecuteChanged();`
`518`	`529`	`});`
	`530`	`+`
	`531`	`+ RaisePropertyChanged(nameof(HasChanges));`
`519`	`532`	`}`
`520`	`533`	`}`
`521`	`534`	`}`
`@@ -581,6 +594,7 @@ public List<string> SelectedHosts`
`581`	`594`	`SelectedHostsString = SelectedHostsString.Trim().TrimEnd(',');`
`582`	`595`	`RaisePropertyChanged( nameof(SelectedHosts));`
`583`	`596`	`RaisePropertyChanged( nameof(SelectedHostsString));`
	`597`	`+ RaisePropertyChanged(nameof(HasChanges));`
`584`	`598`	`}`
`585`	`599`	`}`
`586`	`600`	`}`
`@@ -598,6 +612,7 @@ public string SelectedHostsString`
`598`	`612`	`{`
`599`	`613`	`selectedHostsString = value;`
`600`	`614`	`RaisePropertyChanged(nameof(SelectedHostsString));`
	`615`	`+ RaisePropertyChanged(nameof(HasChanges));`
`601`	`616`	`}`
`602`	`617`	`}`
`603`	`618`	`}`
`@@ -759,6 +774,7 @@ public ObservableCollection<string> AdditionalFiles`
`759`	`774`	`{`
`760`	`775`	`_additionalFiles = value;`
`761`	`776`	`RaisePropertyChanged("AdditionalFiles");`
	`777`	`+ RaisePropertyChanged(nameof(HasChanges));`
`762`	`778`	`}`
`763`	`779`	`}`
`764`	`780`	`}`
`@@ -784,6 +800,7 @@ public string DependencyNames`
`784`	`800`	`{`
`785`	`801`	`dependencyNames = value;`
`786`	`802`	`RaisePropertyChanged(nameof(DependencyNames));`
	`803`	`+ RaisePropertyChanged(nameof(HasChanges));`
`787`	`804`	`}`
`788`	`805`	`}`
`789`	`806`
`@@ -892,9 +909,18 @@ public string RootFolder`
`892`	`909`	`{`
`893`	`910`	`_rootFolder = value;`
`894`	`911`	`RaisePropertyChanged(nameof(RootFolder));`
	`912`	`+ RaisePropertyChanged(nameof(HasChanges));`
`895`	`913`	`}`
`896`	`914`	`}`
`897`	`915`
	`916`	`+ /// <summary>`
	`917`	`+ /// Indicates if the user has made any changes to the current publish package form`
	`918`	`+ /// </summary>`
	`919`	`+ public bool HasChanges`
	`920`	`+ {`
	`921`	`+ get { return AnyUserChanges(); }`
	`922`	`+ }`
	`923`	`+`
`898`	`924`	`#endregion`
`899`	`925`
`900`	`926`	`internal PublishPackageViewModel()`