MC-518: Simplify mapping of content type

Michael Yu · Michael Yu · commit a369d41bc8a1 · 2018-07-13T10:04:10.000-05:00
- Removed element name from config
- Updated integration test to reflect changes
- Updated logic to retrieve element name
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,6 @@ private function convertDataMapping(\DOMElement $childNode): array
         foreach ($childNode->getElementsByTagName('element') as $elementNode) {
             $elementName = $elementNode->attributes->getNamedItem('name')->nodeValue;
             $elementData[$elementName] = [
-                'name' => $elementName,
                 'style' => $this->convertProperties($elementNode),
                 'attributes' => $this->convertAttributes($elementNode),
                 'html' => $this->convertHtml($elementNode),
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
@@ -65,7 +65,10 @@ export default class ObservableUpdater {
                 viewModel.data[elementName].style(this.convertStyle(config[elementName], data));
             }
             if (config[elementName].attributes !== undefined) {
-                viewModel.data[elementName].attributes(this.convertAttributes(config[elementName], data));
+                const attributeData = this.convertAttributes(config[elementName], data);
+
+                attributeData["data-element"] = elementName;
+                viewModel.data[elementName].attributes(attributeData);
             }
             if (config[elementName].html !== undefined) {
                 viewModel.data[elementName].html(this.convertHtml(config[elementName], data));
@@ -119,7 +122,6 @@ export default class ObservableUpdater {
             }
             result[attributeConfig.name] = value;
         }
-        result["data-element"] = config.name;
 
         return result;
     }
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,6 @@
                     'data_mapping' => [
                         'elements' => [
                             'main' => [
-                                'name' => 'main',
                                 'style' => [
                                     0 => [
                                         'var' => 'style_converter',
@@ -243,7 +242,6 @@
                     'data_mapping' => [
                         'elements' => [
                             'first_element' => [
-                                'name' => 'first_element',
                                 'style' => [
                                     0 => [
                                         'var' => 'style_no_converter',
@@ -429,7 +427,6 @@
                                 ]
                             ],
                             'second_element' => [
-                                'name' => 'second_element',
                                 'style' => [
                                     0 => [
                                         'var' => 'style_no_converter',
@@ -459,7 +456,6 @@
                                 ]
                             ],
                             'third_element' => [
-                                'name' => 'third_element',
                                 'style' => [
                                     0 => [
                                         'var' => 'style_no_converter',
@@ -526,7 +522,6 @@
                     'data_mapping' => [
                         'elements' => [
                             'main' => [
-                                'name' => 'main',
                                 'style' => [
                                     0 =>[
                                         'var' => 'style_converter',
@@ -591,7 +586,6 @@
                     'data_mapping' => [
                         'elements' => [
                             'main' => [
-                                'name' => 'main',
                                 'style' => [
                                     0 =>[
                                         'var' => 'style_converter',
@@ -657,7 +651,6 @@
                     'data_mapping' => [
                         'elements' => [
                             '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,6 @@
                     'data_mapping' => [
                         'elements' => [
                             'main' => [
-                                'name' => 'main',
                                 'style' => [
                                     0 =>[
                                         'var' => 'style_converter',

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,10 @@ export default class ObservableUpdater {`
`65`	`65`	`viewModel.data[elementName].style(this.convertStyle(config[elementName], data));`
`66`	`66`	`}`
`67`	`67`	`if (config[elementName].attributes !== undefined) {`
`68`		`- viewModel.data[elementName].attributes(this.convertAttributes(config[elementName], data));`
	`68`	`+ const attributeData = this.convertAttributes(config[elementName], data);`
	`69`	`+`
	`70`	`+ attributeData["data-element"] = elementName;`
	`71`	`+ viewModel.data[elementName].attributes(attributeData);`
`69`	`72`	`}`
`70`	`73`	`if (config[elementName].html !== undefined) {`
`71`	`74`	`viewModel.data[elementName].html(this.convertHtml(config[elementName], data));`
`@@ -119,7 +122,6 @@ export default class ObservableUpdater {`
`119`	`122`	`}`
`120`	`123`	`result[attributeConfig.name] = value;`
`121`	`124`	`}`
`122`		`- result["data-element"] = config.name;`
`123`	`125`
`124`	`126`	`return result;`
`125`	`127`	`}`