[PATCH manager v4 01/12] ui: utils: factor out 'media=cdrom' check

[Dominik Csapak <d.csapak@proxmox.com>]

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 8b99371d..4eaec7b4 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -2014,6 +2014,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 = {};
@@ -2024,7 +2031,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 f7f4b46f..d1e5d6c1 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;
             }
@@ -440,7 +440,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;
@@ -780,7 +780,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 1013fe14..fd05d558 100644
--- a/www/manager6/window/GuestImport.js
+++ b/www/manager6/window/GuestImport.js
@@ -1075,7 +1075,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