all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Dominik Csapak <d.csapak@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-manager v5 03/18] ui: factor out the guest key nic regex check
Date: Mon, 16 Nov 2026 17:30:28 +0100	[thread overview]
Message-ID: <20261116163138.343821-4-d.csapak@proxmox.com> (raw)
In-Reply-To: <20261116163138.343821-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





  parent reply	other threads:[~2026-11-16 16:32 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-16 16:30 [PATCH pve-manager v5 00/18] ui: split out disks and nics into grids Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 01/18] ui: utils: factor out 'media=cdrom' check Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 02/18] ui: parser: qemu drive: allow '-' in key name Dominik Csapak
2026-11-16 16:30 ` Dominik Csapak [this message]
2026-11-16 16:30 ` [PATCH pve-manager v5 04/18] ui: add pending grid Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 05/18] ui: revert button: add parentXType and reloadCallback Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 06/18] ui: button: add config remove button Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 07/18] ui: qemu: hardware: wrap in container Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 08/18] ui: qemu: introduce hardware disk grid Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 09/18] ui: qemu: introduce hardware net grid Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 10/18] ui: qemu: hardware view: separate disks into own grid Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 11/18] ui: qemu: hardware view: separate nics " Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 12/18] ui: qemu: hardware view: inline edit/remove/revert button in general grid Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 13/18] ui: qemu: hardware view: inline 'add efi' menuitem Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 14/18] ui: utils: factor out volume size renderer Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 15/18] ui: lxc: network view: convert to pending grid Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 16/18] ui: lxc: introduce resource volume grid Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 17/18] ui: lxc: resources: separate volumes into own grid Dominik Csapak
2026-11-16 16:30 ` [PATCH pve-manager v5 18/18] ui: lxc: resources: integrate network view Dominik Csapak
2026-11-19 10:01 ` superseded: [PATCH pve-manager v5 00/18] ui: split out disks and nics into grids 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=20261116163138.343821-4-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal