ACP2E-3972: Csv product import : Unable to unset a swatch image

Author: aplapana

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

@@ -987,6 +987,42 @@ 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;
+    }
+
     /**
      * Multiple value separator getter.
      *
@@ -1682,6 +1718,7 @@ protected function _saveProducts()
                     $this->saveProductToWebsitePhase($rowData);
                     $this->saveProductCategoriesPhase($rowNum, $rowData);
                     $this->saveProductTierPricesPhase($rowData, $priceIsGlobal, $tierPrices);
+                    $imagesToBeRemoved = [];
                     $this->saveProductMediaGalleryPhase(
                         $rowNum,
                         $rowData,
@@ -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,