From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-manager v6 05/21] ui: factor out the guest key nic regex check
Date: Thu, 19 Nov 2026 10:28:18 +0100 [thread overview]
Message-ID: <20261119092930.830046-6-d.csapak@proxmox.com> (raw)
In-Reply-To: <20261119092930.830046-1-d.csapak@proxmox.com>
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
next prev parent reply other threads:[~2026-11-19 9:30 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 ` Dominik Csapak [this message]
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
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-6-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