wscalls: unflatten payload when calling webservice (#66916)

@@ -51,0 +69,4 @@
+
+    def split_key(key):
+        def map_key(x):
+            if x.isnumeric():

@@ -51,0 +75,4 @@
+                return x.replace('%s%s' % (separator, separator), separator)
+            return x
+
+        return [map_key(x) for x in re.split(r'(?<!%s)%s(?!%s)' % (separator, separator, separator), key)]

@@ -410,1 +497,4 @@
             },
+            hint=_(
+                'Parameters names could be separated by / character to create object or array payload,'
+                ' ex: parameter named "element/child" with value "value" will be sent as {"element": {"child": "value"}.'

@@ -158,0 +235,4 @@
+                unflattened_data = unflatten_data(post_data)
+            except UnflattenDataException as e:
+                get_publisher().record_error(
+                    exception=e, context='[WSCALL]', notify=notify_on_errors, record=record_on_errors

@@ -292,0 +314,4 @@
+    wscall.store()
+    try:
+        wscall.call()
+    except Exception:

@@ -292,0 +316,4 @@
+        wscall.call()
+    except Exception:
+        pass
+    assert http_requests.count() == 1

@@ -576,0 +599,4 @@
+    assert payload == {'foo': ['first', 'second'], 'bar': 'example'}
+    assert http_requests.count() == 1
+
+    try:

@@ -301,0 +310,4 @@
+                    '"element": {"child": "value"}. If the subkey, i.e. "child", is an integer it will '
+                    'become a list index and two elements "element/0", "element/1" containing "value1" '
+                    'and "value2" will generate the payload "element": ["value1", "value2"]. '
+                    'It is possible to combine the two types, for example "element/0/key1" to generate '

@@ -51,0 +61,4 @@
+    into:
+
+       {"a": {"b": [{"x": "1234"}]}}
+    """

@@ -155,3 +233,3 @@
         payload = {}
         with get_publisher().complex_data():
-            for key, value in post_data.items():
+            for key, value in unflatten_keys(post_data).items():

@@ -51,0 +66,4 @@
+    if not isinstance(d, dict) or not d:  # unflattening an empty dict has no sense
+        return d
+
+    # ok d is a dict

@@ -51,0 +77,4 @@
+                return x.replace('//', '/')
+            return x
+
+        return [map_key(x) for x in re.split(r'(?<!/)/(?!/)', key)]

@@ -51,0 +83,4 @@
+    try:
+        keys.sort()
+    except TypeError:
+        # sorting fail means that there is mix between lists and dicts

@@ -51,0 +84,4 @@
+        keys.sort()
+    except TypeError:
+        # sorting fail means that there is mix between lists and dicts
+        raise UnflattenKeysException(_('incorrect elements order'))

@@ -51,0 +91,4 @@
+
+        key, tail = path[i], path[i + 1 :]
+
+        if not tail:  # end of path, set thevalue

@@ -51,0 +99,4 @@
+                d.append(value)
+            else:
+                assert isinstance(d, dict)
+                d[key] = value

@@ -51,0 +107,4 @@
+                assert isinstance(d, list)
+                if len(d) < key:
+                    raise UnflattenKeysException(
+                        _('incomplete array before %s in %s') % ('/'.join(map(str, path[: i + 1])), orig_key)

@@ -51,0 +118,4 @@
+            set_path(path, orig_key, new, value, i + 1)
+
+    # Is the first level an array or a dict ?
+    if isinstance(keys[0][0][0], int):

@@ -213,6 +216,7 @@ class RootDirectory(Directory):
         'fargo',
         'static',
         'actions',
+        ('preview-json-payload', 'preview_json_payload'),

@@ -303,0 +335,4 @@
+        r += htmltext('<div class="payload-preview">')
+        try:
+            dump = json.dumps(unflatten_keys(payload), ensure_ascii=False, indent=2)
+            r += htmltext('<pre>%s</pre>') % dump.replace('"{{', '{{').replace('}}"', '}}')

@@ -303,0 +337,4 @@
+            dump = json.dumps(unflatten_keys(payload), ensure_ascii=False, indent=2)
+            r += htmltext('<pre>%s</pre>') % dump.replace('"{{', '{{').replace('}}"', '}}')
+        except UnflattenKeysException as e:
+            r += htmltext('<div class="errornotice"><p>%s</p><p>%s<code>%s</code></p></div>') % (

@@ -3134,0 +3135,4 @@
+span.payload-preview {
+	&--value {
+		font-family: Monospace;
+	}

@@ -3134,0 +3141,4 @@
+		display: block;
+	}
+	&--item-separator::after {
+		content: '\a';

@@ -88,6 +88,7 @@ def i18n_js(request):
         'close': _('Close'),
         'email_domain_suggest': _('Did you want to write'),
         'email_domain_fix': _('Apply fix'),
+        'preview_json_payload': _('Preview produced payload'),