]> git.proxmox.com Git - proxmox-widget-toolkit.git/blobdiff - src/Utils.js
bump version to 2.3-7
[proxmox-widget-toolkit.git] / src / Utils.js
index 4be95b2be1de56409207a47be7315a40a360c2d1..abbad36f67e276e15274ddd305fd47355481882d 100644 (file)
@@ -71,26 +71,28 @@ utilities: {
     language_map: {
        ar: 'Arabic',
        ca: 'Catalan',
+       zh_CN: 'Chinese (Simplified)',
+       zh_TW: 'Chinese (Traditional)',
        da: 'Danish',
-       de: 'German',
+       nl: 'Dutch',
        en: 'English',
-       es: 'Spanish',
        eu: 'Euskera (Basque)',
-       fa: 'Persian (Farsi)',
        fr: 'French',
+       de: 'German',
        he: 'Hebrew',
        it: 'Italian',
        ja: 'Japanese',
+       kr: 'Korean',
        nb: 'Norwegian (Bokmal)',
        nn: 'Norwegian (Nynorsk)',
+       fa: 'Persian (Farsi)',
        pl: 'Polish',
        pt_BR: 'Portuguese (Brazil)',
        ru: 'Russian',
        sl: 'Slovenian',
+       es: 'Spanish',
        sv: 'Swedish',
        tr: 'Turkish',
-       zh_CN: 'Chinese (Simplified)',
-       zh_TW: 'Chinese (Traditional)',
     },
 
     render_language: function(value) {
@@ -449,32 +451,35 @@ utilities: {
     },
 
     checked_command: function(orig_cmd) {
-       Proxmox.Utils.API2Request({
-           url: '/nodes/localhost/subscription',
-           method: 'GET',
-           failure: function(response, opts) {
-               Ext.Msg.alert(gettext('Error'), response.htmlStatus);
-           },
-           success: function(response, opts) {
-               let data = response.result.data;
-               if (data.status !== 'Active') {
-                   Ext.Msg.show({
-                       title: gettext('No valid subscription'),
-                       icon: Ext.Msg.WARNING,
-                       message: Proxmox.Utils.getNoSubKeyHtml(data.url),
-                       buttons: Ext.Msg.OK,
-                       callback: function(btn) {
-                           if (btn !== 'ok') {
-                               return;
-                           }
-                           orig_cmd();
-                       },
-                   });
-               } else {
-                   orig_cmd();
-               }
+       Proxmox.Utils.API2Request(
+           {
+               url: '/nodes/localhost/subscription',
+               method: 'GET',
+               failure: function(response, opts) {
+                   Ext.Msg.alert(gettext('Error'), response.htmlStatus);
+               },
+               success: function(response, opts) {
+                   let res = response.result;
+                   if (res === null || res === undefined || !res || res
+                       .data.status.toLowerCase() !== 'active') {
+                       Ext.Msg.show({
+                           title: gettext('No valid subscription'),
+                           icon: Ext.Msg.WARNING,
+                           message: Proxmox.Utils.getNoSubKeyHtml(res.data.url),
+                           buttons: Ext.Msg.OK,
+                           callback: function(btn) {
+                               if (btn !== 'ok') {
+                                   return;
+                               }
+                               orig_cmd();
+                           },
+                       });
+                   } else {
+                       orig_cmd();
+                   }
+               },
            },
-       });
+       );
     },
 
     assemble_field_data: function(values, data) {
@@ -641,6 +646,7 @@ utilities: {
        stopall: ['', gettext('Stop all VMs and Containers')],
        migrateall: ['', gettext('Migrate all VMs and Containers')],
        dircreate: [gettext('Directory Storage'), gettext('Create')],
+       dirremove: [gettext('Directory'), gettext('Remove')],
        lvmcreate: [gettext('LVM Storage'), gettext('Create')],
        lvmthincreate: [gettext('LVM-Thin Storage'), gettext('Create')],
        zfscreate: [gettext('ZFS Storage'), gettext('Create')],
@@ -705,6 +711,65 @@ utilities: {
        return Proxmox.Utils.format_duration_long(uptime);
     },
 
+    systemd_unescape: function(string_value) {
+       const charcode_0 = '0'.charCodeAt(0);
+       const charcode_9 = '9'.charCodeAt(0);
+       const charcode_A = 'A'.charCodeAt(0);
+       const charcode_F = 'F'.charCodeAt(0);
+       const charcode_a = 'a'.charCodeAt(0);
+       const charcode_f = 'f'.charCodeAt(0);
+       const charcode_x = 'x'.charCodeAt(0);
+       const charcode_minus = '-'.charCodeAt(0);
+       const charcode_slash = '/'.charCodeAt(0);
+       const charcode_backslash = '\\'.charCodeAt(0);
+
+       let parse_hex_digit = function(d) {
+           if (d >= charcode_0 && d <= charcode_9) {
+               return d - charcode_0;
+           }
+           if (d >= charcode_A && d <= charcode_F) {
+               return d - charcode_A + 10;
+           }
+           if (d >= charcode_a && d <= charcode_f) {
+               return d - charcode_a + 10;
+           }
+           throw "got invalid hex digit";
+       };
+
+       let value = new TextEncoder().encode(string_value);
+       let result = new Uint8Array(value.length);
+
+       let i = 0;
+       let result_len = 0;
+
+       while (i < value.length) {
+           let c0 = value[i];
+           if (c0 === charcode_minus) {
+               result.set([charcode_slash], result_len);
+               result_len += 1;
+               i += 1;
+               continue;
+           }
+           if ((i + 4) < value.length) {
+               let c1 = value[i+1];
+               if (c0 === charcode_backslash && c1 === charcode_x) {
+                   let h1 = parse_hex_digit(value[i+2]);
+                   let h0 = parse_hex_digit(value[i+3]);
+                   let ord = h1*16+h0;
+                   result.set([ord], result_len);
+                   result_len += 1;
+                   i += 4;
+                   continue;
+               }
+           }
+           result.set([c0], result_len);
+           result_len += 1;
+           i += 1;
+       }
+
+       return new TextDecoder().decode(result.slice(0, result.len));
+    },
+
     parse_task_upid: function(upid) {
        let task = {};
 
@@ -720,7 +785,7 @@ utilities: {
        }
        task.starttime = parseInt(res[6], 16);
        task.type = res[7];
-       task.id = res[8];
+       task.id = Proxmox.Utils.systemd_unescape(res[8]);
        task.user = res[9];
 
        task.desc = Proxmox.Utils.format_task_description(task.type, task.id);
@@ -869,12 +934,12 @@ utilities: {
        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 + ")$");
 
-       let 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])?))";
+       let 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 + "$");
 
-       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.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 = /^vlan(\\d+)/;
        me.VlanInterface_match = /(\\w+)\\.(\\d+)/;
     },