* [pbs-devel] [PATCH proxmox-backup 1/2] api2/admin/datastore: add delete for groups @ 2021-05-14 14:36 Dominik Csapak 2021-05-14 14:36 ` [pbs-devel] [PATCH proxmox-backup 2/2] ui: datastore/Content: add forget button " Dominik Csapak 2021-05-17 6:46 ` [pbs-devel] applied: [PATCH proxmox-backup 1/2] api2/admin/datastore: add delete " Dietmar Maurer 0 siblings, 2 replies; 3+ messages in thread From: Dominik Csapak @ 2021-05-14 14:36 UTC (permalink / raw) To: pbs-devel so that a user can delete a whole group at once, until now, the fastest way for this was to prune to one snapshot, and delete that code is basically a copy/paste from the snapshot delete, sans the 'backup-time' parameter Signed-off-by: Dominik Csapak <d.csapak@proxmox.com> --- src/api2/admin/datastore.rs | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index 97860910..e0dfeecc 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -219,6 +219,48 @@ pub fn list_groups( Ok(group_info) } +#[api( + input: { + properties: { + store: { + schema: DATASTORE_SCHEMA, + }, + "backup-type": { + schema: BACKUP_TYPE_SCHEMA, + }, + "backup-id": { + schema: BACKUP_ID_SCHEMA, + }, + }, + }, + access: { + permission: &Permission::Privilege( + &["datastore", "{store}"], + PRIV_DATASTORE_MODIFY| PRIV_DATASTORE_PRUNE, + true), + }, +)] +/// Delete backup group including all snapshots. +pub fn delete_group( + store: String, + backup_type: String, + backup_id: String, + _info: &ApiMethod, + rpcenv: &mut dyn RpcEnvironment, +) -> Result<Value, Error> { + + let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; + + let group = BackupGroup::new(backup_type, backup_id); + let datastore = DataStore::lookup_datastore(&store)?; + + check_priv_or_backup_owner(&datastore, &group, &auth_id, PRIV_DATASTORE_MODIFY)?; + + datastore.remove_backup_group(&group)?; + + Ok(Value::Null) +} + #[api( input: { properties: { @@ -1722,6 +1764,7 @@ const DATASTORE_INFO_SUBDIRS: SubdirMap = &[ "groups", &Router::new() .get(&API_METHOD_LIST_GROUPS) + .delete(&API_METHOD_DELETE_GROUP) ), ( "notes", -- 2.20.1 ^ permalink raw reply [flat|nested] 3+ messages in thread
* [pbs-devel] [PATCH proxmox-backup 2/2] ui: datastore/Content: add forget button for groups 2021-05-14 14:36 [pbs-devel] [PATCH proxmox-backup 1/2] api2/admin/datastore: add delete for groups Dominik Csapak @ 2021-05-14 14:36 ` Dominik Csapak 2021-05-17 6:46 ` [pbs-devel] applied: [PATCH proxmox-backup 1/2] api2/admin/datastore: add delete " Dietmar Maurer 1 sibling, 0 replies; 3+ messages in thread From: Dominik Csapak @ 2021-05-14 14:36 UTC (permalink / raw) To: pbs-devel since we can remove whole groups via api now Signed-off-by: Dominik Csapak <d.csapak@proxmox.com> --- www/datastore/Content.js | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/www/datastore/Content.js b/www/datastore/Content.js index 1394b2ea..67ebbdac 100644 --- a/www/datastore/Content.js +++ b/www/datastore/Content.js @@ -382,10 +382,30 @@ Ext.define('PBS.DataStoreContent', { let data = rec.data; if (!view.datastore) return; + let params; + let message; + let url; + if (rec.parentNode.id !== 'root') { + message = Ext.String.format(gettext('Are you sure you want to remove snapshot {0}'), `'${data.text}'`); + url = `/admin/datastore/${view.datastore}/snapshots`; + params = { + "backup-type": data["backup-type"], + "backup-id": data["backup-id"], + "backup-time": (data['backup-time'].getTime()/1000).toFixed(0), + }; + } else { + message = Ext.String.format(gettext('Are you sure you want to remove group {0}'), `'${data.text}'`); + url = `/admin/datastore/${view.datastore}/groups`; + params = { + "backup-type": data.backup_type, + "backup-id": data.backup_id, + }; + } + Ext.Msg.show({ title: gettext('Confirm'), icon: Ext.Msg.WARNING, - message: Ext.String.format(gettext('Are you sure you want to remove snapshot {0}'), `'${data.text}'`), + message, buttons: Ext.Msg.YESNO, defaultFocus: 'no', callback: function(btn) { @@ -394,12 +414,8 @@ Ext.define('PBS.DataStoreContent', { } Proxmox.Utils.API2Request({ - params: { - "backup-type": data["backup-type"], - "backup-id": data["backup-id"], - "backup-time": (data['backup-time'].getTime()/1000).toFixed(0), - }, - url: `/admin/datastore/${view.datastore}/snapshots`, + url, + params, method: 'DELETE', waitMsgTarget: view, failure: function(response, opts) { @@ -617,8 +633,8 @@ Ext.define('PBS.DataStoreContent', { { handler: 'onForget', getTip: (v, m, rec) => Ext.String.format(gettext("Permanently forget snapshot '{0}'"), v), - getClass: (v, m, rec) => !rec.data.leaf && rec.parentNode.id !== 'root' ? 'fa critical fa-trash-o' : 'pmx-hidden', - isDisabled: (v, r, c, i, rec) => rec.data.leaf || rec.parentNode.id === 'root', + getClass: (v, m, rec) => !rec.data.leaf ? 'fa critical fa-trash-o' : 'pmx-hidden', + isDisabled: (v, r, c, i, rec) => !!rec.data.leaf, }, { handler: 'downloadFile', -- 2.20.1 ^ permalink raw reply [flat|nested] 3+ messages in thread
* [pbs-devel] applied: [PATCH proxmox-backup 1/2] api2/admin/datastore: add delete for groups 2021-05-14 14:36 [pbs-devel] [PATCH proxmox-backup 1/2] api2/admin/datastore: add delete for groups Dominik Csapak 2021-05-14 14:36 ` [pbs-devel] [PATCH proxmox-backup 2/2] ui: datastore/Content: add forget button " Dominik Csapak @ 2021-05-17 6:46 ` Dietmar Maurer 1 sibling, 0 replies; 3+ messages in thread From: Dietmar Maurer @ 2021-05-17 6:46 UTC (permalink / raw) To: Proxmox Backup Server development discussion, Dominik Csapak applied both patches ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-17 6:46 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-05-14 14:36 [pbs-devel] [PATCH proxmox-backup 1/2] api2/admin/datastore: add delete for groups Dominik Csapak 2021-05-14 14:36 ` [pbs-devel] [PATCH proxmox-backup 2/2] ui: datastore/Content: add forget button " Dominik Csapak 2021-05-17 6:46 ` [pbs-devel] applied: [PATCH proxmox-backup 1/2] api2/admin/datastore: add delete " Dietmar Maurer
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox