api: add proxmox-firewall to versions pkg list

[pve-manager.git] / www / manager6 / qemu / AgentIPView.js

diff --git a/www/manager6/qemu/AgentIPView.js b/www/manager6/qemu/AgentIPView.js
index 853e88205e3517d8b3f9fa5f185c63c14411bfb6..829e55960b2379cd6850e4b339c0cb5458fb5bea 100644 (file)
--- a/www/manager6/qemu/AgentIPView.js
+++ b/www/manager6/qemu/AgentIPView.js
@@ -4,23 +4,27 @@ Ext.define('PVE.window.IPInfo', {
     title: gettext('Guest Agent Network Information'),
     height: 300,
     layout: {
-       type: 'fit'
+       type: 'fit',
     },
     modal: true,
     items: [
        {
            xtype: 'grid',
+           store: {},
            emptyText: gettext('No network information'),
+           viewConfig: {
+               enableTextSelection: true,
+           },
            columns: [
                {
                    dataIndex: 'name',
                    text: gettext('Name'),
-                   flex: 3
+                   flex: 3,
                },
                {
                    dataIndex: 'hardware-address',
                    text: gettext('MAC address'),
-                   width: 140
+                   width: 140,
                },
                {
                    dataIndex: 'ip-addresses',
@@ -35,16 +39,16 @@ Ext.define('PVE.window.IPInfo', {
                        val.forEach(function(ip) {
                            var addr = ip['ip-address'];
                            var pref = ip.prefix;
-                           if  (addr && pref) {
+                           if (addr && pref) {
                                ips.push(addr + '/' + pref);
                            }
                        });
                        return ips.join('<br>');
-                   }
-               }
-           ]
-       }
-    ]
+                   },
+               },
+           ],
+       },
+    ],
 });
 
 Ext.define('PVE.qemu.AgentIPView', {
@@ -53,7 +57,7 @@ Ext.define('PVE.qemu.AgentIPView', {
 
     layout: {
        type: 'hbox',
-       align: 'top'
+       align: 'top',
     },
 
     nics: [],
@@ -61,7 +65,7 @@ Ext.define('PVE.qemu.AgentIPView', {
     items: [
        {
            xtype: 'box',
-           html: '<i class="fa fa-exchange"></i> IPs'
+           html: '<i class="fa fa-exchange"></i> IPs',
        },
        {
            xtype: 'container',
@@ -69,7 +73,7 @@ Ext.define('PVE.qemu.AgentIPView', {
            layout: {
                type: 'vbox',
                align: 'right',
-               pack: 'end'
+               pack: 'end',
            },
            items: [
                {
@@ -77,8 +81,8 @@ Ext.define('PVE.qemu.AgentIPView', {
                    flex: 1,
                    itemId: 'ipBox',
                    style: {
-                       'text-align': 'right'
-                   }
+                       'text-align': 'right',
+                   },
                },
                {
                    xtype: 'button',
@@ -86,16 +90,16 @@ Ext.define('PVE.qemu.AgentIPView', {
                    hidden: true,
                    ui: 'default-toolbar',
                    handler: function(btn) {
-                       var me = this.up('pveAgentIPView');
+                       let view = this.up('pveAgentIPView');
 
                        var win = Ext.create('PVE.window.IPInfo');
-                       win.down('grid').getStore().setData(me.nics);
+                       win.down('grid').getStore().setData(view.nics);
                        win.show();
                    },
-                   text: gettext('More')
-               }
-           ]
-       }
+                   text: gettext('More'),
+               },
+           ],
+       },
     ],
 
     getDefaultIps: function(nics) {
@@ -103,8 +107,8 @@ Ext.define('PVE.qemu.AgentIPView', {
        var ips = [];
        nics.forEach(function(nic) {
            if (nic['hardware-address'] &&
-               nic['hardware-address'] != '00:00:00:00:00:00') {
-
+               nic['hardware-address'] !== '00:00:00:00:00:00' &&
+               nic['hardware-address'] !== '0:0:0:0:0:0') {
                var nic_ips = nic['ip-addresses'] || [];
                nic_ips.forEach(function(ip) {
                    var p = ip['ip-address'];
@@ -121,12 +125,11 @@ Ext.define('PVE.qemu.AgentIPView', {
 
     startIPStore: function(store, records, success) {
        var me = this;
-       var agentRec = store.getById('agent');
-       /*jslint confusion: true*/
-       /* value is number and string */
-       me.agent = (agentRec && agentRec.data.value === 1);
-       me.running = (store.getById('status').data.value === 'running');
-       /*jslint confusion: false*/
+       let agentRec = store.getById('agent');
+       let state = store.getById('status');
+
+       me.agent = agentRec && agentRec.data.value === 1;
+       me.running = state && state.data.value === 'running';
 
        var caps = Ext.state.Manager.get('GuiCap');
 
@@ -157,7 +160,6 @@ Ext.define('PVE.qemu.AgentIPView', {
                    text = ips.join('<br>');
                }
            } else if (me.nics && me.nics.error) {
-               var msg = gettext('Cannot get info from Guest Agent<br>Error: {0}');
                text = Ext.String.format(text, me.nics.error.desc);
            }
        } else if (me.agent) {
@@ -193,8 +195,8 @@ Ext.define('PVE.qemu.AgentIPView', {
            method: 'POST',
            proxy: {
                type: 'proxmox',
-               url: '/api2/json/nodes/' + nodename + '/qemu/' + vmid + '/agent/network-get-interfaces'
-           }
+               url: '/api2/json/nodes/' + nodename + '/qemu/' + vmid + '/agent/network-get-interfaces',
+           },
        });
 
        me.callParent();
@@ -208,7 +210,7 @@ Ext.define('PVE.qemu.AgentIPView', {
            me.updateStatus(!success);
        });
 
-       me.on('destroy', me.ipStore.stopUpdate);
+       me.on('destroy', me.ipStore.stopUpdate, me.ipStore);
 
        // if we already have info about the vm, use it immediately
        if (me.rstore.getCount()) {
@@ -217,5 +219,5 @@ Ext.define('PVE.qemu.AgentIPView', {
 
        // check if the guest agent is there on every statusstore load
        me.mon(me.rstore, 'load', me.startIPStore, me);
-    }
+    },
 });