]> git.proxmox.com Git - pve-manager.git/commitdiff
ui: eslint: enforce "no-unneeded-ternary" rule
authorThomas Lamprecht <t.lamprecht@proxmox.com>
Tue, 19 Jan 2021 16:41:11 +0000 (17:41 +0100)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Tue, 19 Jan 2021 16:41:11 +0000 (17:41 +0100)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
12 files changed:
www/manager6/Utils.js
www/manager6/dc/Backup.js
www/manager6/dc/UserEdit.js
www/manager6/lxc/Config.js
www/manager6/qemu/CDEdit.js
www/manager6/qemu/Config.js
www/manager6/qemu/HardwareView.js
www/manager6/qemu/IPConfigEdit.js
www/manager6/qemu/NetworkEdit.js
www/manager6/storage/IScsiEdit.js
www/manager6/window/Clone.js
www/manager6/window/SafeDestroy.js

index 80be1e8dc5eb62f8b27a813aa520be4aaf47060c..5d476600b458bfa5caf44c192158ae908310cd19 100644 (file)
@@ -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,
                    });
index 34d072d642484322ab572b97d645d81dd720472f..83f5beafcf0ff76e08f43a5b9dd3e7818c508578 100644 (file)
@@ -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',
            },
            {
index f00a46f8516261920f5f9f9c9fda963b70dedfc4..1ce6b80f3d3dc146f0006bb000ad2e6f3b5034b9 100644 (file)
@@ -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,
            {
index 1becc687af01b9a726b6a75e0485079a202f593e..1d405cf21e656117f0c6f58e386eab2fe985058c 100644 (file)
@@ -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({
index a26854aa9cc815d7f76d1daea8b72a307ed5c855..091fa50b32d24dae6d648fa967083caf4c8bb99d 100644 (file)
@@ -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,
index ce2a768697715af64c2223aa585bac291f077772..49189489ff4e7e271f93815b0e899e4cfca648a5 100644 (file)
@@ -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) {
index 5f60da1c31c78f021c4e0f1fecfe05e794372763..5440a04974341fd829ee2e85560cbe2ea9a6513d 100644 (file)
@@ -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"),
        };
 
index 2b119050fa2807f2ca46789b4aae9583fd272fe8..53976333c719703113928fd2f6cf375c08608e42 100644 (file)
@@ -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,
index fed77f4fbb0ea3d1b9005086eb94ef7fe00554ac..9500b53dcc2094e0340fa89801ec12f7222fe7c5 100644 (file)
@@ -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,
index 2052c05f58f738a15dd12c0f03df0eb729cd149d..4cb6bec57c81b723722a2e6e59c15c677aa284c7 100644 (file)
@@ -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]);
     },
 
index c357fc7ec08f22dfb25bcdcf18970e43460b1e6f..e94cd92dccd0adcdb2081f9603ef9291fddd0f28 100644 (file)
@@ -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', {
index bf6f2cdfc818e196936d38e78660d8ed84548173..5acb6e32bdc15e9f78af569ce80c9e176b0795ad 100644 (file)
@@ -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