ui: utils: drop some useles _array helpers, just use Object.entries

if we need to enforce ordering it may help to reintroduce them
though.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 3e39ea6cf18a29d2aee39d79781363b804b2e886..f13a7dece3c98bf0fb7bbb4b5a5adb7f0fd55335 100644 (file)
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -581,7 +581,6 @@ Ext.define('PVE.Utils', {
        //th: 'Thai',
        tr: 'Turkish',
     },
-    kvm_keymap_array: () => Object.entries(PVE.Utils.kvm_keymaps),
 
     kvm_vga_drivers: {
        '__default__': Proxmox.Utils.defaultText,
@@ -598,7 +597,6 @@ Ext.define('PVE.Utils', {
        virtio: 'VirtIO-GPU',
        none: Proxmox.Utils.noneText,
     },
-    kvm_vga_driver_array: () => Object.entries(PVE.Utils.kvm_vga_drivers),
 
     render_kvm_language: function(value) {
        if (!value) {
@@ -614,7 +612,6 @@ Ext.define('PVE.Utils', {
        'html5': 'HTML5 (noVNC)',
        'xtermjs': 'xterm.js',
     },
-    console_viewer_array: () => Object.entries(PVE.Utils.console_map),
 
     render_console_viewer: function(value) {
        value = value || '__default__';

diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js
index 6b30ede943c11885a241d8ea496a16adb13122de..bd9f8f0666ecba4dca2ec99bf3df1c4396fb9629 100644 (file)
--- a/www/manager6/dc/OptionView.js
+++ b/www/manager6/dc/OptionView.js
@@ -70,7 +70,7 @@ Ext.define('PVE.dc.OptionView', {
 
        me.add_combobox_row('keyboard', gettext('Keyboard Layout'), {
            renderer: PVE.Utils.render_kvm_language,
-           comboItems: PVE.Utils.kvm_keymap_array(),
+           comboItems: Object.entries(PVE.Utils.kvm_keymaps),
            defaultValue: '__default__',
            deleteEmpty: true,
        });
@@ -81,7 +81,7 @@ Ext.define('PVE.dc.OptionView', {
        });
        me.add_combobox_row('console', gettext('Console Viewer'), {
            renderer: PVE.Utils.render_console_viewer,
-           comboItems: PVE.Utils.console_viewer_array(),
+           comboItems: Object.entries(PVE.Utils.console_map),
            defaultValue: '__default__',
            deleteEmpty: true,
        });

diff --git a/www/manager6/form/VNCKeyboardSelector.js b/www/manager6/form/VNCKeyboardSelector.js
index 6d6e4783ea0253f1e1350d2e333da8fb1f10cacd..94eb3ab27071b04b807ef825eb2a44385a5cfb47 100644 (file)
--- a/www/manager6/form/VNCKeyboardSelector.js
+++ b/www/manager6/form/VNCKeyboardSelector.js
@@ -1,5 +1,5 @@
 Ext.define('PVE.form.VNCKeyboardSelector', {
     extend: 'Proxmox.form.KVComboBox',
     alias: ['widget.VNCKeyboardSelector'],
-    comboItems: PVE.Utils.kvm_keymap_array(),
+    comboItems: Object.entries(PVE.Utils.kvm_keymaps),
 });

diff --git a/www/manager6/qemu/DisplayEdit.js b/www/manager6/qemu/DisplayEdit.js
index 04cfadd69ccf4e5c1057277aeea4c5c546ae7a3a..9bb1763ece1fd8b5b20704a49c1d3b25a4882421 100644 (file)
--- a/www/manager6/qemu/DisplayEdit.js
+++ b/www/manager6/qemu/DisplayEdit.js
@@ -17,7 +17,7 @@ Ext.define('PVE.qemu.DisplayInputPanel', {
        value: '__default__',
        deleteEmpty: false,
        fieldLabel: gettext('Graphic card'),
-       comboItems: PVE.Utils.kvm_vga_driver_array(),
+       comboItems: Object.entries(PVE.Utils.kvm_vga_drivers),
        validator: function(v) {
            let cfg = this.up('proxmoxWindowEdit').vmconfig || {};
 

diff --git a/www/manager6/qemu/SystemEdit.js b/www/manager6/qemu/SystemEdit.js
index 11fee24b4781d3d18009b36d13401fdf18993eb3..592c88eee6dc677a72b6d1720d22995ac478703e 100644 (file)
--- a/www/manager6/qemu/SystemEdit.js
+++ b/www/manager6/qemu/SystemEdit.js
@@ -80,7 +80,7 @@ Ext.define('PVE.qemu.SystemInputPanel', {
            deleteEmpty: false,
            fieldLabel: gettext('Graphic card'),
            name: 'vga',
-           comboItems: PVE.Utils.kvm_vga_driver_array(),
+           comboItems: Object.entries(PVE.Utils.kvm_vga_drivers),
        },
        {
            xtype: 'proxmoxKVComboBox',