Merge remote-tracking branch 'origin/MC-3145-data-migration-is-broken' into cms-team-2-sprint-13

Author: Hwashiang Yu

app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Product.php

@@ -125,16 +125,15 @@ public function render(array $itemData, array $additionalData = []) : string
             ],
         ];
 
-        $productsCount = $eavData['product_display'] ?? 5;
         $conditionsEncoded = $this->conditionsHelper->encode($conditions);
         $widgetString = "{{widget type=\"Magento\CatalogWidget\Block\Product\ProductsList\" " .
             "template=\"Magento_CatalogWidget::product/widget/content/grid.phtml\" " .
             "type_name=\"Catalog Products List\" anchor_text=\"\" id_path=\"\" show_pager=\"0\" " .
-            "products_count=\"$productsCount\" conditions_encoded=\"$conditionsEncoded\"}}";
+            "products_count=\"1\" conditions_encoded=\"$conditionsEncoded\"}}";
 
         $rootElementAttributes = [
             'data-element' => 'main',
-            'data-role' => 'product',
+            'data-role' => 'products',
             'data-appearance' => 'grid',
             'class' => $eavData['css_classes'] ?? '',
         ];

dev/tests/integration/testsuite/Magento/PageBuilder/_files/product.html

@@ -1 +1 @@
-<div data-element="main" data-role="row" data-appearance="default"><div data-element="main" data-role="product" data-appearance="grid" class="one two" style="text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;">{{widget type="Magento\CatalogWidget\Block\Product\ProductsList" template="Magento_CatalogWidget::product/widget/content/grid.phtml" type_name="Catalog Products List" anchor_text="" id_path="" show_pager="0" products_count="2" conditions_encoded="^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:^[`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`==`,`value`:`product-for-data-migration`^]^]^]^]"}}</div></div>
+<div data-element="main" data-role="row" data-appearance="default"><div data-element="main" data-role="products" data-appearance="grid" class="one two" style="text-align: left; margin: 2px 3px 4px 1px; padding: 6px 7px 8px 5px;">{{widget type="Magento\CatalogWidget\Block\Product\ProductsList" template="Magento_CatalogWidget::product/widget/content/grid.phtml" type_name="Catalog Products List" anchor_text="" id_path="" show_pager="0" products_count="1" conditions_encoded="^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:^[`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`==`,`value`:`product-for-data-migration`^]^]^]^]"}}</div></div>