MAGETWO-83204: "Hide from Product Page" option does not work for child of configurable product

Author: dhorytskyi

app/code/Magento/Swatches/Helper/Data.php

@@ -189,6 +189,26 @@ private function populateAdditionalDataEavAttribute(Attribute $attribute)
         return $this;
     }
 
+    /**
+     * @param ModelProduct $product
+     * @param string $attributeCode
+     * @return bool
+     */
+    private function isMediaAvailable(ModelProduct $product, $attributeCode)
+    {
+        $isAvailable = false;
+
+        $mediaGallery = $product->getMediaGalleryEntries();
+        foreach ($mediaGallery as $mediaEntry) {
+            if (in_array($attributeCode, $mediaEntry->getTypes(), true)) {
+                $isAvailable = !$mediaEntry->isDisabled();
+                break;
+            }
+        }
+
+        return $isAvailable;
+    }
+
     /**
      * @param string $attributeCode swatch_image|image
      * @param ModelProduct $configurableProduct
@@ -201,8 +221,9 @@ private function loadFirstVariation($attributeCode, ModelProduct $configurablePr
             $usedProducts = $configurableProduct->getTypeInstance()->getUsedProducts($configurableProduct);
 
             foreach ($usedProducts as $simpleProduct) {
-                if (!in_array($simpleProduct->getData($attributeCode), [null, self::EMPTY_IMAGE_VALUE], true)
-                    && !array_diff_assoc($requiredAttributes, $simpleProduct->getData())
+                if (
+                    !array_diff_assoc($requiredAttributes, $simpleProduct->getData())
+                    && $this->isMediaAvailable($simpleProduct, $attributeCode)
                 ) {
                     return $simpleProduct;
                 }
@@ -313,50 +334,34 @@ private function addFilterByParent(ProductCollection $productCollection, $parent
      */
     public function getProductMediaGallery(ModelProduct $product)
     {
-        if (!in_array($product->getData('image'), [null, self::EMPTY_IMAGE_VALUE], true)) {
-            $baseImage = $product->getData('image');
-        } else {
-            $productMediaAttributes = array_filter($product->getMediaAttributeValues(), function ($value) {
-                return $value !== self::EMPTY_IMAGE_VALUE && $value !== null;
-            });
-            foreach ($productMediaAttributes as $attributeCode => $value) {
-                if ($attributeCode !== 'swatch_image') {
-                    $baseImage = (string)$value;
-                    break;
-                }
+        $baseImage = null;
+        $gallery = [];
+
+        $mediaGallery = $product->getMediaGalleryEntries();
+        foreach ($mediaGallery as $mediaEntry) {
+            if ($mediaEntry->isDisabled()) {
+                continue;
             }
+
+            if (in_array('image', $mediaEntry->getTypes(), true)) {
+                $baseImage = $mediaEntry->getFile();
+            } elseif (!$baseImage) {
+                $baseImage = $mediaEntry->getFile();
+            }
+
+            $gallery[$mediaEntry->getId()] = $this->getAllSizeImages($product, $mediaEntry->getFile());
         }
 
-        if (empty($baseImage)) {
+        if (!$baseImage) {
             return [];
         }
 
         $resultGallery = $this->getAllSizeImages($product, $baseImage);
-        $resultGallery['gallery'] = $this->getGalleryImages($product);
+        $resultGallery['gallery'] = $gallery;
 
         return $resultGallery;
     }
 
-    /**
-     * @param ModelProduct $product
-     * @return array
-     */
-    private function getGalleryImages(ModelProduct $product)
-    {
-        //TODO: remove after fix MAGETWO-48040
-        $product = $this->productRepository->getById($product->getId());
-
-        $result = [];
-        $mediaGallery = $product->getMediaGalleryImages();
-        foreach ($mediaGallery as $media) {
-            $result[$media->getData('value_id')] = $this->getAllSizeImages(
-                $product,
-                $media->getData('file')
-            );
-        }
-        return $result;
-    }
-
     /**
      * @param ModelProduct $product
      * @param string $imageFile