MAGETWO-91137: Rename products and products-list templates

krissyhiserote · krissyhiserote · commit 5bb9b3f8336c · 2018-05-07T09:41:32.000-05:00
- rename product and product list forms, layouts and migration
diff --git a/app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Product.php b/app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Product.php
@@ -74,7 +74,7 @@ public function render(array $itemData, array $additionalData = [])
         }
 
         $rootElementAttributes = [
-            'data-role' => 'products',
+            'data-role' => 'product',
             'data-appearance' => 'default',
             'class' => $eavData['css_classes'] ?? '',
             'data-view-mode' => $eavData['product_display'] ?? '',
diff --git a/app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/ProductList.php b/app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/ProductList.php
@@ -45,7 +45,7 @@ public function render(array $itemData, array $additionalData = [])
         $eavData = $this->eavAttributeLoader->load($itemData['entityId']);
 
         $rootElementAttributes = [
-            'data-role' => 'products-list',
+            'data-role' => 'product-list',
             'data-appearance' => 'default',
             'class' => $itemData['formData']['css_classes'] ?? '',
             'data-category-id' => $eavData['category_id'] ?? '',
diff --git a/app/code/Magento/PageBuilder/etc/content_types/product.xml b/app/code/Magento/PageBuilder/etc/content_types/product.xml
@@ -12,7 +12,7 @@
             <icon>icon-pagebuilder-products</icon>
             <component>Magento_PageBuilder/js/content-type</component>
             <preview_component>Magento_PageBuilder/js/content-type/product/preview</preview_component>
-            <form>pagebuilder_products_form</form>
+            <form>pagebuilder_product_form</form>
             <group>magento</group>
             <backend_block>Magento\PageBuilder\Block\ContentType\Product</backend_block>
             <backend_template>Magento_PageBuilder::content_type/product.phtml</backend_template>
diff --git a/app/code/Magento/PageBuilder/etc/content_types/product_list.xml b/app/code/Magento/PageBuilder/etc/content_types/product_list.xml
@@ -12,7 +12,7 @@
             <icon>icon-pagebuilder-products</icon>
             <component>Magento_PageBuilder/js/content-type</component>
             <preview_component>Magento_PageBuilder/js/content-type/product-list/preview</preview_component>
-            <form>pagebuilder_products_list_form</form>
+            <form>pagebuilder_product_list_form</form>
             <group>magento</group>
             <backend_block>Magento\PageBuilder\Block\ContentType\ProductList</backend_block>
             <backend_template>Magento_PageBuilder::content_type/product_list.phtml</backend_template>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/layout/pagebuilder_product_form.xml b/app/code/Magento/PageBuilder/view/adminhtml/layout/pagebuilder_product_form.xml
@@ -9,7 +9,7 @@
     <update handle="styles"/>
     <body>
         <referenceContainer name="content">
-            <uiComponent name="pagebuilder_products_form"/>
+            <uiComponent name="pagebuilder_product_form"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/layout/pagebuilder_product_list_form.xml b/app/code/Magento/PageBuilder/view/adminhtml/layout/pagebuilder_product_list_form.xml
@@ -9,7 +9,7 @@
     <update handle="styles"/>
     <body>
         <referenceContainer name="content">
-            <uiComponent name="pagebuilder_products_list_form"/>
+            <uiComponent name="pagebuilder_product_list_form"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_product_form.xml b/app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_product_form.xml
@@ -8,23 +8,23 @@
 <form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd" extends="pagebuilder_base_form">
     <argument name="data" xsi:type="array">
         <item name="js_config" xsi:type="array">
-            <item name="provider" xsi:type="string">pagebuilder_products_form.pagebuilder_products_form_data_source</item>
+            <item name="provider" xsi:type="string">pagebuilder_product_form.pagebuilder_product_form_data_source</item>
         </item>
         <item name="label" xsi:type="string" translate="true">Products</item>
     </argument>
     <settings>
         <deps>
-            <dep>pagebuilder_products_form.pagebuilder_products_form_data_source</dep>
+            <dep>pagebuilder_product_form.pagebuilder_product_form_data_source</dep>
         </deps>
-        <namespace>pagebuilder_products_form</namespace>
+        <namespace>pagebuilder_product_form</namespace>
     </settings>
-    <dataSource name="pagebuilder_products_form_data_source">
+    <dataSource name="pagebuilder_product_form_data_source">
         <argument name="data" xsi:type="array">
             <item name="js_config" xsi:type="array">
                 <item name="component" xsi:type="string">Magento_PageBuilder/js/form/provider</item>
             </item>
         </argument>
-        <dataProvider name="pagebuilder_products_form_data_source" class="Magento\PageBuilder\Model\ContentBlock\DataProvider">
+        <dataProvider name="pagebuilder_product_form_data_source" class="Magento\PageBuilder\Model\ContentBlock\DataProvider">
             <settings>
                 <requestFieldName/>
                 <primaryFieldName/>
diff --git a/app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_product_list_form.xml b/app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_product_list_form.xml
@@ -9,23 +9,23 @@
       xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd" extends="pagebuilder_base_form">
     <argument name="data" xsi:type="array">
         <item name="js_config" xsi:type="array">
-            <item name="provider" xsi:type="string">pagebuilder_products_list_form.pagebuilder_products_list_form_data_source</item>
+            <item name="provider" xsi:type="string">pagebuilder_product_list_form.pagebuilder_product_list_form_data_source</item>
         </item>
         <item name="label" xsi:type="string" translate="true">Product List</item>
     </argument>
     <settings>
         <deps>
-            <dep>pagebuilder_products_list_form.pagebuilder_products_list_form_data_source</dep>
+            <dep>pagebuilder_product_list_form.pagebuilder_product_list_form_data_source</dep>
         </deps>
-        <namespace>pagebuilder_products_list_form</namespace>
+        <namespace>pagebuilder_product_list_form</namespace>
     </settings>
-    <dataSource name="pagebuilder_products_list_form_data_source">
+    <dataSource name="pagebuilder_product_list_form_data_source">
         <argument name="data" xsi:type="array">
             <item name="js_config" xsi:type="array">
                 <item name="component" xsi:type="string">Magento_PageBuilder/js/form/provider</item>
             </item>
         </argument>
-        <dataProvider name="pagebuilder_products_list_form_data_source" class="Magento\PageBuilder\Model\ContentBlock\DataProvider">
+        <dataProvider name="pagebuilder_product_list_form_data_source" class="Magento\PageBuilder\Model\ContentBlock\DataProvider">
             <settings>
                 <requestFieldName/>
                 <primaryFieldName/>
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/product.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/product.html
@@ -1 +1 @@
-<div data-role="row" data-appearance="default"><div data-role="products" data-appearance="default" class="one two" data-view-mode="2" data-sku="product-for-data-migration" style="text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;"></div></div>
+<div data-role="row" data-appearance="default"><div data-role="product" data-appearance="default" class="one two" data-view-mode="2" data-sku="product-for-data-migration" style="text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;"></div></div>
diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/_files/product_list.html b/dev/tests/integration/testsuite/Magento/PageBuilder/_files/product_list.html
@@ -1 +1 @@
-<div data-role="row" data-appearance="default"><div data-role="products-list" data-appearance="default" class="productlist-one productlist-two" data-category-id="10" data-product-count="3" data-hide-out-of-stock="1" style="text-align: center; margin: 5px 5px 5px 5px; padding: 1px 1px 1px 1px;"></div></div>
+<div data-role="row" data-appearance="default"><div data-role="product-list" data-appearance="default" class="productlist-one productlist-two" data-category-id="10" data-product-count="3" data-hide-out-of-stock="1" style="text-align: center; margin: 5px 5px 5px 5px; padding: 1px 1px 1px 1px;"></div></div>

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public function render(array $itemData, array $additionalData = [])`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`$rootElementAttributes = [`
`77`		`- 'data-role' => 'products',`
	`77`	`+ 'data-role' => 'product',`
`78`	`78`	`'data-appearance' => 'default',`
`79`	`79`	`'class' => $eavData['css_classes'] ?? '',`
`80`	`80`	`'data-view-mode' => $eavData['product_display'] ?? '',`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<div data-role="row" data-appearance="default"><div data-role="products" data-appearance="default" class="one two" data-view-mode="2" data-sku="product-for-data-migration" style="text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;"></div></div>`
	`1`	`+<div data-role="row" data-appearance="default"><div data-role="product" data-appearance="default" class="one two" data-view-mode="2" data-sku="product-for-data-migration" style="text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;"></div></div>`