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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 7C6407CF7A for ; Mon, 8 Nov 2021 10:56:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6A032229F7 for ; Mon, 8 Nov 2021 10:56:14 +0100 (CET) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id C5970229EE for ; Mon, 8 Nov 2021 10:56:13 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A0EAC42131 for ; Mon, 8 Nov 2021 10:56:13 +0100 (CET) From: Aaron Lauterer To: pve-devel@lists.proxmox.com Date: Mon, 8 Nov 2021 10:56:12 +0100 Message-Id: <20211108095612.193819-1-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.061 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 PROLO_LEO1 0.1 Meta Catches all Leo drug variations so far 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] ui: lxc: resources: add Detach text for mountpoints 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, 08 Nov 2021 09:56:44 -0000 Instead of showing 'Remove' for a mountpoint, change the text to 'Detach' and only show 'Remove' for unused volumes. This aligns the behaviour with VMs and will make it clear, that a mountpoint first needs to be detached before it can be fully removed. Signed-off-by: Aaron Lauterer --- I took the code from the qemu/HardwareView.js and only made minor changes to the check if it is a used disk/volume. Since it is only a minor change, I did not go all the way to modernize it and also stayed with `var ...` instead of `let ...` when defining the `isUsedDisk` variable for consistency. www/manager6/lxc/Resources.js | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js index 58344385..831ae962 100644 --- a/www/manager6/lxc/Resources.js +++ b/www/manager6/lxc/Resources.js @@ -191,12 +191,21 @@ Ext.define('PVE.lxc.RessourceView', { var remove_btn = new Proxmox.button.Button({ text: gettext('Remove'), + defaultText: gettext('Remove'), + altText: gettext('Detach'), selModel: me.selModel, disabled: true, dangerous: true, confirmMsg: function(rec) { - var msg = Ext.String.format(gettext('Are you sure you want to remove entry {0}'), - "'" + me.renderKey(rec.data.key, {}, rec) + "'"); + let warn = Ext.String.format(gettext('Are you sure you want to remove entry {0}')); + if (this.text === this.altText) { + warn = gettext('Are you sure you want to detach entry {0}'); + } + + let key = rec.data.key; + + let rendered = me.renderKey(key, {}, rec); + let msg = Ext.String.format(warn, "'" + rendered + "'"); if (rec.data.key.match(/^unused\d+$/)) { msg += " " + gettext('This will permanently erase all data.'); } @@ -204,6 +213,21 @@ Ext.define('PVE.lxc.RessourceView', { return msg; }, handler: run_remove, + listeners: { + render: function(btn) { + // hack: calculate the max button width on first display to prevent the whole + // toolbar to move when we switch between the "Remove" and "Detach" labels + let def = btn.getSize().width; + + btn.setText(btn.altText); + let alt = btn.getSize().width; + + btn.setText(btn.defaultText); + + let optimal = alt > def ? alt : def; + btn.setSize({ width: optimal }); + }, + }, }); var move_btn = new Proxmox.button.Button({ @@ -233,6 +257,7 @@ Ext.define('PVE.lxc.RessourceView', { var pending = rec.data.delete || me.hasPendingChanges(key); var isDisk = rowdef.tdCls === 'pve-itype-icon-storage'; var isUnusedDisk = key.match(/^unused\d+/); + var isUsedDisk = isDisk && !isUnusedDisk; var noedit = rec.data.delete || !rowdef.editor; if (!noedit && Proxmox.UserName !== 'root@pam' && key.match(/^mp\d+$/)) { @@ -247,6 +272,8 @@ Ext.define('PVE.lxc.RessourceView', { resize_btn.setDisabled(!isDisk || !diskCap || isUnusedDisk); move_btn.setDisabled(!isDisk || !diskCap); revert_btn.setDisabled(!pending); + + remove_btn.setText(isUsedDisk ? remove_btn.altText : remove_btn.defaultText); }; var sorterFn = function(rec1, rec2) { -- 2.30.2