MAGETWO-44868: Swatches thumbnails aren't shown on frontend

Author: Michail Slabko

app/code/Magento/Catalog/Helper/Image.php

@@ -176,8 +176,8 @@ public function init($product, $imageId, $attributes = [])
         $this->_reset();
 
         $this->attributes = array_merge(
-            $attributes,
-            $this->getConfigView()->getMediaAttributes('Magento_Catalog', self::MEDIA_TYPE_CONFIG_NODE, $imageId)
+            $this->getConfigView()->getMediaAttributes('Magento_Catalog', self::MEDIA_TYPE_CONFIG_NODE, $imageId),
+            $attributes
         );
 
         $this->setProduct($product);

app/code/Magento/Swatches/Block/Product/Renderer/Configurable.php

@@ -253,11 +253,11 @@ protected function extractNecessarySwatchData(array $swatchDataArray)
 
         if ($result['type'] == Swatch::SWATCH_TYPE_VISUAL_IMAGE && !empty($swatchDataArray['value'])) {
             $result['value'] = $this->swatchMediaHelper->getSwatchAttributeImage(
-                'swatch_image',
+                Swatch::SWATCH_IMAGE_NAME,
                 $swatchDataArray['value']
             );
             $result['thumb'] = $this->swatchMediaHelper->getSwatchAttributeImage(
-                'swatch_thumb',
+                Swatch::SWATCH_THUMBNAIL_NAME,
                 $swatchDataArray['value']
             );
         } else {
@@ -284,8 +284,8 @@ protected function getVariationMedia($attributeCode, $optionId)
         $variationMediaArray = [];
         if ($variationProduct) {
             $variationMediaArray = [
-                'value' => $this->getSwatchProductImage($variationProduct, 'swatch_image'),
-                'thumb' => $this->getSwatchProductImage($variationProduct, 'swatch_thumb'),
+                'value' => $this->getSwatchProductImage($variationProduct, Swatch::SWATCH_IMAGE_NAME),
+                'thumb' => $this->getSwatchProductImage($variationProduct, Swatch::SWATCH_THUMBNAIL_NAME),
             ];
         }
 
@@ -299,22 +299,28 @@ protected function getVariationMedia($attributeCode, $optionId)
      */
     protected function getSwatchProductImage(Product $childProduct, $imageType)
     {
-        if (
-            $childProduct->getData('swatch_image') !== null
-            && $childProduct->getData('swatch_image') != self::EMPTY_IMAGE_VALUE
-        ) {
-            $swatchImageId = $imageType == 'swatch_image' ? 'swatch_image' : 'swatch_thumb';
-        } elseif (
-            $childProduct->getData('image') !== null
-            && $childProduct->getData('image') != self::EMPTY_IMAGE_VALUE
-        ) {
-            $swatchImageId = $imageType == 'swatch_image' ? 'swatch_image_base' : 'swatch_thumb_base';
+        if ($this->isProductHasImage($childProduct, Swatch::SWATCH_IMAGE_NAME)) {
+            $swatchImageId = $imageType;
+            $imageAttributes = ['type' => Swatch::SWATCH_IMAGE_NAME];
+        } elseif ($this->isProductHasImage($childProduct, 'image')) {
+            $swatchImageId = $imageType == Swatch::SWATCH_IMAGE_NAME ? 'swatch_image_base' : 'swatch_thumb_base';
+            $imageAttributes = ['type' => 'image'];
         }
         if (isset($swatchImageId)) {
-            return $this->_imageHelper->init($childProduct, $swatchImageId)->getUrl();
+            return $this->_imageHelper->init($childProduct, $swatchImageId, $imageAttributes)->getUrl();
         }
     }
 
+    /**
+     * @param Product $product
+     * @param string $imageType
+     * @return bool
+     */
+    protected function isProductHasImage(Product $product, $imageType)
+    {
+        return $product->getData($imageType) !== null && $product->getData($imageType) != self::EMPTY_IMAGE_VALUE;
+    }
+
     /**
      * @param array $attributeData
      * @return array

app/code/Magento/Swatches/Model/Plugin/Product.php

@@ -10,11 +10,6 @@
  */
 class Product
 {
-    /**
-     * Name of swatch image role
-     */
-    const ROLE_SWATCH_IMAGE_NAME = 'swatch_image';
-
     /**
      * Unset swatch image role if product is not simple
      *
@@ -28,7 +23,7 @@ public function afterGetMediaAttributes(\Magento\Catalog\Model\Product $product,
             && $product->getTypeId() !== \Magento\Catalog\Model\Product\Type::TYPE_VIRTUAL
         ) {
             if (is_array($imageRoles)) {
-                unset($imageRoles[self::ROLE_SWATCH_IMAGE_NAME]);
+                unset($imageRoles[\Magento\Swatches\Model\Swatch::SWATCH_IMAGE_NAME]);
             }
         }
 

app/code/Magento/Swatches/Model/Swatch.php

@@ -40,6 +40,16 @@ class Swatch extends \Magento\Framework\Model\AbstractModel
     /** Constant for identifying empty swatch type */
     const SWATCH_TYPE_EMPTY = 3;
 
+    /**
+     * Name of swatch image
+     */
+    const SWATCH_IMAGE_NAME = 'swatch_image';
+
+    /**
+     * Name of swatch thumbnail
+     */
+    const SWATCH_THUMBNAIL_NAME = 'swatch_thumb';
+
     /**
      * Initialize resource model
      *

app/code/Magento/Swatches/Test/Unit/Block/Product/Renderer/ConfigurableTest.php

@@ -176,8 +176,8 @@ public function testGetJsonSwatchConfigNotVisualImageType()
 
         $this->imageHelper->expects($this->exactly(2))->method('init')
             ->willReturnMap([
-                [$this->product, 'swatch_image', [], $this->imageHelper],
-                [$this->product, 'swatch_thumb', [], $this->imageHelper],
+                [$this->product, 'swatch_image', ['type' => 'swatch_image'], $this->imageHelper],
+                [$this->product, 'swatch_thumb', ['type' => 'swatch_image'], $this->imageHelper],
             ]);
 
         $this->jsonEncoder->expects($this->once())->method('encode');
@@ -222,8 +222,8 @@ public function testGetJsonSwatchConfigVisualImageType()
 
         $this->imageHelper->expects($this->exactly(2))->method('init')
             ->willReturnMap([
-                [$this->product, 'swatch_image_base', [], $this->imageHelper],
-                [$this->product, 'swatch_thumb_base', [], $this->imageHelper],
+                [$this->product, 'swatch_image_base', ['type' => 'image'], $this->imageHelper],
+                [$this->product, 'swatch_thumb_base', ['type' => 'image'], $this->imageHelper],
             ]);
 
         $this->jsonEncoder->expects($this->once())->method('encode');