8255: Export Products action doesn't consider hide_for_product_page value.

Author: nmalevanec

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -1670,17 +1670,10 @@ protected function _saveProducts()
                     $disabledImages = array_flip(
                         explode($this->getMultipleValueSeparator(), $rowData['_media_is_disabled'])
                     );
-                    foreach ($disabledImages as $disabledImage => $position) {
-                        $uploadedFile = $this->uploadMediaFiles($disabledImage, true);
-                        $uploadedFile = $uploadedFile ?: $this->getSystemFile($disabledImage);
-                        $mediaGallery[$storeId][$rowSku][$uploadedFile] = [
-                            'attribute_id' => $this->getMediaGalleryAttributeId(),
-                            'label' => $rowLabels[self::COL_MEDIA_IMAGE][$position] ?? '',
-                            'position' => $position,
-                            'disabled' => 1,
-                            'value' => $disabledImage,
-                            'store_id' => $storeId,
-                        ];
+                    if (empty($rowImages)) {
+                        foreach (array_keys($disabledImages) as $disabledImage) {
+                            $rowImages[self::COL_MEDIA_IMAGE][] = $disabledImage;
+                        }
                     }
                 }
                 $rowData[self::COL_MEDIA_IMAGE] = [];
@@ -1740,10 +1733,6 @@ protected function _saveProducts()
                     }
                 }
 
-                //Add images to restore "hide from product page" value for specified store and product.
-                if (empty($mediaGallery[$storeId][$rowSku])) {
-                    $mediaGallery[$storeId][$rowSku]['all'] = ['restore' => true];
-                }
                 // 6. Attributes phase
                 $rowStore = (self::SCOPE_STORE == $rowScope)
                     ? $this->storeResolver->getStoreCodeToId($rowData[self::COL_STORE])

app/code/Magento/CatalogImportExport/Model/Import/Product/MediaGalleryProcessor.php

@@ -109,7 +109,6 @@ public function __construct(
     public function saveMediaGallery(array $mediaGalleryData)
     {
         $this->initMediaGalleryResources();
-        $mediaGalleryData = $this->restoreDisabledImage($mediaGalleryData);
         $mediaGalleryDataGlobal = array_replace_recursive(...$mediaGalleryData);
         $imageNames = [];
         $multiInsertData = [];
@@ -134,9 +133,7 @@ public function saveMediaGallery(array $mediaGalleryData)
             $this->connection->select()->from($this->mediaGalleryTableName, ['value_id', 'value'])
                 ->where('value IN (?)', $imageNames)
         );
-        if (!empty($multiInsertData)) {
-            $this->connection->insertOnDuplicate($this->mediaGalleryTableName, $multiInsertData);
-        }
+        $this->connection->insertOnDuplicate($this->mediaGalleryTableName, $multiInsertData);
         $newMediaSelect = $this->connection->select()->from($this->mediaGalleryTableName, ['value_id', 'value'])
             ->where('value IN (?)', $imageNames);
         if (array_keys($oldMediaValues)) {
@@ -263,39 +260,6 @@ private function initMediaGalleryResources()
         }
     }
 
-    /**
-     * Set product images 'disable' = 0 for specified store.
-     *
-     * @param array $mediaGalleryData
-     * @return array
-     */
-    private function restoreDisabledImage(array $mediaGalleryData)
-    {
-        $restoreData = [];
-        foreach (array_keys($mediaGalleryData) as $storeId) {
-            foreach ($mediaGalleryData[$storeId] as $productSku => $mediaGalleryRows) {
-                $productId = $this->skuProcessor->getNewSku($productSku)[$this->getProductEntityLinkField()];
-                $restoreData[] = sprintf(
-                    'store_id = %s and %s = %s',
-                    $storeId,
-                    $this->getProductEntityLinkField(),
-                    $productId
-                );
-                if (isset($mediaGalleryRows['all']['restore'])) {
-                    unset($mediaGalleryData[$storeId][$productSku]);
-                }
-            }
-        }
-
-        $this->connection->update(
-            $this->mediaGalleryValueTableName,
-            ['disabled' => 0],
-            new \Zend_Db_Expr(implode(' or ', $restoreData))
-        );
-
-        return $mediaGalleryData;
-    }
-
     /**
      * Save media gallery data per store.
      *

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php

@@ -1983,7 +1983,7 @@ public function testImportImageForNonDefaultStore()
         $product = $this->getProductBySku('simple_with_images');
         $mediaGallery = $product->getData('media_gallery');
         foreach ($mediaGallery['images'] as $image) {
-            $image['file'] === 'magento_image.jpg'
+            $image['file'] === '/m/a/magento_image.jpg'
                 ? self::assertSame('1', $image['disabled'])
                 : self::assertSame('0', $image['disabled']);
         }