From ef725143c6843529ee05c8f68617bdff119e5efb Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 19 Jan 2021 17:41:11 +0100 Subject: [PATCH 1/1] ui: eslint: enforce "no-unneeded-ternary" rule Signed-off-by: Thomas Lamprecht --- www/manager6/Utils.js | 4 ++-- www/manager6/dc/Backup.js | 4 ++-- www/manager6/dc/UserEdit.js | 2 +- www/manager6/lxc/Config.js | 4 ++-- www/manager6/qemu/CDEdit.js | 2 +- www/manager6/qemu/Config.js | 8 ++++---- www/manager6/qemu/HardwareView.js | 16 ++++++++-------- www/manager6/qemu/IPConfigEdit.js | 2 +- www/manager6/qemu/NetworkEdit.js | 2 +- www/manager6/storage/IScsiEdit.js | 2 +- www/manager6/window/Clone.js | 8 ++++---- www/manager6/window/SafeDestroy.js | 4 ++-- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index 80be1e8d..5d476600 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1251,7 +1251,7 @@ Ext.define('PVE.Utils', { // Note: we need to tell android the correct file name extension // but we do not set 'download' tag for other environments, because // It can have strange side effects (additional user prompt on firefox) - var andriod = navigator.userAgent.match(/Android/i) ? true : false; + var andriod = !!navigator.userAgent.match(/Android/i); if (andriod) { link.download = name; } @@ -1527,7 +1527,7 @@ Ext.define('PVE.Utils', { if (Proxmox.UserName === 'root@pam') { container.el.mask(); if (!container.down('pveCephInstallWindow')) { - var isInstalled = msg.match(/not initialized/i) ? true : false; + var isInstalled = !!msg.match(/not initialized/i); var win = Ext.create('PVE.ceph.Install', { nodename: nodename, }); diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js index 34d072d6..83f5beaf 100644 --- a/www/manager6/dc/Backup.js +++ b/www/manager6/dc/Backup.js @@ -212,14 +212,14 @@ Ext.define('PVE.dc.BackupEdit', { xtype: 'pveEmailNotificationSelector', fieldLabel: gettext('Email notification'), name: 'mailnotification', - deleteEmpty: me.isCreate ? false : true, + deleteEmpty: !me.isCreate, value: me.isCreate ? 'always' : '', }, { xtype: 'pveCompressionSelector', fieldLabel: gettext('Compression'), name: 'compress', - deleteEmpty: me.isCreate ? false : true, + deleteEmpty: !me.isCreate, value: 'zstd', }, { diff --git a/www/manager6/dc/UserEdit.js b/www/manager6/dc/UserEdit.js index f00a46f8..1ce6b80f 100644 --- a/www/manager6/dc/UserEdit.js +++ b/www/manager6/dc/UserEdit.js @@ -73,7 +73,7 @@ Ext.define('PVE.dc.UserEdit', { value: me.userid, renderer: Ext.String.htmlEncode, allowBlank: false, - submitValue: me.isCreate ? true : false, + submitValue: !!me.isCreate, }, pwfield, verifypw, { diff --git a/www/manager6/lxc/Config.js b/www/manager6/lxc/Config.js index 1becc687..1d405cf2 100644 --- a/www/manager6/lxc/Config.js +++ b/www/manager6/lxc/Config.js @@ -109,7 +109,7 @@ Ext.define('PVE.lxc.Config', { { text: gettext('Clone'), iconCls: 'fa fa-fw fa-clone', - hidden: caps.vms['VM.Clone'] ? false : true, + hidden: !caps.vms['VM.Clone'], handler: function() { PVE.window.Clone.wrap(nodename, vmid, template, 'lxc'); }, @@ -119,7 +119,7 @@ Ext.define('PVE.lxc.Config', { disabled: template, xtype: 'pveMenuItem', iconCls: 'fa fa-fw fa-file-o', - hidden: caps.vms['VM.Allocate'] ? false : true, + hidden: !caps.vms['VM.Allocate'], confirmMsg: Proxmox.Utils.format_task_description('vztemplate', vmid), handler: function() { Proxmox.Utils.API2Request({ diff --git a/www/manager6/qemu/CDEdit.js b/www/manager6/qemu/CDEdit.js index a26854aa..091fa50b 100644 --- a/www/manager6/qemu/CDEdit.js +++ b/www/manager6/qemu/CDEdit.js @@ -159,7 +159,7 @@ Ext.define('PVE.qemu.CDEdit', { throw "no node name specified"; } - me.isCreate = me.confid ? false : true; + me.isCreate = !me.confid; var ipanel = Ext.create('PVE.qemu.CDInputPanel', { confid: me.confid, diff --git a/www/manager6/qemu/Config.js b/www/manager6/qemu/Config.js index ce2a7686..49189489 100644 --- a/www/manager6/qemu/Config.js +++ b/www/manager6/qemu/Config.js @@ -85,7 +85,7 @@ Ext.define('PVE.qemu.Config', { { text: gettext('Clone'), iconCls: 'fa fa-fw fa-clone', - hidden: caps.vms['VM.Clone'] ? false : true, + hidden: !caps.vms['VM.Clone'], handler: function() { PVE.window.Clone.wrap(nodename, vmid, template, 'qemu'); }, @@ -95,7 +95,7 @@ Ext.define('PVE.qemu.Config', { disabled: template, xtype: 'pveMenuItem', iconCls: 'fa fa-fw fa-file-o', - hidden: caps.vms['VM.Allocate'] ? false : true, + hidden: !caps.vms['VM.Allocate'], confirmMsg: Proxmox.Utils.format_task_description('qmtemplate', vmid), handler: function() { Proxmox.Utils.API2Request({ @@ -389,8 +389,8 @@ Ext.define('PVE.qemu.Config', { rec = s.data.get('lock'); lock = rec ? rec.data.value : undefined; - spice = s.data.get('spice') ? true : false; - xtermjs = s.data.get('serial') ? true : false; + spice = !!s.data.get('spice'); + xtermjs = !!s.data.get('serial'); } if (template) { diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js index 5f60da1c..5440a049 100644 --- a/www/manager6/qemu/HardwareView.js +++ b/www/manager6/qemu/HardwareView.js @@ -225,7 +225,7 @@ Ext.define('PVE.qemu.HardwareView', { group: 10, iconCls: 'hdd-o', editor: 'PVE.qemu.HDEdit', - never_delete: caps.vms['VM.Config.Disk'] ? false : true, + never_delete: !caps.vms['VM.Config.Disk'], isOnStorageBus: true, header: gettext('Hard Disk') + ' (' + confid +')', cdheader: gettext('CD/DVD Drive') + ' (' + confid +')', @@ -239,7 +239,7 @@ Ext.define('PVE.qemu.HardwareView', { order: i, iconCls: 'exchange', editor: caps.vms['VM.Config.Network'] ? 'PVE.qemu.NetworkEdit' : undefined, - never_delete: caps.vms['VM.Config.Network'] ? false : true, + never_delete: !caps.vms['VM.Config.Network'], header: gettext('Network Device') + ' (' + confid +')', }; } @@ -247,7 +247,7 @@ Ext.define('PVE.qemu.HardwareView', { group: 20, iconCls: 'hdd-o', editor: null, - never_delete: caps.vms['VM.Config.Disk'] ? false : true, + never_delete: !caps.vms['VM.Config.Disk'], header: gettext('EFI Disk'), }; for (i = 0; i < PVE.Utils.hardware_counts.usb; i++) { @@ -257,7 +257,7 @@ Ext.define('PVE.qemu.HardwareView', { order: i, iconCls: 'usb', editor: caps.nodes['Sys.Console'] ? 'PVE.qemu.USBEdit' : undefined, - never_delete: caps.nodes['Sys.Console'] ? false : true, + never_delete: !caps.nodes['Sys.Console'], header: gettext('USB Device') + ' (' + confid + ')', }; } @@ -267,7 +267,7 @@ Ext.define('PVE.qemu.HardwareView', { group: 30, order: i, tdCls: 'pve-itype-icon-pci', - never_delete: caps.nodes['Sys.Console'] ? false : true, + never_delete: !caps.nodes['Sys.Console'], editor: caps.nodes['Sys.Console'] ? 'PVE.qemu.PCIEdit' : undefined, header: gettext('PCI Device') + ' (' + confid + ')', }; @@ -278,7 +278,7 @@ Ext.define('PVE.qemu.HardwareView', { group: 35, order: i, tdCls: 'pve-itype-icon-serial', - never_delete: caps.nodes['Sys.Console'] ? false : true, + never_delete: !caps.nodes['Sys.Console'], header: gettext('Serial Port') + ' (' + confid + ')', }; } @@ -286,7 +286,7 @@ Ext.define('PVE.qemu.HardwareView', { group: 40, iconCls: 'volume-up', editor: caps.vms['VM.Config.HWType'] ? 'PVE.qemu.AudioEdit' : undefined, - never_delete: caps.vms['VM.Config.HWType'] ? false : true, + never_delete: !caps.vms['VM.Config.HWType'], header: gettext('Audio Device'), }; for (i = 0; i < 256; i++) { @@ -303,7 +303,7 @@ Ext.define('PVE.qemu.HardwareView', { group: 45, tdCls: 'pve-itype-icon-die', editor: caps.nodes['Sys.Console'] ? 'PVE.qemu.RNGEdit' : undefined, - never_delete: caps.nodes['Sys.Console'] ? false : true, + never_delete: !caps.nodes['Sys.Console'], header: gettext("VirtIO RNG"), }; diff --git a/www/manager6/qemu/IPConfigEdit.js b/www/manager6/qemu/IPConfigEdit.js index 2b119050..53976333 100644 --- a/www/manager6/qemu/IPConfigEdit.js +++ b/www/manager6/qemu/IPConfigEdit.js @@ -202,7 +202,7 @@ Ext.define('PVE.qemu.IPConfigEdit', { throw "no node name specified"; } - me.isCreate = me.confid ? false : true; + me.isCreate = !me.confid; var ipanel = Ext.create('PVE.qemu.IPConfigPanel', { confid: me.confid, diff --git a/www/manager6/qemu/NetworkEdit.js b/www/manager6/qemu/NetworkEdit.js index fed77f4f..9500b53d 100644 --- a/www/manager6/qemu/NetworkEdit.js +++ b/www/manager6/qemu/NetworkEdit.js @@ -180,7 +180,7 @@ Ext.define('PVE.qemu.NetworkEdit', { throw "no node name specified"; } - me.isCreate = me.confid ? false : true; + me.isCreate = !me.confid; var ipanel = Ext.create('PVE.qemu.NetworkInputPanel', { confid: me.confid, diff --git a/www/manager6/storage/IScsiEdit.js b/www/manager6/storage/IScsiEdit.js index 2052c05f..4cb6bec5 100644 --- a/www/manager6/storage/IScsiEdit.js +++ b/www/manager6/storage/IScsiEdit.js @@ -71,7 +71,7 @@ Ext.define('PVE.storage.IScsiInputPanel', { }, setValues: function(values) { - values.luns = (values.content.indexOf('images') !== -1) ? true : false; + values.luns = (values.content.indexOf('images') !== -1); this.callParent([values]); }, diff --git a/www/manager6/window/Clone.js b/www/manager6/window/Clone.js index c357fc7e..e94cd92d 100644 --- a/www/manager6/window/Clone.js +++ b/www/manager6/window/Clone.js @@ -29,8 +29,8 @@ Ext.define('PVE.window.Clone', { }, success: function(response, opts) { var snapshotList = response.result.data; - var hasSnapshots = snapshotList.length === 1 && - snapshotList[0].name === 'current' ? false : true; + var hasSnapshots = !(snapshotList.length === 1 && + snapshotList[0].name === 'current'); Ext.create('PVE.window.Clone', { nodename: nodename, @@ -227,7 +227,7 @@ Ext.define('PVE.window.Clone', { nodename: me.nodename, guestType: me.guestType, vmid: me.vmid, - hidden: me.isTemplate || !me.hasSnapshots ? true : false, + hidden: !!(me.isTemplate || !me.hasSnapshots), disabled: false, allowBlank: false, value: me.snapname, @@ -248,7 +248,7 @@ Ext.define('PVE.window.Clone', { allowBlank: true, storageContent: me.guestType === 'qemu' ? 'images' : 'rootdir', emptyText: gettext('Same as source'), - disabled: me.isTemplate ? true : false, // because default mode is clone for templates + disabled: !!me.isTemplate, // because default mode is clone for templates }); var formPanel = Ext.create('Ext.form.Panel', { diff --git a/www/manager6/window/SafeDestroy.js b/www/manager6/window/SafeDestroy.js index bf6f2cdf..5acb6e32 100644 --- a/www/manager6/window/SafeDestroy.js +++ b/www/manager6/window/SafeDestroy.js @@ -70,8 +70,8 @@ Ext.define('PVE.window.SafeDestroy', { Ext.Msg.alert('Error', response.htmlStatus); }, success: function(response, options) { - var hasProgressBar = view.showProgress && - response.result.data ? true : false; + var hasProgressBar = !!(view.showProgress && + response.result.data); if (hasProgressBar) { // stay around so we can trigger our close events -- 2.39.2