Merge remote-tracking branch 'local/ACP2E-741' into PR_19_May_2022_Odubovyk

Author: o-dubovyk

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php

@@ -121,6 +121,24 @@ class Helper
      */
     private $categoryLinkFactory;
 
+    /**
+     * @var array
+     */
+    private $productDataKeys = [
+        'weight',
+        'special_price',
+        'cost',
+        'country_of_manufacture',
+        'description',
+        'short_description',
+        'meta_description',
+        'meta_keyword',
+        'meta_title',
+        'page_layout',
+        'custom_design',
+        'gift_wrapping_price'
+    ];
+
     /**
      * Constructor
      *
@@ -203,6 +221,12 @@ public function initializeFromData(Product $product, array $productData)
             $productData['product_has_weight'] = 0;
         }
 
+        foreach ($productData as $key => $value) {
+            if (in_array($key, $this->productDataKeys) && $value === '') {
+                $productData[$key] = null;
+            }
+        }
+
         foreach (['category_ids', 'website_ids'] as $field) {
             if (!isset($productData[$field])) {
                 $productData[$field] = [];

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Product/Initialization/HelperTest.php

@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Catalog\Controller\Adminhtml\Product\Initialization;
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Test for Initialization Helper
+ */
+class HelperTest extends TestCase
+{
+    /**
+     * @var Helper
+     */
+    private $helper;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp(): void
+    {
+        $this->helper = Bootstrap::getObjectManager()->get(Helper::class);
+    }
+
+    /**
+     * Test that method resets product data
+     *
+     * @magentoDataFixture Magento/Catalog/_files/multiple_products.php
+     */
+    public function testInitializeFromData()
+    {
+        /** @var ProductRepositoryInterface $productRepository */
+        $productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+        $product = $productRepository->get('simple1');
+
+        $productData = [
+            'weight' => null,
+            'special_price' => null,
+            'cost' => null,
+            'description' => null,
+            'short_description' => null,
+            'meta_description' => null,
+            'meta_keyword' => null,
+            'meta_title' => null,
+        ];
+
+        $resultProduct = $this->helper->initializeFromData($product, $productData);
+
+        foreach (array_keys($productData) as $key) {
+            $this->assertEquals(null, $resultProduct->getData($key));
+        }
+    }
+}