Merge branch 'MC-43051' of https://github.com/magento-l3/magento2ce into L3-PR-20210830

Author: ArtemVasyliev

app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php

@@ -17,6 +17,7 @@
 use Magento\GraphQl\Model\Query\ContextInterface;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionProcessorInterface;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Product\CollectionPostProcessor;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
 
 /**
  * Collection for fetching configurable child product data.
@@ -163,6 +164,9 @@ private function fetch(ContextInterface $context) : array
 
             /** @var Product $childProduct */
             foreach ($childCollection as $childProduct) {
+                if ((int)$childProduct->getStatus() !== Status::STATUS_ENABLED) {
+                    continue;
+                }
                 $formattedChild = ['model' => $childProduct, 'sku' => $childProduct->getSku()];
                 $parentId = (int)$childProduct->getParentId();
                 if (!isset($this->childrenMap[$parentId])) {

dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductChildStatusDisabledTest.php

@@ -0,0 +1,63 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\ConfigurableProduct;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Checks disabled child product is not in configurable variants.
+ */
+class ConfigurableProductChildStatusDisabledTest extends GraphQlAbstract
+{
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable_disable_first_child.php
+     * @magentoConfigFixture default_store cataloginventory/options/show_out_of_stock 1
+     */
+    public function testConfigurableProductChildStatusDisabled()
+    {
+        $parentSku = 'configurable';
+        $enabledChildSku = 'simple_20';
+        $disabledChildSku = 'simple_10';
+        $query = $this->getQuery($parentSku);
+        $response = $this->graphQlQuery($query);
+        $this->assertContainsEquals(
+            ['product' => ['sku' => $enabledChildSku, 'stock_status' => 'IN_STOCK']],
+            $response['products']['items'][0]['variants']
+        );
+        $this->assertNotContainsEquals(
+            ['product' => ['sku' => $disabledChildSku, 'stock_status' => 'OUT_OF_STOCK']],
+            $response['products']['items'][0]['variants']
+        );
+    }
+
+    /**
+     * @param string $sku
+     * @return string
+     */
+    private function getQuery(string $sku)
+    {
+        return <<<QUERY
+        {
+            products(filter: {sku: {eq: "{$sku}"}})
+            {
+                items {
+                    sku
+                    ... on ConfigurableProduct {
+                        variants {
+                            product {
+                                sku
+                                stock_status
+                            }
+                        }
+                    }
+                }
+            }
+        }
+QUERY;
+    }
+}