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 F044B1FF0DF for ; Thu, 19 Nov 2026 10:32:39 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id B02C0219F6; Thu, 19 Nov 2026 10:29:49 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Subject: [PATCH pve-manager v6 21/21] ui: qemu/lxc: volume/disk grid: add overflow handler Date: Thu, 19 Nov 2026 10:28:34 +0100 Message-ID: <20261119092930.830046-22-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: HWKWJQZWRJINFEESQMEB3GK6GGQM6A62 X-Message-ID-Hash: HWKWJQZWRJINFEESQMEB3GK6GGQM6A62 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: These grids have a large number of buttons, add an overflow handler so it stays usable on smaller screens. Signed-off-by: Dominik Csapak --- www/manager6/lxc/Resources.js | 175 ++++++------ www/manager6/qemu/HardwareView.js | 443 ++++++++++++++++-------------- 2 files changed, 320 insertions(+), 298 deletions(-) diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js index e29eca55..d5f65420 100644 --- a/www/manager6/lxc/Resources.js +++ b/www/manager6/lxc/Resources.js @@ -375,94 +375,99 @@ Ext.define('PVE.lxc.RessourceView', { itemdblclick: runVolumeEditor, selectionchange: onSelectionChange, }, - tbar: [ - { - text: gettext('Add'), - disabled: !diskCap, - handler: function () { - Ext.create('PVE.lxc.MountPointEdit', { - autoShow: true, - url: `/api2/extjs/${baseurl}`, - unprivileged: me.getObjectValue('unprivileged'), - pveSelNode: me.pveSelNode, - listeners: { - destroy: () => me.reload(), - }, - }); + tbar: { + overflowHandler: 'scroller', + items: [ + { + text: gettext('Add'), + disabled: !diskCap, + handler: function () { + Ext.create('PVE.lxc.MountPointEdit', { + autoShow: true, + url: `/api2/extjs/${baseurl}`, + unprivileged: me.getObjectValue('unprivileged'), + pveSelNode: me.pveSelNode, + listeners: { + destroy: () => me.reload(), + }, + }); + }, }, - }, - { - xtype: 'proxmoxAltTextButton', - text: gettext('Edit'), - defaultText: gettext('Edit'), - altText: gettext('Attach'), - disabled: true, - enableFn: function (rec) { - let button = this; - let { key, deleted } = rec.data; - button.setText( - isUnusedKey(key) ? button.altText : button.defaultText, - ); - if (deleted || !rows[key].editor) { - return false; - } - // only root can edit bind and device mount points - let type = rec.data.type ?? rec.data.pending?.type; - return isRoot || !/^mp\d+$/.test(key) || type === 'volume'; + { + xtype: 'proxmoxAltTextButton', + text: gettext('Edit'), + defaultText: gettext('Edit'), + altText: gettext('Attach'), + disabled: true, + enableFn: function (rec) { + let button = this; + let { key, deleted } = rec.data; + button.setText( + isUnusedKey(key) ? button.altText : button.defaultText, + ); + if (deleted || !rows[key].editor) { + return false; + } + // only root can edit bind and device mount points + let type = rec.data.type ?? rec.data.pending?.type; + return isRoot || !/^mp\d+$/.test(key) || type === 'volume'; + }, + handler: runVolumeEditor, }, - handler: runVolumeEditor, - }, - { - xtype: 'pveConfigRemoveButton', - baseurl, - rows, - waitMsgTarget: me, - renderKey, - reloadCallback: () => me.reload(), - enableFn: function (rec) { - let button = this; - let key = rec.data.key; - button.setText( - isUnusedKey(key) ? button.defaultText : button.altText, - ); - return diskCap && key !== 'rootfs' && !isPending(rec); + { + xtype: 'pveConfigRemoveButton', + baseurl, + rows, + waitMsgTarget: me, + renderKey, + reloadCallback: () => me.reload(), + enableFn: function (rec) { + let button = this; + let key = rec.data.key; + button.setText( + isUnusedKey(key) ? button.defaultText : button.altText, + ); + return diskCap && key !== 'rootfs' && !isPending(rec); + }, }, - }, - { - xtype: 'pvePendingRevertButton', - apiurl: `/api2/extjs/${baseurl}`, - parentXType: 'pvePendingGrid', - enableFn: isPending, - reloadCallback: () => me.reload(), - }, - '-', - { - xtype: 'proxmoxButton', - text: gettext('Move Storage'), - tooltip: gettext('Move volume to another storage'), - iconCls: 'fa fa-database', - disabled: true, - enableFn: (rec) => diskCap && !isUnusedKey(rec.data.key), - handler: volumeWindow('PVE.window.HDMove', { type: 'lxc' }), - }, - { - xtype: 'proxmoxButton', - text: gettext('Reassign Owner'), - tooltip: gettext('Reassign volume to another CT'), - iconCls: 'fa fa-cube', - disabled: true, - enableFn: (rec) => diskCap && rec.data.key !== 'rootfs', - handler: volumeWindow('PVE.window.GuestDiskReassign', { type: 'lxc' }), - }, - { - xtype: 'proxmoxButton', - text: gettext('Resize'), - iconCls: 'fa fa-plus', - disabled: true, - enableFn: (rec) => diskCap && !isUnusedKey(rec.data.key), - handler: volumeWindow('PVE.window.MPResize'), - }, - ], + { + xtype: 'pvePendingRevertButton', + apiurl: `/api2/extjs/${baseurl}`, + parentXType: 'pvePendingGrid', + enableFn: isPending, + reloadCallback: () => me.reload(), + }, + '-', + { + xtype: 'proxmoxButton', + text: gettext('Move Storage'), + tooltip: gettext('Move volume to another storage'), + iconCls: 'fa fa-database', + disabled: true, + enableFn: (rec) => diskCap && !isUnusedKey(rec.data.key), + handler: volumeWindow('PVE.window.HDMove', { type: 'lxc' }), + }, + { + xtype: 'proxmoxButton', + text: gettext('Reassign Owner'), + tooltip: gettext('Reassign volume to another CT'), + iconCls: 'fa fa-cube', + disabled: true, + enableFn: (rec) => diskCap && rec.data.key !== 'rootfs', + handler: volumeWindow('PVE.window.GuestDiskReassign', { + type: 'lxc', + }), + }, + { + xtype: 'proxmoxButton', + text: gettext('Resize'), + iconCls: 'fa fa-plus', + disabled: true, + enableFn: (rec) => diskCap && !isUnusedKey(rec.data.key), + handler: volumeWindow('PVE.window.MPResize'), + }, + ], + }, }, // spacer with bottom border { diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js index 9d9e3371..41704f93 100644 --- a/www/manager6/qemu/HardwareView.js +++ b/www/manager6/qemu/HardwareView.js @@ -831,230 +831,247 @@ Ext.define('PVE.qemu.HardwareView', { 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 }), - }, - { - itemId: 'addEfi', - text: gettext('EFI Disk'), - iconCls: 'fa fa-fw fa-hdd-o black', - disabled: !caps.vms['VM.Config.Disk'], - handler: function () { - let { data: bios } = me.rstore.getData().map.bios || {}; + tbar: { + overflowHandler: 'scroller', + items: [ + { + 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 }), + }, + { + itemId: 'addEfi', + text: gettext('EFI Disk'), + iconCls: 'fa fa-fw fa-hdd-o black', + disabled: !caps.vms['VM.Config.Disk'], + handler: function () { + let { data: bios } = + me.rstore.getData().map.bios || {}; - Ext.create('PVE.qemu.EFIDiskEdit', { - autoShow: true, - url: '/api2/extjs/' + baseurl, - pveSelNode: me.pveSelNode, - usesEFI: - bios?.value === 'ovmf' || - bios?.pending === 'ovmf', - listeners: { - destroy: () => me.reload(), - }, - }); + Ext.create('PVE.qemu.EFIDiskEdit', { + autoShow: true, + url: '/api2/extjs/' + baseurl, + pveSelNode: me.pveSelNode, + usesEFI: + bios?.value === 'ovmf' || + bios?.pending === 'ovmf', + listeners: { + destroy: () => me.reload(), + }, + }); + }, }, - }, - { - 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; + { + 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, + ), + })(), + }, + ], + }, }, - handler: run_editor, - }, - { - xtype: 'pveConfigRemoveButton', - baseurl, - waitMsgTarget: me, - renderKey: function () { - return me.lookup('hardwareGrid').renderKey(...arguments); + { + 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, }, - 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: '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: 'pvePendingRevertButton', + apiurl: '/api2/extjs/' + baseurl, + parentXType: 'pvePendingGrid', + enableFn: (rec) => !!rec.data.deleted || !!rec.data.pending, + reloadCallback: () => 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; + '-', + { + 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(), + }, + }); + }, }, - handler: () => { - let rec = sm.getSelection()[0]; - if (!rec) { - return; - } + { + 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(), - }, - }); + 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('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' - ); + { + 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(), + }, + }); + }, }, - 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(); - }, - }); + { + 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(); + }, + }); + }, }, - }, - ], + ], + }, }, // spacer with bottom border { -- 2.47.3