From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 36B1670997 for ; Mon, 6 Sep 2021 13:32:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 34F2310355 for ; Mon, 6 Sep 2021 13:32:39 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 490A910340 for ; Mon, 6 Sep 2021 13:32:37 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 1FE43445C2 for ; Mon, 6 Sep 2021 13:32:37 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 6 Sep 2021 13:32:30 +0200 Message-Id: <20210906113231.61790-6-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210906113231.61790-1-f.ebner@proxmox.com> References: <20210906113231.61790-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.386 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH manager 5/6] ui: backup job detail: also show retention settings X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Sep 2021 11:32:39 -0000 Signed-off-by: Fabian Ebner --- www/manager6/dc/Backup.js | 115 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js index ff52e382..68f67811 100644 --- a/www/manager6/dc/Backup.js +++ b/www/manager6/dc/Backup.js @@ -589,6 +589,16 @@ Ext.define('PVE.dc.BackupInfo', { extend: 'Proxmox.panel.InputPanel', alias: 'widget.pveBackupInfo', + viewModel: { + data: { + retentionType: 'none', + }, + formulas: { + hasRetention: (get) => get('retentionType') !== 'none', + retentionKeepAll: (get) => get('retentionType') === 'all', + }, + }, + padding: '5 0 5 10', column1: [ @@ -693,8 +703,81 @@ Ext.define('PVE.dc.BackupInfo', { }, ], + columnB: [ + { + xtype: 'label', + name: 'pruneLabel', + text: gettext('Retention Configuration') + ':', + bind: { + hidden: '{!hasRetention}', + }, + }, + { + layout: 'hbox', + border: false, + defaults: { + border: false, + layout: 'anchor', + flex: 1, + }, + items: [ + { + padding: '0 10 0 0', + defaults: { + labelWidth: 110, + }, + items: [{ + xtype: 'displayfield', + name: 'keep-all', + fieldLabel: gettext('Keep All'), + renderer: Proxmox.Utils.format_boolean, + bind: { + hidden: '{!retentionKeepAll}', + }, + }].concat( + [ + ['keep-last', gettext('Keep Last')], + ['keep-daily', gettext('Keep Daily')], + ['keep-monthly', gettext('Keep Monthly')], + ].map( + name => ({ + xtype: 'displayfield', + name: name[0], + fieldLabel: name[1], + bind: { + hidden: '{!hasRetention || retentionKeepAll}', + }, + }), + ), + ), + }, + { + padding: '0 0 0 10', + defaults: { + labelWidth: 110, + }, + items: [ + ['keep-hourly', gettext('Keep Hourly')], + ['keep-weekly', gettext('Keep Weekly')], + ['keep-yearly', gettext('Keep Yearly')], + ].map( + name => ({ + xtype: 'displayfield', + name: name[0], + fieldLabel: name[1], + bind: { + hidden: '{!hasRetention || retentionKeepAll}', + }, + }), + ), + }, + ], + }, + ], + setValues: function(values) { var me = this; + let vm = me.getViewModel(); Ext.iterate(values, function(fieldId, val) { let field = me.query('[isFormField][name=' + fieldId + ']')[0]; @@ -703,6 +786,38 @@ Ext.define('PVE.dc.BackupInfo', { } }); + if (values['prune-backups'] || values.maxfiles !== undefined) { + const keepNames = [ + 'keep-all', + 'keep-last', + 'keep-hourly', + 'keep-daily', + 'keep-weekly', + 'keep-monthly', + 'keep-yearly', + ]; + + let keepValues; + if (values['prune-backups']) { + keepValues = values['prune-backups']; + } else if (values.maxfiles > 0) { + keepValues = { 'keep-last': values.maxfiles }; + } else { + keepValues = { 'keep-all': 1 }; + } + + vm.set('retentionType', keepValues['keep-all'] ? 'all' : 'other'); + + keepNames.forEach(function(name) { + let field = me.query('[isFormField][name=' + name + ']')[0]; + if (field) { + field.setValue(keepValues[name]); + } + }); + } else { + vm.set('retentionType', 'none'); + } + // selection Mode depends on the presence/absence of several keys let selModeField = me.query('[isFormField][name=selMode]')[0]; let selMode = 'none'; -- 2.30.2