Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-1620

Author: devarul

app/code/Magento/Backend/Test/Mftf/ActionGroup/SecondaryGridActionGroup.xml

@@ -27,8 +27,10 @@
         <waitForPageLoad stepKey="waitForTaxRateLoad"/>
 
         <!-- delete the rule -->
+        <waitForElementVisible selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="waitForDelete"/>
         <click stepKey="clickDelete" selector="{{AdminStoresMainActionsSection.deleteButton}}"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForConfirmationModal"/>
         <click stepKey="clickOk" selector="{{AdminConfirmationModalSection.ok}}"/>
-        <see stepKey="seeSuccess" selector="{{AdminMessagesSection.success}}" userInput="deleted"/>
+        <waitForText stepKey="seeSuccess" selector="{{AdminMessagesSection.success}}" userInput="deleted"/>
     </actionGroup>
 </actionGroups>

app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/AttributeOptionProvider.php

@@ -63,6 +63,7 @@ public function getOptions(array $optionIds, ?int $storeId, array $attributeCode
                     'attribute_id' => 'a.attribute_id',
                     'attribute_code' => 'a.attribute_code',
                     'attribute_label' => 'a.frontend_label',
+                    'attribute_type' => 'a.frontend_input',
                     'position' => 'attribute_configuration.position'
                 ]
             )
@@ -137,6 +138,7 @@ private function formatResult(Select $select): array
                     'attribute_code' => $option['attribute_code'],
                     'attribute_label' => $option['attribute_store_label']
                         ? $option['attribute_store_label'] : $option['attribute_label'],
+                    'attribute_type' => $option['attribute_type'],
                     'position' => $option['position'],
                     'options' => [],
                 ];

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

@@ -13,6 +13,7 @@
 use Magento\Framework\Api\Search\AggregationValueInterface;
 use Magento\Framework\Api\Search\BucketInterface;
 use Magento\CatalogGraphQl\DataProvider\Product\LayeredNavigation\Formatter\LayerFormatter;
+use Magento\Config\Model\Config\Source\Yesno;
 
 /**
  * @inheritdoc
@@ -49,18 +50,26 @@ class Attribute implements LayerBuilderInterface
         self::CATEGORY_BUCKET
     ];
 
+    /**
+     * @var Yesno
+     */
+    private Yesno $YesNo;
+
     /**
      * @param AttributeOptionProvider $attributeOptionProvider
      * @param LayerFormatter $layerFormatter
+     * @param Yesno $YesNo
      * @param array $bucketNameFilter
      */
     public function __construct(
         AttributeOptionProvider $attributeOptionProvider,
         LayerFormatter $layerFormatter,
+        Yesno $YesNo,
         $bucketNameFilter = []
     ) {
         $this->attributeOptionProvider = $attributeOptionProvider;
         $this->layerFormatter = $layerFormatter;
+        $this->YesNo = $YesNo;
         $this->bucketNameFilter = \array_merge($this->bucketNameFilter, $bucketNameFilter);
     }
 
@@ -87,7 +96,11 @@ public function build(AggregationInterface $aggregation, ?int $storeId): array
                 isset($attribute['position']) ? $attribute['position'] : null
             );
 
-            $options = $this->getSortedOptions($bucket, isset($attribute['options']) ? $attribute['options'] : []);
+            $options = $this->getSortedOptions(
+                $bucket,
+                isset($attribute['options']) ? $attribute['options'] : [],
+                ($attribute['attribute_type']) ? $attribute['attribute_type']: ''
+            );
             foreach ($options as $option) {
                 $result[$bucketName]['options'][] = $this->layerFormatter->buildItem(
                     $option['label'],
@@ -168,9 +181,11 @@ function (AggregationValueInterface $value) {
      *
      * @param BucketInterface $bucket
      * @param array $optionLabels
+     * @param string $attributeType
      * @return array
+     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
-    private function getSortedOptions(BucketInterface $bucket, array $optionLabels): array
+    private function getSortedOptions(BucketInterface $bucket, array $optionLabels, string $attributeType): array
     {
         /**
          * Option labels array has been sorted
@@ -179,7 +194,16 @@ private function getSortedOptions(BucketInterface $bucket, array $optionLabels):
         foreach ($bucket->getValues() as $value) {
             $metrics = $value->getMetrics();
             $optionValue = $metrics['value'];
-            $optionLabel = $optionLabels[$optionValue] ?? $optionValue;
+            if (isset($optionLabels[$optionValue])) {
+                $optionLabel = $optionLabels[$optionValue];
+            } else {
+                if ($attributeType === 'boolean') {
+                    $yesNoOptions = $this->YesNo->toArray();
+                    $optionLabel = $yesNoOptions[$optionValue];
+                } else {
+                    $optionLabel =  $optionValue;
+                }
+            }
             $options[$optionValue] = $metrics + ['label' => $optionLabel];
         }
 
@@ -188,7 +212,7 @@ private function getSortedOptions(BucketInterface $bucket, array $optionLabels):
          */
         foreach ($options as $optionId => $option) {
             if (!is_array($options[$optionId])) {
-               unset($options[$optionId]);
+                unset($options[$optionId]);
             }
         }
 

app/code/Magento/CatalogGraphQl/Model/AttributesJoiner.php

@@ -61,6 +61,7 @@ public function join(FieldNode $fieldNode, AbstractCollection $collection, Resol
      *
      * @param FieldNode $fieldNode
      * @param ResolveInfo $resolveInfo
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @return string[]
      */
     public function getQueryFields(FieldNode $fieldNode, ResolveInfo $resolveInfo): array
@@ -77,7 +78,11 @@ public function getQueryFields(FieldNode $fieldNode, ResolveInfo $resolveInfo):
                     ($spreadFragmentNode = $resolveInfo->fragments[$field->name->value])) {
 
                     foreach ($spreadFragmentNode->selectionSet->selections as $spreadNode) {
-                        if (isset($spreadNode->selectionSet->selections)) {
+                        if (isset($spreadNode->selectionSet->selections)
+                            && $spreadNode->kind === NodeKind::INLINE_FRAGMENT) {
+                            $fragmentFields[] = $this->addInlineFragmentFields($resolveInfo, $spreadNode);
+                        } elseif (isset($spreadNode->selectionSet->selections)
+                            && $spreadNode->kind !== NodeKind::INLINE_FRAGMENT) {
                             $fragmentFields[] = $this->getQueryFields($spreadNode, $resolveInfo);
                         } else {
                             $selectedFields[] = $spreadNode->name->value;

app/code/Magento/CatalogGraphQl/composer.json

@@ -14,6 +14,7 @@
         "magento/module-catalog-search": "*",
         "magento/framework": "*",
         "magento/module-graph-ql": "*",
+        "magento/module-config": "*",
         "magento/module-advanced-search": "*"
     },
     "suggest": {

app/code/Magento/CatalogGraphQl/etc/module.xml

@@ -13,6 +13,7 @@
             <module name="Magento_Store"/>
             <module name="Magento_Eav"/>
             <module name="Magento_GraphQl"/>
+            <module name="Magento_Config"/>
             <module name="Magento_StoreGraphQl"/>
             <module name="Magento_EavGraphQl"/>
         </sequence>

app/code/Magento/CmsGraphQl/Model/Resolver/Page/ResolverCacheIdentity.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CmsGraphQl\Model\Resolver\Page;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Model\Page;
+use Magento\Framework\GraphQl\Query\Resolver\IdentityInterface;
+
+/**
+ * Identity for resolved CMS page for resolver cache type
+ */
+class ResolverCacheIdentity implements IdentityInterface
+{
+    /**
+     * @var string
+     */
+    private $cacheTag = Page::CACHE_TAG;
+
+    /**
+     * Get page ID from resolved data
+     *
+     * @param array $resolvedData
+     * @return string[]
+     */
+    public function getIdentities(array $resolvedData): array
+    {
+        return empty($resolvedData[PageInterface::PAGE_ID]) ?
+            [] : [sprintf('%s_%s', $this->cacheTag, $resolvedData[PageInterface::PAGE_ID])];
+    }
+}