From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [RFC v2 manager 3/8] ui: storage edit: retention: add max-protected-backups setting
Date: Tue, 29 Mar 2022 14:53:16 +0200 [thread overview]
Message-ID: <20220329125324.120737-5-f.ebner@proxmox.com> (raw)
In-Reply-To: <20220329125324.120737-1-f.ebner@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
I feel like this too might not be needed anymore, now that the default
is more dynamic.
Dependency bump for storage needed.
Changes from v1:
* Adapt empty text to reflect new default.
www/manager6/panel/BackupJobPrune.js | 47 ++++++++++++++++++++++------
www/manager6/storage/Base.js | 1 +
2 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/www/manager6/panel/BackupJobPrune.js b/www/manager6/panel/BackupJobPrune.js
index a58fe1fe..2bc3e633 100644
--- a/www/manager6/panel/BackupJobPrune.js
+++ b/www/manager6/panel/BackupJobPrune.js
@@ -15,21 +15,32 @@ Ext.define('PVE.panel.BackupJobPrune', {
} else if (this.isCreate && !this.rendered) {
return this.keepAllDefaultForCreate ? { 'prune-backups': 'keep-all=1' } : {};
}
+
+ let options = { 'delete': [] };
+
+ if ('max-protected-backups' in formValues) {
+ options['max-protected-backups'] = formValues['max-protected-backups'];
+ } else if (this.hasMaxProtected) {
+ options.delete.push('max-protected-backups');
+ }
+
+ delete formValues['max-protected-backups'];
delete formValues.delete;
+
let retention = PVE.Parser.printPropertyString(formValues);
if (retention === '') {
- if (this.isCreate) {
- return {};
- }
- // always delete old 'maxfiles' on edit, we map it to keep-last on window load
- return {
- 'delete': ['prune-backups', 'maxfiles'],
- };
+ options.delete.push('prune-backups');
+ } else {
+ options['prune-backups'] = retention;
}
- let options = { 'prune-backups': retention };
+
if (!this.isCreate) {
- options.delete = 'maxfiles';
+ // always delete old 'maxfiles' on edit, we map it to keep-last on window load
+ options.delete.push('maxfiles');
+ } else {
+ delete options.delete;
}
+
return options;
},
@@ -57,6 +68,10 @@ Ext.define('PVE.panel.BackupJobPrune', {
}
panel.down('component[name=pbs-hint]').setHidden(!panel.showPBSHint);
+ let maxProtected = panel.down('proxmoxintegerfield[name=max-protected-backups]');
+ maxProtected.setDisabled(!panel.hasMaxProtected);
+ maxProtected.setHidden(!panel.hasMaxProtected);
+
panel.query('pmxPruneKeepField').forEach(field => {
field.on('change', panel.updateComponents, panel);
});
@@ -95,5 +110,19 @@ Ext.define('PVE.panel.BackupJobPrune', {
padding: '5 1',
html: gettext("It's preferred to configure backup retention directly on the Proxmox Backup Server."),
},
+ {
+ xtype: 'proxmoxintegerfield',
+ name: 'max-protected-backups',
+ fieldLabel: gettext('Maximum Protected'),
+ minValue: -1,
+ hidden: true,
+ disabled: true,
+ emptyText: 'unlimited with Datastore.Allocate privilege, 5 otherwise',
+ deleteEmpty: true,
+ autoEl: {
+ tag: 'div',
+ 'data-qtip': Ext.String.format(gettext('Use {0} for unlimited'), -1),
+ },
+ },
],
});
diff --git a/www/manager6/storage/Base.js b/www/manager6/storage/Base.js
index 89dc2eff..7f6d7a09 100644
--- a/www/manager6/storage/Base.js
+++ b/www/manager6/storage/Base.js
@@ -120,6 +120,7 @@ Ext.define('PVE.storage.BaseEdit', {
{
xtype: 'pveBackupJobPrunePanel',
title: gettext('Backup Retention'),
+ hasMaxProtected: true,
isCreate: me.isCreate,
keepAllDefaultForCreate: true,
showPBSHint: me.ipanel.isPBS,
--
2.30.2
next prev parent reply other threads:[~2022-03-29 12:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-29 12:53 [pve-devel] [PATCH-SERIES v2 storage/manager/guest-common/docs] improvements for protected backups Fabian Ebner
2022-03-29 12:53 ` [pve-devel] [PATCH v2 storage 1/1] plugins: allow limiting the number of protected backups per guest Fabian Ebner
2022-04-06 10:42 ` [pve-devel] applied: " Fabian Grünbichler
2022-03-29 12:53 ` [pve-devel] [PATCH v2 manager 1/8] vzdump: backup file list: drop unused parameter Fabian Ebner
2022-03-29 12:53 ` [pve-devel] [PATCH v2 manager 2/8] vzdump: backup limit: only count unprotected backups Fabian Ebner
2022-03-29 12:53 ` Fabian Ebner [this message]
2022-03-29 12:53 ` [pve-devel] [PATCH v2 docs 1/2] storage: switch to prune-backups in examples Fabian Ebner
2022-03-29 12:53 ` [pve-devel] [PATCH v2 docs 2/2] vzdump/storage: mention protected backups limit and give an example Fabian Ebner
2022-03-29 12:53 ` [pve-devel] [PATCH v2 guest-common 1/1] vzdump: schema: add 'notes-template' and 'protected' properties Fabian Ebner
2022-03-29 12:53 ` [pve-devel] [PATCH v2 manager 4/8] vzdump: support setting protected status Fabian Ebner
2022-03-29 12:53 ` [pve-devel] [PATCH v2 manager 5/8] partially close #438: vzdump: support setting notes-template Fabian Ebner
2022-03-29 12:53 ` [pve-devel] [PATCH v2 manager 6/8] ui: backup: allow setting protected and notes-template for manual backup Fabian Ebner
2022-03-29 12:53 ` [pve-devel] [PATCH v2 manager 7/8] close #438: ui: backup job: allow setting a notes-template for a job Fabian Ebner
2022-03-29 12:53 ` [pve-devel] [PATCH v2 manager 8/8] ui: backup job: set guest name as default notes-template Fabian Ebner
2022-04-06 12:10 ` [pve-devel] partially-applied: [PATCH-SERIES v2 storage/manager/guest-common/docs] improvements for protected backups Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220329125324.120737-5-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox