From 03153d556b8b33a943d3d82dc83810519e9c5fed Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 18 May 2021 14:45:55 +0200 Subject: [PATCH] ui: dc: log, options, support: eslint fixes and code cleanup/refactoring Signed-off-by: Thomas Lamprecht --- www/manager6/dc/Log.js | 12 +++++------- www/manager6/dc/OptionView.js | 7 ++----- www/manager6/dc/Support.js | 9 ++++----- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/www/manager6/dc/Log.js b/www/manager6/dc/Log.js index 499e2010..f5817e39 100644 --- a/www/manager6/dc/Log.js +++ b/www/manager6/dc/Log.js @@ -8,9 +8,9 @@ Ext.define('PVE.dc.Log', { alias: ['widget.pveClusterLog'], initComponent: function() { - var me = this; + let me = this; - var logstore = Ext.create('Proxmox.data.UpdateStore', { + let logstore = Ext.create('Proxmox.data.UpdateStore', { storeid: 'pve-cluster-log', model: 'proxmox-cluster-log', proxy: { @@ -18,8 +18,7 @@ Ext.define('PVE.dc.Log', { url: '/api2/json/cluster/log', }, }); - - var store = Ext.create('Proxmox.data.DiffStore', { + let store = Ext.create('Proxmox.data.DiffStore', { rstore: logstore, appendAtStart: true, }); @@ -31,13 +30,12 @@ Ext.define('PVE.dc.Log', { viewConfig: { trackOver: false, stripeRows: true, - getRowClass: function(record, index) { - var pri = record.get('pri'); - + let pri = record.get('pri'); if (pri && pri <= 3) { return "proxmox-invalid-row"; } + return undefined; }, }, sortableColumns: false, diff --git a/www/manager6/dc/OptionView.js b/www/manager6/dc/OptionView.js index 0e783cf4..edae97ea 100644 --- a/www/manager6/dc/OptionView.js +++ b/www/manager6/dc/OptionView.js @@ -12,7 +12,7 @@ Ext.define('PVE.dc.OptionView', { opts = opts || {}; me.rows = me.rows || {}; - let canEdit = !opts.hasOwnProperty('caps') || opts.caps; + let canEdit = !Object.prototype.hasOwnProperty.call(opts, 'caps') || opts.caps; me.rows[name] = { required: true, defaultValue: opts.defaultValue, @@ -68,8 +68,6 @@ Ext.define('PVE.dc.OptionView', { initComponent: function() { var me = this; - var caps = Ext.state.Manager.get('GuiCap'); - me.add_combobox_row('keyboard', gettext('Keyboard Layout'), { renderer: PVE.Utils.render_kvm_language, comboItems: PVE.Utils.kvm_keymap_array(), @@ -150,10 +148,9 @@ Ext.define('PVE.dc.OptionView', { fieldLabel: gettext('U2F AppID URL'), emptyText: gettext('Defaults to origin'), value: '', - skipEmptyText: true, deleteEmpty: true, - submitEmptyText: false, skipEmptyText: true, + submitEmptyText: false, }, { xtype: 'textfield', name: 'origin', diff --git a/www/manager6/dc/Support.js b/www/manager6/dc/Support.js index 1b0e3eac..1b51e5ba 100644 --- a/www/manager6/dc/Support.js +++ b/www/manager6/dc/Support.js @@ -48,20 +48,19 @@ Ext.define('PVE.dc.Support', { }, initComponent: function() { - var me = this; + let me = this; - var reload = function() { + let reload = function() { Proxmox.Utils.API2Request({ url: '/nodes/localhost/subscription', method: 'GET', waitMsgTarget: me, failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); - me.update('Unable to load subscription status' + ": " + response.htmlStatus); + me.update(`${gettext('Unable to load subscription status')}: ${response.htmlStatus}`); }, success: function(response, opts) { - var data = response.result.data; - + let data = response.result.data; if (data.status === 'Active') { if (data.level === 'c') { me.updateCommunity(data);