ui: dc/cluster: eslint fixes and code cleanup/refactoring

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/www/manager6/dc/Cluster.js b/www/manager6/dc/Cluster.js
index 5880fbfc68d265d9c6ead9f6163f92c64920ff70..12fd9468a02046f4100a3524485d4c48459efdc5 100644 (file)
--- a/www/manager6/dc/Cluster.js
+++ b/www/manager6/dc/Cluster.js
@@ -63,7 +63,7 @@ Ext.define('PVE.ClusterAdministration', {
                },
 
                onLoad: function(store, records, success) {
-                   var vm = this.getViewModel();
+                   let vm = this.getViewModel();
                    if (!success || !records || !records[0].data) {
                        vm.set('totem', {});
                        vm.set('isInCluster', false);
@@ -75,7 +75,7 @@ Ext.define('PVE.ClusterAdministration', {
                        });
                        return;
                    }
-                   var data = records[0].data;
+                   let data = records[0].data;
                    vm.set('totem', data.totem);
                    vm.set('isInCluster', !!data.totem.cluster_name);
                    vm.set('nodelist', data.nodelist);
@@ -101,9 +101,9 @@ Ext.define('PVE.ClusterAdministration', {
                },
 
                onCreate: function() {
-                   var view = this.getView();
+                   let view = this.getView();
                    view.store.stopUpdate();
-                   var win = Ext.create('PVE.ClusterCreateWindow', {
+                   Ext.create('PVE.ClusterCreateWindow', {
                        autoShow: true,
                        listeners: {
                            destroy: function() {
@@ -114,8 +114,9 @@ Ext.define('PVE.ClusterAdministration', {
                },
 
                onClusterInfo: function() {
-                   var vm = this.getViewModel();
-                   var win = Ext.create('PVE.ClusterInfoWindow', {
+                   let vm = this.getViewModel();
+                   Ext.create('PVE.ClusterInfoWindow', {
+                       autoShow: true,
                        joinInfo: {
                            ipAddress: vm.get('preferred_node.addr'),
                            fingerprint: vm.get('preferred_node.fp'),
@@ -124,13 +125,12 @@ Ext.define('PVE.ClusterAdministration', {
                            totem: vm.get('totem'),
                        },
                    });
-                   win.show();
                },
 
                onJoin: function() {
-                   var view = this.getView();
+                   let view = this.getView();
                    view.store.stopUpdate();
-                   var win = Ext.create('PVE.ClusterJoinNodeWindow', {
+                   Ext.create('PVE.ClusterJoinNodeWindow', {
                        autoShow: true,
                        listeners: {
                            destroy: function() {
@@ -237,8 +237,8 @@ Ext.define('PVE.ClusterAdministration', {
                },
 
                onLoad: function(store, records, success) {
-                   var view = this.getView();
-                   var vm = this.getViewModel();
+                   let view = this.getView();
+                   let vm = this.getViewModel();
 
                    if (!success || !records || !records.length) {
                        vm.set('nodecount', 0);
@@ -247,13 +247,11 @@ Ext.define('PVE.ClusterAdministration', {
                    vm.set('nodecount', records.length);
 
                    // show/hide columns according to used links
-                   var linkIndex = view.columns.length;
-                   var columns = Ext.each(view.columns, (col, i) => {
+                   let linkIndex = view.columns.length;
+                   Ext.each(view.columns, (col, i) => {
                        if (col.linkNumber !== undefined) {
                            col.setHidden(true);
-
-                           // save offset at which link columns start, so we
-                           // can address them directly below
+                           // save offset at which link columns start, so we can address them directly below
                            if (i < linkIndex) {
                                linkIndex = i;
                            }
@@ -265,7 +263,7 @@ Ext.define('PVE.ClusterAdministration', {
                            if (linknum > 7) {
                                return;
                            }
-                           view.columns[linkIndex+linknum].setHidden(false);
+                           view.columns[linkIndex + linknum].setHidden(false);
                        },
                    );
                },

diff --git a/www/manager6/dc/ClusterEdit.js b/www/manager6/dc/ClusterEdit.js
index 254bfeb05d170f66a85d198bc2cf5dfa6fc1903d..32964fbf6fdff2bb5f05cc3fd1e65662ba1813f1 100644 (file)
--- a/www/manager6/dc/ClusterEdit.js
+++ b/www/manager6/dc/ClusterEdit.js
@@ -241,8 +241,9 @@ Ext.define('PVE.ClusterJoinNodeWindow', {
                });
 
                linkEditor.setInfoText();
-               if (links.length == 1 && joinInfo.ring_addr !== undefined &&
-                   joinInfo.ring_addr[0] === joinInfo.ipAddress) {
+               if (links.length === 1 && joinInfo.ring_addr !== undefined &&
+                   joinInfo.ring_addr[0] === joinInfo.ipAddress
+               ) {
                    links[0].allowBlank = true;
                    links[0].emptyText = gettext("IP resolved by node's hostname");
                }
@@ -274,7 +275,7 @@ Ext.define('PVE.ClusterJoinNodeWindow', {
            Ext.defer(function() {
                window.location.reload(true);
            }, 5000);
-           var txt = gettext('Cluster join task finished, node certificate may have changed, reload GUI!');
+           let txt = gettext('Cluster join task finished, node certificate may have changed, reload GUI!');
            // ensure user cannot do harm
            Ext.getBody().mask(txt, ['pve-static-mask']);
            // TaskView may hide above mask, so tell him directly
@@ -307,8 +308,7 @@ Ext.define('PVE.ClusterJoinNodeWindow', {
        fieldLabel: gettext('Information'),
        emptyText: gettext('Paste encoded Cluster Information here'),
        validator: function(val) {
-           return val === '' || this.valid ||
-              gettext('Does not seem like a valid encoded Cluster Information!');
+           return val === '' || this.valid || gettext('Does not seem like a valid encoded Cluster Information!');
        },
        bind: {
            disabled: '{!assistedEntry.checked}',