Merge pull request #285 from magento-cia/pre-release-develop-sync-12122023

Pre release develop sync 12122023

Author: mmansoor-magento

.github/CONTRIBUTING.md

@@ -21,7 +21,7 @@ For more detailed information on contribution please read our [beginners guide](
 1. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
 1. PRs which include new logic or new features must be submitted along with:
    * Unit/integration test coverage
-   * Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
+   * Proposed [documentation](https://developer.adobe.com/commerce) updates. Use feedback buttons __Edit in GitHub__ and __Log an issue__ at the top of a relevant topic.
 1. For larger features or changes, please [open an issue](https://github.com/magento/magento2-page-builder/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
 
 ## Contribution process

app/code/Magento/AwsS3PageBuilder/Test/Mftf/test-dependency-allowlist

@@ -0,0 +1,8 @@
+ImageAddImageContentTypeToCMSPageTest
+ImageAddImageIntoPageBuilderStageTest
+ImageInvalidFileTypeValidationTest
+ImageRemoveImageFromStageTest
+PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory
+PageBuilderDeleteTemplate
+PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut
+CanAddVideoToColumnTest

app/code/Magento/AwsS3PageBuilder/Test/Mftf/test-dependency-errors-detailed

@@ -0,0 +1,40 @@
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageContentTypeToCMSPageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 ImageAddImageContentTypeToCMSPageTest from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageIntoPageBuilderStageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 ImageAddImageIntoPageBuilderStageTest from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageInvalidFileTypeValidationTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 ImageInvalidFileTypeValidationTest from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageRemoveImageFromStageTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 ImageRemoveImageFromStageTest from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml"
+contains entity references that violate dependency constraints:
+		
+	 PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderDeleteTemplate.xml"
+contains entity references that violate dependency constraints:
+		
+	 PageBuilderDeleteTemplate from module(s): magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml"
+contains entity references that violate dependency constraints:
+		
+	 PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut from module(s): magento/module-banner-page-builder, magento/module-page-builder
+
+File "/var/www/html/app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/AwsS3CanAddVideoToColumnTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 CanAddVideoToColumnTest from module(s): magento/module-page-builder

app/code/Magento/PageBuilder/Model/Catalog/ProductTotals.php

@@ -14,6 +14,9 @@
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\CatalogWidget\Model\Rule;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Rule\Model\Condition\Combine;
@@ -53,25 +56,41 @@ class ProductTotals
      */
     private $categoryRepository;
 
+    /**
+     * @var MetadataPool
+     */
+    private MetadataPool $metadataPool;
+
+    /**
+     * @var ResourceConnection
+     */
+    private ResourceConnection $resource;
+
     /**
      * @param CollectionFactory $productCollectionFactory
      * @param Builder $sqlBuilder
      * @param Rule $rule
      * @param Conditions $conditionsHelper
      * @param CategoryRepositoryInterface $categoryRepository
+     * @param MetadataPool|null $metadataPool
+     * @param ResourceConnection|null $resource
      */
     public function __construct(
         CollectionFactory $productCollectionFactory,
         Builder $sqlBuilder,
         Rule $rule,
         Conditions $conditionsHelper,
-        CategoryRepositoryInterface $categoryRepository
+        CategoryRepositoryInterface $categoryRepository,
+        ?MetadataPool $metadataPool = null,
+        ?ResourceConnection $resource = null
     ) {
         $this->productCollectionFactory = $productCollectionFactory;
         $this->sqlBuilder = $sqlBuilder;
         $this->rule = $rule;
         $this->conditionsHelper = $conditionsHelper;
         $this->categoryRepository = $categoryRepository;
+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
+        $this->resource = $resource ?: ObjectManager::getInstance()->get(ResourceConnection::class);
     }
 
     /**
@@ -159,37 +178,85 @@ private function getProductCollection(string $conditions, bool $usePriceIndex =
         return $collection;
     }
 
+    /**
+     * Get parent products that don't have stand-alone properties (e.g. price or special price)
+     *
+     * @param Collection $collection
+     * @return Collection|null
+     * @throws \Exception
+     */
+    private function getParentProductsCollection(Collection $collection): ?Collection
+    {
+        $parentProducts = $this->productCollectionFactory->create();
+        $linkField = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\ProductInterface::class)
+            ->getLinkField();
+        $connection = $this->resource->getConnection();
+        $productIds = $connection->fetchCol(
+            $connection
+                ->select()
+                ->from(['e' => $collection->getTable('catalog_product_entity')], ['link_table.parent_id'])
+                ->joinInner(
+                    ['link_table' => $collection->getTable('catalog_product_super_link')],
+                    'link_table.product_id = e.' . $linkField,
+                    []
+                )
+                ->where('link_table.product_id IN (?)', $collection->getAllIds())
+        );
+        if ($productIds) {
+            $parentProducts->addIdFilter($productIds);
+            return $parentProducts;
+        }
+
+        return null;
+    }
+
     /**
      * Retrieve count of all enabled products
      *
      * @param string $conditions
      * @return int number of enabled products
+     * @throws LocalizedException
+     * @throws \Exception
      */
     private function getEnabledCount(string $conditions): int
     {
         $collection = $this->getProductCollection($conditions, true);
         $collection->addAttributeToFilter('status', Status::STATUS_ENABLED);
-        return $collection->getSize();
+        $count = $collection->getSize();
+        if ($collection->getSize() && $parentProducts = $this->getParentProductsCollection($collection)) {
+            $parentProducts->addAttributeToFilter('status', Status::STATUS_ENABLED);
+            $count += $parentProducts->getSize();
+        }
+
+        return $count;
     }
 
     /**
      * Retrieve count of all disabled products
      *
      * @param string $conditions
      * @return int number of disabled products
+     * @throws \Exception
      */
     private function getDisabledCount(string $conditions): int
     {
         $collection = $this->getProductCollection($conditions, false);
         $collection->addAttributeToFilter('status', Status::STATUS_DISABLED);
-        return $collection->getSize();
+        $count = $collection->getSize();
+        if ($count && $parentProducts = $this->getParentProductsCollection($collection)) {
+            $parentProducts->addAttributeToFilter('status', Status::STATUS_DISABLED);
+            $count += $parentProducts->getSize();
+        }
+
+        return $count;
     }
 
     /**
      * Retrieve count of all not visible individually products
      *
      * @param string $conditions
      * @return int number of products not visible individually
+     * @throws \Exception
      */
     private function getNotVisibleCount(string $conditions): int
     {
@@ -202,7 +269,20 @@ private function getNotVisibleCount(string $conditions): int
                 Visibility::VISIBILITY_IN_SEARCH
             ]
         );
-        return $collection->getSize();
+        $count = $collection->getSize();
+        if ($count && $parentProducts = $this->getParentProductsCollection($collection)) {
+            $parentProducts->addAttributeToFilter('status', Status::STATUS_ENABLED);
+            $parentProducts->addAttributeToFilter(
+                'visibility',
+                [
+                    Visibility::VISIBILITY_NOT_VISIBLE,
+                    Visibility::VISIBILITY_IN_SEARCH
+                ]
+            );
+            $count += $parentProducts->getSize();
+        }
+
+        return $count;
     }
 
     /**

app/code/Magento/PageBuilder/Test/Mftf/Data/BackgroundFormData.xml

@@ -200,18 +200,18 @@
         <data key="section">background</data>
         <data key="fieldName">background_color</data>
         <data key="value">#804042</data>
-        <data key="rgb">rgb(128, 64, 64)</data>
-        <data key="hex">#804040</data>
+        <data key="rgb">rgb(126, 63, 63)</data>
+        <data key="hex">#7e3f3f</data>
     </entity>
     <entity name="PageBuilderBackgroundColor_CenterColorHueSlider" type="pagebuilder_background_color_property">
         <data key="name">Background Color</data>
         <data key="section">background</data>
         <data key="fieldName">background_color</data>
         <data key="value">#40807f</data>
-        <data key="rgb">rgb(64, 128, 127)</data>
-        <data key="hex">#40807f</data>
+        <data key="rgb">rgb(63, 123, 126)</data>
+        <data key="hex">#3f7b7e</data>
         <data key="rgbaCenterOfLightDarkSlider">rgba(64, 128, 127, 0.5)</data>
-        <data key="rgbaCenterOfLightDarkSliderRegex">^rgba\(64,\s*128,\s*127,\s*0.49(\d+)\)</data>
+        <data key="rgbaCenterOfLightDarkSliderRegex">^rgba\(63,\s*123,\s*126,\s*0.49(\d+)\)</data>
     </entity>
     <entity name="PageBuilderBackgroundColor_Invalid" type="pagebuilder_background_color_property">
         <data key="name">Background Color</data>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnConfigurationSection.xml

@@ -19,6 +19,7 @@
         <element name="tinyMCEWidgetBtn" type="text" selector="#pagebuilder_text_form_content_magentowidget"/>
         <!-- WYSIWYG Disabled -->
         <element name="textArea" type="text" selector="#pagebuilder_text_form_content"/>
+        <element name="textAreaError" type="text" selector="//*[@id='pagebuilder_text_form_content']//ancestor::*[contains(@class,'admin__field-wide')]/*[contains(@class,'admin__field-error')]"/>
         <element name="textAreaId" type="text" selector="pagebuilder_text_form_content"/>
         <element name="insertWidgetButton" type="text" selector="//button[contains(@class,'action-add-widget')][.='Insert Widget...']"/>
         <element name="insertImageButton" type="text" selector="//button[contains(@class,'action-add-image')][.='Insert Image...']" timeout="10"/>

app/code/Magento/PageBuilder/Test/Mftf/Section/PageBuilderTextSection/TextOnStageSection.xml

@@ -26,6 +26,7 @@
         <element name="widgetPlaceholderJS" type="text" selector="(document.querySelectorAll('div.pagebuilder-text')[{{indexOfText}} - 1]).querySelector('.magento-placeholder.magento-widget')" parameterized="true"/>
         <element name="placeholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//div[contains(@class, 'placeholder-text') and text()='Edit Text']" parameterized="true"/>
         <element name="textArea" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//textarea[contains(@class,'inline-wysiwyg-textarea')]" parameterized="true"/>
+        <element name="textAreaForExecuteJS" type="text" selector="(//div[contains(@class,&quot;pagebuilder-text&quot;)])[{{arg}}]//textarea[contains(@class,&quot;inline-wysiwyg-textarea&quot;)]" parameterized="true"/>
         <element name="textareaPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg1}}]//textarea[contains(@class, 'inline-wysiwyg-textarea') and contains(@placeholder,'Edit Text')]" parameterized="true"/>
         <element name="textPlaceholder" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//*[contains(@class, 'placeholder-text') and text()='Edit Text']" parameterized="true"/>
         <element name="tinymce" type="text" selector="(//div[contains(@class,'pagebuilder-text')])[{{arg}}]//div[contains(@class, 'inline-wysiwyg')]" parameterized="true"/>

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

@@ -79,6 +79,17 @@
             <argument name="text" value="\u{1F600}"/>
         </actionGroup>
 
+        <click selector="{{EditPanelForm.editFormSave}}" stepKey="savePageBuilderTextContentType"/>
+        <waitForElementVisible selector="{{TextOnConfiguration.textAreaError}}" stepKey="waitForPageBuilderTextContentTypeError"/>
+        <grabTextFrom selector="{{TextOnConfiguration.textAreaError}}" stepKey="grabTextFromPageBuilderTextContentTypeError"/>
+        <assertStringContainsString stepKey="assertErrorMessageForPageBuilderTextContentType">
+            <expectedResult type="string">Please remove invalid characters</expectedResult>
+            <actualResult type="variable">grabTextFromPageBuilderTextContentTypeError</actualResult>
+        </assertStringContainsString>
+        <actionGroup ref="removeTextFromHtmlCodeWYSIWYGActionGroup" stepKey="removeTheInvalidCharacterFromPageBuilderTextContentType">
+            <argument name="selector" value="//textarea[@id=&quot;{{TextOnConfiguration.textAreaId}}&quot;][1]"/>
+            <argument name="text" value="\u{1F600}"/>
+        </actionGroup>
         <actionGroup ref="saveEditPanelSettingsFullScreen" stepKey="saveTextEditPanelSettings"/>
 
         <!-- Validate Stage -->
@@ -90,6 +101,16 @@
             <expectedResult type="string">{{PageBuilderHtmlPropertyButton.value}}</expectedResult>
             <actualResult type="variable">actualTextFromHtmlCode</actualResult>
         </assertStringContainsString>
+
+        <!-- Add the invalid character in the text element on stage -->
+        <click selector="{{TextOnStage.textareaPlaceholder('1')}}" stepKey="focusOnEditorArea"/>
+        <actionGroup ref="addTextToHtmlCodeWYSIWYGActionGroup" stepKey="enterWrongTextContentOnStage">
+            <argument name="selector" value="{{TextOnStage.textAreaForExecuteJS('1')}}"/>
+            <argument name="text" value="\u{1F600}"/>
+        </actionGroup>
+        <!-- Trigger keyup to dispatch changes -->
+        <pressKey selector="{{TextOnStage.textareaPlaceholder('1')}}" parameterArray="[\Facebook\WebDriver\WebDriverKeys::END]" stepKey="pressEndKey"/>
+        <click selector="{{PageBuilderPanel.searchPanel}}" stepKey="lostFocusFromTextarea"/>
         <actionGroup ref="exitPageBuilderFullScreen" stepKey="exitPageBuilderFullScreen"/>
 
         <!-- Cannot save invalid text-->

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

@@ -21,6 +21,7 @@
             <group value="pagebuilder-cms-page"/>
             <group value="pr_exclude"/>
             <group value="cloud"/>
+	    <skip><issueId value="AC-10534"/></skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

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

@@ -128,7 +128,7 @@
         <waitForPageLoad stepKey="waitForAttributeSetGrid"/>
         <click selector="{{AdminProductAttributeSetGridSection.AttributeSetName('Default')}}" stepKey="navigateToDefaultAttributeSet"/>
         <waitForPageLoad stepKey="waitForAttributeSetEditPage"/>
-        <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute($$createPageBuilderAttribute1.attribute_code$$)}}" selector2="{{AdminProductAttributeSetSection.attribute('weight')}}" stepKey="dragFirstAttributeToWeight"/>
+        <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute($$createPageBuilderAttribute1.attribute_code$$)}}" selector2="{{AdminProductAttributeSetSection.attribute('price')}}" stepKey="dragFirstAttributeToWeight"/>
         <waitForPageLoad stepKey="waitForDragAndDrop"/>
         <dragAndDrop selector1="{{AdminProductAttributeSetSection.attribute($$createPageBuilderAttribute2.attribute_code$$)}}" selector2="{{AdminProductAttributeSetSection.attribute('status')}}" stepKey="dragSecondAttributeToStatus"/>
         <waitForPageLoad stepKey="waitForDragAndDrop2"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderBannerCollageRightAppearanceTest/BannerCollageRightButtonOnHoverTest.xml

@@ -19,9 +19,6 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-banner"/>
             <group value="pagebuilder-bannerCollageRight"/>
-            <skip>
-              <issueId value="ACQE-3837">Skipped</issueId>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
@@ -88,7 +85,6 @@
         </actionGroup>
         <seeElementInDOM selector="{{BannerOnFrontend.button('1')}}" stepKey="seeButtonInDOMStorefront"/>
         <dontSeeElement selector="{{BannerOnFrontend.button('1')}}" stepKey="dontSeeButtonStorefront"/>
-        <!--    -->
         <moveMouseOver selector="//a[@class='logo']" stepKey="moveMouseOverBannerStageOutside"/>
         <wait time="5" stepKey="pauseAfterIconHover"/>
         <moveMouseOver selector="{{BannerOnFrontend.base('1')}}" stepKey="moveMouseOverBannerStorefront"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderCommonTest/EditPanelColorPickerWindowFunctionalityTest.xml

@@ -19,9 +19,6 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-common"/>
             <group value="pagebuilder-banner"/>
-            <skip>
-              <issueId value="ACQE-3836">Skipped</issueId>
-            </skip>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderProductsCommonTest/AdminPageBuilderProductsConfigurationValidateProductTotalsTest.xml

@@ -159,7 +159,7 @@
             <argument name="property" value="PageBuilderProductsSortByNewestTop"/>
         </actionGroup>
         <actionGroup ref="validateProductTotals" stepKey="validateTotalProductsOnEditPanel5">
-            <argument name="productsTotals" value="of 1 total"/>
+            <argument name="productsTotals" value="of 7 total"/>
         </actionGroup>
         <actionGroup ref="saveEditPanelSettings" stepKey="saveEditPanel5"/>
         <actionGroup ref="validateProductCountInProducts" stepKey="validateTotalProductsOnStage5">