Merge remote-tracking branch 'origin/ACP2E-3972' into PR_2025_07_08_muntianu

Author: katmoon

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

@@ -987,6 +987,43 @@ public function isAttributeValid($attrCode, array $attrParams, array $rowData, $
         return true;
     }
 
+    /**
+     * Create disable image details
+     *
+     * @param mixed $rowSku
+     * @param mixed $column
+     * @param mixed $rowExistingImages
+     * @param int $storeId
+     * @return array|null
+     */
+    private function disableExistingProductImage(
+        mixed $rowSku,
+        mixed $column,
+        mixed $rowExistingImages,
+        int $storeId
+    ): ?array {
+        try {
+            $product = $this->productRepository->get($rowSku);
+            if ($imagePath = $product->getData($column)) {
+                foreach ($rowExistingImages as $existingImage) {
+                    if ($existingImage['value'] == $imagePath) {
+                        $existingImage['store_id'] = $storeId;
+
+                        return [
+                            'disabled' => 1,
+                            'imageData' => $existingImage,
+                            'exists' => true
+                        ];
+                    }
+                }
+            }
+        } catch (NoSuchEntityException) {
+            return null;
+        }
+
+        return null;
+    }
+
     /**
      * Multiple value separator getter.
      *
@@ -1918,6 +1955,14 @@ private function saveProductMediaGalleryPhase(
         $imagesByHash = [];
         foreach ($rowImages as $column => $columnImages) {
             foreach ($columnImages as $columnImageKey => $columnImage) {
+                if ($columnImage == $this->getEmptyAttributeValueConstant()) {
+                    if ($disabledImageDetails =
+                        $this->disableExistingProductImage($rowSku, $column, $rowExistingImages, $storeId)
+                    ) {
+                        $imagesForChangeVisibility[] = $disabledImageDetails;
+                    }
+                    continue;
+                }
                 $uploadedFile = $this->findImageByColumnImage(
                     $productMediaPath,
                     $rowExistingImages,

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -115,6 +115,42 @@ public function testImportProductsWithSameImages(): void
         $this->checkProductsImages('/m/a/magento_image.jpg', $this->createdProductsSkus);
     }
 
+    /**
+     * @return void
+     * @throws NoSuchEntityException
+     */
+    public function testHideImageWhenColumnContainsEmptyValue(): void
+    {
+        $productSku = 'ABC';
+        $this->moveImages('magento_image.jpg');
+        $source = $this->prepareFile('catalog_import_products_with_swatch_image.csv');
+        $this->updateUploader();
+        $errors = $this->import->setParameters([
+            'behavior' => Import::BEHAVIOR_ADD_UPDATE,
+            'entity' => ProductEntity::ENTITY,
+        ])
+            ->setSource($source)->validateData();
+        $this->assertEmpty($errors->getAllErrors());
+        $this->import->importData();
+        $this->createdProductsSkus[] = $productSku;
+        $this->checkProductsImages('/m/a/magento_image.jpg', $this->createdProductsSkus);
+
+        $this->importDataResource->cleanBunches();
+        $source = $this->prepareFile('catalog_import_products_without_swatch_image.csv');
+        $this->updateUploader();
+        $errors = $this->import->setParameters([
+            'behavior' => Import::BEHAVIOR_ADD_UPDATE,
+            'entity' => ProductEntity::ENTITY,
+        ])
+            ->setSource($source)->validateData();
+        $this->assertEmpty($errors->getAllErrors());
+        $this->import->importData();
+        $this->productRepository->cleanCache();
+        $product = $this->productRepository->get($productSku);
+        $images = $product->getMediaGalleryImages();
+        $this->assertEmpty($images->getItems());
+    }
+
     /**
      * Check product images
      *

dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/catalog_import_products_with_swatch_image.csv

@@ -0,0 +1,2 @@
+sku,name,swatch_image,swatch_image_label,attribute_set_code,product_type,product_websites
+ABC,abc,magento_image.jpg,testing,Default,simple,base

dev/tests/integration/testsuite/Magento/CatalogImportExport/_files/catalog_import_products_without_swatch_image.csv

@@ -0,0 +1,2 @@
+sku,name,swatch_image,swatch_image_label
+ABC,abc,__EMPTY__VALUE__,__EMPTY__VALUE__