Merge pull request #269 from magento-cia/2.4.7-beta2-develop-2.4-develop-sync-09112023

Sync of 2.4.7-beta2-develop with 2.4-develop

Author: mmansoor-magento

app/code/Magento/PageBuilder/Model/ResourceModel/Template/Grid/Collection.php

@@ -31,6 +31,12 @@ class Collection extends TemplateCollection implements SearchResultInterface
      */
     private $aggregations;
 
+    /** @var string */
+    private $model;
+
+    /** @var string */
+    private $resourceModel;
+
     /**
      * @param EntityFactoryInterface $entityFactory
      * @param LoggerInterface $logger
@@ -58,6 +64,8 @@ public function __construct(
         $connection = null,
         AbstractDb $resource = null
     ) {
+        $this->resourceModel = $resourceModel;
+        $this->model = $model;
         parent::__construct(
             $entityFactory,
             $logger,
@@ -68,10 +76,19 @@ public function __construct(
         );
         $this->_eventPrefix = $eventPrefix;
         $this->_eventObject = $eventObject;
-        $this->_init($model, $resourceModel);
+        $this->_init($this->model, $this->resourceModel);
         $this->setMainTable($mainTable);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function _resetState(): void
+    {
+        parent::_resetState();
+        $this->_init($this->model, $this->resourceModel);
+    }
+
     /**
      * Get aggregations
      *

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/BackgroundConfigurationActionGroup/ValidateBackgroundMobileImageActionGroup.xml

@@ -28,6 +28,6 @@
         </assertRegExp>
         <resizeWindow width="767" height="1000" stepKey="resizeWindowToMobile"/>
         <waitForElementVisible selector="{{section.backgroundMobileImage(index, backgroundMobileImage.fileName)}}" stepKey="waitForBackgroundMobileImageVisible"/>
-        <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+        <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateContainedRowAppearanceActionGroup.xml

@@ -14,7 +14,7 @@
             <argument name="index" defaultValue="1" type="string"/>
         </arguments>
         <comment userInput="Increase window size to see varying widths for rows" stepKey="commentResizeWindow"/>
-        <resizeWindow width="1920" height="1024" stepKey="resizeWindow"/>
+        <resizeWindow width="2560" height="1440" stepKey="resizeWindow"/>
         <executeJS function="return {{pageOrStageWidthJS}}" stepKey="pageOrStageWidth"/>
         <executeJS function="return {{section.rowWidthJS(index)}}" stepKey="rowWidth"/>
         <assertGreaterThan stepKey="assertRowWidthGreaterThanZero">
@@ -25,6 +25,6 @@
             <expectedResult type="variable">pageOrStageWidth</expectedResult>
             <actualResult type="variable">rowWidth</actualResult>
         </assertLessThan>
-        <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+        <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeRowActionGroup/ValidateFullWidthRowAppearanceActionGroup.xml

@@ -20,7 +20,7 @@
             <argument name="affordanceValue" defaultValue="0" type="string"/>
         </arguments>
         <comment userInput="Increase window size to see varying widths for rows" stepKey="commentResizeWindow"/>
-        <resizeWindow width="1920" height="1024" stepKey="resizeWindow"/>
+        <resizeWindow width="2560" height="1440" stepKey="resizeWindow"/>
         <executeJS function="return {{pageOrStageWidthJS}} - {{affordanceValue}}" stepKey="pageOrStageWidth"/>
         <executeJS function="return {{section.rowWidthJS(rowIndex)}}" stepKey="rowWidth"/>
         <executeJS function="return parseInt({{section.rowChildContentWidthJS(rowIndex, childContentType.role, childContentTypeIndex)}} + {{padding.paddingLeft}} + {{padding.paddingRight}} + ({{childContentTypeBorder.value}}*2))" stepKey="rowChildElementWidth"/>
@@ -41,6 +41,6 @@
             <expectedResult type="int">1300</expectedResult>
             <actualResult type="variable">rowChildElementWidth</actualResult>
         </assertLessThanOrEqual>
-        <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+        <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSPagePageBuilderTest/PageBuilderCMSPageVerifyPageFullWidthLayoutTest.xml

@@ -30,7 +30,7 @@
 
         <after>
             <!-- Delete Data -->
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCMSPage" stepKey="deleteCMSPage"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
         </after>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogCategoryPageBuilderTest/PageBuilderCatalogCategoryVerifyCategoryFullWidthLayoutTest.xml

@@ -66,7 +66,7 @@
 
         <after>
             <!-- Delete Data -->
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
             <deleteData createDataKey="createProduct2" stepKey="deleteProduct2"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductPageBuilderTest/PageBuilderCatalogProductVerifyProductFullWidthLayoutTest.xml

@@ -77,7 +77,7 @@
 
         <after>
             <!-- Delete Data & Revert Attribute -->
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <deleteData createDataKey="createProduct" stepKey="deleteCreatedProduct"/>
             <deleteData createDataKey="createProduct1" stepKey="deleteCreatedProduct1"/>
             <deleteData createDataKey="createProduct2" stepKey="deleteCreatedProduct2"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundAttachmentFixedTest.xml

@@ -34,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundImage_JPG.path}}"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageGIFTest.xml

@@ -34,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundMobileImage_GIF.path}}"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBackgroundFormAttributeTest/BackgroundMobileImageInvalidFileSizeTest.xml

@@ -34,7 +34,7 @@
             </actionGroup>
         </before>
         <after>
-            <resizeWindow width="1280" height="1024" stepKey="resizeWindowToDesktop"/>
+            <resizeWindow width="1920" height="1080" stepKey="resizeWindowToDesktop"/>
             <actionGroup ref="NavigateToMediaGalleryActionGroup" stepKey="navigateToMediaGallery"/>
             <actionGroup ref="NavigateToMediaFolderActionGroup" stepKey="NavigateToFolder">
                 <argument name="FolderName" value="{{PageBuilderBackgroundMobileImage_JPG.path}}"/>