X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Utils.js;h=cae25b231efcb74cd9da48355a01aa76cc1ee544;hb=ac6184986ca3621569f87c46bafebd41309a9705;hp=b09037410aac6ec81d1e3c30af78ca663b37e420;hpb=590d00bf20337afe404e37fdd32ef81267298668;p=proxmox-widget-toolkit.git diff --git a/Utils.js b/Utils.js index b090374..cae25b2 100644 --- a/Utils.js +++ b/Utils.js @@ -1,10 +1,6 @@ Ext.ns('Proxmox'); Ext.ns('Proxmox.Setup'); -if (!Ext.isFunction(gettext)) { - function gettext(buf) { return buf; } -} - if (!Ext.isDefined(Proxmox.Setup.auth_cookie_name)) { throw "Proxmox library not initialized"; } @@ -46,6 +42,7 @@ Ext.define('Proxmox.Utils', { utilities: { enabledText: gettext('Enabled'), disabledText: gettext('Disabled'), noneText: gettext('none'), + NoneText: gettext('None'), errorText: gettext('Error'), unknownText: gettext('Unknown'), defaultText: gettext('Default'), @@ -61,25 +58,28 @@ Ext.define('Proxmox.Utils', { utilities: { groupText: gettext('Group'), language_map: { - zh_CN: 'Chinese', + ar: 'Arabic', ca: 'Catalan', da: 'Danish', + de: 'German', en: 'English', + es: 'Spanish', eu: 'Euskera (Basque)', + fa: 'Persian (Farsi)', fr: 'French', - de: 'German', + he: 'Hebrew', it: 'Italian', - es: 'Spanish', ja: 'Japanese', nb: 'Norwegian (Bokmal)', nn: 'Norwegian (Nynorsk)', - fa: 'Persian (Farsi)', pl: 'Polish', pt_BR: 'Portuguese (Brazil)', ru: 'Russian', sl: 'Slovenian', sv: 'Swedish', - tr: 'Turkish' + tr: 'Turkish', + zh_CN: 'Chinese (Simplified)', + zh_TW: 'Chinese (Traditional)', }, render_language: function (value) { @@ -102,9 +102,21 @@ Ext.define('Proxmox.Utils', { utilities: { return data; }, + bond_mode_gettext_map: { + '802.3ad': 'LACP (802.3ad)', + 'lacp-balance-slb': 'LACP (balance-slb)', + 'lacp-balance-tcp': 'LACP (balance-tcp)', + }, + + render_bond_mode: value => Proxmox.Utils.bond_mode_gettext_map[value] || value || '', + + bond_mode_array: function(modes) { + return modes.map(mode => [mode, Proxmox.Utils.render_bond_mode(mode)]); + }, + getNoSubKeyHtml: function(url) { // url http://www.proxmox.com/products/proxmox-ve/subscription-service-plans - return Ext.String.format('You do not have a valid subscription for this server. Please visit www.proxmox.com to get a list of available options.', url || 'http://www.proxmox.com'); + return Ext.String.format('You do not have a valid subscription for this server. Please visit www.proxmox.com to get a list of available options.', url || 'https://www.proxmox.com'); }, format_boolean_with_default: function(value) { @@ -182,11 +194,27 @@ Ext.define('Proxmox.Utils', { utilities: { return min < width ? width : min; }, + setAuthData: function(data) { + Proxmox.CSRFPreventionToken = data.CSRFPreventionToken; + Proxmox.UserName = data.username; + Proxmox.LoggedOut = data.LoggedOut; + // creates a session cookie (expire = null) + // that way the cookie gets deleted after the browser window is closed + Ext.util.Cookies.set(Proxmox.Setup.auth_cookie_name, data.ticket, null, '/', null, true); + }, + authOK: function() { - return (Proxmox.UserName !== '') && Ext.util.Cookies.get(Proxmox.Setup.auth_cookie_name); + if (Proxmox.LoggedOut) { + return undefined; + } + let cookie = Ext.util.Cookies.get(Proxmox.Setup.auth_cookie_name); + return (Proxmox.UserName !== '') && (cookie && !cookie.startsWith("PVE:tfa!")); }, authClear: function() { + if (Proxmox.LoggedOut) { + return undefined; + } Ext.util.Cookies.clear(Proxmox.Setup.auth_cookie_name); }, @@ -208,6 +236,23 @@ Ext.define('Proxmox.Utils', { utilities: { } }, + getResponseErrorMessage: (err) => { + if (!err.statusText) { + return gettext('Connection error'); + } + let msg = `${err.statusText} (${err.status})`; + if (err.response && err.response.responseText) { + let txt = err.response.responseText; + try { + let res = JSON.parse(txt) + for (let [key, value] of Object.entries(res.errors)) { + msg += `
${key}: ${value}`; + } + } catch (e) { /* TODO? */ } + } + return msg; + }, + monStoreErrors: function(me, store, clearMaskBeforeLoad) { if (clearMaskBeforeLoad) { me.mon(store, 'beforeload', function(s, operation, eOpts) { @@ -231,15 +276,8 @@ Ext.define('Proxmox.Utils', { utilities: { return; } - var msg; - /*jslint nomen: true */ - var operation = request._operation; - var error = operation.getError(); - if (error.statusText) { - msg = error.statusText + ' (' + error.status + ')'; - } else { - msg = gettext('Connection error'); - } + let error = request._operation.getError(); + let msg = Proxmox.Utils.getResponseErrorMessage(error); Proxmox.Utils.setErrorMask(me, msg); }); }, @@ -283,7 +321,11 @@ Ext.define('Proxmox.Utils', { utilities: { Ext.apply(newopts, { success: function(response, options) { if (options.waitMsgTarget) { - options.waitMsgTarget.setLoading(false); + if (Proxmox.Utils.toolkit === 'touch') { + options.waitMsgTarget.setMasked(false); + } else { + options.waitMsgTarget.setLoading(false); + } } var result = Ext.decode(response.responseText); response.result = result; @@ -298,7 +340,11 @@ Ext.define('Proxmox.Utils', { utilities: { }, failure: function(response, options) { if (options.waitMsgTarget) { - options.waitMsgTarget.setLoading(false); + if (Proxmox.Utils.toolkit === 'touch') { + options.waitMsgTarget.setMasked(false); + } else { + options.waitMsgTarget.setLoading(false); + } } response.result = {}; try { @@ -323,8 +369,12 @@ Ext.define('Proxmox.Utils', { utilities: { var target = newopts.waitMsgTarget; if (target) { - // Note: ExtJS bug - this does not work when component is not rendered - target.setLoading(newopts.waitMsg); + if (Proxmox.Utils.toolkit === 'touch') { + target.setMasked({ xtype: 'loadmask', message: newopts.waitMsg} ); + } else { + // Note: ExtJS bug - this does not work when component is not rendered + target.setLoading(newopts.waitMsg); + } } Ext.Ajax.request(newopts); }, @@ -344,7 +394,7 @@ Ext.define('Proxmox.Utils', { utilities: { Ext.Msg.show({ title: gettext('No valid subscription'), icon: Ext.Msg.WARNING, - msg: Proxmox.Utils.getNoSubKeyHtml(data.url), + message: Proxmox.Utils.getNoSubKeyHtml(data.url), buttons: Ext.Msg.OK, callback: function(btn) { if (btn !== 'ok') { @@ -396,6 +446,7 @@ Ext.define('Proxmox.Utils', { utilities: { eth: gettext("Network Device"), bridge: 'Linux Bridge', bond: 'Linux Bond', + vlan: 'Linux VLAN', OVSBridge: 'OVS Bridge', OVSBond: 'OVS Bond', OVSPort: 'OVS Port', @@ -407,9 +458,112 @@ Ext.define('Proxmox.Utils', { utilities: { Proxmox.Utils.unknownText; }, - // you can override this to provide nicer task descriptions + task_desc_table: { + acmenewcert: [ 'SRV', gettext('Order Certificate') ], + acmeregister: [ 'ACME Account', gettext('Register') ], + acmedeactivate: [ 'ACME Account', gettext('Deactivate') ], + acmeupdate: [ 'ACME Account', gettext('Update') ], + acmerefresh: [ 'ACME Account', gettext('Refresh') ], + acmerenew: [ 'SRV', gettext('Renew Certificate') ], + acmerevoke: [ 'SRV', gettext('Revoke Certificate') ], + 'auth-realm-sync': [ gettext('Realm'), gettext('Sync') ], + 'auth-realm-sync-test': [ gettext('Realm'), gettext('Sync Preview')], + 'move_volume': [ 'CT', gettext('Move Volume') ], + clustercreate: [ '', gettext('Create Cluster') ], + clusterjoin: [ '', gettext('Join Cluster') ], + diskinit: [ 'Disk', gettext('Initialize Disk with GPT') ], + vncproxy: [ 'VM/CT', gettext('Console') ], + spiceproxy: [ 'VM/CT', gettext('Console') + ' (Spice)' ], + vncshell: [ '', gettext('Shell') ], + spiceshell: [ '', gettext('Shell') + ' (Spice)' ], + qmsnapshot: [ 'VM', gettext('Snapshot') ], + qmrollback: [ 'VM', gettext('Rollback') ], + qmdelsnapshot: [ 'VM', gettext('Delete Snapshot') ], + qmcreate: [ 'VM', gettext('Create') ], + qmrestore: [ 'VM', gettext('Restore') ], + qmdestroy: [ 'VM', gettext('Destroy') ], + qmigrate: [ 'VM', gettext('Migrate') ], + qmclone: [ 'VM', gettext('Clone') ], + qmmove: [ 'VM', gettext('Move disk') ], + qmtemplate: [ 'VM', gettext('Convert to template') ], + qmstart: [ 'VM', gettext('Start') ], + qmstop: [ 'VM', gettext('Stop') ], + qmreset: [ 'VM', gettext('Reset') ], + qmshutdown: [ 'VM', gettext('Shutdown') ], + qmreboot: [ 'VM', gettext('Reboot') ], + qmsuspend: [ 'VM', gettext('Hibernate') ], + qmpause: [ 'VM', gettext('Pause') ], + qmresume: [ 'VM', gettext('Resume') ], + qmconfig: [ 'VM', gettext('Configure') ], + vzsnapshot: [ 'CT', gettext('Snapshot') ], + vzrollback: [ 'CT', gettext('Rollback') ], + vzdelsnapshot: [ 'CT', gettext('Delete Snapshot') ], + vzcreate: ['CT', gettext('Create') ], + vzrestore: ['CT', gettext('Restore') ], + vzdestroy: ['CT', gettext('Destroy') ], + vzmigrate: [ 'CT', gettext('Migrate') ], + vzclone: [ 'CT', gettext('Clone') ], + vztemplate: [ 'CT', gettext('Convert to template') ], + vzstart: ['CT', gettext('Start') ], + vzstop: ['CT', gettext('Stop') ], + vzmount: ['CT', gettext('Mount') ], + vzumount: ['CT', gettext('Unmount') ], + vzshutdown: ['CT', gettext('Shutdown') ], + vzreboot: ['CT', gettext('Reboot') ], + vzsuspend: [ 'CT', gettext('Suspend') ], + vzresume: [ 'CT', gettext('Resume') ], + push_file: ['CT', gettext('Push file')], + pull_file: ['CT', gettext('Pull file')], + hamigrate: [ 'HA', gettext('Migrate') ], + hastart: [ 'HA', gettext('Start') ], + hastop: [ 'HA', gettext('Stop') ], + hashutdown: [ 'HA', gettext('Shutdown') ], + srvstart: ['SRV', gettext('Start') ], + srvstop: ['SRV', gettext('Stop') ], + srvrestart: ['SRV', gettext('Restart') ], + srvreload: ['SRV', gettext('Reload') ], + cephcreatemgr: ['Ceph Manager', gettext('Create') ], + cephdestroymgr: ['Ceph Manager', gettext('Destroy') ], + cephcreatemon: ['Ceph Monitor', gettext('Create') ], + cephdestroymon: ['Ceph Monitor', gettext('Destroy') ], + cephcreateosd: ['Ceph OSD', gettext('Create') ], + cephdestroyosd: ['Ceph OSD', gettext('Destroy') ], + cephcreatepool: ['Ceph Pool', gettext('Create') ], + cephdestroypool: ['Ceph Pool', gettext('Destroy') ], + cephfscreate: ['CephFS', gettext('Create') ], + cephcreatemds: ['Ceph Metadata Server', gettext('Create') ], + cephdestroymds: ['Ceph Metadata Server', gettext('Destroy') ], + imgcopy: ['', gettext('Copy data') ], + imgdel: ['', gettext('Erase data') ], + unknownimgdel: ['', gettext('Destroy image from unknown guest') ], + download: ['', gettext('Download') ], + vzdump: ['VM/CT', gettext('Backup') ], + aptupdate: ['', gettext('Update package database') ], + startall: [ '', gettext('Start all VMs and Containers') ], + stopall: [ '', gettext('Stop all VMs and Containers') ], + migrateall: [ '', gettext('Migrate all VMs and Containers') ], + dircreate: [ gettext('Directory Storage'), gettext('Create') ], + lvmcreate: [ gettext('LVM Storage'), gettext('Create') ], + lvmthincreate: [ gettext('LVM-Thin Storage'), gettext('Create') ], + zfscreate: [ gettext('ZFS Storage'), gettext('Create') ] + }, + format_task_description: function(type, id) { - return type + ' ' + id; + var farray = Proxmox.Utils.task_desc_table[type]; + var text; + if (!farray) { + text = type; + if (id) { + type += ' ' + id; + } + return text; + } + var prefix = farray[0]; + text = farray[1]; + if (prefix) { + return prefix + ' ' + id + ' - ' + text; + } + return text; }, format_size: function(size) { @@ -450,17 +604,20 @@ Ext.define('Proxmox.Utils', { utilities: { parse_task_upid: function(upid) { var task = {}; - var res = upid.match(/^UPID:(\S+):([0-9A-Fa-f]{8}):([0-9A-Fa-f]{8,9}):([0-9A-Fa-f]{8}):([^:\s]+):([^:\s]*):([^:\s]+):$/); + var res = upid.match(/^UPID:([^\s:]+):([0-9A-Fa-f]{8}):([0-9A-Fa-f]{8,9}):(([0-9A-Fa-f]{8,16}):)?([0-9A-Fa-f]{8}):([^:\s]+):([^:\s]*):([^:\s]+):$/); if (!res) { throw "unable to parse upid '" + upid + "'"; } task.node = res[1]; task.pid = parseInt(res[2], 16); task.pstart = parseInt(res[3], 16); - task.starttime = parseInt(res[4], 16); - task.type = res[5]; - task.id = res[6]; - task.user = res[7]; + if (res[5] !== undefined) { + task.task_id = parseInt(res[5], 16); + } + task.starttime = parseInt(res[6], 16); + task.type = res[7]; + task.id = res[8]; + task.user = res[9]; task.desc = Proxmox.Utils.format_task_description(task.type, task.id); @@ -472,16 +629,43 @@ Ext.define('Proxmox.Utils', { utilities: { return Ext.Date.format(servertime, 'Y-m-d H:i:s'); }, - openXtermJsViewer: function(vmtype, vmid, nodename, vmname) { - var url = Ext.urlEncode({ + get_help_info: function(section) { + var helpMap; + if (typeof proxmoxOnlineHelpInfo !== 'undefined') { + helpMap = proxmoxOnlineHelpInfo; + } else if (typeof pveOnlineHelpInfo !== 'undefined') { + // be backward compatible with older pve-doc-generators + helpMap = pveOnlineHelpInfo; + } else { + throw "no global OnlineHelpInfo map declared"; + } + + return helpMap[section]; + }, + + get_help_link: function(section) { + var info = Proxmox.Utils.get_help_info(section); + if (!info) { + return; + } + + return window.location.origin + info.link; + }, + + openXtermJsViewer: function(vmtype, vmid, nodename, vmname, cmd) { + var url = Ext.Object.toQueryString({ console: vmtype, // kvm, lxc, upgrade or shell xtermjs: 1, vmid: vmid, vmname: vmname, - node: nodename + node: nodename, + cmd: cmd, + }); var nw = window.open("?" + url, '_blank', 'toolbar=no,location=no,status=no,menubar=no,resizable=yes,width=800,height=420'); - nw.focus(); + if (nw) { + nw.focus(); + } } }, @@ -495,10 +679,12 @@ Ext.define('Proxmox.Utils', { utilities: { var IPV4_REGEXP = "(?:(?:" + IPV4_OCTET + "\\.){3}" + IPV4_OCTET + ")"; var IPV6_H16 = "(?:[0-9a-fA-F]{1,4})"; var IPV6_LS32 = "(?:(?:" + IPV6_H16 + ":" + IPV6_H16 + ")|" + IPV4_REGEXP + ")"; + var IPV4_CIDR_MASK = "([0-9]{1,2})"; + var IPV6_CIDR_MASK = "([0-9]{1,3})"; me.IP4_match = new RegExp("^(?:" + IPV4_REGEXP + ")$"); - me.IP4_cidr_match = new RegExp("^(?:" + IPV4_REGEXP + ")\/([0-9]{1,2})$"); + me.IP4_cidr_match = new RegExp("^(?:" + IPV4_REGEXP + ")\/" + IPV4_CIDR_MASK + "$"); var IPV6_REGEXP = "(?:" + "(?:(?:" + "(?:" + IPV6_H16 + ":){6})" + IPV6_LS32 + ")|" + @@ -513,10 +699,11 @@ Ext.define('Proxmox.Utils', { utilities: { ")"; me.IP6_match = new RegExp("^(?:" + IPV6_REGEXP + ")$"); - me.IP6_cidr_match = new RegExp("^(?:" + IPV6_REGEXP + ")\/([0-9]{1,3})$"); + me.IP6_cidr_match = new RegExp("^(?:" + IPV6_REGEXP + ")\/" + IPV6_CIDR_MASK + "$"); me.IP6_bracket_match = new RegExp("^\\[(" + IPV6_REGEXP + ")\\]"); me.IP64_match = new RegExp("^(?:" + IPV6_REGEXP + "|" + IPV4_REGEXP + ")$"); + me.IP64_cidr_match = new RegExp("^(?:" + IPV6_REGEXP + "\/" + IPV6_CIDR_MASK + ")|(?:" + IPV4_REGEXP + "\/" + IPV4_CIDR_MASK + ")$"); var DnsName_REGEXP = "(?:(([a-zA-Z0-9]([a-zA-Z0-9\\-]*[a-zA-Z0-9])?)\\.)*([A-Za-z0-9]([A-Za-z0-9\\-]*[A-Za-z0-9])?))"; me.DnsName_match = new RegExp("^" + DnsName_REGEXP + "$"); @@ -524,5 +711,7 @@ Ext.define('Proxmox.Utils', { utilities: { me.HostPort_match = new RegExp("^(" + IPV4_REGEXP + "|" + DnsName_REGEXP + ")(:\\d+)?$"); me.HostPortBrackets_match = new RegExp("^\\[(?:" + IPV6_REGEXP + "|" + IPV4_REGEXP + "|" + DnsName_REGEXP + ")\\](:\\d+)?$"); me.IP6_dotnotation_match = new RegExp("^" + IPV6_REGEXP + "(\\.\\d+)?$"); + me.Vlan_match = new RegExp('^vlan(\\d+)'); + me.VlanInterface_match = new RegExp('(\\w+)\\.(\\d+)'); } });