proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-09 08:56:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ui: form/Node Selector: eslint fixes and code cleanup/refactoring

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-05-18 16:50:38 +02:00
parent 86b60bd59e
commit 65c6c5d592
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
www/manager6/form/NodeSelector.js
View File

@ -63,16 +63,14 @@ Ext.define('PVE.form.NodeSelector', {
}, },
validator: function(value) { validator: function(value) {
var me = this; let me = this;
if (!me.onlineValidator || me.allowBlank && !value) { if (!me.onlineValidator || (me.allowBlank && !value)) {
return true; return true;
} }
var offline = []; let offline = [], notAllowed = [];
var notAllowed = [];
Ext.Array.each(value.split(/\s*,\s*/), function(node) { Ext.Array.each(value.split(/\s*,\s*/), function(node) {
var rec = me.store.findRecord(me.valueField, node, 0, false, true, true); let rec = me.store.findRecord(me.valueField, node, 0, false, true, true);
if (!(rec && rec.data) || rec.data.status !== 'online') { if (!(rec && rec.data) || rec.data.status !== 'online') {
offline.push(node); offline.push(node);
} else if (me.allowedNodes && !Ext.Array.contains(me.allowedNodes, node)) { } else if (me.allowedNodes && !Ext.Array.contains(me.allowedNodes, node)) {
@ -83,7 +81,6 @@ Ext.define('PVE.form.NodeSelector', {
if (value && notAllowed.length !== 0) { if (value && notAllowed.length !== 0) {
return "Node " + notAllowed.join(', ') + " is not allowed for this action!"; return "Node " + notAllowed.join(', ') + " is not allowed for this action!";
} }
if (value && offline.length !== 0) { if (value && offline.length !== 0) {
return "Node " + offline.join(', ') + " seems to be offline!"; return "Node " + offline.join(', ') + " seems to be offline!";
} }
@ -93,26 +90,17 @@ Ext.define('PVE.form.NodeSelector', {
initComponent: function() { initComponent: function() {
var me = this; var me = this;
if (me.selectCurNode && PVE.curSelectedNode && PVE.curSelectedNode.data.node) { if (me.selectCurNode && PVE.curSelectedNode && PVE.curSelectedNode.data.node) {
me.preferredValue = PVE.curSelectedNode.data.node; me.preferredValue = PVE.curSelectedNode.data.node;
} }
me.callParent(); me.callParent();
me.getStore().load(); me.getStore().load();
// filter out disallowed nodes me.getStore().addFilter(new Ext.util.Filter({ // filter out disallowed nodes
me.getStore().addFilter(new Ext.util.Filter({ filterFn: (item) => !(me.disallowedNodes && me.disallowedNodes.includes(item.data.node)),
filterFn: function(item) {
if (Ext.isArray(me.disallowedNodes)) {
return !Ext.Array.contains(me.disallowedNodes, item.data.node);
} else {
return true;
}
},
})); }));
me.mon(me.getStore(), 'load', function() { me.mon(me.getStore(), 'load', () => me.isValid());
me.isValid();
});
}, },
}); });