]> git.proxmox.com Git - pmg-gui.git/blobdiff - js/ClusterAdministration.js
NavigationTree: Remove extra space
[pmg-gui.git] / js / ClusterAdministration.js
index a7bc9681be7136fd104d6c5ca990e05c692b9047..105b2a69873a08e8df60606248bc7d222026275c 100644 (file)
@@ -4,30 +4,33 @@ Ext.define('pmg-cluster', {
        'type', 'name', 'ip', 'hostrsapubkey', 'rootrsapubkey',
        'fingerprint', { type: 'integer', name: 'cid' },
        { type: 'boolean', name: 'insync' },
-       'memory', 'loadavg', 'uptime', 'rootfs', 'conn_error',
-       { type: 'number', name: 'memory_per',
+       'memory', 'loadavg', 'uptime', 'rootfs', 'conn_error', 'level',
+       {
+ type: 'number', name: 'memory_per',
          calculate: function(data) {
              var mem = data.memory;
              return Ext.isObject(mem) ? mem.used/mem.total : 0;
-         }
+         },
        },
-       { type: 'number', name: 'rootfs_per',
+       {
+ type: 'number', name: 'rootfs_per',
          calculate: function(data) {
              var du = data.rootfs;
              return Ext.isObject(du) ? du.used/du.total : 0;
-         }
-       }
+         },
+       },
     ],
     proxy: {
         type: 'proxmox',
-       url: "/api2/json/config/cluster/nodes"
+       url: "/api2/json/config/cluster/status",
     },
-    idProperty: 'cid'
+    idProperty: 'cid',
 });
 
 Ext.define('PMG.ClusterJoinNodeWindow', {
     extend: 'Proxmox.window.Edit',
     xtype: 'pmgClusterJoinNodeWindow',
+    onlineHelp: 'pmgcm_join',
 
     title: gettext('Cluster Join'),
 
@@ -41,20 +44,20 @@ Ext.define('PMG.ClusterJoinNodeWindow', {
        {
            xtype: 'textfield',
            fieldLabel: 'IP Address',
-           name: 'master_ip'
+           name: 'master_ip',
        },
        {
            xtype: 'textfield',
            inputType: 'password',
            fieldLabel: gettext('Password'),
-           name: 'password'
+           name: 'password',
        },
        {
            xtype: 'textfield',
            fieldLabel: gettext('Fingerprint'),
-           name: 'fingerprint'
-       }
-    ]
+           name: 'fingerprint',
+       },
+    ],
 });
 
 Ext.define('PMG.ClusterAddNodeWindow', {
@@ -76,8 +79,8 @@ Ext.define('PMG.ClusterAddNodeWindow', {
        {
            xtype: 'component',
            border: false,
-           padding: 10,
-           html: gettext("Please use the 'Join' button on the node you want to add, using the following IP address and fingerprint.")
+           padding: '10 10 10 10',
+           html: gettext("Please use the 'Join' button on the node you want to add, using the following IP address and fingerprint."),
        },
        {
            xtype: 'container',
@@ -89,17 +92,17 @@ Ext.define('PMG.ClusterAddNodeWindow', {
                    xtype: 'textfield',
                    fieldLabel: gettext('IP Address'),
                    cbind: { value: '{ipAddress}' },
-                   editable: false
+                   editable: false,
                },
                {
                    xtype: 'textfield',
                    fieldLabel: gettext('Fingerprint'),
                    cbind: { value: '{fingerprint}' },
-                   editable: false
-               }
-           ]
-       }
-    ]
+                   editable: false,
+               },
+           ],
+       },
+    ],
 });
 
 Ext.define('PMG.ClusterAdministration', {
@@ -115,8 +118,8 @@ Ext.define('PMG.ClusterAdministration', {
        parent: null,
        data: {
            nodecount: 0,
-           master: null
-       }
+           master: null,
+       },
     },
 
     items: [
@@ -128,10 +131,14 @@ Ext.define('PMG.ClusterAdministration', {
 
                init: function(view) {
                    view.store.on('load', this.onLoad, this);
+                   Proxmox.Utils.monStoreErrors(view, view.getStore(), true);
                },
 
-               onLoad: function(store, records) {
+               onLoad: function(store, records, success) {
                    var vm = this.getViewModel();
+                   if (!success || !records) {
+                       return;
+                   }
                    vm.set('nodecount', records.length);
 
                    var master = null;
@@ -150,7 +157,7 @@ Ext.define('PMG.ClusterAdministration', {
                        url: '/config/cluster/create',
                        method: 'POST',
                        waitMsgTarget: view,
-                       failure: function (response, opts) {
+                       failure: function(response, opts) {
                            Ext.Msg.alert(gettext('Error'), response.htmlStatus);
                        },
                        success: function(response, options) {
@@ -158,12 +165,11 @@ Ext.define('PMG.ClusterAdministration', {
                            var win = Ext.create('Proxmox.window.TaskProgress', { upid: upid });
                            win.show();
                            win.on('destroy', function() { view.store.load(); });
-                       }
+                       },
                    });
                },
 
                onJoin: function() {
-                   var view = this.getView();
                    var win = Ext.create('PMG.ClusterJoinNodeWindow', {});
                    win.show();
                    win.on('destroy', function() {
@@ -176,15 +182,16 @@ Ext.define('PMG.ClusterAdministration', {
 
                    var win = Ext.create('PMG.ClusterAddNodeWindow', {
                        ipAddress: vm.get('master').get('ip'),
-                       fingerprint: vm.get('master').get('fingerprint')
+                       fingerprint: vm.get('master').get('fingerprint'),
                    });
 
                    win.show();
-               }
+               },
            },
            store: {
                autoLoad: true,
-               model: 'pmg-cluster'
+               model: 'pmg-cluster',
+               sorters: ['cid'],
            },
            tbar: [
                {
@@ -192,47 +199,47 @@ Ext.define('PMG.ClusterAdministration', {
                    reference: 'createButton',
                    handler: 'onCreate',
                    bind: {
-                       disabled: '{nodecount}'
-                   }
+                       disabled: '{nodecount}',
+                   },
                },
                {
                    text: gettext('Add'),
                    reference: 'addButton',
                    handler: 'onAdd',
                    bind: {
-                       disabled: '{!master}'
-                   }
+                       disabled: '{!master}',
+                   },
                },
                {
                    text: gettext('Join'),
                    reference: 'joinButton',
                    handler: 'onJoin',
                    bind: {
-                       disabled: '{nodecount}'
-                   }
-               }
+                       disabled: '{nodecount}',
+                   },
+               },
            ],
            columns: [
                {
                    header: gettext('Node'),
                    width: 150,
-                   dataIndex: 'name'
+                   dataIndex: 'name',
                },
                {
                    header: gettext('Role'),
                    width: 100,
-                   dataIndex: 'type'
+                   dataIndex: 'type',
                },
                {
                    header: gettext('ID'),
                    width: 80,
-                   dataIndex: 'cid'
+                   dataIndex: 'cid',
                },
                {
 
                    header: gettext('IP'),
                    width: 150,
-                   dataIndex: 'ip'
+                   dataIndex: 'ip',
                },
                {
                    header: gettext('State'),
@@ -240,54 +247,65 @@ Ext.define('PMG.ClusterAdministration', {
                    renderer: function(value, metaData, record) {
                        var d = record.data;
                        var state = 'active';
-                       if (!d.insync) state = 'syncing';
+                       if (!d.insync) {
+                           state = 'syncing';
+                       }
                        if (d.conn_error) {
                            metaData.tdCls = 'x-form-invalid-field';
-                           var html = '<p>' +  Ext.htmlEncode(d.conn_error) + '</p>';
+                           var html = '<p>' + Ext.htmlEncode(d.conn_error) + '</p>';
                            html = html.replace(/\n/g, '<br>');
                            metaData.tdAttr = 'data-qwidth=600 data-qtitle="ERROR" data-qtip="' +
-                               html.replace(/\"/g,'&quot;') + '"';
+                               html.replace(/"/g, '&quot;') + '"';
                            state = 'error';
                        }
                        return state;
                    },
-                   dataIndex: 'insync'
+                   dataIndex: 'insync',
+               },
+               {
+                   header: gettext('Subscription'),
+                   width: 120,
+                   renderer: Proxmox.Utils.format_subscription_level,
+                   dataIndex: 'level',
                },
                {
                    header: gettext('Uptime'),
                    width: 150,
                    renderer: Proxmox.Utils.render_uptime,
-                   dataIndex: 'uptime'
+                   dataIndex: 'uptime',
                },
                {
                    header: gettext('Load average'),
                    renderer: function(value) {
-                       if (Ext.isArray(value)) {
-                           return value[0];
+                       if (Ext.isDefined(value)) {
+                           if (Ext.isArray(value)) {
+                               return value[0];
+                           }
+                           return value.toString();
                        }
-                       return value;
+                       return '';
                    },
-                   dataIndex: 'loadavg'
+                   dataIndex: 'loadavg',
                },
                {
                    xtype: 'widgetcolumn',
                    widget: {
                        xtype: 'progressbarwidget',
-                       textTpl: '{value:percent}'
+                       textTpl: '{value:percent}',
                    },
                    header: gettext('RAM usage'),
-                   dataIndex: 'memory_per'
+                   dataIndex: 'memory_per',
                },
                {
                    xtype: 'widgetcolumn',
                    widget: {
                        xtype: 'progressbarwidget',
-                       textTpl: '{value:percent}'
+                       textTpl: '{value:percent}',
                    },
                    header: gettext('HD space'),
-                   dataIndex: 'rootfs_per'
-               }
-           ]
-       }
-    ]
+                   dataIndex: 'rootfs_per',
+               },
+           ],
+       },
+    ],
 });