From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@proxmox.com>
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 6C3FD76859
for <pve-devel@lists.proxmox.com>; Tue, 19 Oct 2021 11:34:33 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 3B1DB2AFBB
for <pve-devel@lists.proxmox.com>; Tue, 19 Oct 2021 11:33:59 +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 CFDB82AF24
for <pve-devel@lists.proxmox.com>; Tue, 19 Oct 2021 11:33:55 +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 735D9468D9
for <pve-devel@lists.proxmox.com>; Tue, 19 Oct 2021 11:33:55 +0200 (CEST)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 19 Oct 2021 11:33:53 +0200
Message-Id: <20211019093353.2451987-13-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20211019093353.2451987-1-d.csapak@proxmox.com>
References: <20211019093353.2451987-1-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.288 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 11/11] ui: ceph/fs: allow destroying
cephfs
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 19 Oct 2021 09:34:33 -0000
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/manager6/Makefile | 1 +
www/manager6/ceph/FS.js | 35 ++++++++++++++++++++++++
www/manager6/window/SafeDestroyCephFS.js | 22 +++++++++++++++
3 files changed, 58 insertions(+)
create mode 100644 www/manager6/window/SafeDestroyCephFS.js
diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index a759db87..ccf9872b 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -104,6 +104,7 @@ JSSRC= \
window/Prune.js \
window/Restore.js \
window/SafeDestroyGuest.js \
+ window/SafeDestroyCephFS.js \
window/Settings.js \
window/Snapshot.js \
window/StartupEdit.js \
diff --git a/www/manager6/ceph/FS.js b/www/manager6/ceph/FS.js
index a3fa3672..1a8eca26 100644
--- a/www/manager6/ceph/FS.js
+++ b/www/manager6/ceph/FS.js
@@ -139,6 +139,34 @@ Ext.define('PVE.NodeCephFSPanel', {
});
},
+ onRemove: function() {
+ let me = this;
+ let view = me.getView();
+ let selection = view.getSelection();
+ if (!selection || selection.length < 1) {
+ return;
+ }
+
+ let rec = selection[0];
+ let fsname = rec.data.name;
+
+ Ext.create('PVE.window.SafeDestroyCephFS', {
+ showProgress: true,
+ url: `/nodes/${view.nodename}/ceph/fs/${fsname}`,
+ params: {
+ 'remove-storages': 1,
+ },
+ item: {
+ type: 'CephFS',
+ id: fsname,
+ },
+ taskName: 'cephdestroyfs',
+ autoShow: true,
+ listeners: {
+ destroy: () => view.rstore.load(),
+ },
+ });
+ },
},
tbar: [
{
@@ -149,6 +177,13 @@ Ext.define('PVE.NodeCephFSPanel', {
disabled: '{!canCreateFS}',
},
},
+ {
+ xtype: 'proxmoxButton',
+ text: gettext('Remove CephFS'),
+ reference: 'removeButton',
+ disabled: true,
+ handler: 'onRemove',
+ },
],
columns: [
{
diff --git a/www/manager6/window/SafeDestroyCephFS.js b/www/manager6/window/SafeDestroyCephFS.js
new file mode 100644
index 00000000..08e910ac
--- /dev/null
+++ b/www/manager6/window/SafeDestroyCephFS.js
@@ -0,0 +1,22 @@
+Ext.define('PVE.window.SafeDestroyCephFS', {
+ extend: 'Proxmox.window.SafeDestroy',
+ alias: 'widget.pveSafeDestroyCephFS',
+
+ additionalItems: [
+ {
+ xtype: 'proxmoxcheckbox',
+ name: 'remove-pools',
+ reference: 'poolsCheckbox',
+ boxLabel: gettext('Remove associated pools.'),
+ checked: true,
+ },
+ ],
+
+ getParams: function() {
+ let me = this;
+
+ me.params['remove-pools'] = me.lookup('poolsCheckbox').checked ? 1 : 0;
+
+ return me.callParent();
+ },
+});
--
2.30.2