MAGETWO-62647: "Invalid option value" Error message is shown when delete option row without data

Author: ameysar

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

@@ -5,6 +5,11 @@
  */
 namespace Magento\Catalog\Controller\Adminhtml\Product\Initialization;
 
+/**
+ * Product initialization helper class
+ * 
+ * @package Magento\Catalog\Controller\Adminhtml\Product\Initialization
+ */
 class Helper
 {
     /**
@@ -62,16 +67,18 @@ public function __construct(
     }
 
     /**
-     * Initialize product before saving
+     * Initialize product from data
      *
      * @param \Magento\Catalog\Model\Product $product
+     * @param array $productData
      * @return \Magento\Catalog\Model\Product
+     * @throws \Magento\Framework\Exception\LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function initialize(\Magento\Catalog\Model\Product $product)
+    public function initializeFromData(\Magento\Catalog\Model\Product $product, array $productData = null)
     {
-        $productData = $this->request->getPost('product');
+        $productData = $productData ?: $this->request->getPost('product', []);
         unset($productData['custom_attributes']);
         unset($productData['extension_attributes']);
 
@@ -144,6 +151,13 @@ public function initialize(\Magento\Catalog\Model\Product $product)
                 $productData['options'],
                 $this->request->getPost('options_use_default')
             );
+            foreach ($options as &$customOptionData) {
+                if (isset($customOptionData['values'])) {
+                    $customOptionData['values'] = array_filter($customOptionData['values'], function ($valueData) {
+                        return empty($valueData['is_delete']);
+                    });
+                }
+            }
             $product->setProductOptions($options);
         }
 
@@ -154,6 +168,18 @@ public function initialize(\Magento\Catalog\Model\Product $product)
         return $product;
     }
 
+    /**
+     * Initialize product before saving
+     *
+     * @param \Magento\Catalog\Model\Product $product
+     * @return \Magento\Catalog\Model\Product
+     */
+    public function initialize(\Magento\Catalog\Model\Product $product)
+    {
+        $productData = $this->request->getPost('product', []);
+        return $this->initializeFromData($product, $productData);
+    }
+
     /**
      * Merge product and default options for product
      *

app/code/Magento/Catalog/Controller/Adminhtml/Product/NewAction.php

@@ -8,7 +8,13 @@
 
 use Magento\Backend\App\Action;
 use Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Framework\App\ObjectManager;
 
+/**
+ * Class that handle new product creation
+ *
+ * @package Magento\Catalog\Controller\Adminhtml\Product
+ */
 class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
@@ -26,6 +32,11 @@ class NewAction extends \Magento\Catalog\Controller\Adminhtml\Product
      */
     protected $resultForwardFactory;
 
+    /**
+     * @var Initialization\Helper
+     */
+    protected $initializationHelper;
+
     /**
      * @param Action\Context $context
      * @param Builder $productBuilder
@@ -69,7 +80,7 @@ public function execute()
         if ($productData) {
             $stockData = isset($productData['stock_data']) ? $productData['stock_data'] : [];
             $productData['stock_data'] = $this->stockFilter->filter($stockData);
-            $product->addData($productData);
+            $product = $this->getInitializationHelper()->initializeFromData($product, $productData);
         }
 
         $this->_eventManager->dispatch('catalog_product_new_action', ['product' => $product]);
@@ -92,4 +103,16 @@ public function execute()
 
         return $resultPage;
     }
+
+    /**
+     * @deprecated
+     * @return Initialization\Helper
+     */
+    protected function getInitializationHelper()
+    {
+        if (null === $this->initializationHelper) {
+            $this->initializationHelper = ObjectManager::getInstance()->get(Initialization\Helper::class);
+        }
+        return $this->initializationHelper;
+    }
 }

app/code/Magento/Catalog/Controller/Adminhtml/Product/Validate.php

@@ -8,6 +8,7 @@
 
 use Magento\Backend\App\Action;
 use Magento\Catalog\Controller\Adminhtml\Product;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Product validate
@@ -18,6 +19,7 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product
 {
     /**
      * @var \Magento\Framework\Stdlib\DateTime\Filter\Date
+     * @deprecated
      */
     protected $_dateFilter;
 
@@ -39,6 +41,11 @@ class Validate extends \Magento\Catalog\Controller\Adminhtml\Product
     /** @var \Magento\Catalog\Model\ProductFactory */
     protected $productFactory;
 
+    /**
+     * @var Initialization\Helper
+     */
+    protected $initializationHelper;
+
     /**
      * @param Action\Context $context
      * @param Builder $productBuilder
@@ -78,7 +85,7 @@ public function execute()
         $response->setError(false);
 
         try {
-            $productData = $this->getRequest()->getPost('product');
+            $productData = $this->getRequest()->getPost('product', []);
 
             if ($productData && !isset($productData['stock_data']['use_config_manage_stock'])) {
                 $productData['stock_data']['use_config_manage_stock'] = 0;
@@ -102,19 +109,7 @@ public function execute()
             if ($productId) {
                 $product->load($productId);
             }
-
-            $dateFieldFilters = [];
-            $attributes = $product->getAttributes();
-            foreach ($attributes as $attrKey => $attribute) {
-                if ($attribute->getBackend()->getType() == 'datetime') {
-                    if (array_key_exists($attrKey, $productData) && $productData[$attrKey] != '') {
-                        $dateFieldFilters[$attrKey] = $this->_dateFilter;
-                    }
-                }
-            }
-            $inputFilter = new \Zend_Filter_Input($dateFieldFilters, [], $productData);
-            $productData = $inputFilter->getUnescaped();
-            $product->addData($productData);
+            $product = $this->getInitializationHelper()->initializeFromData($product, $productData);
 
             /* set restrictions for date ranges */
             $resource = $product->getResource();
@@ -140,4 +135,16 @@ public function execute()
 
         return $this->resultJsonFactory->create()->setJsonData($response->toJson());
     }
+
+    /**
+     * @return Initialization\Helper
+     * @deprecated
+     */
+    protected function getInitializationHelper()
+    {
+        if (null === $this->initializationHelper) {
+            $this->initializationHelper = ObjectManager::getInstance()->get(Initialization\Helper::class);
+        }
+        return $this->initializationHelper;
+    }
 }