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 BF2A677F75 for ; Mon, 25 Oct 2021 15:48:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 425CC23794 for ; Mon, 25 Oct 2021 15:48:08 +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 C9C532364B for ; Mon, 25 Oct 2021 15:48:00 +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 A234845E7F for ; Mon, 25 Oct 2021 15:48:00 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 25 Oct 2021 15:47:54 +0200 Message-Id: <20211025134755.169491-12-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211025134755.169491-1-f.ebner@proxmox.com> References: <20211025134755.169491-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.262 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: node: storage removal: add checkbox for cleaning up disks 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, 25 Oct 2021 13:48:39 -0000 and factor out a SafeDestroyStorage sub-class to avoid duplication. Signed-off-by: Fabian Ebner --- www/manager6/Makefile | 1 + www/manager6/node/Directory.js | 3 +-- www/manager6/node/LVM.js | 3 +-- www/manager6/node/LVMThin.js | 3 +-- www/manager6/node/ZFS.js | 3 +-- www/manager6/window/SafeDestroyStorage.js | 31 +++++++++++++++++++++++ 6 files changed, 36 insertions(+), 8 deletions(-) create mode 100644 www/manager6/window/SafeDestroyStorage.js diff --git a/www/manager6/Makefile b/www/manager6/Makefile index 3d1778c2..ecff8216 100644 --- a/www/manager6/Makefile +++ b/www/manager6/Makefile @@ -103,6 +103,7 @@ JSSRC= \ window/Prune.js \ window/Restore.js \ window/SafeDestroyGuest.js \ + window/SafeDestroyStorage.js \ window/Settings.js \ window/Snapshot.js \ window/StartupEdit.js \ diff --git a/www/manager6/node/Directory.js b/www/manager6/node/Directory.js index c3dba2ef..cab3d28b 100644 --- a/www/manager6/node/Directory.js +++ b/www/manager6/node/Directory.js @@ -90,10 +90,9 @@ Ext.define('PVE.node.Directorylist', { throw "no directory name specified"; } - Ext.create('Proxmox.window.SafeDestroy', { + Ext.create('PVE.window.SafeDestroyStorage', { url: `/nodes/${view.nodename}/disks/directory/${dirName}`, item: { id: dirName }, - showProgress: true, taskName: 'dirremove', taskDone: () => { view.reload(); }, }).show(); diff --git a/www/manager6/node/LVM.js b/www/manager6/node/LVM.js index 70ddf451..d4024de1 100644 --- a/www/manager6/node/LVM.js +++ b/www/manager6/node/LVM.js @@ -76,10 +76,9 @@ Ext.define('PVE.node.LVMList', { throw "no volume group specified"; } - Ext.create('Proxmox.window.SafeDestroy', { + Ext.create('PVE.window.SafeDestroyStorage', { url: `/nodes/${view.nodename}/disks/lvm/${volumeGroup}`, item: { id: volumeGroup }, - showProgress: true, taskName: 'lvmremove', taskDone: () => { view.reload(); }, }).show(); diff --git a/www/manager6/node/LVMThin.js b/www/manager6/node/LVMThin.js index ca32bb3b..ebd83c54 100644 --- a/www/manager6/node/LVMThin.js +++ b/www/manager6/node/LVMThin.js @@ -80,11 +80,10 @@ Ext.define('PVE.node.LVMThinList', { throw "no volume group specified"; } - Ext.create('Proxmox.window.SafeDestroy', { + Ext.create('PVE.window.SafeDestroyStorage', { url: `/nodes/${view.nodename}/disks/lvmthin/${thinPool}`, params: { 'volume-group': volumeGroup }, item: { id: `${volumeGroup}/${thinPool}` }, - showProgress: true, taskName: 'lvmthinremove', taskDone: () => { view.reload(); }, }).show(); diff --git a/www/manager6/node/ZFS.js b/www/manager6/node/ZFS.js index c5c5aac8..01c56e40 100644 --- a/www/manager6/node/ZFS.js +++ b/www/manager6/node/ZFS.js @@ -321,10 +321,9 @@ Ext.define('PVE.node.ZFSList', { throw "no pool specified"; } - Ext.create('Proxmox.window.SafeDestroy', { + Ext.create('PVE.window.SafeDestroyStorage', { url: `/nodes/${view.nodename}/disks/zfs/${pool}`, item: { id: pool }, - showProgress: true, taskName: 'zfsremove', taskDone: () => { view.reload(); }, }).show(); diff --git a/www/manager6/window/SafeDestroyStorage.js b/www/manager6/window/SafeDestroyStorage.js new file mode 100644 index 00000000..62882f37 --- /dev/null +++ b/www/manager6/window/SafeDestroyStorage.js @@ -0,0 +1,31 @@ +/* + * SafeDestroy window with additional checkboxes for removing a storage on the disk level. + */ +Ext.define('PVE.window.SafeDestroyStorage', { + extend: 'Proxmox.window.SafeDestroy', + alias: 'widget.pveSafeDestroyStorage', + + showProgress: true, + + additionalItems: [ + { + xtype: 'proxmoxcheckbox', + name: 'wipeDisks', + reference: 'wipeDisksCheckbox', + boxLabel: gettext('Cleanup Disks'), + checked: true, + autoEl: { + tag: 'div', + 'data-qtip': gettext('Wipe labels and other left-overs'), + }, + }, + ], + + getParams: function() { + let me = this; + + me.params['cleanup-disks'] = me.lookupReference('wipeDisksCheckbox').checked ? 1 : 0; + + return me.callParent(); + }, +}); -- 2.30.2