From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-manager v6 14/21] ui: qemu: hardware view: inline edit/remove/revert button in general grid
Date: Thu, 19 Nov 2026 10:28:27 +0100 [thread overview]
Message-ID: <20261119092930.830046-15-d.csapak@proxmox.com> (raw)
In-Reply-To: <20261119092930.830046-1-d.csapak@proxmox.com>
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
next prev parent reply other threads:[~2026-11-19 9:31 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` Dominik Csapak [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261119092930.830046-15-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox