Merge remote-tracking branch 'origin/2.3.2-develop' into 2.3.2-develop-pr52

Author: zakdma

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

@@ -86,6 +86,9 @@ public function getList(
         $collection->load();
 
         // Methods that perform extra fetches post-load
+        if (in_array('media_gallery_entries', $attributes)) {
+            $collection->addMediaGalleryData();
+        }
         if (in_array('options', $attributes)) {
             $collection->addOptionsToResult();
         }

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product/CollectionProcessor/MediaGalleryProcessor.php

@@ -49,7 +49,6 @@ public function process(
                     $collection->addAttributeToSelect($mediaAttribute);
                 }
             }
-            $collection->addMediaGalleryData();
         }
 
         return $collection;

dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductQueryTest.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;
+
+/**
+ * Test configurable product queries work correctly
+ */
+class ConfigurableProductQueryTest extends GraphQlAbstract
+{
+
+    /**
+     * @magentoApiDataFixture Magento/ConfigurableProduct/_files/product_configurable.php
+     */
+    public function testNonVisibleVariationsNotReturned()
+    {
+        $categoryId = '2';
+        $query = <<<QUERY
+{
+  products(filter: {category_id: {eq: "{$categoryId}"}}) {
+    items {
+      __typename
+      sku
+      name
+      url_key
+      price {
+        regularPrice {
+          amount {
+            currency
+            value
+          }
+        }
+      }
+      media_gallery_entries {
+        media_type
+        label
+        position
+        file
+        id
+        types
+      }
+      description {
+        html
+      }
+    }
+  }
+}
+QUERY;
+
+        $result = $this->graphQlQuery($query);
+        $products = $result['products']['items'];
+        $this->assertCount(1, $products);
+        $this->assertEquals('ConfigurableProduct', $products[0]['__typename']);
+        $this->assertEquals('configurable', $products[0]['sku']);
+        $this->assertArrayHasKey('media_gallery_entries', $products[0]);
+    }
+}