From 943ad781cc4a8a3fa1845159bacbf504ef8f41d9 Mon Sep 17 00:00:00 2001 From: MlssFrncJrg <119158464+MelissaFrncJrg@users.noreply.github.com> Date: Thu, 26 Sep 2024 17:18:56 +0200 Subject: [PATCH] fix(xo-server/xo-web/mirrorBackup): correct new schedule property on edited mirror backup job (#8001) Introduced by ee0adae --- CHANGELOG.unreleased.md | 2 ++ packages/xo-server/src/api/mirror-backup.mjs | 4 ---- packages/xo-web/src/xo-app/backup/new/mirror/index.js | 7 +++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 2aa6c3de837..7d61e6fbece 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -45,4 +45,6 @@ - xen-api minor - xo-cli minor - xo-server minor +- xo-web patch + diff --git a/packages/xo-server/src/api/mirror-backup.mjs b/packages/xo-server/src/api/mirror-backup.mjs index 802f25ac522..d8bd341cf5d 100644 --- a/packages/xo-server/src/api/mirror-backup.mjs +++ b/packages/xo-server/src/api/mirror-backup.mjs @@ -113,10 +113,6 @@ editJob.params = { remotes: { type: 'object', }, - schedules: { - type: 'object', - optional: true, - }, filter: MIRROR_BACKUP_FILTER, settings: SCHEMA_SETTINGS, } diff --git a/packages/xo-web/src/xo-app/backup/new/mirror/index.js b/packages/xo-web/src/xo-app/backup/new/mirror/index.js index 951b0f22047..111c9b482fa 100644 --- a/packages/xo-web/src/xo-app/backup/new/mirror/index.js +++ b/packages/xo-web/src/xo-app/backup/new/mirror/index.js @@ -189,7 +189,6 @@ const NewMirrorBackup = decorate([ } const settings = { ...state.settings } - const schedules = { ...state.schedules } await Promise.all([ ...map(props.schedules, ({ id }) => { const schedule = state.schedules[id] @@ -214,16 +213,16 @@ const NewMirrorBackup = decorate([ enabled: schedule.enabled, }) settings[newSchedule.id] = settings[schedule.id] - schedules[newSchedule.id] = newSchedule delete settings[schedule.id] - delete schedules[schedule.id] } }), ]) + const { schedules, ...jobProps } = normalize({ ...state, settings, isIncremental: state.isIncremental }) + await editMirrorBackupJob({ id: props.job.id, - ...normalize({ ...state, settings, schedules, isIncremental: state.isIncremental }), + ...jobProps, }) }, resetMirrorBackup: () => (_, props) => getInitialState(props),