From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 4C5B81FF14C for ; Fri, 15 May 2026 10:54:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 05F211169C; Fri, 15 May 2026 10:54:09 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Subject: [PATCH manager v3 12/13] ui: qemu: hardware view: inline edit/remove/revert button in general grid Date: Fri, 15 May 2026 10:44:30 +0200 Message-ID: <20260515085349.1123127-13-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260515085349.1123127-1-d.csapak@proxmox.com> References: <20260515085349.1123127-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.050 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 Message-ID-Hash: BCEZKEJCNDPZHM2D3RQHSIE3DZNS4HA2 X-Message-ID-Hash: BCEZKEJCNDPZHM2D3RQHSIE3DZNS4HA2 X-MailFrom: d.csapak@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This means that the enableFn function handles the enabling/disabling now for these buttons instead of set_button_status. The logic is partially duplicated, but it's now with the respective button instead in a central location. Consequently, the set_button_status function now only sets the status for the add buttons/menuitems. Signed-off-by: Dominik Csapak --- www/manager6/qemu/HardwareView.js | 118 +++++++++++++++--------------- 1 file changed, 58 insertions(+), 60 deletions(-) diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js index e888bb46..e16436ab 100644 --- a/www/manager6/qemu/HardwareView.js +++ b/www/manager6/qemu/HardwareView.js @@ -447,13 +447,6 @@ Ext.define('PVE.qemu.HardwareView', { } }; - let edit_btn = new Proxmox.button.Button({ - text: gettext('Edit'), - selModel: sm, - disabled: true, - handler: run_editor, - }); - let runEfiEnroll = function () { let rec = sm.getSelection()[0]; if (!rec) { @@ -509,19 +502,6 @@ Ext.define('PVE.qemu.HardwareView', { 'Otherwise, you will be prompted for the BitLocker recovery key on the next boot!', ); - let remove_btn = new PVE.button.ConfigRemove({ - baseurl, - rows, - renderKey: function () { - return me.lookup('hardwareGrid').renderKey(...arguments); - }, - reloadCallback: () => me.reload(), - }); - - let revert_btn = new PVE.button.PendingRevert({ - apiurl: '/api2/extjs/' + baseurl, - }); - let efidisk_menuitem = Ext.create('Ext.menu.Item', { text: gettext('EFI Disk'), iconCls: 'fa fa-fw fa-hdd-o black', @@ -550,9 +530,6 @@ Ext.define('PVE.qemu.HardwareView', { }; let set_button_status = function () { - let hardwareGrid = me.lookup('hardwareGrid'); - let rec = hardwareGrid.getSelection()[0]; - counts = {}; // en/disable hardwarebuttons let hasCloudInit = false; let items = me.rstore.getData(); @@ -589,40 +566,6 @@ Ext.define('PVE.qemu.HardwareView', { me.down('#addCloudinitDrive').setDisabled( noVMConfigCDROMPerm || noVMConfigCloudinitPerm || hasCloudInit, ); - - if (!rec) { - remove_btn.disable(); - edit_btn.disable(); - revert_btn.disable(); - return; - } - const { key, value } = rec.data; - const row = rows[key]; - - const deleted = !!rec.data.delete; - const pending = deleted || hardwareGrid.hasPendingChanges(key); - - const isCloudInit = isCloudInitKey(value); - const isCDRom = value && PVE.Utils.diskIsCdrom(value); - - const isUnusedDisk = key.match(/^unused\d+/); - const isUsedDisk = !isUnusedDisk && row.isOnStorageBus && !isCDRom; - const isDisk = isUnusedDisk || isUsedDisk; - - let cannotDelete = deleted || row.never_delete; - cannotDelete ||= isCDRom && !cdromCap; - cannotDelete ||= isCloudInit && noVMConfigCloudinitPerm; - remove_btn.setDisabled(cannotDelete); - - edit_btn.setDisabled( - deleted || - !row.editor || - isCloudInit || - (isCDRom && !cdromCap) || - (isDisk && !diskCap), - ); - - revert_btn.setDisabled(!pending); }; let editorFactory = (classPath, extraOptions) => { @@ -793,9 +736,64 @@ Ext.define('PVE.qemu.HardwareView', { ], }), }, - edit_btn, - remove_btn, - revert_btn, + { + xtype: 'proxmoxButton', + text: gettext('Edit'), + enableFn: function (rec) { + const row = rows[rec.data.key]; + if (!!rec.data.delete || !row.editor) { + return false; + } + if (isCloudInitKey(rec.data.value)) { + return false; + } + if (PVE.Utils.diskIsCdrom(rec.data.value) && !cdromCap) { + return false; + } + if ( + row.isOnStorageBus && + !PVE.Utils.diskIsCdrom(rec.data.value) && + !diskCap + ) { + return false; + } + return true; + }, + selModel: sm, + disabled: true, + handler: run_editor, + }, + { + xtype: 'pveConfigRemoveButton', + baseurl, + rows, + enableFn: function (rec) { + if (!!rec.data.delete || rows[rec.data.key].never_delete) { + return false; + } + if (PVE.Utils.diskIsCdrom(rec.data.value) && !cdromCap) { + return false; + } + if ( + isCloudInitKey(rec.data.value) && + !caps.vms['VM.Config.Cloudinit'] + ) { + return false; + } + return true; + }, + renderKey: function () { + return me.lookup('hardwareGrid').renderKey(...arguments); + }, + reloadCallback: () => me.reload(), + }, + { + xtype: 'pvePendingRevertButton', + enableFn: (rec) => + !!rec.data.delete || + me.lookup('hardwareGrid').hasPendingChanges(rec.data.key), + apiurl: '/api2/extjs/' + baseurl, + }, ], rows: rows, sorterFn: sorterFn, -- 2.47.3