ui: fix wrong defaultConsole fallback in tree

[pve-manager.git] / www / manager6 / Utils.js

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 50e8c297fd1915246e233cd8df31175518d16c82..d72ba64f2bc0a1028422694adfa55611356547b6 100644 (file)
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -46,11 +46,11 @@ Ext.define('PVE.Utils', { utilities: {
        'p': gettext('Premium')
     },
 
-    noSubKeyHtml: 'You do not have a valid subscription for this server. Please visit <a target="_blank" href="http://www.proxmox.com/products/proxmox-ve/subscription-service-plans">www.proxmox.com</a> to get a list of available options.',
+    noSubKeyHtml: 'You do not have a valid subscription for this server. Please visit <a target="_blank" href="https://www.proxmox.com/products/proxmox-ve/subscription-service-plans">www.proxmox.com</a> to get a list of available options.',
 
     kvm_ostypes: {
        'Linux': [
-           { desc: '4.X/3.X/2.6 Kernel', val: 'l26' },
+           { desc: '5.x - 2.6 Kernel', val: 'l26' },
            { desc: '2.4 Kernel', val: 'l24' }
        ],
        'Microsoft Windows': [
@@ -83,6 +83,9 @@ Ext.define('PVE.Utils', { utilities: {
            case 'good':
                icon = 'good fa-check';
                break;
+           case 'old':
+               icon = 'warning fa-refresh';
+               break;
            case 'warning':
                icon = 'warning fa-exclamation';
                break;
@@ -99,8 +102,59 @@ Ext.define('PVE.Utils', { utilities: {
        return icon;
     },
 
+    parse_ceph_version: function(service) {
+       if (service.ceph_version_short) {
+           return service.ceph_version_short;
+       }
+
+       if (service.ceph_version) {
+           var match = service.ceph_version.match(/version (\d+(\.\d+)*)/);
+           if (match) {
+               return match[1];
+           }
+       }
+
+       return undefined;
+    },
+
+    compare_ceph_versions: function(a, b) {
+       if (a === b) {
+           return 0;
+       }
+       let avers = a.toString().split('.');
+       let bvers = b.toString().split('.');
+
+       while (true) {
+           let av = avers.shift();
+           let bv = bvers.shift();
+
+           if (av === undefined && bv === undefined) {
+               return 0;
+           } else if (av === undefined)  {
+               return -1;
+           } else if (bv === undefined) {
+               return 1;
+           } else {
+               let diff = parseInt(av, 10) - parseInt(bv, 10);
+               if (diff != 0) return diff;
+               // else we need to look at the next parts
+           }
+       }
+
+    },
+
+    get_ceph_icon_html: function(health, fw) {
+       var state = PVE.Utils.map_ceph_health[health];
+       var cls = PVE.Utils.get_health_icon(state);
+       if (fw) {
+           cls += ' fa-fw';
+       }
+       return "<i class='fa " + cls + "'></i> ";
+    },
+
     map_ceph_health: {
        'HEALTH_OK':'good',
+       'HEALTH_OLD':'old',
        'HEALTH_WARN':'warning',
        'HEALTH_ERR':'critical'
     },
@@ -228,6 +282,10 @@ Ext.define('PVE.Utils', { utilities: {
        return agentstring;
     },
 
+    render_qemu_machine: function(value) {
+       return value || (Proxmox.Utils.defaultText + ' (i440fx)');
+    },
+
     render_qemu_bios: function(value) {
        if (!value) {
            return Proxmox.Utils.defaultText + ' (SeaBIOS)';
@@ -240,6 +298,18 @@ Ext.define('PVE.Utils', { utilities: {
        }
     },
 
+    render_dc_ha_opts: function(value) {
+       if (!value) {
+           return Proxmox.Utils.defaultText;
+       } else {
+           return PVE.Parser.printPropertyString(value);
+       }
+    },
+    render_as_property_string: function(value) {
+       return (!value) ? Proxmox.Utils.defaultText
+           : PVE.Parser.printPropertyString(value);
+    },
+
     render_scsihw: function(value) {
        if (!value) {
            return Proxmox.Utils.defaultText + ' (LSI 53C895A)';
@@ -334,7 +404,7 @@ Ext.define('PVE.Utils', { utilities: {
     },
 
     console_map: {
-       '__default__': Proxmox.Utils.defaultText + ' (HTML5)',
+       '__default__': Proxmox.Utils.defaultText + ' (xterm.js)',
        'vv': 'SPICE (remote-viewer)',
        'html5': 'HTML5 (noVNC)',
        'xtermjs': 'xterm.js'
@@ -483,12 +553,6 @@ Ext.define('PVE.Utils', { utilities: {
            ipanel: 'IScsiInputPanel',
            faIcon: 'building'
        },
-       sheepdog: {
-           name: 'Sheepdog',
-           ipanel: 'SheepdogInputPanel',
-           hideAdd: true,
-           faIcon: 'building'
-       },
        cephfs: {
            name: 'CephFS',
            ipanel: 'CephFSInputPanel',
@@ -719,6 +783,10 @@ Ext.define('PVE.Utils', { utilities: {
            status = record.status + ' ha-' + record.hastate;
        }
 
+       if (record.lock) {
+           status += ' locked lock-' + record.lock;
+       }
+
        var defaults = PVE.tree.ResourceTree.typeDefaults[objType];
        if (defaults && defaults.iconCls) {
            var retVal = defaults.iconCls + ' ' + status;
@@ -804,6 +872,17 @@ Ext.define('PVE.Utils', { utilities: {
        return Ext.htmlEncode(first + " " + last);
     },
 
+    render_u2f_error: function(error) {
+       var ErrorNames = {
+           '1': gettext('Other Error'),
+           '2': gettext('Bad Request'),
+           '3': gettext('Configuration Unsupported'),
+           '4': gettext('Device Ineligible'),
+           '5': gettext('Timeout')
+       };
+       return "U2F Error: "  + ErrorNames[error] || Proxmox.Utils.unknownText;
+    },
+
     windowHostname: function() {
        return window.location.hostname.replace(Proxmox.Utils.IP6_bracket_match,
             function(m, addr, offset, original) { return addr; });
@@ -866,10 +945,9 @@ Ext.define('PVE.Utils', { utilities: {
            allowSpice = consoles.spice;
            allowXtermjs = !!consoles.xtermjs;
        }
-       var vncdefault = 'html5';
-       var dv = PVE.VersionInfo.console || vncdefault;
+       var dv = PVE.VersionInfo.console || 'xtermjs';
        if ((dv === 'vv' && !allowSpice) || (dv === 'xtermjs' && !allowXtermjs)) {
-           dv = vncdefault;
+           dv = 'html5';
        }
 
        return dv;
@@ -949,8 +1027,11 @@ Ext.define('PVE.Utils', { utilities: {
                    Ext.Msg.alert('Error', response.htmlStatus);
                },
                success: function(response, opts) {
-                   var allowSpice = !!response.result.data.spice;
-                   PVE.Utils.openDefaultConsoleWindow(allowSpice, 'kvm', vmid, nodename, vmname);
+                   var consoles = {
+                       spice: !!response.result.data.spice,
+                       xtermjs: !!response.result.data.serial,
+                   };
+                   PVE.Utils.openDefaultConsoleWindow(consoles, 'kvm', vmid, nodename, vmname);
                }
            });
        } else if (record.data.type === 'lxc' && !record.data.template) {
@@ -1134,9 +1215,11 @@ Ext.define('PVE.Utils', { utilities: {
            if (Proxmox.UserName === 'root@pam') {
                container.el.mask();
                if (!container.down('pveCephInstallWindow')){
+                   var isInstalled = msg.match(/not initialized/i) ? true : false;
                    var win = Ext.create('PVE.ceph.Install', {
                        nodename: nodename
                    });
+                   win.getViewModel().set('isInstalled', isInstalled);
                    container.add(win);
                    win.show();
                    callback(win);