Skip to content

fix: #20183 preserve syncOptions when rolling back from the UI #21871

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
merged 5 commits into from
Apr 2, 2025
Merged

fix: #20183 preserve syncOptions when rolling back from the UI #21871

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98a0142
fix: #20183 preserve syncOptions when rolling back
alexef Feb 13, 2025
a8771d7
Update ui/src/app/applications/components/application-details/applica…
alexef Mar 3, 2025
b7680fe
Update ui/src/app/applications/components/application-details/applica…
alexef Mar 3, 2025
8f331a2
Update ui/src/app/applications/components/application-details/applica…
alexef Mar 3, 2025
41c3d5b
Merge branch 'master' into patch-3
alexef Mar 7, 2025
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
2 changes: 1 addition & 1 deletion ui/src/app/applications/components/application-details/application-details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1204,7 +1204,7 @@ Are you sure you want to disable auto-sync and rollback application '${this.prop
if (confirmed) {
if (needDisableRollback) {
const update = JSON.parse(JSON.stringify(application)) as appModels.Application;
update.spec.syncPolicy = {automated: null};
update.spec.syncPolicy.automated = null;
Copy link
Member Author

@alexef alexef Mar 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

at this point in code (see needDisableRollback) we know that update.spec.syncPolicy.automated is set to something not null. this is why we can set it to null, while leaving the rest of syncPolicy (syncOptions) unchanged.

await services.applications.update(update);
}
await services.applications.rollback(this.props.match.params.name, this.getAppNamespace(), revisionHistory.id);
Expand Down
Loading