Merge remote-tracking branch 'mainline/2.4-develop' into 2.4-develop-pr44

Author: serhii-balko

app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Price.php

@@ -72,7 +72,7 @@ public function build(AggregationInterface $aggregation, ?int $storeId): array
             );
         }
 
-        return [$result];
+        return [self::PRICE_BUCKET => $result];
     }
 
     /**

app/code/Magento/CatalogGraphQl/Model/Resolver/Aggregations.php

@@ -7,10 +7,12 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver;
 
+use Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\LayerBuilder;
+use Magento\Directory\Model\PriceCurrency;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\LayerBuilder;
 use Magento\Store\Api\Data\StoreInterface;
 
 /**
@@ -28,16 +30,24 @@ class Aggregations implements ResolverInterface
      */
     private $layerBuilder;
 
+    /**
+     * @var PriceCurrency
+     */
+    private $priceCurrency;
+
     /**
      * @param \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider
      * @param LayerBuilder $layerBuilder
+     * @param PriceCurrency $priceCurrency
      */
     public function __construct(
         \Magento\CatalogGraphQl\Model\Resolver\Layer\DataProvider\Filters $filtersDataProvider,
-        LayerBuilder $layerBuilder
+        LayerBuilder $layerBuilder,
+        PriceCurrency $priceCurrency = null
     ) {
         $this->filtersDataProvider = $filtersDataProvider;
         $this->layerBuilder = $layerBuilder;
+        $this->priceCurrency = $priceCurrency ?: ObjectManager::getInstance()->get(PriceCurrency::class);
     }
 
     /**
@@ -60,7 +70,18 @@ public function resolve(
             /** @var StoreInterface $store */
             $store = $context->getExtensionAttributes()->getStore();
             $storeId = (int)$store->getId();
-            return $this->layerBuilder->build($aggregations, $storeId);
+            $results = $this->layerBuilder->build($aggregations, $storeId);
+            if (isset($results['price_bucket'])) {
+                foreach ($results['price_bucket']['options'] as &$value) {
+                    list($from, $to) = explode('-', $value['label']);
+                    $newLabel = $this->priceCurrency->convertAndRound($from)
+                        . '-'
+                        . $this->priceCurrency->convertAndRound($to);
+                    $value['label'] = $newLabel;
+                    $value['value'] = str_replace('-', '_', $newLabel);
+                }
+            }
+            return $results;
         } else {
             return [];
         }

app/code/Magento/CatalogGraphQl/Model/Resolver/Category/DataProvider/Breadcrumbs.php

@@ -7,6 +7,7 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Category\DataProvider;
 
+use Magento\Catalog\Api\Data\CategoryInterface;
 use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory;
 
 /**
@@ -46,6 +47,7 @@ public function getData(string $categoryPath): array
             $collection = $this->collectionFactory->create();
             $collection->addAttributeToSelect(['name', 'url_key', 'url_path']);
             $collection->addAttributeToFilter('entity_id', $parentCategoryIds);
+            $collection->addAttributeToFilter(CategoryInterface::KEY_IS_ACTIVE, 1);
 
             foreach ($collection as $category) {
                 $breadcrumbsData[] = [

app/code/Magento/CatalogGraphQl/Model/Resolver/Category/Image.php

@@ -7,14 +7,16 @@
 
 namespace Magento\CatalogGraphQl\Model\Resolver\Category;
 
+use Magento\Catalog\Model\Category;
+use Magento\Catalog\Model\Category\FileInfo;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Filesystem\DirectoryList;
 use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\UrlInterface;
 use Magento\Store\Api\Data\StoreInterface;
-use Magento\Framework\Filesystem\DirectoryList;
-use Magento\Catalog\Model\Category\FileInfo;
-use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 
 /**
  * Resolve category image to a fully qualified URL
@@ -52,15 +54,15 @@ public function resolve(
         if (!isset($value['model'])) {
             throw new LocalizedException(__('"model" value should be specified'));
         }
-        /** @var \Magento\Catalog\Model\Category $category */
+        /** @var Category $category */
         $category = $value['model'];
         $imagePath = $category->getData('image');
         if (empty($imagePath)) {
             return null;
         }
         /** @var StoreInterface $store */
         $store = $context->getExtensionAttributes()->getStore();
-        $baseUrl = $store->getBaseUrl();
+        $baseUrl = $store->getBaseUrl(UrlInterface::URL_TYPE_WEB);
 
         $filenameWithMedia =  $this->fileInfo->isBeginsWithMediaDirectoryPath($imagePath)
             ? $imagePath : $this->formatFileNameWithMediaCategoryFolder($imagePath);

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/ProductSearch.php

@@ -113,7 +113,7 @@ public function getList(
         $searchResults = $this->searchResultsFactory->create();
         $searchResults->setSearchCriteria($searchCriteriaForCollection);
         $searchResults->setItems($collection->getItems());
-        $searchResults->setTotalCount($searchResult->getTotalCount());
+        $searchResults->setTotalCount($collection->getSize());
         return $searchResults;
     }
 

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/SearchCriteria/CollectionProcessor/FilterProcessor/CategoryFilter.php

@@ -51,6 +51,11 @@ public function __construct(
      */
     public function apply(Filter $filter, AbstractDb $collection)
     {
+        $conditionType = $filter->getConditionType();
+        if ($conditionType !== 'eq') {
+            return true;
+        }
+
         $categoryIds = $filter->getValue();
         if (!is_array($categoryIds)) {
             $categoryIds = [$categoryIds];

app/code/Magento/CatalogGraphQl/composer.json

@@ -7,6 +7,7 @@
         "magento/module-eav": "*",
         "magento/module-catalog": "*",
         "magento/module-catalog-inventory": "*",
+        "magento/module-directory": "*",
         "magento/module-search": "*",
         "magento/module-store": "*",
         "magento/module-eav-graph-ql": "*",

app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCmsPageFillOutBasicFieldsActionGroup.xml

@@ -0,0 +1,30 @@
+<?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="AdminCmsPageFillOutBasicFieldsActionGroup">
+        <annotations>
+            <description>Fills out the Page details (Page Title, Content and URL Key) on the Admin Page creation/edit page.</description>
+        </annotations>
+        <arguments>
+            <argument name="title" type="string" defaultValue="{{_defaultCmsPage.title}}"/>
+            <argument name="contentHeading" type="string" defaultValue="{{_defaultCmsPage.content_heading}}"/>
+            <argument name="content" type="string" defaultValue="{{_defaultCmsPage.content}}"/>
+            <argument name="urlKey" type="string" defaultValue="{{_defaultCmsPage.identifier}}"/>
+        </arguments>
+
+        <fillField selector="{{CmsNewPagePageBasicFieldsSection.pageTitle}}" userInput="{{title}}" stepKey="fillTitle"/>
+        <conditionalClick selector="{{CmsNewPagePageContentSection.header}}" dependentSelector="{{CmsNewPagePageContentSection.contentHeading}}" visible="false" stepKey="expandContentTabIfCollapsed"/>
+        <fillField selector="{{CmsNewPagePageContentSection.contentHeading}}" userInput="{{contentHeading}}" stepKey="fillContentHeading"/>
+        <scrollTo selector="{{CmsNewPagePageContentSection.content}}" stepKey="scrollToPageContent"/>
+        <fillField selector="{{CmsNewPagePageContentSection.content}}" userInput="{{content}}" stepKey="fillContent"/>
+        <conditionalClick selector="{{CmsNewPagePageSeoSection.header}}" dependentSelector="{{CmsNewPagePageSeoSection.urlKey}}" visible="false" stepKey="clickExpandSearchEngineOptimisationIfCollapsed"/>
+        <fillField selector="{{CmsNewPagePageSeoSection.urlKey}}" userInput="{{urlKey}}" stepKey="fillUrlKey"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml

@@ -13,6 +13,6 @@
             <description>Runs bin/magento command to disable WYSIWYG</description>
         </annotations>
 
-        <magentoCLI stepKey="disableWYSIWYG" command="config:set cms/wysiwyg/enabled disabled"/>
+        <magentoCLI command="config:set {{WysiwygDisabledByDefault.path}} {{WysiwygDisabledByDefault.value}}" stepKey="disableWYSIWYG"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminEnableWYSIWYGActionGroup.xml

@@ -13,6 +13,6 @@
             <description>Runs bin/magento command to enable WYSIWYG</description>
         </annotations>
 
-        <magentoCLI stepKey="enableWYSIWYG" command="config:set cms/wysiwyg/enabled enabled"/>
+        <magentoCLI command="config:set {{WysiwygEnabledByDefault.path}} {{WysiwygEnabledByDefault.value}}" stepKey="enableWYSIWYG"/>
     </actionGroup>
 </actionGroups>