public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
* [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids
@ 2026-11-19  9:28 Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 01/21] ui: utils: factor out 'media=cdrom' check Dominik Csapak
                   ` (20 more replies)
  0 siblings, 21 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

This splits the disks and nics of the qemu hardware view into their own
grids, where each option gets its own column (including pending
changes), instead of showing the raw config string in one big list.

New in this version is that the series does the same for containers:
the volumes (rootfs, mount points, unused disks) get their own grid in
the resource view, and the existing network view is converted to show
pending changes and then moved into the resource view too, so there is
no separate 'Network' panel for containers anymore.

For the container network view I tried to keep the existing behavior
and code where possible (it still shows the name and addresses from
inside the container), so that patch is hopefully easy to compare with
what we have now. It differs a bit from the qemu net grid in that it
keeps its own toolbar instead of the surrounding view handling the
buttons, since it had that before and it does not need anything from
the resource view.

I tried to keep most commits small so it's easier to see what the actual
changes are.

NOTE: I took special care for the button enablement logic, but having a
close look at that during review would make a lot of sense. That goes
for the new container patches as well.

Not addressed from the v4 feedback are the horizontal scrollbar topics
(overlapping the last row, toolbar not scrolling with the grid), since
those are not specific to this series.

changes from v5:
* new patch 3/21: remove unused 'networkmode' from qemu network edit
* new patch 4/21: parse and print unknown qemu nic options
* new patch 21/21: add overflow handler to disk/volume grid toolbars
* config remove button: don't throw for keys without a row definition
* qemu disk grid: rename 'Secure Boot' column to 'Pre-Enrolled Keys'
* qemu disk grid: show 'Detect Zeroes' as enabled when unset
* qemu disk grid: html-encode the ms-cert value
* qemu net grid: add hidden 'Raw Config' column
* lxc network view: disable 'Add' without VM.Config.Network

changes from v4:
* rebased on master
* new patches to do the same for containers (volumes and nics)
* re-added the parser patch for '-' in key names (reverted on master)
* pending grid: don't save sorters in the state
* pending grid: handle nested columns
* pending grid: mark the id of entries with pending changes
* pending grid: don't break on properties the parser does not know
* config remove button: make the waitMsgTarget configurable
* fix the remove button and the storage content selection mid-series
* disk grid: fix 'Secure Boot', 'Replicate' and 'Async I/O' columns
* net grid: fix the 'Disconnected' column
* make the hardware view scrollable
* fix sorting of the disk and net grids (e.g. unused disks)
* update the buttons when the selected entry changes on a reload
* fix the edit button in the general grid and for nics
* fix the 'Enroll Updated Certificates' button
* show 'Attach' for unused disks and don't allow reassigning tpmstate

changes from v3:
* rebased on master:
  - dropped the parser patch (something similar was already applied)
  - while moving to a container, the selection logic when coming from
    a storage content panel had to be adapted.

changes from v2:
* reorganized code/commits for the most part, so it doesn't make much
  sense to compare it to the previous version

changes from v1:
* refactor some regexes/checks
* fix some bugs I encountered during testing again

Dominik Csapak (21):
  ui: utils: factor out 'media=cdrom' check
  ui: parser: qemu drive: allow '-' in key name
  ui: qemu: network edit: remove unused 'networkmode' property
  ui: parser: qemu network: allow unknown keys
  ui: factor out the guest key nic regex check
  ui: add pending grid
  ui: revert button: add parentXType and reloadCallback
  ui: button: add config remove button
  ui: qemu: hardware: wrap in container
  ui: qemu: introduce hardware disk grid
  ui: qemu: introduce hardware net grid
  ui: qemu: hardware view: separate disks into own grid
  ui: qemu: hardware view: separate nics into own grid
  ui: qemu: hardware view: inline edit/remove/revert button in general
    grid
  ui: qemu: hardware view: inline 'add efi' menuitem
  ui: utils: factor out volume size renderer
  ui: lxc: network view: convert to pending grid
  ui: lxc: introduce resource volume grid
  ui: lxc: resources: separate volumes into own grid
  ui: lxc: resources: integrate network view
  ui: qemu/lxc: volume/disk grid: add overflow handler

 www/manager6/Makefile                  |   5 +
 www/manager6/Parser.js                 |  27 +-
 www/manager6/Utils.js                  |  38 +-
 www/manager6/button/ConfigRemove.js    |  61 ++
 www/manager6/button/Revert.js          |   8 +-
 www/manager6/grid/PendingGrid.js       | 166 +++++
 www/manager6/lxc/Config.js             |   6 -
 www/manager6/lxc/Network.js            | 186 +++--
 www/manager6/lxc/ResourceVolumeGrid.js |  96 +++
 www/manager6/lxc/Resources.js          | 557 ++++++++------
 www/manager6/qemu/BootOrderEdit.js     |  12 +-
 www/manager6/qemu/CreateWizard.js      |   4 +-
 www/manager6/qemu/HardwareDiskGrid.js  | 203 ++++++
 www/manager6/qemu/HardwareNetGrid.js   |  87 +++
 www/manager6/qemu/HardwareView.js      | 969 +++++++++++++++----------
 www/manager6/qemu/NetworkEdit.js       |   9 +-
 www/manager6/window/GuestImport.js     |   2 +-
 17 files changed, 1714 insertions(+), 722 deletions(-)
 create mode 100644 www/manager6/button/ConfigRemove.js
 create mode 100644 www/manager6/grid/PendingGrid.js
 create mode 100644 www/manager6/lxc/ResourceVolumeGrid.js
 create mode 100644 www/manager6/qemu/HardwareDiskGrid.js
 create mode 100644 www/manager6/qemu/HardwareNetGrid.js

-- 
2.47.3





^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 01/21] ui: utils: factor out 'media=cdrom' check
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 02/21] ui: parser: qemu drive: allow '-' in key name Dominik Csapak
                   ` (19 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

this is a check we have all over the place and is prone to typos when
one tries to check it in a new place.

introduce a 'diskIsCdrom' check in Utils and use that in every place.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/Utils.js              | 9 ++++++++-
 www/manager6/qemu/BootOrderEdit.js | 6 +++---
 www/manager6/qemu/CreateWizard.js  | 4 ++--
 www/manager6/qemu/HardwareView.js  | 6 +++---
 www/manager6/window/GuestImport.js | 2 +-
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index c616ab9b..39fc3cf8 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -2051,6 +2051,13 @@ Ext.define('PVE.Utils', {
             return true;
         },
 
+        diskIsCdrom: function (value) {
+            if (!value) {
+                return false;
+            }
+            return !!value.toString().match(/media=cdrom/);
+        },
+
         sortByPreviousUsage: function (vmconfig, nodename) {
             let controllerList = ['ide', 'virtio', 'scsi', 'sata'];
             let usedControllers = {};
@@ -2061,7 +2068,7 @@ Ext.define('PVE.Utils', {
             for (const property of Object.keys(vmconfig)) {
                 if (
                     property.match(PVE.Utils.bus_match) &&
-                    !vmconfig[property].match(/media=cdrom/)
+                    !PVE.Utils.diskIsCdrom(vmconfig[property])
                 ) {
                     const foundController = property.match(PVE.Utils.bus_match)[1];
                     usedControllers[foundController]++;
diff --git a/www/manager6/qemu/BootOrderEdit.js b/www/manager6/qemu/BootOrderEdit.js
index 6239aeca..22112f8d 100644
--- a/www/manager6/qemu/BootOrderEdit.js
+++ b/www/manager6/qemu/BootOrderEdit.js
@@ -60,7 +60,7 @@ Ext.define('PVE.qemu.BootOrderPanel', {
         },
     },
 
-    isCloudinit: (v) => v.match(/media=cdrom/) && v.match(/[:/]vm-\d+-cloudinit/),
+    isCloudinit: (v) => PVE.Utils.diskIsCdrom(v) && v.match(/[:/]vm-\d+-cloudinit/),
 
     isDisk: function (value) {
         return PVE.Utils.bus_match.test(value);
@@ -106,7 +106,7 @@ Ext.define('PVE.qemu.BootOrderPanel', {
                     Ext.Object.each(me.vmconfig, function (key, value) {
                         if (
                             me.isDisk(key) &&
-                            value.match(/media=cdrom/) &&
+                            PVE.Utils.diskIsCdrom(value) &&
                             !me.isCloudinit(value)
                         ) {
                             list.push(key);
@@ -205,7 +205,7 @@ Ext.define('PVE.qemu.BootOrderPanel', {
                             iconCls;
                         if (value.match(/^net\d+$/)) {
                             iconCls = 'exchange';
-                        } else if (desc.match(/media=cdrom/)) {
+                        } else if (PVE.Utils.diskIsCdrom(desc)) {
                             metaData.tdCls = 'pve-itype-icon-cdrom';
                         } else {
                             iconCls = 'hdd-o';
diff --git a/www/manager6/qemu/CreateWizard.js b/www/manager6/qemu/CreateWizard.js
index 5eb784c4..2ee209da 100644
--- a/www/manager6/qemu/CreateWizard.js
+++ b/www/manager6/qemu/CreateWizard.js
@@ -33,14 +33,14 @@ Ext.define('PVE.qemu.CreateWizard', {
     // cannot know which one is a bootable iso and hardcodes the known values (ide0/2, net0)
     calculateBootOrder: function (values) {
         // user selected windows + second cdrom
-        if (values.ide0 && values.ide0.match(/media=cdrom/)) {
+        if (values.ide0 && PVE.Utils.diskIsCdrom(values.ide0)) {
             let disk;
             PVE.Utils.forEachBus(['ide', 'scsi', 'virtio', 'sata'], (type, id) => {
                 let confId = type + id;
                 if (!values[confId]) {
                     return undefined;
                 }
-                if (values[confId].match(/media=cdrom/)) {
+                if (PVE.Utils.diskIsCdrom(values[confId])) {
                     return undefined;
                 }
                 disk = confId;
diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
index fdb1802c..7fba8903 100644
--- a/www/manager6/qemu/HardwareView.js
+++ b/www/manager6/qemu/HardwareView.js
@@ -22,7 +22,7 @@ Ext.define('PVE.qemu.HardwareView', {
             if (value.match(/vm-.*-cloudinit/)) {
                 iconCls = 'cloud';
                 txt = rowdef.cloudheader;
-            } else if (value.match(/media=cdrom/)) {
+            } else if (PVE.Utils.diskIsCdrom(value)) {
                 metaData.tdCls = 'pve-itype-icon-cdrom';
                 return rowdef.cdheader;
             }
@@ -441,7 +441,7 @@ Ext.define('PVE.qemu.HardwareView', {
                 let value = me.getObjectValue(rec.data.key, '', true);
                 if (isCloudInitKey(value)) {
                     return;
-                } else if (value.match(/media=cdrom/)) {
+                } else if (PVE.Utils.diskIsCdrom(value)) {
                     editor = 'PVE.qemu.CDEdit';
                 } else if (!diskCap) {
                     return;
@@ -768,7 +768,7 @@ Ext.define('PVE.qemu.HardwareView', {
             const isRunning = me.pveSelNode.data.running;
 
             const isCloudInit = isCloudInitKey(value);
-            const isCDRom = value && !!value.toString().match(/media=cdrom/);
+            const isCDRom = value && PVE.Utils.diskIsCdrom(value);
 
             const isUnusedDisk = key.match(/^unused\d+/);
             const isUsedDisk = !isUnusedDisk && row.isOnStorageBus && !isCDRom;
diff --git a/www/manager6/window/GuestImport.js b/www/manager6/window/GuestImport.js
index b7b73ae4..af64c626 100644
--- a/www/manager6/window/GuestImport.js
+++ b/www/manager6/window/GuestImport.js
@@ -1095,7 +1095,7 @@ Ext.define('PVE.window.GuestImport', {
 
                 let cdroms = [];
                 for (const [id, value] of Object.entries(me.vmConfig)) {
-                    if (!Ext.isString(value) || !value.match(/media=cdrom/)) {
+                    if (!Ext.isString(value) || !PVE.Utils.diskIsCdrom(value)) {
                         continue;
                     }
                     cdroms.push({
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 02/21] ui: parser: qemu drive: allow '-' in key name
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 01/21] ui: utils: factor out 'media=cdrom' check Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 03/21] ui: qemu: network edit: remove unused 'networkmode' property Dominik Csapak
                   ` (18 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

This is required for properties such as 'ms-cert' of efidisks.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/Parser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/manager6/Parser.js b/www/manager6/Parser.js
index 36df8e9d..a82b3d3d 100644
--- a/www/manager6/Parser.js
+++ b/www/manager6/Parser.js
@@ -207,7 +207,7 @@ Ext.define('PVE.Parser', {
                 if (!p || p.match(/^\s*$/)) {
                     return undefined; // continue
                 }
-                let match = p.match(/^([a-z_]+)=(\S+)$/);
+                let match = p.match(/^([a-z_-]+)=(\S+)$/);
                 if (!match) {
                     if (!p.match(/[=]/)) {
                         res.file = p;
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 03/21] ui: qemu: network edit: remove unused 'networkmode' property
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 01/21] ui: utils: factor out 'media=cdrom' check Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 02/21] ui: parser: qemu drive: allow '-' in key name Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 04/21] ui: parser: qemu network: allow unknown keys Dominik Csapak
                   ` (17 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

This property is unused since commit:
 57f034f6 (qemu/NetworkEdit: rework panel for advanced options)

from 2018, and can be removed.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/qemu/NetworkEdit.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/www/manager6/qemu/NetworkEdit.js b/www/manager6/qemu/NetworkEdit.js
index 9f992d1d..d4fe0f54 100644
--- a/www/manager6/qemu/NetworkEdit.js
+++ b/www/manager6/qemu/NetworkEdit.js
@@ -49,14 +49,7 @@ Ext.define('PVE.qemu.NetworkInputPanel', {
         var me = this;
 
         me.confid = confid;
-
-        if (data) {
-            data.networkmode = data.bridge ? 'bridge' : 'nat';
-        } else {
-            data = {};
-            data.networkmode = 'bridge';
-        }
-        me.network = data;
+        me.network = data || {};
 
         me.setValues(me.network);
     },
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 04/21] ui: parser: qemu network: allow unknown keys
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (2 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 03/21] ui: qemu: network edit: remove unused 'networkmode' property Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 05/21] ui: factor out the guest key nic regex check Dominik Csapak
                   ` (16 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

The backend often gets new options for nics, and the gui does not
always keep up, so parse unknown options too so the parser does not
break as a whole, just for one unknown key.

Do this instead of adding all known keys, since we can already assume
that only valid values are returned from the api.

To not lose those unknown keys on an edit cycle, we also have to print
them out again when using printQemuNetwork.

This brings the network parser more inline with the drive parser, which
has a similar logic.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/Parser.js | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/www/manager6/Parser.js b/www/manager6/Parser.js
index a82b3d3d..bdd4fed5 100644
--- a/www/manager6/Parser.js
+++ b/www/manager6/Parser.js
@@ -142,6 +142,8 @@ Ext.define('PVE.Parser', {
                     res.trunks = match_res[1];
                 } else if ((match_res = p.match(/^mtu=(\d+)$/)) !== null) {
                     res.mtu = match_res[1];
+                } else if ((match_res = p.match(/^([^=]+)=(.+)$/)) !== null) {
+                    res[match_res[1]] = match_res[2];
                 } else {
                     errors = true;
                     return false; // break
@@ -170,21 +172,22 @@ Ext.define('PVE.Parser', {
                     netstr += ',firewall=' + net.firewall;
                 }
             }
-            if (net.rate) {
-                netstr += ',rate=' + net.rate;
-            }
-            if (net.queues) {
-                netstr += ',queues=' + net.queues;
-            }
             if (net.disconnect) {
                 netstr += ',link_down=' + net.disconnect;
             }
-            if (net.trunks) {
-                netstr += ',trunks=' + net.trunks;
-            }
-            if (net.mtu) {
-                netstr += ',mtu=' + net.mtu;
+            delete net.model;
+            delete net.macaddr;
+            delete net.bridge;
+            delete net.tag;
+            delete net.firewall;
+            delete net.disconnect;
+
+            for (const [key, value] of Object.entries(net)) {
+                if (value !== undefined) {
+                    netstr += `,${key}=${value}`;
+                }
             }
+
             return netstr;
         },
 
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 05/21] ui: factor out the guest key nic regex check
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (3 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 04/21] ui: parser: qemu network: allow unknown keys Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 06/21] ui: add pending grid Dominik Csapak
                   ` (15 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

It's better to have these regexes in one place, otherwise they're easily
typoed.

I noticed that some of the checks were not anchored at the end, but all
valid values these can have, should match the new check as well.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/Utils.js              | 7 +++++++
 www/manager6/lxc/Network.js        | 4 ++--
 www/manager6/qemu/BootOrderEdit.js | 6 +++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 39fc3cf8..42d3242a 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -2058,6 +2058,13 @@ Ext.define('PVE.Utils', {
             return !!value.toString().match(/media=cdrom/);
         },
 
+        keyIsNic: function (value) {
+            if (!value) {
+                return false;
+            }
+            return !!value.toString().match(/^net\d+$/);
+        },
+
         sortByPreviousUsage: function (vmconfig, nodename) {
             let controllerList = ['ide', 'virtio', 'scsi', 'sata'];
             let usedControllers = {};
diff --git a/www/manager6/lxc/Network.js b/www/manager6/lxc/Network.js
index e56d47c0..b2737471 100644
--- a/www/manager6/lxc/Network.js
+++ b/www/manager6/lxc/Network.js
@@ -89,7 +89,7 @@ Ext.define('PVE.lxc.NetworkInputPanel', {
                 value: cdata.name,
                 validator: function (value) {
                     for (const [key, netRaw] of Object.entries(me.dataCache)) {
-                        if (!key.match(/^net\d+/) || key === me.ifname) {
+                        if (!PVE.Utils.keyIsNic(key) || key === me.ifname) {
                             continue;
                         }
                         let net = PVE.Parser.parseLxcNetwork(netRaw);
@@ -385,7 +385,7 @@ Ext.define(
                 let records = [];
                 me.dataCache = confResponse.result.data || {};
                 for (const [key, value] of Object.entries(confResponse.result.data)) {
-                    if (!key.match(/^net\d+/)) {
+                    if (!PVE.Utils.keyIsNic(key)) {
                         continue;
                     }
                     let config = PVE.Parser.parseLxcNetwork(value);
diff --git a/www/manager6/qemu/BootOrderEdit.js b/www/manager6/qemu/BootOrderEdit.js
index 22112f8d..1548bf7d 100644
--- a/www/manager6/qemu/BootOrderEdit.js
+++ b/www/manager6/qemu/BootOrderEdit.js
@@ -69,7 +69,7 @@ Ext.define('PVE.qemu.BootOrderPanel', {
     isBootdev: function (dev, value) {
         return (
             (this.isDisk(dev) && !this.isCloudinit(value)) ||
-            /^net\d+/.test(dev) ||
+            PVE.Utils.keyIsNic(dev) ||
             /^hostpci\d+/.test(dev) ||
             (/^usb\d+/.test(dev) && !/spice/.test(value))
         );
@@ -114,7 +114,7 @@ Ext.define('PVE.qemu.BootOrderPanel', {
                     });
                 } else if (orderList[i] === 'n') {
                     Ext.Object.each(me.vmconfig, function (key, value) {
-                        if (/^net\d+/.test(key)) {
+                        if (PVE.Utils.keyIsNic(key)) {
                             list.push(key);
                         }
                     });
@@ -203,7 +203,7 @@ Ext.define('PVE.qemu.BootOrderPanel', {
 
                         let icon = '',
                             iconCls;
-                        if (value.match(/^net\d+$/)) {
+                        if (PVE.Utils.keyIsNic(value)) {
                             iconCls = 'exchange';
                         } else if (PVE.Utils.diskIsCdrom(desc)) {
                             metaData.tdCls = 'pve-itype-icon-cdrom';
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 06/21] ui: add pending grid
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (4 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 05/21] ui: factor out the guest key nic regex check Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 07/21] ui: revert button: add parentXType and reloadCallback Dominik Csapak
                   ` (14 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

A new grid type that gets its data from a PendingObjectGrid and displays
a parsed property string in various columns. Each column shows its own
pending changes so that this can be seen more easily.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/Makefile            |   1 +
 www/manager6/grid/PendingGrid.js | 166 +++++++++++++++++++++++++++++++
 2 files changed, 167 insertions(+)
 create mode 100644 www/manager6/grid/PendingGrid.js

diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index e8e2bd0b..4977213e 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -101,6 +101,7 @@ JSSRC= 							\
 	grid/FirewallAliases.js				\
 	grid/FirewallOptions.js				\
 	grid/FirewallRules.js				\
+	grid/PendingGrid.js				\
 	grid/PoolMembers.js				\
 	grid/Replication.js				\
 	grid/ResourceGrid.js				\
diff --git a/www/manager6/grid/PendingGrid.js b/www/manager6/grid/PendingGrid.js
new file mode 100644
index 00000000..23430a14
--- /dev/null
+++ b/www/manager6/grid/PendingGrid.js
@@ -0,0 +1,166 @@
+/* Its main use is to be a 'sub grid' for a PendingObjectGrid, for qemu/HardwareView
+ * and lxc/Resources.
+ */
+Ext.define('PVE.grid.PendingGrid', {
+    extend: 'Ext.grid.Panel',
+    alias: 'widget.pvePendingGrid',
+
+    /// the original store of the PendingObjectGrid, used for retrieving data
+    rstore: undefined,
+
+    /// the filter function to filter only relevant data from rstore
+    storeFilter: function (_rec) {
+        return true;
+    },
+
+    // don't save or reload sorters, which live in `storeState`
+    getState: function () {
+        let state = this.callParent();
+        delete state?.storeState;
+        return state;
+    },
+
+    applyState: function (state) {
+        delete state?.storeState;
+        this.callParent([state]);
+    },
+
+    /// the parser for the data, should return an object
+    recordParser: function (key, value) {
+        let parsed = PVE.Parser.parsePropertyString(value);
+        return {
+            key,
+            ...parsed,
+        };
+    },
+
+    pendingRenderer: function (originalRenderer) {
+        originalRenderer ??= Ext.htmlEncode;
+        return function (val, mD, rec, rowIdx, colIdx, store, view) {
+            // add a 'pending parameter'
+            let txt = originalRenderer(val, mD, rec, rowIdx, colIdx, store, view, false);
+            let pendingTxt;
+
+            let pending = rec.get('pending');
+            let dataIndex = view.up().getColumns()[colIdx].dataIndex;
+            if (pending) {
+                let value = pending[dataIndex];
+                pendingTxt = originalRenderer(value, mD, rec, rowIdx, colIdx, store, view, true);
+            }
+
+            if (pendingTxt && txt && pendingTxt !== txt) {
+                txt += '<br />';
+                txt += `<span style="color: darkorange">${pendingTxt}</span>`;
+            }
+            if (pending && pendingTxt && (!txt || !rec.data.raw)) {
+                txt = `<span style="color: darkorange">${pendingTxt}</span>`;
+            }
+            if (pending && !pendingTxt && txt) {
+                txt = `<div style="color: darkorange; text-decoration: line-through;">${txt}</div>`;
+            }
+            // not every property has a (visible) column, so always mark the id for a change
+            if (dataIndex === 'id' && rec.data.raw && pending && pending.raw !== rec.data.raw) {
+                txt = `<span style="color: darkorange">${txt}</span>`;
+            }
+            if (rec.data.deleted && txt) {
+                txt = `<div style="color: darkorange; text-decoration: line-through;">${txt}</div>`;
+            }
+
+            return txt;
+        };
+    },
+
+    updateData: function () {
+        let me = this;
+        let records = [];
+        let data = me.rstore.getData();
+        (data.getSource() ?? data).each(function (rec) {
+            if (!me.storeFilter(rec)) {
+                return;
+            }
+
+            let key = rec.get('key');
+            let value = rec.get('value');
+            let deleted = rec.get('delete');
+
+            // the parser might not know all properties, still show the entry in that case
+            let parsed = me.recordParser(key, value) ?? {};
+            parsed.raw = value;
+
+            let pending = rec.get('pending');
+            let parsedPending;
+            if (pending) {
+                // without a parsed value only the id and the raw value show the change
+                parsedPending = me.recordParser(key, pending) ?? { ...parsed };
+                parsedPending.id = key;
+                parsedPending.raw = pending;
+            }
+
+            records.push({
+                ...parsed,
+                id: key,
+                key,
+                pending: parsedPending,
+                deleted,
+            });
+        });
+
+        me.getStore().setData(records);
+    },
+
+    store: {},
+
+    columns: [],
+
+    initComponent: function () {
+        let me = this;
+
+        if (!me.rstore) {
+            throw 'no rstore defined';
+        }
+
+        let columns = [];
+
+        // overwrite renderer to be pending
+        //
+        // CAUTION: don't modify the original column objects, rather copy them
+        let getPendingColumn = function (column) {
+            let originalRenderer = column.renderer;
+            // might be a string (named scope)
+            if (Ext.isString(originalRenderer)) {
+                let renderString = originalRenderer.toString();
+                originalRenderer = function () {
+                    return Ext.callback(renderString, me.scope, arguments, 0, me);
+                };
+            }
+
+            let renderer = me.pendingRenderer(originalRenderer);
+            return {
+                ...column,
+                renderer,
+            };
+        };
+
+        for (const column of me.columns ?? []) {
+            if (Ext.isArray(column.columns)) {
+                // handle one level of nested columns
+                let innerColumns = [];
+                for (const innerColumn of column.columns) {
+                    innerColumns.push(getPendingColumn(innerColumn));
+                }
+                columns.push({
+                    ...column,
+                    columns: innerColumns,
+                });
+            } else {
+                columns.push(getPendingColumn(column));
+            }
+        }
+
+        me.columns = columns;
+
+        me.callParent();
+
+        me.mon(me.rstore, 'refresh', me.updateData, me);
+    },
+});
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 07/21] ui: revert button: add parentXType and reloadCallback
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (5 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 06/21] ui: add pending grid Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 08/21] ui: button: add config remove button Dominik Csapak
                   ` (13 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

makes it useful in more situations when the direct parent is not a
PendingObjectGrid but e.g. a pvePendingGrid.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/button/Revert.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/www/manager6/button/Revert.js b/www/manager6/button/Revert.js
index 14b13f5b..d8fcca2c 100644
--- a/www/manager6/button/Revert.js
+++ b/www/manager6/button/Revert.js
@@ -7,11 +7,13 @@ Ext.define('PVE.button.PendingRevert', {
     config: {
         pendingGrid: null,
         apiurl: undefined,
+        parentXType: 'proxmoxPendingObjectGrid',
+        reloadCallback: undefined,
     },
 
     handler: function () {
         if (!this.pendingGrid) {
-            this.pendingGrid = this.up('proxmoxPendingObjectGrid');
+            this.pendingGrid = this.up(this.parentXType);
             if (!this.pendingGrid) {
                 throw 'revert button requires a pendingGrid';
             }
@@ -23,7 +25,7 @@ Ext.define('PVE.button.PendingRevert', {
             return;
         }
 
-        let rowdef = view.rows[rec.data.key] || {};
+        let rowdef = view.rows?.[rec.data.key] || {};
         let keys = rowdef.multiKey || [rec.data.key];
 
         Proxmox.Utils.API2Request({
@@ -34,7 +36,7 @@ Ext.define('PVE.button.PendingRevert', {
             params: {
                 revert: keys.join(','),
             },
-            callback: () => view.reload(),
+            callback: () => (this.reloadCallback ? this.reloadCallback() : view.reload()),
             failure: (response) => Ext.Msg.alert('Error', response.htmlStatus),
         });
     },
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 08/21] ui: button: add config remove button
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (6 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 07/21] ui: revert button: add parentXType and reloadCallback Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 09/21] ui: qemu: hardware: wrap in container Dominik Csapak
                   ` (12 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

this is a special remove button that has two main features:
* removes properties from configs via PUT/POST instead of DELETE
* can show an alternative text if set

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/Makefile               |  1 +
 www/manager6/button/ConfigRemove.js | 61 +++++++++++++++++++++++++++++
 www/manager6/qemu/HardwareView.js   | 51 ++++--------------------
 3 files changed, 69 insertions(+), 44 deletions(-)
 create mode 100644 www/manager6/button/ConfigRemove.js

diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 4977213e..364f0883 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -13,6 +13,7 @@ JSSRC= 							\
 	button/ConsoleButton.js				\
 	button/Revert.js				\
 	button/Split.js					\
+	button/ConfigRemove.js				\
 	controller/StorageEdit.js			\
 	data/PermPathStore.js				\
 	data/ResourceStore.js				\
diff --git a/www/manager6/button/ConfigRemove.js b/www/manager6/button/ConfigRemove.js
new file mode 100644
index 00000000..58a4bb0d
--- /dev/null
+++ b/www/manager6/button/ConfigRemove.js
@@ -0,0 +1,61 @@
+Ext.define('PVE.button.ConfigRemove', {
+    extend: 'Proxmox.button.AltText',
+    alias: 'widget.pveConfigRemoveButton',
+
+    text: gettext('Remove'),
+    defaultText: gettext('Remove'),
+    altText: gettext('Detach'),
+    disabled: true,
+    dangerous: true,
+    RESTMethod: 'PUT',
+
+    // overwrite for key rendering
+    renderKey: Ext.htmlEncode,
+    // overwrite for extra message
+    rows: {},
+
+    reloadCallback: Ext.identityFn,
+
+    waitMsgTarget: undefined,
+
+    confirmMsg: function (rec) {
+        let me = this;
+        let warn = 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 (me.rows[rec.data.key]?.del_extra_msg) {
+            msg += '<br>' + me.rows[rec.data.key].del_extra_msg;
+        }
+        return msg;
+    },
+    handler: function (btn, e, rec) {
+        let me = this;
+        let params = { delete: rec.data.key };
+        if (btn.RESTMethod === 'POST') {
+            params.background_delay = 5;
+        }
+        Proxmox.Utils.API2Request({
+            url: '/api2/extjs/' + me.baseurl,
+            waitMsgTarget: me.waitMsgTarget,
+            method: btn.RESTMethod,
+            params: params,
+            callback: () => me.reloadCallback(),
+            failure: (response) => Ext.Msg.alert('Error', response.htmlStatus),
+            success: function (response, options) {
+                if (btn.RESTMethod === 'POST' && response.result.data !== null) {
+                    Ext.create('Proxmox.window.TaskProgress', {
+                        autoShow: true,
+                        upid: response.result.data,
+                        listeners: {
+                            destroy: () => me.reloadCallback(),
+                        },
+                    });
+                }
+            },
+        });
+    },
+});
diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
index 7fba8903..39e36206 100644
--- a/www/manager6/qemu/HardwareView.js
+++ b/www/manager6/qemu/HardwareView.js
@@ -634,52 +634,15 @@ Ext.define('PVE.qemu.HardwareView', {
             },
         });
 
-        let remove_btn = new Proxmox.button.AltText({
-            text: gettext('Remove'),
-            defaultText: gettext('Remove'),
-            altText: gettext('Detach'),
+        let remove_btn = new PVE.button.ConfigRemove({
             selModel: sm,
-            disabled: true,
-            dangerous: true,
-            RESTMethod: 'PUT',
-            confirmMsg: function (rec) {
-                let warn = 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 (rows[rec.data.key].del_extra_msg) {
-                    msg += '<br>' + rows[rec.data.key].del_extra_msg;
-                }
-                return msg;
-            },
-            handler: function (btn, e, rec) {
-                let params = { delete: rec.data.key };
-                if (btn.RESTMethod === 'POST') {
-                    params.background_delay = 5;
-                }
-                Proxmox.Utils.API2Request({
-                    url: '/api2/extjs/' + baseurl,
-                    waitMsgTarget: me,
-                    method: btn.RESTMethod,
-                    params: params,
-                    callback: () => me.reload(),
-                    failure: (response) => Ext.Msg.alert('Error', response.htmlStatus),
-                    success: function (response, options) {
-                        if (btn.RESTMethod === 'POST' && response.result.data !== null) {
-                            Ext.create('Proxmox.window.TaskProgress', {
-                                autoShow: true,
-                                upid: response.result.data,
-                                listeners: {
-                                    destroy: () => me.reload(),
-                                },
-                            });
-                        }
-                    },
-                });
+            waitMsgTarget: me,
+            baseurl,
+            rows,
+            renderKey: function () {
+                return me.renderKey(...arguments);
             },
+            reloadCallback: () => me.reload(),
         });
 
         let revert_btn = new PVE.button.PendingRevert({
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 09/21] ui: qemu: hardware: wrap in container
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (7 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 08/21] ui: button: add config remove button Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 10/21] ui: qemu: introduce hardware disk grid Dominik Csapak
                   ` (11 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

this is preparation for showing multiple grids in the hardware view, so
we move the actual PendingObjectGrid one level deeper.

Introduces some helpers that redirect to the PendingObjectGrid to keep
the diff a bit smaller.

Explicitly create the rstore outside the PendingObjectGrid because
we'll need it anyway later on.

To keep the selection logic when coming from a storage content grid, the
selection logic must now go through the store of the disk grid, not
through the rstore.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/qemu/HardwareView.js | 356 ++++++++++++++++--------------
 1 file changed, 195 insertions(+), 161 deletions(-)

diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
index 39e36206..3c26f924 100644
--- a/www/manager6/qemu/HardwareView.js
+++ b/www/manager6/qemu/HardwareView.js
@@ -1,46 +1,23 @@
 Ext.define('PVE.qemu.HardwareView', {
-    extend: 'Proxmox.grid.PendingObjectGrid',
+    extend: 'Ext.container.Container',
     alias: ['widget.PVE.qemu.HardwareView'],
 
     onlineHelp: 'qm_virtual_machines_settings',
 
-    renderKey: function (key, metaData, rec, rowIndex, colIndex, store) {
-        var me = this;
-        var rows = me.rows;
-        var rowdef = rows[key] || {};
-        var iconCls = rowdef.iconCls;
-        var icon = '';
-        var txt = rowdef.header || key;
-
-        metaData.tdAttr = 'valign=middle';
-
-        if (rowdef.isOnStorageBus) {
-            let value = me.getObjectValue(key, '', false);
-            if (value === '') {
-                value = me.getObjectValue(key, '', true);
-            }
-            if (value.match(/vm-.*-cloudinit/)) {
-                iconCls = 'cloud';
-                txt = rowdef.cloudheader;
-            } else if (PVE.Utils.diskIsCdrom(value)) {
-                metaData.tdCls = 'pve-itype-icon-cdrom';
-                return rowdef.cdheader;
-            }
-        }
+    referenceHolder: true,
 
-        if (rowdef.tdCls) {
-            metaData.tdCls = rowdef.tdCls;
-        } else if (iconCls) {
-            icon = "<i class='pve-grid-fa fa fa-fw fa-" + iconCls + "'></i>";
-            metaData.tdCls += ' pve-itype-fa';
-        }
+    // helpers to redirect the methods to the hardwareGrid
 
-        // only return icons in grid but not remove dialog
-        if (rowIndex !== undefined) {
-            return icon + txt;
-        } else {
-            return txt;
-        }
+    getObjectValue: function () {
+        let me = this;
+        let hardwareGrid = me.lookup('hardwareGrid');
+        return hardwareGrid.getObjectValue(...arguments);
+    },
+
+    reload: function () {
+        let me = this;
+        let hardwareGrid = me.lookup('hardwareGrid');
+        return hardwareGrid.reload();
     },
 
     initComponent: function () {
@@ -640,7 +617,7 @@ Ext.define('PVE.qemu.HardwareView', {
             baseurl,
             rows,
             renderKey: function () {
-                return me.renderKey(...arguments);
+                return me.lookup('hardwareGrid').renderKey(...arguments);
             },
             reloadCallback: () => me.reload(),
         });
@@ -677,7 +654,8 @@ Ext.define('PVE.qemu.HardwareView', {
         };
 
         let set_button_status = function () {
-            let selection_model = me.getSelectionModel();
+            let hardwareGrid = me.lookup('hardwareGrid');
+            let selection_model = hardwareGrid.getSelectionModel();
             let rec = selection_model.getSelection()[0];
 
             counts = {}; // en/disable hardwarebuttons
@@ -727,7 +705,7 @@ Ext.define('PVE.qemu.HardwareView', {
             const row = rows[key];
 
             const deleted = !!rec.data.delete;
-            const pending = deleted || me.hasPendingChanges(key);
+            const pending = deleted || hardwareGrid.hasPendingChanges(key);
             const isRunning = me.pveSelNode.data.running;
 
             const isCloudInit = isCloudInitKey(value);
@@ -798,124 +776,180 @@ Ext.define('PVE.qemu.HardwareView', {
                 });
         };
 
-        Ext.apply(me, {
+        me.rstore = Ext.create('Proxmox.data.ObjectStore', {
+            model: 'KeyValuePendingDelete',
+            readArray: true,
             url: `/api2/json/nodes/${nodename}/qemu/${vmid}/pending`,
             interval: 5000,
-            selModel: sm,
-            run_editor: run_editor,
-            tbar: [
+            rows,
+        });
+
+        Ext.apply(me, {
+            items: [
                 {
-                    text: gettext('Add'),
-                    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',
-                                disabled: !caps.vms['VM.Config.CDROM'],
-                                handler: editorFactory('CDEdit'),
-                            },
-                            {
-                                text: gettext('Network Device'),
-                                itemId: 'addNet',
-                                iconCls: 'fa fa-fw fa-exchange black',
-                                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',
-                                iconCls: 'fa fa-fw fa-usb black',
-                                disabled:
-                                    !caps.nodes['Sys.Console'] && !caps.mapping['Mapping.Use'],
-                                handler: editorFactory('USBEdit'),
-                            },
-                            {
-                                text: gettext('PCI Device'),
-                                itemId: 'addPci',
-                                iconCls: 'pve-itype-icon-pci',
-                                disabled:
-                                    !caps.nodes['Sys.Console'] && !caps.mapping['Mapping.Use'],
-                                handler: editorFactory('PCIEdit'),
-                            },
-                            {
-                                text: gettext('Serial Port'),
-                                itemId: 'addSerial',
-                                iconCls: 'pve-itype-icon-serial',
-                                disabled: !caps.vms['VM.Config.Options'],
-                                handler: editorFactory('SerialEdit'),
-                            },
-                            {
-                                text: gettext('CloudInit Drive'),
-                                itemId: 'addCloudinitDrive',
-                                iconCls: 'fa fa-fw fa-cloud black',
-                                disabled:
-                                    !caps.vms['VM.Config.CDROM'] ||
-                                    !caps.vms['VM.Config.Cloudinit'],
-                                handler: editorFactory('CIDriveEdit'),
-                            },
-                            {
-                                text: gettext('Audio Device'),
-                                itemId: 'addAudio',
-                                iconCls: 'fa fa-fw fa-volume-up black',
-                                disabled: !caps.vms['VM.Config.HWType'],
-                                handler: editorFactory('AudioEdit'),
-                            },
-                            {
-                                text: gettext('VirtIO RNG'),
-                                itemId: 'addRng',
-                                iconCls: 'pve-itype-icon-die',
-                                disabled:
-                                    !caps.vms['VM.Config.HWType'] && !caps.mapping['Mapping.Use'],
-                                handler: editorFactory('RNGEdit'),
-                            },
-                            {
-                                text: gettext('Virtiofs'),
-                                itemId: 'addVirtiofs',
-                                iconCls: 'fa fa-folder',
-                                disabled: !caps.nodes['Sys.Console'],
-                                handler: editorFactory('VirtiofsEdit'),
-                            },
-                        ],
-                    }),
+                    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;
+                        var rows = me.rows;
+                        var rowdef = rows[key] || {};
+                        var iconCls = rowdef.iconCls;
+                        var icon = '';
+                        var txt = rowdef.header || key;
+
+                        metaData.tdAttr = 'valign=middle';
+
+                        if (rowdef.isOnStorageBus) {
+                            let value = me.getObjectValue(key, '', false);
+                            if (value === '') {
+                                value = me.getObjectValue(key, '', true);
+                            }
+                            if (value.match(/vm-.*-cloudinit/)) {
+                                iconCls = 'cloud';
+                                txt = rowdef.cloudheader;
+                            } else if (PVE.Utils.diskIsCdrom(value)) {
+                                metaData.tdCls = 'pve-itype-icon-cdrom';
+                                return rowdef.cdheader;
+                            }
+                        }
+
+                        if (rowdef.tdCls) {
+                            metaData.tdCls = rowdef.tdCls;
+                        } else if (iconCls) {
+                            icon = "<i class='pve-grid-fa fa fa-fw fa-" + iconCls + "'></i>";
+                            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: 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',
+                                        disabled: !caps.vms['VM.Config.CDROM'],
+                                        handler: editorFactory('CDEdit'),
+                                    },
+                                    {
+                                        text: gettext('Network Device'),
+                                        itemId: 'addNet',
+                                        iconCls: 'fa fa-fw fa-exchange black',
+                                        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',
+                                        iconCls: 'fa fa-fw fa-usb black',
+                                        disabled:
+                                            !caps.nodes['Sys.Console'] &&
+                                            !caps.mapping['Mapping.Use'],
+                                        handler: editorFactory('USBEdit'),
+                                    },
+                                    {
+                                        text: gettext('PCI Device'),
+                                        itemId: 'addPci',
+                                        iconCls: 'pve-itype-icon-pci',
+                                        disabled:
+                                            !caps.nodes['Sys.Console'] &&
+                                            !caps.mapping['Mapping.Use'],
+                                        handler: editorFactory('PCIEdit'),
+                                    },
+                                    {
+                                        text: gettext('Serial Port'),
+                                        itemId: 'addSerial',
+                                        iconCls: 'pve-itype-icon-serial',
+                                        disabled: !caps.vms['VM.Config.Options'],
+                                        handler: editorFactory('SerialEdit'),
+                                    },
+                                    {
+                                        text: gettext('CloudInit Drive'),
+                                        itemId: 'addCloudinitDrive',
+                                        iconCls: 'fa fa-fw fa-cloud black',
+                                        disabled:
+                                            !caps.vms['VM.Config.CDROM'] ||
+                                            !caps.vms['VM.Config.Cloudinit'],
+                                        handler: editorFactory('CIDriveEdit'),
+                                    },
+                                    {
+                                        text: gettext('Audio Device'),
+                                        itemId: 'addAudio',
+                                        iconCls: 'fa fa-fw fa-volume-up black',
+                                        disabled: !caps.vms['VM.Config.HWType'],
+                                        handler: editorFactory('AudioEdit'),
+                                    },
+                                    {
+                                        text: gettext('VirtIO RNG'),
+                                        itemId: 'addRng',
+                                        iconCls: 'pve-itype-icon-die',
+                                        disabled:
+                                            !caps.vms['VM.Config.HWType'] &&
+                                            !caps.mapping['Mapping.Use'],
+                                        handler: editorFactory('RNGEdit'),
+                                    },
+                                    {
+                                        text: gettext('Virtiofs'),
+                                        itemId: 'addVirtiofs',
+                                        iconCls: 'fa fa-folder',
+                                        disabled: !caps.nodes['Sys.Console'],
+                                        handler: editorFactory('VirtiofsEdit'),
+                                    },
+                                ],
+                            }),
+                        },
+                        remove_btn,
+                        edit_btn,
+                        diskaction_btn,
+                        revert_btn,
+                    ],
+                    rows: rows,
+                    sorterFn: sorterFn,
+                    listeners: {
+                        itemdblclick: run_editor,
+                        selectionchange: set_button_status,
+                    },
                 },
-                remove_btn,
-                edit_btn,
-                diskaction_btn,
-                revert_btn,
             ],
-            rows: rows,
-            sorterFn: sorterFn,
-            listeners: {
-                itemdblclick: run_editor,
-                selectionchange: set_button_status,
-            },
         });
 
         me.callParent();
@@ -923,22 +957,22 @@ Ext.define('PVE.qemu.HardwareView', {
         me.on('activate', me.rstore.startUpdate, me.rstore);
         me.on('destroy', me.rstore.stopUpdate, me.rstore);
 
-        me.mon(me.getStore(), 'datachanged', set_button_status, me);
+        me.mon(me.rstore, 'datachanged', set_button_status, me);
 
-        me.mon(me.getStore(), 'datachanged', function () {
+        let hardwareGrid = me.lookup('hardwareGrid');
+        let hardwareStore = hardwareGrid.getStore();
+        me.mon(hardwareStore, '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 = hardwareStore.findBy(
+                (r) => typeof r.data.value === 'string' && r.data.value.split(',', 1)[0] === volid,
+            );
+
             if (index >= 0) {
-                me.getSelectionModel().select(index);
+                hardwareGrid.getSelectionModel().select(index);
             }
         });
     },
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 10/21] ui: qemu: introduce hardware disk grid
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (8 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 09/21] ui: qemu: hardware: wrap in container Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 11/21] ui: qemu: introduce hardware net grid Dominik Csapak
                   ` (10 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

intended to be used inside the hardware view. not used yet.

The toolbar buttons will be added directly in the hardware view since
it requires accessing some data from there.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/Makefile                 |   1 +
 www/manager6/Utils.js                 |   7 +
 www/manager6/qemu/HardwareDiskGrid.js | 215 ++++++++++++++++++++++++++
 3 files changed, 223 insertions(+)
 create mode 100644 www/manager6/qemu/HardwareDiskGrid.js

diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 364f0883..dd33eb90 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -270,6 +270,7 @@ JSSRC= 							\
 	qemu/HDTPM.js					\
 	qemu/HDMove.js					\
 	qemu/HDResize.js				\
+	qemu/HardwareDiskGrid.js			\
 	qemu/HardwareView.js				\
 	qemu/IPConfigEdit.js				\
 	qemu/KeyboardEdit.js				\
diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 42d3242a..49862c0f 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -2205,6 +2205,13 @@ Ext.define('PVE.Utils', {
             );
             return Ext.htmlEncode(description);
         },
+
+        renderBooleanProperty: function (value) {
+            if (Ext.isString(value)) {
+                value = PVE.Parser.parseBoolean(value);
+            }
+            return Proxmox.Utils.format_boolean(value);
+        },
     },
 
     singleton: true,
diff --git a/www/manager6/qemu/HardwareDiskGrid.js b/www/manager6/qemu/HardwareDiskGrid.js
new file mode 100644
index 00000000..912aa4fc
--- /dev/null
+++ b/www/manager6/qemu/HardwareDiskGrid.js
@@ -0,0 +1,215 @@
+Ext.define('PVE.qemu.HardwareDiskGrid', {
+    extend: 'PVE.grid.PendingGrid',
+    alias: 'widget.pveHardwareDiskGrid',
+
+    title: gettext('Hard Disks'),
+
+    stateful: true,
+    stateId: 'pve-qemu-hardware-disk',
+
+    border: false,
+    expandable: false,
+
+    minHeight: 100,
+    emptyText: gettext('No hard disks configured'),
+
+    recordParser: PVE.Parser.parseQemuDrive,
+    // override to render the keys properly
+    renderKey: Ext.htmlEncode,
+
+    columns: [
+        {
+            header: gettext('Bus/Device'),
+            dataIndex: 'id',
+            width: 150,
+            renderer: 'renderKey',
+        },
+        {
+            header: gettext('Volume/File'),
+            dataIndex: 'file',
+            flex: 1,
+            minWidth: 200,
+        },
+        {
+            header: gettext('Size'),
+            dataIndex: 'size',
+            width: 100,
+            renderer: (value) => {
+                if (value === undefined || value === null) {
+                    return '';
+                }
+
+                let size = value;
+                if (!size.toString().slice(-1).match(/[0-9]/)) {
+                    // IEC unit is implicit in config, but parser expects it as 'i' suffix
+                    size = `${value}i`;
+                }
+
+                return Proxmox.Utils.autoscale_size_unit(size);
+            },
+        },
+        {
+            header: gettext('Pre-Enrolled Keys (EFI Disk only)'),
+            dataIndex: 'pre-enrolled-keys',
+            renderer: (v, _md, rec, rI, cI, store, view, pending) => {
+                let iface = pending ? rec.data.pending?.interface : rec.data.interface;
+                if (iface !== 'efidisk') {
+                    return '';
+                }
+                if (PVE.Parser.parseBoolean(v)) {
+                    let msCerts = pending ? rec.data.pending?.['ms-cert'] : rec.data['ms-cert'];
+                    if (msCerts) {
+                        return `${gettext('Yes')} (MS Certificate: ${Ext.htmlEncode(msCerts)})`;
+                    } else {
+                        return gettext('Yes');
+                    }
+                } else {
+                    return gettext('No');
+                }
+            },
+        },
+        {
+            header: gettext('Cache'),
+            dataIndex: 'cache',
+            width: 140,
+            renderer: (v) =>
+                Ext.htmlEncode(v) ?? `${Proxmox.Utils.defaultText} (${gettext('No cache')})`,
+        },
+        {
+            header: gettext('Discard'),
+            dataIndex: 'discard',
+            width: 80,
+            renderer: PVE.Utils.renderBooleanProperty,
+        },
+        {
+            header: gettext('IO thread'),
+            dataIndex: 'iothread',
+            width: 100,
+            renderer: PVE.Utils.renderBooleanProperty,
+        },
+        {
+            header: gettext('SSD emulation'),
+            dataIndex: 'ssd',
+            width: 120,
+            renderer: PVE.Utils.renderBooleanProperty,
+        },
+        {
+            header: gettext('Backup'),
+            dataIndex: 'backup',
+            width: 80,
+            renderer: (v) => PVE.Utils.renderBooleanProperty(v ?? true),
+        },
+        {
+            header: gettext('Read-Only'),
+            dataIndex: 'ro',
+            width: 100,
+            renderer: PVE.Utils.renderBooleanProperty,
+        },
+        {
+            header: gettext('Replicate'),
+            dataIndex: 'replicate',
+            width: 100,
+            renderer: (v) => PVE.Utils.renderBooleanProperty(v ?? true),
+        },
+        {
+            header: gettext('Async I/O'),
+            dataIndex: 'aio',
+            width: 100,
+            renderer: (v) => Ext.htmlEncode(v) ?? `${Proxmox.Utils.defaultText} (io_uring)`,
+        },
+        {
+            header: gettext('Bandwidth Limits'),
+            hidden: true,
+            columns: [
+                {
+                    header: gettext('Read limit (MiB/s)'),
+                    dataIndex: 'mbps_rd',
+                    width: 120,
+                },
+                {
+                    header: gettext('Write limit (MiB/s)'),
+                    dataIndex: 'mbps_wr',
+                    width: 120,
+                },
+                {
+                    header: gettext('Read limit (ops/s)'),
+                    dataIndex: 'iops_rd',
+                    width: 120,
+                },
+                {
+                    header: gettext('Write limit (ops/s)'),
+                    dataIndex: 'iops_wr',
+                    width: 120,
+                },
+                {
+                    header: gettext('Read Burst (MiB/s)'),
+                    dataIndex: 'mbps_rd_max',
+                    width: 120,
+                },
+                {
+                    header: gettext('Write Burst (MiB/s)'),
+                    dataIndex: 'mbps_wr_max',
+                    width: 120,
+                },
+                {
+                    header: gettext('Read Burst (ops/s)'),
+                    dataIndex: 'iops_rd_max',
+                    width: 120,
+                },
+                {
+                    header: gettext('Write Burst (ops/s)'),
+                    dataIndex: 'iops_wr_max',
+                    width: 120,
+                },
+            ],
+        },
+        {
+            header: gettext('Detect Zeroes'),
+            dataIndex: 'detect_zeroes',
+            hidden: true,
+            renderer: (v) => PVE.Utils.renderBooleanProperty(v ?? true),
+        },
+        {
+            header: gettext('Vendor'),
+            dataIndex: 'vendor',
+            hidden: true,
+        },
+        {
+            header: gettext('Product'),
+            dataIndex: 'product',
+            hidden: true,
+        },
+        {
+            header: gettext('Serial'),
+            dataIndex: 'serial',
+            hidden: true,
+        },
+        {
+            header: gettext('Queues'),
+            dataIndex: 'queues',
+            hidden: true,
+        },
+        {
+            header: gettext('Shared'),
+            dataIndex: 'shared',
+            hidden: true,
+            renderer: PVE.Utils.renderBooleanProperty,
+        },
+        {
+            header: gettext('Write Error Action'),
+            dataIndex: 'werror',
+            hidden: true,
+        },
+        {
+            header: 'WWN',
+            dataIndex: 'wwn',
+            hidden: true,
+        },
+        {
+            header: gettext('Raw Config'),
+            dataIndex: 'raw',
+            hidden: true,
+            flex: 1,
+        },
+    ],
+});
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 11/21] ui: qemu: introduce hardware net grid
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (9 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 10/21] ui: qemu: introduce hardware disk grid Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 12/21] ui: qemu: hardware view: separate disks into own grid Dominik Csapak
                   ` (9 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

intended to be used inside the hardware view.

Same as the hardware disk grid, the toolbar buttons will be added in the
hardware view itself.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/Makefile                |  1 +
 www/manager6/qemu/HardwareNetGrid.js | 87 ++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 www/manager6/qemu/HardwareNetGrid.js

diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index dd33eb90..d14256f9 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -271,6 +271,7 @@ JSSRC= 							\
 	qemu/HDMove.js					\
 	qemu/HDResize.js				\
 	qemu/HardwareDiskGrid.js			\
+	qemu/HardwareNetGrid.js				\
 	qemu/HardwareView.js				\
 	qemu/IPConfigEdit.js				\
 	qemu/KeyboardEdit.js				\
diff --git a/www/manager6/qemu/HardwareNetGrid.js b/www/manager6/qemu/HardwareNetGrid.js
new file mode 100644
index 00000000..4cd20589
--- /dev/null
+++ b/www/manager6/qemu/HardwareNetGrid.js
@@ -0,0 +1,87 @@
+Ext.define('PVE.qemu.HardwareNetGrid', {
+    extend: 'PVE.grid.PendingGrid',
+    alias: 'widget.pveHardwareNetGrid',
+
+    title: gettext('Network Interfaces'),
+
+    stateful: true,
+    stateId: 'pve-qemu-hardware-net',
+
+    border: false,
+    expandable: false,
+
+    emptyText: gettext('No network interfaces configured'),
+
+    storeFilter: (rec) => PVE.Utils.keyIsNic(rec.data.key),
+    recordParser: PVE.Parser.parseQemuNetwork,
+
+    renderKey: Ext.htmlEncode,
+
+    columns: [
+        {
+            header: gettext('ID'),
+            dataIndex: 'id',
+            width: 200,
+            renderer: 'renderKey',
+        },
+        {
+            header: gettext('Model'),
+            dataIndex: 'model',
+            width: 100,
+        },
+        {
+            header: gettext('MAC address'),
+            dataIndex: 'macaddr',
+            minWidth: 200,
+            flex: 1,
+        },
+        {
+            header: gettext('Bridge'),
+            dataIndex: 'bridge',
+            width: 100,
+        },
+        {
+            header: gettext('Firewall enabled'),
+            dataIndex: 'firewall',
+            width: 150,
+            renderer: PVE.Utils.renderBooleanProperty,
+        },
+        {
+            header: gettext('VLAN tag'),
+            dataIndex: 'tag',
+            width: 80,
+        },
+        {
+            header: gettext('MTU'),
+            dataIndex: 'mtu',
+            width: 100,
+        },
+        {
+            header: gettext('Multiqueue'),
+            dataIndex: 'queues',
+            width: 100,
+        },
+        {
+            header: gettext('Rate limit (MB/s)'),
+            dataIndex: 'rate',
+            width: 200,
+        },
+        {
+            header: gettext('Disconnected'),
+            dataIndex: 'disconnect',
+            width: 100,
+            renderer: PVE.Utils.renderBooleanProperty,
+        },
+        {
+            header: gettext('Trunks'),
+            dataIndex: 'trunks',
+            width: 100,
+        },
+        {
+            header: gettext('Raw Config'),
+            dataIndex: 'raw',
+            hidden: true,
+            flex: 1,
+        },
+    ],
+});
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 12/21] ui: qemu: hardware view: separate disks into own grid
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (10 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 11/21] ui: qemu: introduce hardware net grid Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 13/21] ui: qemu: hardware view: separate nics " Dominik Csapak
                   ` (8 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

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 <d.csapak@proxmox.com>
---
 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





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 13/21] ui: qemu: hardware view: separate nics into own grid
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (11 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 12/21] ui: qemu: hardware view: separate disks into own grid Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 14/21] ui: qemu: hardware view: inline edit/remove/revert button in general grid Dominik Csapak
                   ` (7 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

by using the newly added HardwareNetGrid and ConfigRemoveButton.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/qemu/HardwareView.js | 67 +++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 8 deletions(-)

diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
index 8aac20a0..ea1ed9b6 100644
--- a/www/manager6/qemu/HardwareView.js
+++ b/www/manager6/qemu/HardwareView.js
@@ -685,7 +685,7 @@ Ext.define('PVE.qemu.HardwareView', {
             url: `/api2/json/nodes/${nodename}/qemu/${vmid}/pending`,
             interval: 5000,
             rows,
-            filters: [(rec) => !diskGridFilter(rec)],
+            filters: [(rec) => !diskGridFilter(rec), (rec) => !PVE.Utils.keyIsNic(rec.data.key)],
         });
 
         let onSelectionChange = function (sm, selected) {
@@ -761,13 +761,6 @@ Ext.define('PVE.qemu.HardwareView', {
                                         disabled: !caps.vms['VM.Config.CDROM'],
                                         handler: editorFactory('CDEdit'),
                                     },
-                                    {
-                                        text: gettext('Network Device'),
-                                        itemId: 'addNet',
-                                        iconCls: 'fa fa-fw fa-exchange black',
-                                        disabled: !caps.vms['VM.Config.Network'],
-                                        handler: editorFactory('NetworkEdit'),
-                                    },
                                     {
                                         text: gettext('USB Device'),
                                         itemId: 'addUsb',
@@ -1066,6 +1059,64 @@ Ext.define('PVE.qemu.HardwareView', {
                         },
                     ],
                 },
+                // spacer with bottom border
+                {
+                    xtype: 'panel',
+                    border: true,
+                    height: 1,
+                    margin: '20 0 0 0',
+                },
+                {
+                    xtype: 'pveHardwareNetGrid',
+                    rstore: me.rstore,
+                    store: {
+                        sorters: [sorterFn],
+                    },
+                    renderKey: function () {
+                        let hardwareGrid = me.lookup('hardwareGrid');
+                        return hardwareGrid.renderKey(...arguments);
+                    },
+                    listeners: {
+                        itemdblclick: run_editor,
+                        selectionchange: onSelectionChange,
+                    },
+                    tbar: [
+                        {
+                            text: gettext('Add'),
+                            itemId: 'addNet',
+                            disabled: !caps.vms['VM.Config.Network'],
+                            handler: editorFactory('NetworkEdit'),
+                        },
+                        {
+                            xtype: 'proxmoxButton',
+                            text: gettext('Edit'),
+                            disabled: true,
+                            enableFn: (rec) => !rec.data.deleted && !!rows[rec.data.key].editor,
+                            handler: run_editor,
+                        },
+                        {
+                            xtype: 'pveConfigRemoveButton',
+                            baseurl,
+                            rows,
+                            waitMsgTarget: me,
+                            reloadCallback: () => me.reload(),
+                            renderKey: function () {
+                                return me.lookup('hardwareGrid').renderKey(...arguments);
+                            },
+                            enableFn: (rec) =>
+                                caps.vms['VM.Config.Network'] &&
+                                !rec.data.deleted &&
+                                !rows[rec.data.key].never_delete,
+                        },
+                        {
+                            xtype: 'pvePendingRevertButton',
+                            apiurl: '/api2/extjs/' + baseurl,
+                            parentXType: 'pvePendingGrid',
+                            enableFn: (rec) => !!rec.data.deleted || !!rec.data.pending,
+                            reloadCallback: () => me.reload(),
+                        },
+                    ],
+                },
             ],
         });
 
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 14/21] ui: qemu: hardware view: inline edit/remove/revert button in general grid
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (12 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 13/21] ui: qemu: hardware view: separate nics " Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 15/21] ui: qemu: hardware view: inline 'add efi' menuitem Dominik Csapak
                   ` (6 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

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 <d.csapak@proxmox.com>
---
 www/manager6/qemu/HardwareView.js | 120 +++++++++++++++---------------
 1 file changed, 58 insertions(+), 62 deletions(-)

diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
index ea1ed9b6..04f4b5a5 100644
--- a/www/manager6/qemu/HardwareView.js
+++ b/www/manager6/qemu/HardwareView.js
@@ -473,13 +473,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) {
@@ -535,21 +528,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({
-            selModel: sm,
-            waitMsgTarget: me,
-            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',
@@ -578,9 +556,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();
@@ -617,40 +592,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) => {
@@ -821,9 +762,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;
+                            },
+                            disabled: true,
+                            handler: run_editor,
+                        },
+                        {
+                            xtype: 'pveConfigRemoveButton',
+                            baseurl,
+                            rows,
+                            waitMsgTarget: me,
+                            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





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 15/21] ui: qemu: hardware view: inline 'add efi' menuitem
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (13 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 14/21] ui: qemu: hardware view: inline edit/remove/revert button in general grid Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 16/21] ui: utils: factor out volume size renderer Dominik Csapak
                   ` (5 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

so it's in line with the remaining add buttons.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/qemu/HardwareView.js | 43 ++++++++++++++++---------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
index 04f4b5a5..9d9e3371 100644
--- a/www/manager6/qemu/HardwareView.js
+++ b/www/manager6/qemu/HardwareView.js
@@ -528,25 +528,6 @@ Ext.define('PVE.qemu.HardwareView', {
                 'Otherwise, you will be prompted for the BitLocker recovery key on the next boot!',
             );
 
-        let efidisk_menuitem = Ext.create('Ext.menu.Item', {
-            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(),
-                    },
-                });
-            },
-        });
-
         let counts = {};
         let isAtLimit = (type) => counts[type] >= PVE.Utils.hardware_counts[type];
         let isAtUsbLimit = () => {
@@ -586,7 +567,7 @@ Ext.define('PVE.qemu.HardwareView', {
             me.down('#addSerial').setDisabled(noVMConfigHWTypePerm || isAtLimit('serial'));
             me.down('#addNet').setDisabled(noVMConfigNetPerm || isAtLimit('net'));
             me.down('#addRng').setDisabled(noVMConfigHWTypePerm || isAtLimit('rng'));
-            efidisk_menuitem.setDisabled(noVMConfigDiskPerm || isAtLimit('efidisk'));
+            me.down('#addEfi').setDisabled(noVMConfigDiskPerm || isAtLimit('efidisk'));
             me.down('#addTpmState').setDisabled(noVMConfigDiskPerm || isAtLimit('tpmstate'));
             me.down('#addVirtiofs').setDisabled(noVMConfigOptionsPerm || isAtLimit('virtiofs'));
             me.down('#addCloudinitDrive').setDisabled(
@@ -868,7 +849,27 @@ Ext.define('PVE.qemu.HardwareView', {
                                         disabled: !caps.vms['VM.Config.Disk'],
                                         handler: editorFactory('HDEdit', { importDisk: true }),
                                     },
-                                    efidisk_menuitem,
+                                    {
+                                        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(),
+                                                },
+                                            });
+                                        },
+                                    },
                                     {
                                         text: gettext('TPM State'),
                                         itemId: 'addTpmState',
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 16/21] ui: utils: factor out volume size renderer
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (14 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 15/21] ui: qemu: hardware view: inline 'add efi' menuitem Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 17/21] ui: lxc: network view: convert to pending grid Dominik Csapak
                   ` (4 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

so it can be reused for the volumes of containers.

No functional change intended.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/Utils.js                 | 15 +++++++++++++++
 www/manager6/qemu/HardwareDiskGrid.js | 14 +-------------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 49862c0f..92ed6861 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -2206,6 +2206,21 @@ Ext.define('PVE.Utils', {
             return Ext.htmlEncode(description);
         },
 
+        // renders the size of a volume from a guest config
+        renderConfigVolumeSize: function (value) {
+            if (value === undefined || value === null) {
+                return '';
+            }
+
+            let size = value;
+            if (!size.toString().slice(-1).match(/[0-9]/)) {
+                // IEC unit is implicit in config, but parser expects it as 'i' suffix
+                size = `${value}i`;
+            }
+
+            return Proxmox.Utils.autoscale_size_unit(size);
+        },
+
         renderBooleanProperty: function (value) {
             if (Ext.isString(value)) {
                 value = PVE.Parser.parseBoolean(value);
diff --git a/www/manager6/qemu/HardwareDiskGrid.js b/www/manager6/qemu/HardwareDiskGrid.js
index 912aa4fc..a0da9f0d 100644
--- a/www/manager6/qemu/HardwareDiskGrid.js
+++ b/www/manager6/qemu/HardwareDiskGrid.js
@@ -34,19 +34,7 @@ Ext.define('PVE.qemu.HardwareDiskGrid', {
             header: gettext('Size'),
             dataIndex: 'size',
             width: 100,
-            renderer: (value) => {
-                if (value === undefined || value === null) {
-                    return '';
-                }
-
-                let size = value;
-                if (!size.toString().slice(-1).match(/[0-9]/)) {
-                    // IEC unit is implicit in config, but parser expects it as 'i' suffix
-                    size = `${value}i`;
-                }
-
-                return Proxmox.Utils.autoscale_size_unit(size);
-            },
+            renderer: PVE.Utils.renderConfigVolumeSize,
         },
         {
             header: gettext('Pre-Enrolled Keys (EFI Disk only)'),
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 17/21] ui: lxc: network view: convert to pending grid
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (15 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 16/21] ui: utils: factor out volume size renderer Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 18/21] ui: lxc: introduce resource volume grid Dominik Csapak
                   ` (3 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

so that pending changes of the nics are shown, and can be reverted with
the new revert button. This is also preparation for showing the nics in
the resource view.

Instead of loading the config once, the grid now uses an ObjectStore
for the pending api call. That one can also be given from outside, so
it can be shared with a PendingObjectGrid. If it's not given, the grid
creates its own. In both cases 'load' still loads the interfaces first
and then triggers a load of that store.

The code that built the records moves mostly unchanged into the
'recordParser'. Since that overwrites the name and addresses with the
ones from inside the container, the parsed config is saved in the
record too. That way the renderers can show the configured values for
a pending change that modifies them, otherwise it could not be seen.

The 'dataCache' for the edit window (and the digest) is now filled from
the store on each update.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/lxc/Network.js | 184 +++++++++++++++++++++++++-----------
 1 file changed, 130 insertions(+), 54 deletions(-)

diff --git a/www/manager6/lxc/Network.js b/www/manager6/lxc/Network.js
index b2737471..87cf7962 100644
--- a/www/manager6/lxc/Network.js
+++ b/www/manager6/lxc/Network.js
@@ -349,16 +349,39 @@ Ext.define('PVE.lxc.NetworkEdit', {
 Ext.define(
     'PVE.lxc.NetworkView',
     {
-        extend: 'Ext.grid.GridPanel',
+        extend: 'PVE.grid.PendingGrid',
         alias: 'widget.pveLxcNetworkView',
 
         onlineHelp: 'pct_container_network',
 
         dataCache: {}, // used to store result of last load
 
+        // interfaces as seen inside the container, indexed by mac address
+        interfaces: undefined,
+
         stateful: true,
         stateId: 'grid-lxc-network',
 
+        storeFilter: (rec) => PVE.Utils.keyIsNic(rec.data.key),
+
+        statics: {
+            // the record data to show for the current or pending config
+            //
+            // the name and addresses from inside the container are also used for the pending
+            // config, except when it changes them
+            displayData: function (rec, pending) {
+                if (!pending) {
+                    return rec.data;
+                }
+                let current = rec.data.config ?? {};
+                let config = rec.data.pending?.config ?? {};
+                let changed = ['hwaddr', 'name', 'ip', 'ip6'].some(
+                    (key) => config[key] !== current[key],
+                );
+                return changed ? config : rec.data;
+            },
+        },
+
         load: async function () {
             let me = this;
 
@@ -372,9 +395,6 @@ Ext.define(
                     url: `/nodes/${nodename}/lxc/${vmid}/interfaces`,
                     method: 'GET',
                 });
-                let confResponse = await Proxmox.Async.api2({
-                    url: me.url,
-                });
                 Proxmox.Utils.setErrorMask(me, false);
 
                 let interfaces = [];
@@ -382,48 +402,70 @@ Ext.define(
                     interfaces[iface['hardware-address']] = iface;
                 }
 
-                let records = [];
-                me.dataCache = confResponse.result.data || {};
-                for (const [key, value] of Object.entries(confResponse.result.data)) {
-                    if (!PVE.Utils.keyIsNic(key)) {
-                        continue;
-                    }
-                    let config = PVE.Parser.parseLxcNetwork(value);
-                    let net = structuredClone(config);
-                    net.id = key;
-
-                    let iface = interfaces[config.hwaddr.toLowerCase()];
-                    if (iface) {
-                        net.name = iface.name;
-                        net.ip = [];
-                        net.ip6 = [];
-                        for (const i of iface['ip-addresses']) {
-                            let ip_with_prefix = `${i['ip-address']}/${i.prefix}`;
-                            if (i['ip-address-type'] === 'inet') {
-                                if (config.ip === ip_with_prefix) {
-                                    net.ip.push(`${ip_with_prefix} (static)`);
-                                } else {
-                                    // this could be dhcp, but also a static address set directly on the container
-                                    net.ip.push(`${ip_with_prefix} (dynamic)`);
-                                }
-                            } else if (i['ip-address-type'] === 'inet6') {
-                                if (config.ip6 === ip_with_prefix) {
-                                    net.ip6.push(`${ip_with_prefix} (static)`);
-                                } else {
-                                    // this could be dhcp, slaac, but also a static address set directly on the container
-                                    net.ip6.push(`${ip_with_prefix} (dynamic)`);
-                                }
-                            }
+                me.interfaces = interfaces;
+                me.rstore.load();
+            } catch (error) {
+                Proxmox.Utils.setErrorMask(me, gettext('Error') + ': ' + error);
+            }
+        },
+
+        recordParser: function (key, value) {
+            let me = this;
+
+            let config = PVE.Parser.parseLxcNetwork(value);
+            if (!config) {
+                return undefined;
+            }
+            let net = structuredClone(config);
+            net.id = key;
+            // the values below get overwritten, but they are needed for pending changes
+            net.config = config;
+
+            let iface = me.interfaces?.[config.hwaddr.toLowerCase()];
+            if (iface) {
+                net.name = iface.name;
+                net.ip = [];
+                net.ip6 = [];
+                for (const i of iface['ip-addresses']) {
+                    let ip_with_prefix = `${i['ip-address']}/${i.prefix}`;
+                    if (i['ip-address-type'] === 'inet') {
+                        if (config.ip === ip_with_prefix) {
+                            net.ip.push(`${ip_with_prefix} (static)`);
+                        } else {
+                            // this could be dhcp, but also a static address set directly on the container
+                            net.ip.push(`${ip_with_prefix} (dynamic)`);
+                        }
+                    } else if (i['ip-address-type'] === 'inet6') {
+                        if (config.ip6 === ip_with_prefix) {
+                            net.ip6.push(`${ip_with_prefix} (static)`);
+                        } else {
+                            // this could be dhcp, slaac, but also a static address set directly on the container
+                            net.ip6.push(`${ip_with_prefix} (dynamic)`);
                         }
                     }
-                    records.push(net);
                 }
-
-                me.store.loadData(records);
-                me.down('button[name=addButton]').setDisabled(records.length >= 32);
-            } catch (error) {
-                Proxmox.Utils.setErrorMask(me, gettext('Error') + ': ' + error);
             }
+            return net;
+        },
+
+        updateData: function () {
+            let me = this;
+
+            me.callParent();
+
+            let records = me.store.getRange();
+            me.dataCache = {};
+            let data = me.rstore.getData();
+            // like the config api call, this includes the pending changes
+            (data.getSource() ?? data).each(function (rec) {
+                if (!rec.data.delete) {
+                    me.dataCache[rec.data.key] = rec.data.pending ?? rec.data.value;
+                }
+            });
+            let caps = Ext.state.Manager.get('GuiCap');
+            me.down('button[name=addButton]').setDisabled(
+                !caps.vms['VM.Config.Network'] || records.length >= 32,
+            );
         },
 
         initComponent: function () {
@@ -443,6 +485,16 @@ Ext.define(
 
             me.url = `/nodes/${nodename}/lxc/${vmid}/config`;
 
+            // can be given from outside to share it, e.g. with a PendingObjectGrid
+            let ownRstore = !me.rstore;
+            if (ownRstore) {
+                me.rstore = Ext.create('Proxmox.data.ObjectStore', {
+                    model: 'KeyValuePendingDelete',
+                    readArray: true,
+                    url: `/api2/json/nodes/${nodename}/lxc/${vmid}/pending`,
+                });
+            }
+
             let store = new Ext.data.Store({
                 model: 'pve-lxc-network',
                 sorters: [
@@ -457,7 +509,7 @@ Ext.define(
 
             let run_editor = function () {
                 let rec = sm.getSelection()[0];
-                if (!rec || !caps.vms['VM.Config.Network']) {
+                if (!rec || !!rec.data.deleted || !caps.vms['VM.Config.Network']) {
                     return false; // disable default-propagation when triggered by grid dblclick
                 }
                 Ext.create('PVE.lxc.NetworkEdit', {
@@ -500,7 +552,7 @@ Ext.define(
                         disabled: true,
                         selModel: sm,
                         enableFn: function (rec) {
-                            return !!caps.vms['VM.Config.Network'];
+                            return !!caps.vms['VM.Config.Network'] && !rec.data.deleted;
                         },
                         confirmMsg: ({ data }) =>
                             Ext.String.format(
@@ -527,9 +579,17 @@ Ext.define(
                         text: gettext('Edit'),
                         selModel: sm,
                         disabled: true,
-                        enableFn: (rec) => !!caps.vms['VM.Config.Network'],
+                        enableFn: (rec) => !!caps.vms['VM.Config.Network'] && !rec.data.deleted,
                         handler: run_editor,
                     },
+                    {
+                        xtype: 'pvePendingRevertButton',
+                        apiurl: `/api2/extjs${me.url}`,
+                        parentXType: 'pvePendingGrid',
+                        selModel: sm,
+                        enableFn: (rec) => !!rec.data.deleted || !!rec.data.pending,
+                        reloadCallback: () => me.load(),
+                    },
                 ],
                 columns: [
                     {
@@ -541,6 +601,8 @@ Ext.define(
                         header: gettext('Name'),
                         width: 80,
                         dataIndex: 'name',
+                        renderer: (_value, _metaData, rec, _rI, _cI, _store, _view, pending) =>
+                            Ext.htmlEncode(PVE.lxc.NetworkView.displayData(rec, pending).name),
                     },
                     {
                         header: gettext('Bridge'),
@@ -567,7 +629,7 @@ Ext.define(
                         header: gettext('IP address'),
                         width: 300,
                         dataIndex: 'ip',
-                        renderer: function (_value, _metaData, rec) {
+                        renderer: function (_value, _metaData, rec, _ri, _ci, _s, _v, pending) {
                             const formatIpValue = (value, prefix) => {
                                 if (Array.isArray(value) && value.length > 0) {
                                     // multiple addresses (usually from the api)
@@ -587,9 +649,9 @@ Ext.define(
                                 return '';
                             };
 
+                            let data = PVE.lxc.NetworkView.displayData(rec, pending);
                             return (
-                                formatIpValue(rec.data.ip, 'ip: ') +
-                                formatIpValue(rec.data.ip6, 'ip6: ')
+                                formatIpValue(data.ip, 'ip: ') + formatIpValue(data.ip6, 'ip6: ')
                             );
                         },
                     },
@@ -597,13 +659,14 @@ Ext.define(
                         header: gettext('Gateway'),
                         width: 150,
                         dataIndex: 'gw',
-                        renderer: function (value, metaData, rec) {
-                            if (rec.data.gw && rec.data.gw6) {
-                                return rec.data.gw + '<br>' + rec.data.gw6;
-                            } else if (rec.data.gw6) {
-                                return rec.data.gw6;
+                        renderer: function (value, metaData, rec, _ri, _ci, _s, _v, pending) {
+                            let data = (pending ? rec.data.pending : rec.data) ?? {};
+                            if (data.gw && data.gw6) {
+                                return data.gw + '<br>' + data.gw6;
+                            } else if (data.gw6) {
+                                return data.gw6;
                             } else {
-                                return rec.data.gw;
+                                return data.gw;
                             }
                         },
                     },
@@ -626,6 +689,19 @@ Ext.define(
             });
 
             me.callParent();
+
+            if (ownRstore) {
+                Proxmox.Utils.monStoreErrors(me, me.rstore);
+            }
+
+            // the buttons only evaluate their enableFn on selection changes, but the data of a
+            // selected record can change on a reload too
+            me.mon(me.store, 'refresh', function () {
+                let selection = sm.getSelection();
+                if (selection.length) {
+                    sm.fireEvent('selectionchange', sm, selection);
+                }
+            });
         },
     },
     function () {
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 18/21] ui: lxc: introduce resource volume grid
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (16 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 17/21] ui: lxc: network view: convert to pending grid Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 19/21] ui: lxc: resources: separate volumes into own grid Dominik Csapak
                   ` (2 subsequent siblings)
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

intended to be used inside the resource view. not used yet.

Shows the rootfs, the mount points and the unused disks with their
options split out into columns, like the hardware disk grid for qemu.

Same as there, the toolbar buttons will be added directly in the
resource view since they require accessing some data from there.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/Makefile                  |  1 +
 www/manager6/lxc/ResourceVolumeGrid.js | 96 ++++++++++++++++++++++++++
 2 files changed, 97 insertions(+)
 create mode 100644 www/manager6/lxc/ResourceVolumeGrid.js

diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index d14256f9..02e3a8e5 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -223,6 +223,7 @@ JSSRC= 							\
 	lxc/Network.js					\
 	lxc/Options.js					\
 	lxc/ResourceEdit.js				\
+	lxc/ResourceVolumeGrid.js			\
 	lxc/Resources.js				\
 	lxc/MultiMPEdit.js				\
 	menu/MenuItem.js				\
diff --git a/www/manager6/lxc/ResourceVolumeGrid.js b/www/manager6/lxc/ResourceVolumeGrid.js
new file mode 100644
index 00000000..56a9a4e5
--- /dev/null
+++ b/www/manager6/lxc/ResourceVolumeGrid.js
@@ -0,0 +1,96 @@
+Ext.define('PVE.lxc.ResourceVolumeGrid', {
+    extend: 'PVE.grid.PendingGrid',
+    alias: 'widget.pveLxcResourceVolumeGrid',
+
+    title: gettext('Mount Points'),
+
+    stateful: true,
+    stateId: 'pve-lxc-resource-volume',
+
+    border: false,
+    expandable: false,
+
+    minHeight: 100,
+
+    recordParser: (_key, value) => PVE.Parser.parseLxcMountPoint(value),
+    // override to render the keys properly
+    renderKey: Ext.htmlEncode,
+
+    columns: [
+        {
+            header: 'ID',
+            dataIndex: 'id',
+            width: 170,
+            renderer: 'renderKey',
+        },
+        {
+            header: gettext('Volume'),
+            dataIndex: 'file',
+            flex: 1,
+            minWidth: 200,
+        },
+        {
+            header: gettext('Path'),
+            dataIndex: 'mp',
+            flex: 1,
+            minWidth: 150,
+            renderer: (v, _md, rec) => (rec.data.key === 'rootfs' ? '/' : Ext.htmlEncode(v)),
+        },
+        {
+            header: gettext('Size'),
+            dataIndex: 'size',
+            width: 100,
+            renderer: PVE.Utils.renderConfigVolumeSize,
+        },
+        {
+            header: gettext('ACLs'),
+            dataIndex: 'acl',
+            width: 80,
+            renderer: (v) =>
+                v === undefined ? Proxmox.Utils.defaultText : PVE.Utils.renderBooleanProperty(v),
+        },
+        {
+            header: gettext('Backup'),
+            dataIndex: 'backup',
+            width: 80,
+            // rootfs is always included in backups
+            renderer: (v, _md, rec) =>
+                PVE.Utils.renderBooleanProperty(rec.data.key === 'rootfs' ? true : v),
+        },
+        {
+            header: gettext('Quota'),
+            dataIndex: 'quota',
+            width: 80,
+            renderer: PVE.Utils.renderBooleanProperty,
+        },
+        {
+            header: gettext('Read-Only'),
+            dataIndex: 'ro',
+            width: 100,
+            renderer: PVE.Utils.renderBooleanProperty,
+        },
+        {
+            header: gettext('Replicate'),
+            dataIndex: 'replicate',
+            width: 100,
+            renderer: (v) => PVE.Utils.renderBooleanProperty(v ?? true),
+        },
+        {
+            header: gettext('Mount options'),
+            dataIndex: 'mountoptions',
+            width: 150,
+        },
+        {
+            header: gettext('Shared'),
+            dataIndex: 'shared',
+            hidden: true,
+            renderer: PVE.Utils.renderBooleanProperty,
+        },
+        {
+            header: gettext('Raw Config'),
+            dataIndex: 'raw',
+            hidden: true,
+            flex: 1,
+        },
+    ],
+});
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 19/21] ui: lxc: resources: separate volumes into own grid
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (17 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 18/21] ui: lxc: introduce resource volume grid Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 20/21] ui: lxc: resources: integrate network view Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 21/21] ui: qemu/lxc: volume/disk grid: add overflow handler Dominik Csapak
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

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 <d.csapak@proxmox.com>
---
 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 = `<i class='pve-grid-fa fa fa-fw fa-${rowdef.iconCls}'></i>`;
-            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 = `<i class='pve-grid-fa fa fa-fw fa-${rowdef.iconCls}'></i>`;
+                            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





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 20/21] ui: lxc: resources: integrate network view
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (18 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 19/21] ui: lxc: resources: separate volumes into own grid Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  2026-11-19  9:28 ` [PATCH pve-manager v6 21/21] ui: qemu/lxc: volume/disk grid: add overflow handler Dominik Csapak
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

and remove it as separate panel, so the nics are shown below the
volumes, like in the hardware view of qemu.

Since the pending store only contains keys that are defined in 'rows',
add the nics and the digest there, so that the network view can use the
store too.

The network view handles its buttons and reloading after changes by
itself. Only the load on activate and on a reload of the resource view
has to be triggered from here, since it's not a direct child of the
config panel anymore.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/manager6/lxc/Config.js    |  6 ------
 www/manager6/lxc/Resources.js | 36 ++++++++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js
index 3a99d6a7..4019b81d 100644
--- a/www/manager6/lxc/Config.js
+++ b/www/manager6/lxc/Config.js
@@ -271,12 +271,6 @@ Ext.define('PVE.lxc.Config', {
                 iconCls: 'fa fa-cube',
                 xtype: 'pveLxcRessourceView',
             },
-            {
-                title: gettext('Network'),
-                iconCls: 'fa fa-exchange',
-                itemId: 'network',
-                xtype: 'pveLxcNetworkView',
-            },
             {
                 title: gettext('DNS'),
                 iconCls: 'fa fa-globe',
diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js
index 944c0356..e29eca55 100644
--- a/www/manager6/lxc/Resources.js
+++ b/www/manager6/lxc/Resources.js
@@ -21,8 +21,10 @@ Ext.define('PVE.lxc.RessourceView', {
         return resourceGrid.getObjectValue(...arguments);
     },
 
+    // also reloads the interfaces of the network view, their addresses could have changed
     reload: function () {
         let me = this;
+        me.down('pveLxcNetworkView').load();
         return me.rstore.load();
     },
 
@@ -113,6 +115,10 @@ Ext.define('PVE.lxc.RessourceView', {
             unprivileged: {
                 visible: false,
             },
+            // only needed for the network view
+            digest: {
+                visible: false,
+            },
         };
 
         PVE.Utils.forEachLxcMP(function (bus, i, confid) {
@@ -137,6 +143,11 @@ Ext.define('PVE.lxc.RessourceView', {
             }
         }, true);
 
+        // not shown in the general grid, but the network view needs them in the store
+        for (let i = 0; i < PVE.Utils.hardware_counts.net; i++) {
+            rows[`net${i}`] = { visible: false };
+        }
+
         let deveditor = Proxmox.UserName === 'root@pam' ? 'PVE.lxc.DeviceEdit' : undefined;
 
         PVE.Utils.forEachLxcDev(function (i, confid) {
@@ -236,7 +247,7 @@ Ext.define('PVE.lxc.RessourceView', {
             url: `/api2/json/nodes/${nodename}/lxc/${vmid}/pending`,
             interval: 2000,
             rows,
-            filters: [(rec) => !volumeGridFilter(rec)],
+            filters: [(rec) => !volumeGridFilter(rec), (rec) => !PVE.Utils.keyIsNic(rec.data.key)],
         });
 
         let onSelectionChange = function (sm, selected) {
@@ -453,20 +464,39 @@ Ext.define('PVE.lxc.RessourceView', {
                         },
                     ],
                 },
+                // spacer with bottom border
+                {
+                    xtype: 'panel',
+                    border: true,
+                    height: 1,
+                    margin: '20 0 0 0',
+                },
+                {
+                    xtype: 'pveLxcNetworkView',
+                    title: gettext('Network Interfaces'),
+                    border: false,
+                    pveSelNode: me.pveSelNode,
+                    rstore: me.rstore,
+                },
             ],
         });
 
         me.callParent();
 
+        // it sets its own listeners, so add it afterwards
+        let networkView = me.down('pveLxcNetworkView');
+        networkView.on('selectionchange', onSelectionChange);
+
         me.on('activate', me.rstore.startUpdate, me.rstore);
+        me.on('activate', () => networkView.load());
         me.on('destroy', me.rstore.stopUpdate, me.rstore);
         me.on('deactivate', me.rstore.stopUpdate, me.rstore);
 
         let volumeGrid = me.down('pveLxcResourceVolumeGrid');
 
         // 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')) {
+        // selected record can change on a reload too (the network view handles that itself)
+        for (const grid of [me.lookup('resourceGrid'), volumeGrid]) {
             me.mon(grid.getStore(), 'refresh', function () {
                 let selModel = grid.getSelectionModel();
                 let selection = selModel.getSelection();
-- 
2.47.3





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH pve-manager v6 21/21] ui: qemu/lxc: volume/disk grid: add overflow handler
  2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
                   ` (19 preceding siblings ...)
  2026-11-19  9:28 ` [PATCH pve-manager v6 20/21] ui: lxc: resources: integrate network view Dominik Csapak
@ 2026-11-19  9:28 ` Dominik Csapak
  20 siblings, 0 replies; 22+ messages in thread
From: Dominik Csapak @ 2026-11-19  9:28 UTC (permalink / raw)
  To: pve-devel

These grids have a large number of buttons, add an overflow handler so
it stays usable on smaller screens.

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 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





^ permalink raw reply related	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2026-11-19  9:32 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-19  9:28 [PATCH pve-manager v6 00/21] ui: split out disks and nics into grids Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 01/21] ui: utils: factor out 'media=cdrom' check Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 02/21] ui: parser: qemu drive: allow '-' in key name Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 03/21] ui: qemu: network edit: remove unused 'networkmode' property Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 04/21] ui: parser: qemu network: allow unknown keys Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 05/21] ui: factor out the guest key nic regex check Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 06/21] ui: add pending grid Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 07/21] ui: revert button: add parentXType and reloadCallback Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 08/21] ui: button: add config remove button Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 09/21] ui: qemu: hardware: wrap in container Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 10/21] ui: qemu: introduce hardware disk grid Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 11/21] ui: qemu: introduce hardware net grid Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 12/21] ui: qemu: hardware view: separate disks into own grid Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 13/21] ui: qemu: hardware view: separate nics " Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 14/21] ui: qemu: hardware view: inline edit/remove/revert button in general grid Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 15/21] ui: qemu: hardware view: inline 'add efi' menuitem Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 16/21] ui: utils: factor out volume size renderer Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 17/21] ui: lxc: network view: convert to pending grid Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 18/21] ui: lxc: introduce resource volume grid Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 19/21] ui: lxc: resources: separate volumes into own grid Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 20/21] ui: lxc: resources: integrate network view Dominik Csapak
2026-11-19  9:28 ` [PATCH pve-manager v6 21/21] ui: qemu/lxc: volume/disk grid: add overflow handler Dominik Csapak

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal