From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 5346F1FF0DF for ; Thu, 19 Nov 2026 10:32:31 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 31155219D6; Thu, 19 Nov 2026 10:29:49 +0100 (CET) From: Dominik Csapak To: pve-devel@lists.proxmox.com Subject: [PATCH pve-manager v6 19/21] ui: lxc: resources: separate volumes into own grid Date: Thu, 19 Nov 2026 10:28:32 +0100 Message-ID: <20261119092930.830046-20-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: LQZMWBTM2MSKEI7BTZ2OPOEPZMR7HDXM X-Message-ID-Hash: LQZMWBTM2MSKEI7BTZ2OPOEPZMR7HDXM 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 ResourceVolumeGrid, in the same way as for the disks in the hardware view of qemu. The resource view is now a container with two grids that share the pending store. The volume action menu is split out into separate buttons in the volume grid, and all edit/remove/revert buttons are enabled/disabled via their enableFn instead of in set_button_status. The remove confirmation for unused disks now uses the 'del_extra_msg' of the config remove button, so that part is shown on its own line. Signed-off-by: Dominik Csapak --- www/manager6/lxc/Resources.js | 550 ++++++++++++++++++---------------- 1 file changed, 297 insertions(+), 253 deletions(-) diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js index e04d5283..944c0356 100644 --- a/www/manager6/lxc/Resources.js +++ b/www/manager6/lxc/Resources.js @@ -1,29 +1,29 @@ Ext.define('PVE.lxc.RessourceView', { - extend: 'Proxmox.grid.PendingObjectGrid', + extend: 'Ext.container.Container', alias: ['widget.pveLxcRessourceView'], onlineHelp: 'pct_configuration', - renderKey: function (key, metaData, rec, rowIndex, colIndex, store) { - let me = this; - let rowdef = me.rows[key] || {}; + referenceHolder: true, - let txt = rowdef.header || key; - let icon = ''; + scrollable: 'y', - metaData.tdAttr = 'valign=middle'; - if (rowdef.tdCls) { - metaData.tdCls = rowdef.tdCls; - } else if (rowdef.iconCls) { - icon = ``; - metaData.tdCls += ' pve-itype-fa'; - } - // only return icons in grid but not remove dialog - if (rowIndex !== undefined) { - return icon + txt; - } else { - return txt; - } + layout: { + type: 'vbox', + align: 'stretch', + }, + + // helpers to redirect the methods to the resourceGrid + + getObjectValue: function () { + let me = this; + let resourceGrid = me.lookup('resourceGrid'); + return resourceGrid.getObjectValue(...arguments); + }, + + reload: function () { + let me = this; + return me.rstore.load(); }, initComponent: function () { @@ -99,7 +99,6 @@ Ext.define('PVE.lxc.RessourceView', { }, rootfs: { header: gettext('Root Disk'), - defaultValue: Proxmox.Utils.noneText, editor: mpeditor, iconCls: 'hdd-o', group: 4, @@ -133,6 +132,9 @@ Ext.define('PVE.lxc.RessourceView', { header: header, renderer: Ext.htmlEncode, }; + if (bus === 'unused') { + rows[confid].del_extra_msg = gettext('This will permanently erase all data.'); + } }, true); let deveditor = Proxmox.UserName === 'root@pam' ? 'PVE.lxc.DeviceEdit' : undefined; @@ -148,188 +150,57 @@ Ext.define('PVE.lxc.RessourceView', { }; }); - var baseurl = 'nodes/' + nodename + '/lxc/' + vmid + '/config'; + const baseurl = `nodes/${nodename}/lxc/${vmid}/config`; + const isRoot = Proxmox.UserName === 'root@pam'; - me.selModel = Ext.create('Ext.selection.RowModel', {}); - - var run_resize = function () { - var rec = me.selModel.getSelection()[0]; - if (!rec) { - return; + // returns the selected record of the grid that has a selection + let getSelected = function () { + for (const grid of me.query('grid')) { + let rec = grid.getSelection()[0]; + if (rec) { + return rec; + } } - - var win = Ext.create('PVE.window.MPResize', { - disk: rec.data.key, - nodename: nodename, - vmid: vmid, - }); - - win.show(); - }; - - var run_remove = function (b, e, rec) { - Proxmox.Utils.API2Request({ - url: '/api2/extjs/' + baseurl, - waitMsgTarget: me, - method: 'PUT', - params: { - delete: rec.data.key, - }, - failure: function (response, opts) { - Ext.Msg.alert('Error', response.htmlStatus); - }, - }); + return undefined; }; - let run_move = function () { - let rec = me.selModel.getSelection()[0]; - if (!rec) { - return; - } - - var win = Ext.create('PVE.window.HDMove', { - disk: rec.data.key, - nodename: nodename, - vmid: vmid, - type: 'lxc', - }); - - win.show(); + let isPending = (rec) => !!rec.data.deleted || !!rec.data.pending; + let isUnusedKey = (key) => /^unused\d+$/.test(key); - win.on('destroy', me.reload, me); - }; - - let run_reassign = function () { - let rec = me.selModel.getSelection()[0]; - if (!rec) { + let runVolumeEditor = function () { + let rec = getSelected(); + if (!rec || !rows[rec.data.key]?.editor) { return; } - - Ext.create('PVE.window.GuestDiskReassign', { - disk: rec.data.key, - nodename: nodename, + Ext.create(rows[rec.data.key].editor, { autoShow: true, - vmid: vmid, - type: 'lxc', + confid: rec.data.key, + pveSelNode: me.pveSelNode, + url: `/api2/extjs/${baseurl}`, + unprivileged: me.getObjectValue('unprivileged'), listeners: { destroy: () => me.reload(), }, }); }; - let edit_btn = new Proxmox.button.AltText({ - text: gettext('Edit'), - defaultText: gettext('Edit'), - altText: gettext('Attach'), - selModel: me.selModel, - disabled: true, - enableFn: function (rec) { + let volumeWindow = function (cls, extraConfig) { + return function () { + let rec = getSelected(); if (!rec) { - return false; - } - let rowdef = rows[rec.data.key]; - return !!rowdef.editor; - }, - handler: function () { - me.run_editor(); - }, - }); - - var remove_btn = new Proxmox.button.AltText({ - text: gettext('Remove'), - defaultText: gettext('Remove'), - altText: gettext('Detach'), - selModel: me.selModel, - disabled: true, - dangerous: true, - confirmMsg: function (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 rendered = me.renderKey(rec.data.key, {}, rec); - let msg = Ext.String.format(warn, `'${rendered}'`); - - if (rec.data.key.match(/^unused\d+$/)) { - msg += ' ' + gettext('This will permanently erase all data.'); - } - return msg; - }, - handler: run_remove, - }); - - let move_menuitem = new Ext.menu.Item({ - text: gettext('Move Storage'), - tooltip: gettext('Move volume to another storage'), - iconCls: 'fa fa-database', - selModel: me.selModel, - handler: run_move, - }); - - let reassign_menuitem = new Ext.menu.Item({ - text: gettext('Reassign Owner'), - tooltip: gettext('Reassign volume to another CT'), - iconCls: 'fa fa-cube', - handler: run_reassign, - reference: 'reassing_item', - }); - - let resize_menuitem = new Ext.menu.Item({ - text: gettext('Resize'), - iconCls: 'fa fa-plus', - selModel: me.selModel, - handler: run_resize, - }); - - let volumeaction_btn = new Proxmox.button.Button({ - text: gettext('Volume Action'), - disabled: true, - menu: { - items: [move_menuitem, reassign_menuitem, resize_menuitem], - }, - }); - - let revert_btn = new PVE.button.PendingRevert(); - - let set_button_status = function () { - let rec = me.selModel.getSelection()[0]; - - if (!rec) { - edit_btn.disable(); - remove_btn.disable(); - volumeaction_btn.disable(); - revert_btn.disable(); - return; - } - let { key, value, delete: isDelete } = rec.data; - let rowdef = rows[key]; - - let pending = isDelete || me.hasPendingChanges(key); - let isRootFS = key === 'rootfs'; - let isDisk = isRootFS || key.match(/^(mp|unused)\d+/); - let isUnusedDisk = key.match(/^unused\d+/); - let isUsedDisk = isDisk && !isUnusedDisk; - let isDevice = key.match(/^dev\d+/); - - let noedit = isDelete || !rowdef.editor; - if (!noedit && Proxmox.UserName !== 'root@pam' && key.match(/^mp\d+$/)) { - let mp = PVE.Parser.parseLxcMountPoint(value); - if (mp.type !== 'volume') { - noedit = true; + return; } - } - edit_btn.setDisabled(noedit); - edit_btn.setText(isUnusedDisk ? edit_btn.altText : edit_btn.defaultText); - - volumeaction_btn.setDisabled(!isDisk || !diskCap); - move_menuitem.setDisabled(isUnusedDisk); - reassign_menuitem.setDisabled(isRootFS); - resize_menuitem.setDisabled(isUnusedDisk); - - remove_btn.setDisabled(!(isDisk || isDevice) || isRootFS || !diskCap || pending); - revert_btn.setDisabled(!pending); - - remove_btn.setText(isUsedDisk ? remove_btn.altText : remove_btn.defaultText); + Ext.create(cls, { + autoShow: true, + disk: rec.data.key, + nodename, + vmid, + listeners: { + destroy: () => me.reload(), + }, + ...extraConfig, + }); + }; }; let sorterFn = function (rec1, rec2) { @@ -357,94 +228,267 @@ Ext.define('PVE.lxc.RessourceView', { } }; - Ext.apply(me, { + let volumeGridFilter = (rec) => /^(rootfs|mp\d+|unused\d+)$/.test(rec.data.key); + + me.rstore = Ext.create('Proxmox.data.ObjectStore', { + model: 'KeyValuePendingDelete', + readArray: true, url: `/api2/json/nodes/${nodename}/lxc/${vmid}/pending`, - selModel: me.selModel, interval: 2000, - cwidth1: 170, - tbar: [ + rows, + filters: [(rec) => !volumeGridFilter(rec)], + }); + + let onSelectionChange = function (sm, selected) { + let selectionGrid = this; + if (selected.length) { + for (const grid of me.query('grid')) { + if (grid !== selectionGrid) { + grid.getSelectionModel().deselectAll(); + } + } + } + }; + + let renderKey = function () { + return me.lookup('resourceGrid').renderKey(...arguments); + }; + + Ext.apply(me, { + items: [ { - text: gettext('Add'), - menu: new Ext.menu.Menu({ - items: [ - { - text: gettext('Mount Point'), - iconCls: 'fa fa-fw fa-hdd-o black', - disabled: !caps.vms['VM.Config.Disk'], - handler: function () { - Ext.create('PVE.lxc.MountPointEdit', { - autoShow: true, - url: `/api2/extjs/${baseurl}`, - unprivileged: me.getObjectValue('unprivileged'), - pveSelNode: me.pveSelNode, - listeners: { - destroy: () => me.reload(), + title: gettext('General'), + iconCls: 'fa fa-cube', + xtype: 'proxmoxPendingObjectGrid', + reference: 'resourceGrid', + border: false, + rstore: me.rstore, + cwidth1: 170, + rows, + sorterFn, + editorConfig: { + pveSelNode: me.pveSelNode, + url: `/api2/extjs/${baseurl}`, + }, + renderKey: function (key, metaData, rec, rowIndex, colIndex, store) { + let rowdef = rows[key] || {}; + + let txt = rowdef.header || key; + let icon = ''; + + metaData.tdAttr = 'valign=middle'; + if (rowdef.tdCls) { + metaData.tdCls = rowdef.tdCls; + } else if (rowdef.iconCls) { + icon = ``; + metaData.tdCls += ' pve-itype-fa'; + } + // only return icons in grid but not remove dialog + if (rowIndex !== undefined) { + return icon + txt; + } else { + return txt; + } + }, + tbar: [ + { + text: gettext('Add'), + menu: { + items: [ + { + text: gettext('Device Passthrough'), + iconCls: 'pve-itype-icon-pci', + disabled: !isRoot, + handler: function () { + Ext.create('PVE.lxc.DeviceEdit', { + autoShow: true, + url: `/api2/extjs/${baseurl}`, + pveSelNode: me.pveSelNode, + listeners: { + destroy: () => me.reload(), + }, + }); }, - }); - }, + }, + ], }, - { - text: gettext('Device Passthrough'), - iconCls: 'pve-itype-icon-pci', - disabled: Proxmox.UserName !== 'root@pam', - handler: function () { - Ext.create('PVE.lxc.DeviceEdit', { - autoShow: true, - url: `/api2/extjs/${baseurl}`, - pveSelNode: me.pveSelNode, - listeners: { - destroy: () => me.reload(), - }, - }); - }, + }, + { + xtype: 'proxmoxButton', + text: gettext('Edit'), + disabled: true, + enableFn: (rec) => !rec.data.delete && !!rows[rec.data.key].editor, + handler: () => me.lookup('resourceGrid').run_editor(), + }, + { + xtype: 'pveConfigRemoveButton', + baseurl, + rows, + waitMsgTarget: me, + renderKey, + reloadCallback: () => me.reload(), + enableFn: (rec) => + diskCap && + /^dev\d+$/.test(rec.data.key) && + !rec.data.delete && + !me.lookup('resourceGrid').hasPendingChanges(rec.data.key), + }, + { + xtype: 'pvePendingRevertButton', + enableFn: (rec) => + !!rec.data.delete || + me.lookup('resourceGrid').hasPendingChanges(rec.data.key), + }, + ], + listeners: { + itemdblclick: () => me.lookup('resourceGrid').run_editor(), + selectionchange: onSelectionChange, + }, + }, + // spacer with bottom border + { + xtype: 'panel', + border: true, + height: 1, + margin: '20 0 0 0', + }, + { + xtype: 'pveLxcResourceVolumeGrid', + rstore: me.rstore, + store: { + sorters: [sorterFn], + }, + renderKey, + storeFilter: volumeGridFilter, + listeners: { + 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(), + }, + }); }, - ], - }), + }, + { + 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, + }, + { + 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'), + }, + ], }, - edit_btn, - remove_btn, - volumeaction_btn, - revert_btn, ], - rows: rows, - sorterFn: sorterFn, - editorConfig: { - pveSelNode: me.pveSelNode, - url: '/api2/extjs/' + baseurl, - }, - listeners: { - itemdblclick: me.run_editor, - selectionchange: set_button_status, - }, }); me.callParent(); - me.on('activate', me.rstore.startUpdate); - me.on('destroy', me.rstore.stopUpdate); - me.on('deactivate', me.rstore.stopUpdate); + me.on('activate', me.rstore.startUpdate, me.rstore); + me.on('destroy', me.rstore.stopUpdate, me.rstore); + me.on('deactivate', me.rstore.stopUpdate, me.rstore); - me.mon(me.getStore(), 'datachanged', function () { - set_button_status(); - }); + let volumeGrid = me.down('pveLxcResourceVolumeGrid'); - me.mon(me.getStore(), '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 volumeStore = volumeGrid.getStore(); + me.mon(volumeStore, 'datachanged', function () { if (!me.pendingVolid) { return; } let volid = me.pendingVolid; delete me.pendingVolid; - let index = me - .getStore() - .findBy( - (r) => - typeof r.data.value === 'string' && r.data.value.split(',', 1)[0] === volid, - ); + let index = volumeStore.findBy( + (r) => typeof r.data.file === 'string' && r.data.file === volid, + ); if (index >= 0) { - me.getSelectionModel().select(index); + volumeGrid.getSelectionModel().select(index); } }); - - Ext.apply(me.editorConfig, { unprivileged: me.getObjectValue('unprivileged') }); }, }); -- 2.47.3