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>
This commit is contained in:
Thomas Lamprecht 2022-04-26 09:05:35 +02:00
parent b7004b4682
commit 56148f253e
5 changed files with 5 additions and 8 deletions

View File

@ -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__';

View File

@ -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,
});

View File

@ -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),
});

View File

@ -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 || {};

View File

@ -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',