From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id EF95B1FF0B0 for ; Fri, 09 Oct 2026 16:55:16 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id BF4E921624; Fri, 09 Oct 2026 16:55:16 +0200 (CEST) From: Jonas Theisen To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v3 10/10] ui: create datastore: add enable checkboxes for {GC, prune} Date: Fri, 9 Oct 2026 16:54:41 +0200 Message-ID: <20261009145445.282494-8-j.theisen@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261009145445.282494-1-j.theisen@proxmox.com> References: <20261009145445.282494-1-j.theisen@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1791557708971 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.152 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 6AXKJU4XWSXHU5ZJSR6I5JBIOV44J7NQ X-Message-ID-Hash: 6AXKJU4XWSXHU5ZJSR6I5JBIOV44J7NQ X-MailFrom: j.theisen@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: To allow users to disable GC and prune jobs at creation of a datastore without setting the schedule to none, this patch adds the necessary checkboxes and logic. This patch depends on a changed API endpoint to allow a creation of the datastore without the prune job. Signed-off-by: Jonas Theisen --- www/window/DataStoreEdit.js | 77 +++++++++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 4 deletions(-) diff --git a/www/window/DataStoreEdit.js b/www/window/DataStoreEdit.js index 911bf47d6..2a59d33ed 100644 --- a/www/window/DataStoreEdit.js +++ b/www/window/DataStoreEdit.js @@ -26,6 +26,19 @@ Ext.define('PBS.DataStoreEdit', { return {}; }, + setValues: function (values) { + let me = this; + + if (!values['gc-schedule'] || values['gc-schedule'] === '') { + values['gc-disable'] = true; + } + if (!values['prune-schedule'] || values['prune-schedule'] === '') { + values['prune-disable'] = true; + } + + me.callParent([values]); + }, + items: { xtype: 'tabpanel', bodyPadding: 10, @@ -142,24 +155,62 @@ Ext.define('PBS.DataStoreEdit', { }, ], column2: [ + { + xtype: 'proxmoxcheckbox', + fieldLabel: gettext('Enable GC'), + name: 'gc-enable', + autoEl: { + tag: 'div', + 'data-qtip': gettext('Enable scheduled execution of garbage collection.'), + }, + listeners: { + change: function (field, enabled) { + let me = this; + let view = me.up('pbsDataStoreEdit'); + let schedule = view.down('field[name=gc-schedule]'); + schedule.setDisabled(!enabled); + }, + }, + uncheckedValue: false, + value: true, + }, { xtype: 'pbsCalendarEvent', name: 'gc-schedule', fieldLabel: gettext('GC Schedule'), - emptyText: gettext('none'), + allowBlank: false, cbind: { - deleteEmpty: '{!isCreate}', value: '{scheduleValue}', }, }, + { + xtype: 'proxmoxcheckbox', + fieldLabel: gettext('Enable Prune'), + name: 'prune-enable', + autoEl: { + tag: 'div', + 'data-qtip': gettext('Create a prune job for this datastore.'), + }, + listeners: { + change: function (field, enabled) { + let me = this; + let view = me.up('pbsDataStoreEdit'); + let schedule = view.down('field[name=prune-schedule]'); + let pruneOptions = view.down('pbsPruneInputPanel'); + schedule.setDisabled(!enabled); + pruneOptions.setDisabled(!enabled); + }, + }, + uncheckedValue: false, + value: true, + }, { xtype: 'pbsCalendarEvent', name: 'prune-schedule', fieldLabel: gettext('Prune Schedule'), value: 'daily', - emptyText: gettext('none'), + allowBlank: false, cbind: { - deleteEmpty: '{!isCreate}', value: '{scheduleValue}', }, }, @@ -238,6 +289,24 @@ Ext.define('PBS.DataStoreEdit', { delete values.s3client; delete values.bucket; + values['gc-disable'] = !values['gc-enable']; + if (me.isCreate) { + values['prune-disable'] = !values['prune-enable']; + } + delete values['gc-enable']; + delete values['prune-enable']; + + return values; + }, + + onSetValues: function (values) { + let _me = this; + + values['gc-enable'] = !values['gc-disable']; + values['prune-enable'] = !values['prune-disable']; + delete values['gc-disable']; + delete values['prune-disable']; + return values; }, }, -- 2.47.3