Merge branch 'develop' into fix-AdminCheckCreateFolderEscapeAndEnterHandlesForWYSIWYGBlockTest

Author: omiroshnichenko

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

@@ -134,18 +134,21 @@ private function updateAnchorCategoryConditions(array $condition): array
      * Retrieve product collection based on provided conditions
      *
      * @param string $conditions
+     * @param bool $usePriceIndex use minimal price from price index to filter by price.
+     * If TRUE only enabled products will be returned, as price indexer does not include disabled products
      * @return Collection
      * @throws LocalizedException
      */
-    private function getProductCollection(string $conditions): Collection
+    private function getProductCollection(string $conditions, bool $usePriceIndex = true): Collection
     {
         /** @var $collection Collection */
         $collection = $this->productCollectionFactory->create();
+        if ($usePriceIndex && strpos($conditions, '"attribute":"price"') !== false) {
+            $collection->addMinimalPrice();
+        }
 
-        /** @var Combine $collectionConditions */
-        $collectionConditions = $this->decodeConditions($conditions);
-        $collectionConditions->collectValidatedAttributes($collection);
-        $this->sqlBuilder->attachConditionToCollection($collection, $collectionConditions);
+        $collection = $this->applyConditionsToCollection($conditions, $collection);
+        $collection = $this->excludeLinkedProducts($collection);
 
         /**
          * Prevent retrieval of duplicate records. This may occur when multiselect product attribute matches
@@ -156,38 +159,90 @@ private function getProductCollection(string $conditions): Collection
         return $collection;
     }
 
+    /**
+     * Retrieve count of all enabled products
+     *
+     * @param string $conditions
+     * @return int number of enabled products
+     */
+    private function getEnabledCount(string $conditions): int
+    {
+        $collection = $this->getProductCollection($conditions, true);
+        $collection->addAttributeToFilter('status', Status::STATUS_ENABLED);
+        return $collection->getSize();
+    }
+
     /**
      * Retrieve count of all disabled products
      *
-     * @param Collection $baseCollection
+     * @param string $conditions
      * @return int number of disabled products
      */
-    private function getDisabledCount(Collection $baseCollection): int
+    private function getDisabledCount(string $conditions): int
     {
-        /** @var Collection $disabledCollection */
-        $disabledCollection = clone $baseCollection;
-        $disabledCollection->addAttributeToFilter('status', Status::STATUS_DISABLED);
-        return $disabledCollection->getSize();
+        $collection = $this->getProductCollection($conditions, false);
+        $collection->addAttributeToFilter('status', Status::STATUS_DISABLED);
+        return $collection->getSize();
     }
 
     /**
      * Retrieve count of all not visible individually products
      *
-     * @param Collection $baseCollection
+     * @param string $conditions
      * @return int number of products not visible individually
      */
-    private function getNotVisibleCount(Collection $baseCollection): int
+    private function getNotVisibleCount(string $conditions): int
     {
-        $notVisibleCollection = clone $baseCollection;
-        $notVisibleCollection->addAttributeToFilter('status', Status::STATUS_ENABLED);
-        $notVisibleCollection->addAttributeToFilter(
+        $collection = $this->getProductCollection($conditions, true);
+        $collection->addAttributeToFilter('status', Status::STATUS_ENABLED);
+        $collection->addAttributeToFilter(
             'visibility',
             [
                 Visibility::VISIBILITY_NOT_VISIBLE,
                 Visibility::VISIBILITY_IN_SEARCH
             ]
         );
-        return $notVisibleCollection->getSize();
+        return $collection->getSize();
+    }
+
+    /**
+     * Exclude any linked products, e.g. simple products assigned to a configurable, bundle or group
+     *
+     * @param Collection $collection
+     * @return Collection
+     */
+    private function excludeLinkedProducts(Collection $collection): Collection
+    {
+        $collection->getSelect()
+            ->joinLeft(
+                ['super_link_table' => $collection->getTable('catalog_product_super_link')],
+                'super_link_table.product_id = e.entity_id',
+                ['product_id']
+            )
+            ->joinLeft(
+                ['link_table' => $collection->getTable('catalog_product_link')],
+                'link_table.product_id = e.entity_id',
+                ['product_id']
+            )
+            ->where('link_table.product_id IS NULL OR super_link_table.product_id IS NULL');
+        return $collection;
+    }
+
+    /**
+     * Apply conditions to collection
+     *
+     * @param string $conditions
+     * @param Collection $collection
+     * @return Collection
+     * @throws LocalizedException
+     */
+    private function applyConditionsToCollection(string $conditions, Collection $collection): Collection
+    {
+        /** @var Combine $collectionConditions */
+        $collectionConditions = $this->decodeConditions($conditions);
+        $collectionConditions->collectValidatedAttributes($collection);
+        $this->sqlBuilder->attachConditionToCollection($collection, $collectionConditions);
+        return $collection;
     }
 
     /**
@@ -200,25 +255,12 @@ private function getNotVisibleCount(Collection $baseCollection): int
      */
     public function getProductTotals(string $conditions): array
     {
-        /** @var Collection $collection */
-        $collection = $this->getProductCollection($conditions);
-
-        // Exclude any linked products, e.g. simple products assigned to a configurable, bundle or group
-        $collection->getSelect()->joinLeft(
-            ['super_link_table' => $collection->getTable('catalog_product_super_link')],
-            'super_link_table.product_id = e.entity_id',
-            ['product_id']
-        )->joinLeft(
-            ['link_table' => $collection->getTable('catalog_product_link')],
-            'link_table.product_id = e.entity_id',
-            ['product_id']
-        )->where('link_table.product_id IS NULL OR super_link_table.product_id IS NULL');
-
-        $disabledCount = $this->getDisabledCount($collection);
-        $notVisibleCount = $this->getNotVisibleCount($collection);
+        $enabledCount = $this->getEnabledCount($conditions);
+        $disabledCount = $this->getDisabledCount($conditions);
+        $notVisibleCount = $this->getNotVisibleCount($conditions);
 
         return [
-            'total' => $collection->getSize(),
+            'total' => $enabledCount + $disabledCount,
             'disabled' => $disabledCount,
             'notVisible' => $notVisibleCount,
         ];

app/code/Magento/PageBuilder/Model/Catalog/Sorting/Price.php

@@ -0,0 +1,71 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\PageBuilder\Model\Catalog\Sorting;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\Framework\DB\Select;
+use Magento\Framework\Phrase;
+
+/**
+ * Sort catalog products by price
+ */
+class Price implements OptionInterface
+{
+    /**
+     * @var string
+     */
+    private $label;
+
+    /**
+     * @var string
+     */
+    private $sortDirection;
+
+    /**
+     * @var string
+     */
+    private $secondarySortDirection;
+
+    /**
+     * @param string $label
+     * @param string $sortDirection
+     * @param string $secondarySortDirection
+     */
+    public function __construct(
+        string $label,
+        string $sortDirection = Select::SQL_ASC,
+        ?string $secondarySortDirection = null
+    ) {
+        $this->label = $label;
+        $this->sortDirection = $sortDirection;
+        $this->secondarySortDirection = $secondarySortDirection ?? $sortDirection;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function sort(Collection $collection): Collection
+    {
+        $collection->getSelect()->reset(Select::ORDER);
+        if ($collection->getLimitationFilters()->isUsingPriceIndex()) {
+            $collection->getSelect()->order("price_index.min_price $this->sortDirection");
+        } else {
+            $collection->addAttributeToSort('price', $this->sortDirection);
+        }
+        $collection->addAttributeToSort('entity_id', $this->secondarySortDirection);
+        return $collection;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getLabel(): Phrase
+    {
+        return __($this->label);
+    }
+}

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="addPageBuilderPageTitle">
+        <arguments>
+            <argument name="contentType"/>
+        </arguments>
+        <fillField selector="{{CmsNewPagePageActionsSection.pageTitle}}" userInput="{{contentType.name}}{{PageBuilderPageTitle.pageName}}" stepKey="enterPageTitle"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/AddPageBuilderPageTitleActionGroup.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="navigateToAPageWithPageBuilder">
+        <waitForPageLoad stepKey="waitForDashboardPageLoad"/>
+        <amOnPage url="{{CmsPagesPage.url}}/new" stepKey="amOnPageBuilderPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/AdminActionGroup/NavigateToAPageWithPageBuilderActionGroup.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="navigateToCMSPage">
+        <!-- This goes in CE repo -->
+        <arguments>
+            <argument name="CMSPage"/>
+        </arguments>
+        <amOnPage url="{{CmsPagesPage.url}}" stepKey="navigateToCMSPagesGrid"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <conditionalClick selector="{{CmsPagesPageActionsSection.clearAllButton}}" dependentSelector="{{CmsPagesPageActionsSection.activeFilters}}" visible="true" stepKey="clickToResetFilter"/>
+        <waitForPageLoad stepKey="waitForGridLoad"/>
+        <conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" visible="true" stepKey="clickToAttemptSortByIdDescending"/>
+        <waitForPageLoad stepKey="waitForFirstIdSortDescendingToFinish"/>
+        <!-- Conditional Click again in case it goes from default state to ascending on first click -->
+        <conditionalClick selector="//div[contains(@data-role, 'grid-wrapper')]/table/thead/tr/th/span[contains(text(), 'ID')]" dependentSelector="//span[contains(text(), 'ID')]/parent::th[not(contains(@class, '_descend'))]/parent::tr/parent::thead/parent::table/parent::div[contains(@data-role, 'grid-wrapper')]" visible="true" stepKey="secondClickToAttemptSortByIdDescending"/>
+        <waitForPageLoad stepKey="waitForSecondIdSortDescendingToFinish"/>
+        <click selector="{{CmsPagesPageActionsSection.select(CMSPage.identifier)}}" stepKey="clickSelectCreatedCMSPage"/>
+        <click selector="{{CmsPagesPageActionsSection.edit(CMSPage.identifier)}}" stepKey="navigateToCreatedCMSPage"/>
+        <waitForPageLoad stepKey="waitForPageLoad2"/>
+        <seeElement selector="{{CmsNewPagePageContentSection.header}}" stepKey="seeContentSectionHeaderForPage"/>
+    </actionGroup>
+</actionGroups>