[pve-devel] [PATCH manager 5/6] ui: node: storage removal: add checkbox for cleaning up disks

Fabian Ebner f.ebner at proxmox.com
Mon Oct 25 15:47:54 CEST 2021


and factor out a SafeDestroyStorage sub-class to avoid duplication.

Signed-off-by: Fabian Ebner <f.ebner at proxmox.com>
---
 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





More information about the pve-devel mailing list