Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reddyashish merged 4 commits into from
Dec 6, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
749429d
disable cancel button of no changes
dnenov Dec 5, 2023
07d57f6
revert namespaces
dnenov Dec 6, 2023
5261af9
revert namespaces
dnenov Dec 6, 2023
4d3da3e
rename button cancel to reset
dnenov Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/DynamoCoreWpf/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion src/DynamoCoreWpf/Properties/Resources.en-US.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -3858,4 +3861,4 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
<data name="NotificationToAgreeMLNodeautocompleteTOU" xml:space="preserve">
<value>To access the Recommended Nodes feature, please read and accept Dynamo &gt; Agreement and Terms of Use.</value>
</data>
</root>
</root>
3 changes: 3 additions & 0 deletions src/DynamoCoreWpf/Properties/Resources.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
26 changes: 26 additions & 0 deletions src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ public string Group
{
_group = value;
RaisePropertyChanged("Group");
RaisePropertyChanged(nameof(HasChanges));
}
}
}
Expand All @@ -287,6 +288,7 @@ public string Description
{
_Description = value;
RaisePropertyChanged("Description");
RaisePropertyChanged(nameof(HasChanges));
BeginInvoke(() =>
{
SubmitCommand.RaiseCanExecuteChanged();
Expand Down Expand Up @@ -315,6 +317,7 @@ public string Keywords

_Keywords = value;
RaisePropertyChanged("Keywords");
RaisePropertyChanged(nameof(HasChanges));
KeywordList = value.Split(' ').Where(x => x.Length > 0).ToList();
}
}
Expand Down Expand Up @@ -368,6 +371,7 @@ public string MinorVersion
if (value.Length != 1) value = value.TrimStart(new char[] { '0' });
_MinorVersion = value;
RaisePropertyChanged("MinorVersion");
RaisePropertyChanged(nameof(HasChanges));
BeginInvoke(() =>
{
SubmitCommand.RaiseCanExecuteChanged();
Expand All @@ -394,6 +398,7 @@ public string BuildVersion
if (value.Length != 1) value = value.TrimStart(new char[] { '0' });
_BuildVersion = value;
RaisePropertyChanged("BuildVersion");
RaisePropertyChanged(nameof(HasChanges));
BeginInvoke(() =>
{
SubmitCommand.RaiseCanExecuteChanged();
Expand All @@ -420,6 +425,7 @@ public string MajorVersion
if (value.Length != 1) value = value.TrimStart(new char[] { '0' });
_MajorVersion = value;
RaisePropertyChanged("MajorVersion");
RaisePropertyChanged(nameof(HasChanges));
BeginInvoke(() =>
{
SubmitCommand.RaiseCanExecuteChanged();
Expand All @@ -443,6 +449,7 @@ public string License
{
_license = value;
RaisePropertyChanged(nameof(License));
RaisePropertyChanged(nameof(HasChanges));
}
}
}
Expand All @@ -458,6 +465,7 @@ public string CopyrightHolder
{
copyrightHolder = value;
RaisePropertyChanged(nameof(CopyrightHolder));
RaisePropertyChanged(nameof(HasChanges));
}
}

Expand All @@ -472,6 +480,7 @@ public string CopyrightYear
{
copyrightYear = value;
RaisePropertyChanged(nameof(CopyrightYear));
RaisePropertyChanged(nameof(HasChanges));
}
}

Expand All @@ -489,6 +498,7 @@ public string SiteUrl
{
_siteUrl = value;
RaisePropertyChanged("SiteUrl");
RaisePropertyChanged(nameof(HasChanges));
}
}
}
Expand All @@ -507,6 +517,7 @@ public string RepositoryUrl
{
_repositoryUrl = value;
RaisePropertyChanged("RepositoryUrl");
RaisePropertyChanged(nameof(HasChanges));
}
}
}
Expand All @@ -530,6 +541,8 @@ public string Name
SubmitCommand.RaiseCanExecuteChanged();
PublishLocallyCommand.RaiseCanExecuteChanged();
});

RaisePropertyChanged(nameof(HasChanges));
}
}
}
Expand Down Expand Up @@ -595,6 +608,7 @@ public List<string> SelectedHosts
SelectedHostsString = SelectedHostsString.Trim().TrimEnd(',');
RaisePropertyChanged( nameof(SelectedHosts));
RaisePropertyChanged( nameof(SelectedHostsString));
RaisePropertyChanged(nameof(HasChanges));
}
}
}
Expand All @@ -612,6 +626,7 @@ public string SelectedHostsString
{
selectedHostsString = value;
RaisePropertyChanged(nameof(SelectedHostsString));
RaisePropertyChanged(nameof(HasChanges));
}
}
}
Expand Down Expand Up @@ -773,6 +788,7 @@ public ObservableCollection<string> AdditionalFiles
{
_additionalFiles = value;
RaisePropertyChanged("AdditionalFiles");
RaisePropertyChanged(nameof(HasChanges));
}
}
}
Expand All @@ -798,6 +814,7 @@ public string DependencyNames
{
dependencyNames = value;
RaisePropertyChanged(nameof(DependencyNames));
RaisePropertyChanged(nameof(HasChanges));
}
}

Expand Down Expand Up @@ -906,9 +923,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()
Expand Down
3 changes: 2 additions & 1 deletion src/DynamoCoreWpf/Views/PackageManager/Controls/PackageManagerPublishControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down