ui: sdn: eslint auto fixes

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-04-26 15:44:57 +02:00
parent 81a6afa87d
commit 4966ba74f3
20 changed files with 132 additions and 139 deletions

View File

@ -51,7 +51,6 @@ Ext.define('PVE.sdn.ControllerView', {
if (!rec || rec.data.state === 'deleted') {
edit_btn.disable();
remove_btn.disable();
return;
}
};
@ -123,7 +122,7 @@ Ext.define('PVE.sdn.ControllerView', {
dataIndex: 'controller',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'controller', 1);
}
},
},
{
header: gettext('Type'),
@ -132,7 +131,7 @@ Ext.define('PVE.sdn.ControllerView', {
dataIndex: 'type',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'type', 1);
}
},
},
{
header: gettext('Node'),
@ -141,7 +140,7 @@ Ext.define('PVE.sdn.ControllerView', {
dataIndex: 'node',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'node', 1);
}
},
},
{
header: gettext('State'),
@ -149,8 +148,8 @@ Ext.define('PVE.sdn.ControllerView', {
dataIndex: 'state',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending_state(rec, value);
}
}
},
},
],
listeners: {
activate: reload,

View File

@ -17,23 +17,23 @@ Ext.define('PVE.sdn.DnsView', {
dns: sid,
autoShow: true,
listeners: {
destroy: this.reloadStore
}
destroy: this.reloadStore,
},
});
},
initComponent : function() {
initComponent: function() {
let me = this;
let store = new Ext.data.Store({
model: 'pve-sdn-dns',
proxy: {
type: 'proxmox',
url: "/api2/json/cluster/sdn/dns"
url: "/api2/json/cluster/sdn/dns",
},
sorters: {
property: 'dns',
order: 'DESC'
order: 'DESC',
},
});
@ -58,13 +58,13 @@ Ext.define('PVE.sdn.DnsView', {
text: gettext('Edit'),
disabled: true,
selModel: sm,
handler: run_editor
handler: run_editor,
});
let remove_btn = Ext.create('Proxmox.button.StdRemoveButton', {
selModel: sm,
baseurl: '/cluster/sdn/dns/',
callback: reload
callback: reload,
});
// else we cannot dynamically generate the add menu handlers
@ -79,9 +79,9 @@ Ext.define('PVE.sdn.DnsView', {
continue;
}
addMenuItems.push({
text: PVE.Utils.format_sdndns_type(type),
text: PVE.Utils.format_sdndns_type(type),
iconCls: 'fa fa-fw fa-' + dns.faIcon,
handler: addHandleGenerator(type)
handler: addHandleGenerator(type),
});
}
@ -90,14 +90,14 @@ Ext.define('PVE.sdn.DnsView', {
reloadStore: reload,
selModel: sm,
viewConfig: {
trackOver: false
trackOver: false,
},
tbar: [
{
text: gettext('Add'),
menu: new Ext.menu.Menu({
items: addMenuItems
})
items: addMenuItems,
}),
},
remove_btn,
edit_btn,
@ -106,13 +106,13 @@ Ext.define('PVE.sdn.DnsView', {
{
header: 'ID',
flex: 2,
dataIndex: 'dns'
dataIndex: 'dns',
},
{
header: gettext('Type'),
flex: 1,
dataIndex: 'type',
renderer: PVE.Utils.format_sdndns_type
renderer: PVE.Utils.format_sdndns_type,
},
{
header: 'url',
@ -122,11 +122,11 @@ Ext.define('PVE.sdn.DnsView', {
],
listeners: {
activate: reload,
itemdblclick: run_editor
}
itemdblclick: run_editor,
},
});
store.load();
me.callParent();
}
},
});

View File

@ -17,23 +17,23 @@ Ext.define('PVE.sdn.IpamView', {
ipam: sid,
autoShow: true,
listeners: {
destroy: this.reloadStore
}
destroy: this.reloadStore,
},
});
},
initComponent : function() {
initComponent: function() {
let me = this;
let store = new Ext.data.Store({
model: 'pve-sdn-ipam',
proxy: {
type: 'proxmox',
url: "/api2/json/cluster/sdn/ipams"
url: "/api2/json/cluster/sdn/ipams",
},
sorters: {
property: 'ipam',
order: 'DESC'
order: 'DESC',
},
});
@ -58,13 +58,13 @@ Ext.define('PVE.sdn.IpamView', {
text: gettext('Edit'),
disabled: true,
selModel: sm,
handler: run_editor
handler: run_editor,
});
let remove_btn = Ext.create('Proxmox.button.StdRemoveButton', {
selModel: sm,
baseurl: '/cluster/sdn/ipams/',
callback: reload
callback: reload,
});
// else we cannot dynamically generate the add menu handlers
@ -79,9 +79,9 @@ Ext.define('PVE.sdn.IpamView', {
continue;
}
addMenuItems.push({
text: PVE.Utils.format_sdnipam_type(type),
text: PVE.Utils.format_sdnipam_type(type),
iconCls: 'fa fa-fw fa-' + ipam.faIcon,
handler: addHandleGenerator(type)
handler: addHandleGenerator(type),
});
}
@ -90,14 +90,14 @@ Ext.define('PVE.sdn.IpamView', {
reloadStore: reload,
selModel: sm,
viewConfig: {
trackOver: false
trackOver: false,
},
tbar: [
{
text: gettext('Add'),
menu: new Ext.menu.Menu({
items: addMenuItems
})
items: addMenuItems,
}),
},
remove_btn,
edit_btn,
@ -106,13 +106,13 @@ Ext.define('PVE.sdn.IpamView', {
{
header: 'ID',
flex: 2,
dataIndex: 'ipam'
dataIndex: 'ipam',
},
{
header: gettext('Type'),
flex: 1,
dataIndex: 'type',
renderer: PVE.Utils.format_sdnipam_type
renderer: PVE.Utils.format_sdnipam_type,
},
{
header: 'url',
@ -122,12 +122,11 @@ Ext.define('PVE.sdn.IpamView', {
],
listeners: {
activate: reload,
itemdblclick: run_editor
}
itemdblclick: run_editor,
},
});
store.load();
me.callParent();
}
},
});

View File

@ -6,7 +6,7 @@ Ext.define('PVE.sdn.Options', {
layout: {
type: 'vbox',
align: 'stretch'
align: 'stretch',
},
onlineHelp: 'pvesdn_config_controllers',
@ -20,15 +20,15 @@ Ext.define('PVE.sdn.Options', {
title: gettext('Controllers'),
border: 0,
collapsible: true,
padding: '0 0 20 0'
padding: '0 0 20 0',
},
{
xtype: 'pveSDNIpamView',
title: gettext('Ipams'),
border: 0,
collapsible: true,
padding: '0 0 20 0'
},{
padding: '0 0 20 0',
}, {
xtype: 'pveSDNDnsView',
flex: 1,
collapsible: true,
@ -37,5 +37,5 @@ Ext.define('PVE.sdn.Options', {
}];
me.callParent();
}
},
});

View File

@ -44,16 +44,16 @@ Ext.define('PVE.sdn.SubnetInputPanel', {
name: 'snat',
uncheckedValue: 0,
checked: false,
fieldLabel: 'SNAT'
fieldLabel: 'SNAT',
},
{
xtype: 'proxmoxtextfield',
name: 'dnszoneprefix',
skipEmptyText: true,
fieldLabel: gettext('DNS zone prefix'),
allowBlank: true
}
]
allowBlank: true,
},
],
});
Ext.define('PVE.sdn.SubnetEdit', {

View File

@ -20,18 +20,18 @@ Ext.define('PVE.sdn.SubnetView', {
me.remove_btn.baseurl = url + '/';
me.store.setProxy({
type: 'proxmox',
url: '/api2/json/' + url + '?pending=1'
url: '/api2/json/' + url + '?pending=1',
});
me.store.load();
}
},
initComponent : function() {
initComponent: function() {
let me = this;
var store = new Ext.data.Store({
model: 'pve-sdn-subnet'
model: 'pve-sdn-subnet',
});
var reload = function() {
@ -46,14 +46,13 @@ Ext.define('PVE.sdn.SubnetView', {
if (!rec || rec.data.state === 'deleted') {
edit_btn.disable();
remove_btn.disable();
return;
}
};
let run_editor = function() {
let rec = sm.getSelection()[0];
let win = Ext.create('PVE.sdn.SubnetEdit',{
let win = Ext.create('PVE.sdn.SubnetEdit', {
autoShow: true,
subnet: rec.data.subnet,
base_url: me.base_url,
@ -81,7 +80,7 @@ Ext.define('PVE.sdn.SubnetView', {
reloadStore: reload,
selModel: sm,
viewConfig: {
trackOver: false
trackOver: false,
},
tbar: [
{
@ -93,7 +92,7 @@ Ext.define('PVE.sdn.SubnetView', {
type: 'subnet',
});
win.on('destroy', reload);
}
},
},
me.remove_btn,
edit_btn,
@ -105,7 +104,7 @@ Ext.define('PVE.sdn.SubnetView', {
dataIndex: 'cidr',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'cidr', 1);
}
},
},
{
header: gettext('Gateway'),
@ -113,7 +112,7 @@ Ext.define('PVE.sdn.SubnetView', {
dataIndex: 'gateway',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'gateway');
}
},
},
{
header: 'SNAT',
@ -121,7 +120,7 @@ Ext.define('PVE.sdn.SubnetView', {
dataIndex: 'snat',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'snat');
}
},
},
{
header: gettext('Dns prefix'),
@ -129,7 +128,7 @@ Ext.define('PVE.sdn.SubnetView', {
dataIndex: 'dnszoneprefix',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'dnszoneprefix');
}
},
},
{
header: gettext('State'),
@ -137,15 +136,15 @@ Ext.define('PVE.sdn.SubnetView', {
dataIndex: 'state',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending_state(rec, value);
}
}
},
},
],
listeners: {
activate: reload,
itemdblclick: run_editor,
selectionchange: set_button_status
}
selectionchange: set_button_status,
},
});
me.callParent();
@ -153,9 +152,8 @@ Ext.define('PVE.sdn.SubnetView', {
if (me.base_url) {
me.setBaseUrl(me.base_url); // load
}
}
},
}, function() {
Ext.define('pve-sdn-subnet', {
extend: 'Ext.data.Model',
fields: [
@ -163,7 +161,6 @@ Ext.define('PVE.sdn.SubnetView', {
'gateway',
'snat',
],
idProperty: 'subnet'
idProperty: 'subnet',
});
});

View File

@ -55,8 +55,8 @@ Ext.define('PVE.sdn.VnetInputPanel', {
uncheckedValue: 0,
checked: false,
fieldLabel: gettext('VLAN Aware'),
}
]
},
],
});
Ext.define('PVE.sdn.VnetEdit', {

View File

@ -12,7 +12,7 @@ Ext.define('PVE.sdn.Vnet', {
var subnetview_panel = Ext.createWidget('pveSDNSubnetView', {
title: gettext('Subnets'),
region: 'center',
border: false
border: false,
});
var vnetview_panel = Ext.createWidget('pveSDNVnetView', {
@ -21,19 +21,19 @@ Ext.define('PVE.sdn.Vnet', {
subnetview_panel: subnetview_panel,
width: '50%',
border: false,
split: true
split: true,
});
Ext.apply(me, {
layout: 'border',
items: [ vnetview_panel, subnetview_panel ],
items: [vnetview_panel, subnetview_panel],
listeners: {
show: function() {
subnetview_panel.fireEvent('show', subnetview_panel);
}
}
},
},
});
me.callParent();
}
},
});

View File

@ -34,7 +34,6 @@ Ext.define('PVE.sdn.VnetView', {
if (!rec || rec.data.state === 'deleted') {
edit_btn.disable();
remove_btn.disable();
return;
}
};
@ -91,7 +90,7 @@ Ext.define('PVE.sdn.VnetView', {
dataIndex: 'vnet',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'vnet', 1);
}
},
},
{
header: gettext('Alias'),
@ -99,7 +98,7 @@ Ext.define('PVE.sdn.VnetView', {
dataIndex: 'alias',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'alias');
}
},
},
{
header: gettext('Zone'),
@ -107,7 +106,7 @@ Ext.define('PVE.sdn.VnetView', {
dataIndex: 'zone',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'zone');
}
},
},
{
header: gettext('Tag'),
@ -115,7 +114,7 @@ Ext.define('PVE.sdn.VnetView', {
dataIndex: 'tag',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'tag');
}
},
},
{
header: gettext('VLAN Aware'),
@ -123,7 +122,7 @@ Ext.define('PVE.sdn.VnetView', {
dataIndex: 'vlanaware',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'vlanaware');
}
},
},
{
header: gettext('State'),
@ -131,8 +130,8 @@ Ext.define('PVE.sdn.VnetView', {
dataIndex: 'state',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending_state(rec, value);
}
}
},
},
],
listeners: {
activate: reload,

View File

@ -65,7 +65,7 @@ Ext.define('PVE.sdn.ZoneContentView', {
header: 'Alias',
width: 300,
sortable: true,
dataIndex: 'alias'
dataIndex: 'alias',
},
{
header: gettext('Status'),

View File

@ -51,7 +51,6 @@ Ext.define('PVE.sdn.ZoneView', {
if (!rec || rec.data.state === 'deleted') {
edit_btn.disable();
remove_btn.disable();
return;
}
};
@ -121,7 +120,7 @@ Ext.define('PVE.sdn.ZoneView', {
dataIndex: 'zone',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'zone', 1);
}
},
},
{
header: gettext('Type'),
@ -129,7 +128,7 @@ Ext.define('PVE.sdn.ZoneView', {
dataIndex: 'type',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'type', 1);
}
},
},
{
header: 'MTU',
@ -137,7 +136,7 @@ Ext.define('PVE.sdn.ZoneView', {
dataIndex: 'mtu',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'mtu');
}
},
},
{
header: 'Ipam',
@ -145,7 +144,7 @@ Ext.define('PVE.sdn.ZoneView', {
dataIndex: 'ipam',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'ipam');
}
},
},
{
header: gettext('Domain'),
@ -153,7 +152,7 @@ Ext.define('PVE.sdn.ZoneView', {
dataIndex: 'dnszone',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'dnszone');
}
},
},
{
header: gettext('Dns'),
@ -161,7 +160,7 @@ Ext.define('PVE.sdn.ZoneView', {
dataIndex: 'dns',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'dns');
}
},
},
{
header: gettext('Reverse dns'),
@ -169,7 +168,7 @@ Ext.define('PVE.sdn.ZoneView', {
dataIndex: 'reversedns',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'reversedns');
}
},
},
{
header: gettext('Nodes'),
@ -177,7 +176,7 @@ Ext.define('PVE.sdn.ZoneView', {
dataIndex: 'nodes',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending(rec, value, 'nodes');
}
},
},
{
header: gettext('State'),
@ -185,13 +184,13 @@ Ext.define('PVE.sdn.ZoneView', {
dataIndex: 'state',
renderer: function(value, metaData, rec) {
return PVE.Utils.render_sdn_pending_state(rec, value);
}
}
},
},
],
listeners: {
activate: reload,
itemdblclick: run_editor,
selectionchange: set_button_status
selectionchange: set_button_status,
},
});

View File

@ -16,7 +16,7 @@ Ext.define('PVE.sdn.controllers.BgpInputPanel', {
return values;
},
initComponent : function() {
initComponent: function() {
var me = this;
me.items = [
@ -26,7 +26,7 @@ Ext.define('PVE.sdn.controllers.BgpInputPanel', {
fieldLabel: gettext('Node'),
multiSelect: false,
autoSelect: false,
allowBlank: false
allowBlank: false,
},
{
xtype: 'proxmoxintegerfield',
@ -35,20 +35,20 @@ Ext.define('PVE.sdn.controllers.BgpInputPanel', {
maxValue: 4294967295,
value: 65000,
fieldLabel: 'ASN #',
allowBlank: false
allowBlank: false,
},
{
xtype: 'textfield',
name: 'peers',
fieldLabel: gettext('Peers'),
allowBlank: false
allowBlank: false,
},
{
xtype: 'proxmoxcheckbox',
name: 'ebgp',
uncheckedValue: 0,
checked: false,
fieldLabel: 'EBGP'
fieldLabel: 'EBGP',
},
];
@ -66,10 +66,10 @@ Ext.define('PVE.sdn.controllers.BgpInputPanel', {
minValue: 1,
maxValue: 100,
fieldLabel: 'ebgp-multihop',
allowBlank: true
allowBlank: true,
},
];
me.callParent();
}
},
});

View File

@ -15,17 +15,17 @@ Ext.define('PVE.panel.SDNDnsBase', {
return values;
},
initComponent : function() {
initComponent: function() {
var me = this;
me.callParent();
}
},
});
Ext.define('PVE.sdn.dns.BaseEdit', {
extend: 'Proxmox.window.Edit',
initComponent : function() {
initComponent: function() {
var me = this;
me.isCreate = !me.dns;
@ -41,20 +41,20 @@ Ext.define('PVE.sdn.dns.BaseEdit', {
var ipanel = Ext.create(me.paneltype, {
type: me.type,
isCreate: me.isCreate,
dns: me.dns
dns: me.dns,
});
Ext.apply(me, {
subject: PVE.Utils.format_sdndns_type(me.type),
isAdd: true,
items: [ ipanel ]
items: [ipanel],
});
me.callParent();
if (!me.isCreate) {
me.load({
success: function(response, options) {
success: function(response, options) {
var values = response.result.data;
var ctypes = values.content || '';
@ -66,8 +66,8 @@ Ext.define('PVE.sdn.dns.BaseEdit', {
values.enable = values.disable ? 0 : 1;
ipanel.setValues(values);
}
},
});
}
}
},
});

View File

@ -15,7 +15,7 @@ Ext.define('PVE.sdn.dns.PowerdnsInputPanel', {
return values;
},
initComponent : function() {
initComponent: function() {
var me = this;
me.items = [
@ -25,7 +25,7 @@ Ext.define('PVE.sdn.dns.PowerdnsInputPanel', {
maxLength: 10,
value: me.dns || '',
fieldLabel: 'ID',
allowBlank: false
allowBlank: false,
},
{
xtype: 'textfield',
@ -43,10 +43,10 @@ Ext.define('PVE.sdn.dns.PowerdnsInputPanel', {
xtype: 'proxmoxintegerfield',
name: 'ttl',
fieldLabel: 'ttl',
allowBlank: true
allowBlank: true,
},
];
me.callParent();
}
},
});

View File

@ -15,17 +15,17 @@ Ext.define('PVE.panel.SDNIpamBase', {
return values;
},
initComponent : function() {
initComponent: function() {
var me = this;
me.callParent();
}
},
});
Ext.define('PVE.sdn.ipams.BaseEdit', {
extend: 'Proxmox.window.Edit',
initComponent : function() {
initComponent: function() {
var me = this;
me.isCreate = !me.ipam;
@ -41,20 +41,20 @@ Ext.define('PVE.sdn.ipams.BaseEdit', {
var ipanel = Ext.create(me.paneltype, {
type: me.type,
isCreate: me.isCreate,
ipam: me.ipam
ipam: me.ipam,
});
Ext.apply(me, {
subject: PVE.Utils.format_sdnipam_type(me.type),
isAdd: true,
items: [ ipanel ]
items: [ipanel],
});
me.callParent();
if (!me.isCreate) {
me.load({
success: function(response, options) {
success: function(response, options) {
var values = response.result.data;
var ctypes = values.content || '';
@ -66,8 +66,8 @@ Ext.define('PVE.sdn.ipams.BaseEdit', {
values.enable = values.disable ? 0 : 1;
ipanel.setValues(values);
}
},
});
}
}
},
});

View File

@ -15,7 +15,7 @@ Ext.define('PVE.sdn.ipams.NetboxInputPanel', {
return values;
},
initComponent : function() {
initComponent: function() {
var me = this;
me.items = [
@ -25,7 +25,7 @@ Ext.define('PVE.sdn.ipams.NetboxInputPanel', {
maxLength: 10,
value: me.zone || '',
fieldLabel: 'ID',
allowBlank: false
allowBlank: false,
},
{
xtype: 'textfield',
@ -42,5 +42,5 @@ Ext.define('PVE.sdn.ipams.NetboxInputPanel', {
];
me.callParent();
}
},
});

View File

@ -15,7 +15,7 @@ Ext.define('PVE.sdn.ipams.PVEIpamInputPanel', {
return values;
},
initComponent : function() {
initComponent: function() {
var me = this;
me.items = [
@ -25,10 +25,10 @@ Ext.define('PVE.sdn.ipams.PVEIpamInputPanel', {
maxLength: 10,
value: me.zone || '',
fieldLabel: 'ID',
allowBlank: false
allowBlank: false,
},
];
me.callParent();
}
},
});

View File

@ -15,7 +15,7 @@ Ext.define('PVE.sdn.ipams.PhpIpamInputPanel', {
return values;
},
initComponent : function() {
initComponent: function() {
var me = this;
me.items = [
@ -25,7 +25,7 @@ Ext.define('PVE.sdn.ipams.PhpIpamInputPanel', {
maxLength: 10,
value: me.zone || '',
fieldLabel: 'ID',
allowBlank: false
allowBlank: false,
},
{
xtype: 'textfield',
@ -48,5 +48,5 @@ Ext.define('PVE.sdn.ipams.PhpIpamInputPanel', {
];
me.callParent();
}
},
});

View File

@ -45,18 +45,18 @@ Ext.define('PVE.panel.SDNZoneBase', {
name: 'dnszone',
skipEmptyText: true,
fieldLabel: gettext('DNS zone'),
allowBlank: true
allowBlank: true,
},
];
me.callParent();
}
},
});
Ext.define('PVE.sdn.zones.BaseEdit', {
extend: 'Proxmox.window.Edit',
initComponent : function() {
initComponent: function() {
var me = this;
me.isCreate = !me.zone;

View File

@ -45,14 +45,14 @@ Ext.define('PVE.sdn.zones.EvpnInputPanel', {
fieldLabel: gettext('Vnet MAC address'),
vtype: 'MacAddress',
allowBlank: true,
emptyText: 'auto'
emptyText: 'auto',
},
{
xtype: 'pveNodeSelector',
name: 'exitnodes',
fieldLabel: gettext('Exit Nodes'),
multiSelect: true,
autoSelect: false
autoSelect: false,
},
{
xtype: 'pveSDNControllerSelector',