From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 34AF81FF0DF for ; Thu, 19 Nov 2026 10:32:15 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 2FE8B21985; Thu, 19 Nov 2026 10:29:48 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Subject: [PATCH pve-manager v6 12/21] ui: qemu: hardware view: separate disks into own grid Date: Thu, 19 Nov 2026 10:28:25 +0100 Message-ID: <20261119092930.830046-13-d.csapak@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261119092930.830046-1-d.csapak@proxmox.com> References: <20261119092930.830046-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.278 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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: MLSOJXJVJ3EEIPD243CCQSY5EK6PU3CQ X-Message-ID-Hash: MLSOJXJVJ3EEIPD243CCQSY5EK6PU3CQ 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: by using the newly added HardwareDiskGrid. For this to work, the selection model as well as the button logic has to be changed a bit. There are now two add/edit/remove/revert buttons and the one of the disk grid enable/disable themselves with the enableFn instead of being enabled in the set_button_status. The disk action menu is split out into separate buttons in the disk grid, so the enableFns of these take care of enabling/disabling now. This slightly duplicates some checks, but it's now defined with each button when its enabled and disabled and we can simplify some variables. While at it, change the order of the edit and remove button in the general grid to have it more aligned with all our other grids. Signed-off-by: Dominik Csapak --- www/manager6/qemu/HardwareView.js | 475 +++++++++++++++++++----------- 1 file changed, 302 insertions(+), 173 deletions(-) diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js index 3c26f924..8aac20a0 100644 --- a/www/manager6/qemu/HardwareView.js +++ b/www/manager6/qemu/HardwareView.js @@ -6,6 +6,13 @@ Ext.define('PVE.qemu.HardwareView', { referenceHolder: true, + scrollable: 'y', + + layout: { + type: 'vbox', + align: 'stretch', + }, + // helpers to redirect the methods to the hardwareGrid getObjectValue: function () { @@ -404,7 +411,23 @@ Ext.define('PVE.qemu.HardwareView', { let baseurl = `nodes/${nodename}/qemu/${vmid}/config`; - let sm = Ext.create('Ext.selection.RowModel', {}); + let sm = Ext.create('Ext.selection.Model', { + getSelection: () => { + let selection = []; + me.items.each((item) => { + if (item.isXType('grid')) { + let itemSelection = item.getSelection(); + if (itemSelection.length > 0) { + selection = itemSelection; + return false; + } + } + return true; + }); + + return selection; + }, + }); let run_editor = function () { let rec = sm.getSelection()[0]; @@ -450,10 +473,8 @@ Ext.define('PVE.qemu.HardwareView', { } }; - let edit_btn = new Proxmox.button.AltText({ + let edit_btn = new Proxmox.button.Button({ text: gettext('Edit'), - defaultText: gettext('Edit'), - altText: gettext('Attach'), selModel: sm, disabled: true, handler: run_editor, @@ -465,7 +486,7 @@ Ext.define('PVE.qemu.HardwareView', { return; } - let efidisk = PVE.Parser.parsePropertyString(rec.data.value, 'file'); + let efidisk = PVE.Parser.parsePropertyString(rec.data.raw, 'file'); efidisk['ms-cert'] = '2023k'; let params = {}; @@ -491,74 +512,6 @@ Ext.define('PVE.qemu.HardwareView', { }); }; - let move_menuitem = new Ext.menu.Item({ - text: gettext('Move Storage'), - tooltip: gettext('Move disk to another storage'), - iconCls: 'fa fa-database', - selModel: sm, - handler: () => { - let rec = sm.getSelection()[0]; - if (!rec) { - return; - } - Ext.create('PVE.window.HDMove', { - autoShow: true, - disk: rec.data.key, - nodename: nodename, - vmid: vmid, - type: 'qemu', - listeners: { - destroy: () => me.reload(), - }, - }); - }, - }); - - let reassign_menuitem = new Ext.menu.Item({ - text: gettext('Reassign Owner'), - tooltip: gettext('Reassign disk to another VM'), - iconCls: 'fa fa-desktop', - selModel: sm, - handler: () => { - let rec = sm.getSelection()[0]; - if (!rec) { - return; - } - - Ext.create('PVE.window.GuestDiskReassign', { - autoShow: true, - disk: rec.data.key, - nodename: nodename, - vmid: vmid, - type: 'qemu', - listeners: { - destroy: () => me.reload(), - }, - }); - }, - }); - - let resize_menuitem = new Ext.menu.Item({ - text: gettext('Resize'), - iconCls: 'fa fa-plus', - selModel: sm, - handler: () => { - let rec = sm.getSelection()[0]; - if (!rec) { - return; - } - Ext.create('PVE.window.HDResize', { - autoShow: true, - disk: rec.data.key, - nodename: nodename, - vmid: vmid, - listeners: { - destroy: () => me.reload(), - }, - }); - }, - }); - const efiEnrollMsg = gettext( 'Enroll the UEFI 2023 certificates from Microsoft required for secure boot update.', @@ -581,35 +534,6 @@ Ext.define('PVE.qemu.HardwareView', { gettext( 'Otherwise, you will be prompted for the BitLocker recovery key on the next boot!', ); - let efiEnrollMenuItem = new Ext.menu.Item({ - text: gettext('Enroll Updated Certificates'), - iconCls: 'fa fa-refresh', - selModel: sm, - disabled: true, - hidden: true, - handler: () => { - Ext.Msg.show({ - title: gettext('Confirm'), - icon: Ext.Msg.QUESTION, - message: efiEnrollMsg, - buttons: Ext.Msg.YESNO, - callback: function (btn) { - if (btn !== 'yes') { - return; - } - runEfiEnroll(); - }, - }); - }, - }); - - let diskaction_btn = new Proxmox.button.Button({ - text: gettext('Disk Action'), - disabled: true, - menu: { - items: [move_menuitem, reassign_menuitem, resize_menuitem, efiEnrollMenuItem], - }, - }); let remove_btn = new PVE.button.ConfigRemove({ selModel: sm, @@ -655,15 +579,15 @@ Ext.define('PVE.qemu.HardwareView', { let set_button_status = function () { let hardwareGrid = me.lookup('hardwareGrid'); - let selection_model = hardwareGrid.getSelectionModel(); - let rec = selection_model.getSelection()[0]; + let rec = hardwareGrid.getSelection()[0]; counts = {}; // en/disable hardwarebuttons let hasCloudInit = false; - me.rstore.getData().items.forEach(function ({ id, data }) { + let items = me.rstore.getData(); + (items.getSource() ?? items).each(function ({ id, data }) { if (!hasCloudInit && (isCloudInitKey(data.value) || isCloudInitKey(data.pending))) { hasCloudInit = true; - return; + return true; } let match = id.match(/^([^\d]+)\d+$/); @@ -697,7 +621,6 @@ Ext.define('PVE.qemu.HardwareView', { if (!rec) { remove_btn.disable(); edit_btn.disable(); - diskaction_btn.disable(); revert_btn.disable(); return; } @@ -706,7 +629,6 @@ Ext.define('PVE.qemu.HardwareView', { const deleted = !!rec.data.delete; const pending = deleted || hardwareGrid.hasPendingChanges(key); - const isRunning = me.pveSelNode.data.running; const isCloudInit = isCloudInitKey(value); const isCDRom = value && PVE.Utils.diskIsCdrom(value); @@ -714,31 +636,12 @@ Ext.define('PVE.qemu.HardwareView', { const isUnusedDisk = key.match(/^unused\d+/); const isUsedDisk = !isUnusedDisk && row.isOnStorageBus && !isCDRom; const isDisk = isUnusedDisk || isUsedDisk; - const isEfi = key === 'efidisk0'; - const tpmMoveable = key === 'tpmstate0' && !isRunning; let cannotDelete = deleted || row.never_delete; cannotDelete ||= isCDRom && !cdromCap; - cannotDelete ||= isDisk && !diskCap; cannotDelete ||= isCloudInit && noVMConfigCloudinitPerm; remove_btn.setDisabled(cannotDelete); - remove_btn.setText( - isUsedDisk && !isCloudInit ? remove_btn.altText : remove_btn.defaultText, - ); - remove_btn.RESTMethod = isUnusedDisk || (isDisk && isRunning) ? 'POST' : 'PUT'; - - let suggestEfiEnroll = false; - if (isEfi) { - let drive = PVE.Parser.parsePropertyString(value, 'file'); - suggestEfiEnroll = - !pending && - PVE.Parser.parseBoolean(drive['pre-enrolled-keys'], false) && - drive['ms-cert'] !== '2023k'; - } - efiEnrollMenuItem.setDisabled(!suggestEfiEnroll); - efiEnrollMenuItem.setHidden(!isEfi); - edit_btn.setDisabled( deleted || !row.editor || @@ -747,16 +650,6 @@ Ext.define('PVE.qemu.HardwareView', { (isDisk && !diskCap), ); - edit_btn.setText( - isUnusedDisk && !isCloudInit ? edit_btn.altText : edit_btn.defaultText, - ); - - diskaction_btn.setDisabled( - pending || !diskCap || isCloudInit || !(isDisk || isEfi || tpmMoveable), - ); - reassign_menuitem.setDisabled(pending || isEfi || tpmMoveable); - resize_menuitem.setDisabled(pending || !isUsedDisk); - revert_btn.setDisabled(!pending); }; @@ -776,23 +669,47 @@ Ext.define('PVE.qemu.HardwareView', { }); }; + let diskGridFilter = function (rec) { + let val = rec.get('value') ?? rec.get('pending'); + let key = rec.get('key'); + return ( + key.match(/^(ide|sata|scsi|virtio|unused|efidisk|tpmstate)\d+$/) && + !PVE.Utils.diskIsCdrom(val) && + !isCloudInitKey(val) + ); + }; + me.rstore = Ext.create('Proxmox.data.ObjectStore', { model: 'KeyValuePendingDelete', readArray: true, url: `/api2/json/nodes/${nodename}/qemu/${vmid}/pending`, interval: 5000, rows, + filters: [(rec) => !diskGridFilter(rec)], }); + let onSelectionChange = function (sm, selected) { + let selectionGrid = this; + if (selected.length) { + me.items.each((item) => { + if (item.isXType('grid') && item !== selectionGrid) { + item.getSelectionModel().deselectAll(); + } + }); + } + set_button_status(); + }; + Ext.apply(me, { items: [ { + title: gettext('General'), + iconCls: 'fa fa-desktop', xtype: 'proxmoxPendingObjectGrid', reference: 'hardwareGrid', border: false, rstore: me.rstore, interval: 5000, - selModel: sm, run_editor: run_editor, renderKey: function (key, metaData, rec, rowIndex, colIndex, store) { var me = this; @@ -838,18 +755,6 @@ Ext.define('PVE.qemu.HardwareView', { menu: new Ext.menu.Menu({ cls: 'pve-add-hw-menu', items: [ - { - text: gettext('Hard Disk'), - iconCls: 'fa fa-fw fa-hdd-o black', - disabled: !caps.vms['VM.Config.Disk'], - handler: editorFactory('HDEdit'), - }, - { - text: gettext('Import Hard Disk'), - iconCls: 'fa fa-fw fa-cloud-download', - disabled: !caps.vms['VM.Config.Disk'], - handler: editorFactory('HDEdit', { importDisk: true }), - }, { text: gettext('CD/DVD Drive'), iconCls: 'pve-itype-icon-cdrom', @@ -863,20 +768,6 @@ Ext.define('PVE.qemu.HardwareView', { disabled: !caps.vms['VM.Config.Network'], handler: editorFactory('NetworkEdit'), }, - efidisk_menuitem, - { - text: gettext('TPM State'), - itemId: 'addTpmState', - iconCls: 'fa fa-fw fa-hdd-o black', - disabled: !caps.vms['VM.Config.Disk'], - handler: () => - editorFactory('TPMDiskEdit', { - arch: PVE.qemu.Architecture.getGuestArchitecture( - me.getObjectValue('arch'), - nodename, - ), - })(), - }, { text: gettext('USB Device'), itemId: 'addUsb', @@ -937,17 +828,243 @@ Ext.define('PVE.qemu.HardwareView', { ], }), }, - remove_btn, edit_btn, - diskaction_btn, + remove_btn, revert_btn, ], rows: rows, sorterFn: sorterFn, listeners: { itemdblclick: run_editor, - selectionchange: set_button_status, + selectionchange: onSelectionChange, + }, + }, + // spacer with bottom border + { + xtype: 'panel', + border: true, + height: 1, + margin: '20 0 0 0', + }, + { + xtype: 'pveHardwareDiskGrid', + rstore: me.rstore, + store: { + sorters: [sorterFn], + }, + renderKey: function () { + let hardwareGrid = me.lookup('hardwareGrid'); + return hardwareGrid.renderKey(...arguments); + }, + storeFilter: diskGridFilter, + listeners: { + itemdblclick: run_editor, + selectionchange: onSelectionChange, }, + tbar: [ + { + text: gettext('Add'), + menu: { + cls: 'pve-add-hw-menu', + items: [ + { + text: gettext('Hard Disk'), + iconCls: 'fa fa-fw fa-hdd-o black', + disabled: !caps.vms['VM.Config.Disk'], + handler: editorFactory('HDEdit'), + }, + { + text: gettext('Import Hard Disk'), + iconCls: 'fa fa-fw fa-cloud-download', + disabled: !caps.vms['VM.Config.Disk'], + handler: editorFactory('HDEdit', { importDisk: true }), + }, + efidisk_menuitem, + { + text: gettext('TPM State'), + itemId: 'addTpmState', + iconCls: 'fa fa-fw fa-hdd-o black', + disabled: !caps.vms['VM.Config.Disk'], + handler: () => + editorFactory('TPMDiskEdit', { + arch: PVE.qemu.Architecture.getGuestArchitecture( + me.getObjectValue('arch'), + nodename, + ), + })(), + }, + ], + }, + }, + { + xtype: 'proxmoxAltTextButton', + text: gettext('Edit'), + defaultText: gettext('Edit'), + altText: gettext('Attach'), + disabled: true, + enableFn: function (rec) { + let button = this; + const isUnusedDisk = rec.data.key.match(/^unused\d+/); + button.setText(isUnusedDisk ? button.altText : button.defaultText); + return diskCap && !rec.data.deleted && !!rows[rec.data.key].editor; + }, + handler: run_editor, + }, + { + xtype: 'pveConfigRemoveButton', + baseurl, + waitMsgTarget: me, + renderKey: function () { + return me.lookup('hardwareGrid').renderKey(...arguments); + }, + rows, + reloadCallback: () => me.reload(), + enableFn: function (rec) { + let button = this; + const isRunning = me.pveSelNode.data.running; + const isUnusedDisk = rec.data.key.match(/^unused\d+/); + const isDisk = rows[rec.data.key].isOnStorageBus; + button.setText(isUnusedDisk ? button.defaultText : button.altText); + button.RESTMethod = + isUnusedDisk || (isDisk && isRunning) ? 'POST' : 'PUT'; + return ( + !rec.data.deleted && !rows[rec.data.key].never_delete && diskCap + ); + }, + }, + { + xtype: 'pvePendingRevertButton', + apiurl: '/api2/extjs/' + baseurl, + parentXType: 'pvePendingGrid', + enableFn: (rec) => !!rec.data.deleted || !!rec.data.pending, + reloadCallback: () => me.reload(), + }, + '-', + { + xtype: 'proxmoxButton', + text: gettext('Move Storage'), + tooltip: gettext('Move disk to another storage'), + iconCls: 'fa fa-database', + enableFn: (rec) => + diskCap && + !rec.data.deleted && + !rec.data.pending && + (rec.data.key !== 'tpmstate0' || !me.pveSelNode.data.running), + handler: () => { + let rec = sm.getSelection()[0]; + if (!rec) { + return; + } + Ext.create('PVE.window.HDMove', { + autoShow: true, + disk: rec.data.key, + nodename: nodename, + vmid: vmid, + type: 'qemu', + listeners: { + destroy: () => me.reload(), + }, + }); + }, + }, + { + xtype: 'proxmoxButton', + text: gettext('Reassign Owner'), + tooltip: gettext('Reassign disk to another VM'), + iconCls: 'fa fa-desktop', + enableFn: function (rec) { + if (!diskCap || !!rec.data.deleted || !!rec.data.pending) { + return false; + } + if (rec.data.key === 'tpmstate0') { + return false; + } + if (rec.data.key === 'efidisk0') { + return false; + } + return true; + }, + handler: () => { + let rec = sm.getSelection()[0]; + if (!rec) { + return; + } + + Ext.create('PVE.window.GuestDiskReassign', { + autoShow: true, + disk: rec.data.key, + nodename: nodename, + vmid: vmid, + type: 'qemu', + listeners: { + destroy: () => me.reload(), + }, + }); + }, + }, + { + xtype: 'proxmoxButton', + text: gettext('Resize'), + iconCls: 'fa fa-plus', + enableFn: function (rec) { + if (!diskCap || !!rec.data.deleted || !!rec.data.pending) { + return false; + } + return ( + !rec.data.key.match(/^unused\d+/) && + !!rows[rec.data.key].isOnStorageBus + ); + }, + handler: () => { + let rec = sm.getSelection()[0]; + if (!rec) { + return; + } + Ext.create('PVE.window.HDResize', { + autoShow: true, + disk: rec.data.key, + nodename: nodename, + vmid: vmid, + listeners: { + destroy: () => me.reload(), + }, + }); + }, + }, + { + xtype: 'proxmoxButton', + text: gettext('Enroll Updated Certificates'), + iconCls: 'fa fa-refresh', + disabled: true, + enableFn: function (rec) { + if (!diskCap || !!rec.data.deleted || !!rec.data.pending) { + return false; + } + if (rec.data.key !== 'efidisk0') { + return false; + } + let drive = PVE.Parser.parsePropertyString(rec.data.raw, 'file'); + return ( + PVE.Parser.parseBoolean(drive['pre-enrolled-keys'], false) && + drive['ms-cert'] !== '2023k' + ); + }, + handler: () => { + Ext.Msg.show({ + title: gettext('Confirm'), + icon: Ext.Msg.QUESTION, + message: efiEnrollMsg, + buttons: Ext.Msg.YESNO, + callback: function (btn) { + if (btn !== 'yes') { + return; + } + runEfiEnroll(); + }, + }); + }, + }, + ], }, ], }); @@ -959,20 +1076,32 @@ Ext.define('PVE.qemu.HardwareView', { me.mon(me.rstore, 'datachanged', set_button_status, me); - let hardwareGrid = me.lookup('hardwareGrid'); - let hardwareStore = hardwareGrid.getStore(); - me.mon(hardwareStore, 'datachanged', function () { + // the buttons only evaluate their enableFn on selection changes, but the data of a + // selected record can change on a reload too + for (const grid of me.query('grid')) { + me.mon(grid.getStore(), 'refresh', function () { + let selModel = grid.getSelectionModel(); + let selection = selModel.getSelection(); + if (selection.length) { + selModel.fireEvent('selectionchange', selModel, selection); + } + }); + } + + let diskGrid = me.down('pveHardwareDiskGrid'); + let diskStore = diskGrid.getStore(); + me.mon(diskStore, 'datachanged', function () { if (!me.pendingVolid) { return; } let volid = me.pendingVolid; delete me.pendingVolid; - let index = hardwareStore.findBy( - (r) => typeof r.data.value === 'string' && r.data.value.split(',', 1)[0] === volid, + let index = diskStore.findBy( + (r) => typeof r.data.file === 'string' && r.data.file === volid, ); if (index >= 0) { - hardwareGrid.getSelectionModel().select(index); + diskGrid.getSelectionModel().select(index); } }); }, -- 2.47.3