From 98a0142d288d1b4dcb49a801c4029738ab049170 Mon Sep 17 00:00:00 2001 From: Alex Eftimie Date: Thu, 13 Feb 2025 11:48:14 +0100 Subject: [PATCH 1/4] fix: #20183 preserve syncOptions when rolling back a rollback initiatiated from the UI shouldn't wipe out syncOptions if set Signed-off-by: Alex Eftimie --- .../components/application-details/application-details.tsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ui/src/app/applications/components/application-details/application-details.tsx b/ui/src/app/applications/components/application-details/application-details.tsx index 3955f45d6f8fd..18f3be7d895b1 100644 --- a/ui/src/app/applications/components/application-details/application-details.tsx +++ b/ui/src/app/applications/components/application-details/application-details.tsx @@ -1205,6 +1205,10 @@ Are you sure you want to disable auto-sync and rollback application '${this.prop if (needDisableRollback) { const update = JSON.parse(JSON.stringify(application)) as appModels.Application; update.spec.syncPolicy = {automated: null}; + // preserve syncOptions when doing rollback + if (application.spec.syncPolicy.syncOptions) { + update.spec.syncPolicy.syncOptions = application.spec.syncPolicy.syncOptions; + } await services.applications.update(update); } await services.applications.rollback(this.props.match.params.name, this.getAppNamespace(), revisionHistory.id); From a8771d79d12a538f01397e136e74f86dce4074c0 Mon Sep 17 00:00:00 2001 From: Alex Eftimie Date: Mon, 3 Mar 2025 10:45:32 +0200 Subject: [PATCH 2/4] Update ui/src/app/applications/components/application-details/application-details.tsx Co-authored-by: Linghao Su Signed-off-by: Alex Eftimie --- .../components/application-details/application-details.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ui/src/app/applications/components/application-details/application-details.tsx b/ui/src/app/applications/components/application-details/application-details.tsx index 18f3be7d895b1..b22572019d06c 100644 --- a/ui/src/app/applications/components/application-details/application-details.tsx +++ b/ui/src/app/applications/components/application-details/application-details.tsx @@ -1204,11 +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}; - // preserve syncOptions when doing rollback - if (application.spec.syncPolicy.syncOptions) { - update.spec.syncPolicy.syncOptions = application.spec.syncPolicy.syncOptions; - } + set('spec.syncPolicy.syncOptions.automated', null) await services.applications.update(update); } await services.applications.rollback(this.props.match.params.name, this.getAppNamespace(), revisionHistory.id); From b7680fe856411f592da0dfbe4df227ea31faa0fb Mon Sep 17 00:00:00 2001 From: Alex Eftimie Date: Mon, 3 Mar 2025 10:46:57 +0200 Subject: [PATCH 3/4] Update ui/src/app/applications/components/application-details/application-details.tsx Signed-off-by: Alex Eftimie --- .../components/application-details/application-details.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/app/applications/components/application-details/application-details.tsx b/ui/src/app/applications/components/application-details/application-details.tsx index b22572019d06c..a145d7e6a6d9e 100644 --- a/ui/src/app/applications/components/application-details/application-details.tsx +++ b/ui/src/app/applications/components/application-details/application-details.tsx @@ -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; - set('spec.syncPolicy.syncOptions.automated', null) + update.spec.syncPolicy.syncOptions.automated = null; await services.applications.update(update); } await services.applications.rollback(this.props.match.params.name, this.getAppNamespace(), revisionHistory.id); From 8f331a28136d9f2cad3ba5dba1dfdec3b0da871d Mon Sep 17 00:00:00 2001 From: Alex Eftimie Date: Mon, 3 Mar 2025 10:48:02 +0200 Subject: [PATCH 4/4] Update ui/src/app/applications/components/application-details/application-details.tsx Signed-off-by: Alex Eftimie --- .../components/application-details/application-details.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/src/app/applications/components/application-details/application-details.tsx b/ui/src/app/applications/components/application-details/application-details.tsx index a145d7e6a6d9e..71ffac24306ef 100644 --- a/ui/src/app/applications/components/application-details/application-details.tsx +++ b/ui/src/app/applications/components/application-details/application-details.tsx @@ -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.syncOptions.automated = null; + update.spec.syncPolicy.automated = null; await services.applications.update(update); } await services.applications.rollback(this.props.match.params.name, this.getAppNamespace(), revisionHistory.id);