MC-518: Simplify mapping of content type

Michael Yu · Michael Yu · commit 7278527b6232 · 2018-07-11T10:15:36.000-05:00
- Fixed code styling
- Updated integration test to use name as key instead of element
- Updated converter
diff --git a/app/code/Magento/PageBuilder/Model/Config/ContentType/Converter.php b/app/code/Magento/PageBuilder/Model/Config/ContentType/Converter.php
@@ -204,7 +204,7 @@ private function convertDataMapping(\DOMElement $childNode): array
         foreach ($childNode->getElementsByTagName('element') as $elementNode) {
             $elementName = $elementNode->attributes->getNamedItem('name')->nodeValue;
             $elementData[$elementName] = [
-                'element' => $elementName,
+                'name' => $elementName,
                 'style' => $this->convertProperties($elementNode),
                 'attributes' => $this->convertAttributes($elementNode),
                 'html' => $this->convertHtml($elementNode),
diff --git a/app/code/Magento/PageBuilder/docs/content-type-configuration.md b/app/code/Magento/PageBuilder/docs/content-type-configuration.md
@@ -160,7 +160,7 @@ The following is an example of a content type configuration in `view/adminhtml/p
                             </style_properties>
                         </element>
                         <element name="content">
-                                                        <html name="message"/>
+                            <html name="message"/>
                         </element>
                         <element name="button">
                             <style_properties>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/observable-updater.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/observable-updater.js
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/observable-updater.ts
@@ -119,7 +119,7 @@ export default class ObservableUpdater {
             }
             result[attributeConfig.name] = value;
         }
-        result["data-element"] = config.element;
+        result["data-element"] = config.name;
 
         return result;
     }
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/read/configurable.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/read/configurable.ts
@@ -40,8 +40,9 @@ export default class Configurable implements ReadInterface {
                 let data = {};
                 for (const elementName of Object.keys(config.elements)) {
                     const elementConfig = config.elements[elementName];
-                    const currentElement = element.getAttribute("data-element") === elementName ?
-                        element : element.querySelector("[data-element = '" + elementName + "']");
+                    const currentElement = element.getAttribute("data-element") === elementName
+                        ? element
+                        : element.querySelector("[data-element = '" + elementName + "']");
 
                     if (currentElement === null || currentElement === undefined) {
                         continue;
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/expected_merged_array.php b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/expected_merged_array.php
@@ -45,7 +45,7 @@
                     'data_mapping' => [
                         'elements' => [
                             'main' => [
-                                'element' => 'main',
+                                'name' => 'main',
                                 'style' => [
                                     0 => [
                                         'var' => 'style_converter',
@@ -243,7 +243,7 @@
                     'data_mapping' => [
                         'elements' => [
                             'first_element' => [
-                                'element' => 'first_element',
+                                'name' => 'first_element',
                                 'style' => [
                                     0 => [
                                         'var' => 'style_no_converter',
@@ -429,7 +429,7 @@
                                 ]
                             ],
                             'second_element' => [
-                                'element' => 'second_element',
+                                'name' => 'second_element',
                                 'style' => [
                                     0 => [
                                         'var' => 'style_no_converter',
@@ -459,7 +459,7 @@
                                 ]
                             ],
                             'third_element' => [
-                                'element' => 'third_element',
+                                'name' => 'third_element',
                                 'style' => [
                                     0 => [
                                         'var' => 'style_no_converter',
@@ -526,7 +526,7 @@
                     'data_mapping' => [
                         'elements' => [
                             'main' => [
-                                'element' => 'main',
+                                'name' => 'main',
                                 'style' => [
                                     0 =>[
                                         'var' => 'style_converter',
@@ -591,7 +591,7 @@
                     'data_mapping' => [
                         'elements' => [
                             'main' => [
-                                'element' => 'main',
+                                'name' => 'main',
                                 'style' => [
                                     0 =>[
                                         'var' => 'style_converter',
@@ -657,7 +657,7 @@
                     'data_mapping' => [
                         'elements' => [
                             'main' => [
-                                'element' => 'main',
+                                'name' => 'main',
                                 'style' => [
                                     0 =>[
                                         'var' => 'style_converter',
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/type3_expected_merged_array.php b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/content_type/type3_expected_merged_array.php
@@ -26,7 +26,7 @@
                     'data_mapping' => [
                         'elements' => [
                             'main' => [
-                                'element' => 'main',
+                                'name' => 'main',
                                 'style' => [
                                     0 =>[
                                         'var' => 'style_converter',

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ export default class ObservableUpdater {`
`119`	`119`	`}`
`120`	`120`	`result[attributeConfig.name] = value;`
`121`	`121`	`}`
`122`		`- result["data-element"] = config.element;`
	`122`	`+ result["data-element"] = config.name;`
`123`	`123`
`124`	`124`	`return result;`
`125`	`125`	`}`