merge magento/2.3-develop into magento-borg/MAGETWO-91608-seo-url

Author: Magento CICD

app/code/Magento/Rule/view/adminhtml/web/conditions-data-normalizer.js

@@ -14,11 +14,11 @@ define([
      */
     var ConditionsDataNormalizer = function () {
         this.patterns = {
-            validate: /^[a-z0-9_-][a-z0-9_-]*(?:\[(?:\d*|[a-z0-9_-]+)\])*$/i,
-            key: /[a-z0-9_-]+|(?=\[\])/gi,
+            validate: /^[a-z0-9_.-][a-z0-9_.-]*(?:\[(?:\d*|[a-z0-9_.-]+)\])*$/i,
+            key: /[a-z0-9_.-]+|(?=\[\])/gi,
             push: /^$/,
             fixed: /^\d+$/,
-            named: /^[a-z0-9_-]+$/i
+            named: /^[a-z0-9_.-]+$/i
         };
     };
 

dev/tests/js/jasmine/tests/app/code/Magento/Rule/view/adminhtml/web/conditions-data-normalizer.test.js

@@ -65,5 +65,17 @@ define([
             expect(normal.foo['1'].value).toEqual(123);
             expect(normal.foo['1--1']).toEqual(321);
         });
+
+        it('Check keys containing a dot are normalized', function () {
+            var normal = normalizer.normalize({
+                'foo[1][name.foo]': 'bar',
+                'foo[1][value.foo]': 123,
+                'foo[1--1]': 321
+            });
+
+            expect(normal.foo['1']['name.foo']).toEqual('bar');
+            expect(normal.foo['1']['value.foo']).toEqual(123);
+            expect(normal.foo['1--1']).toEqual(321);
+        });
     });
 });