MAGETWO-52172: [TD] "Use default value" checkbox is missing for Custom Options on product form

Author: magicbunneh

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

@@ -156,14 +156,12 @@ public function initializeFromData(\Magento\Catalog\Model\Product $product, arra
 
         $inputFilter = new \Zend_Filter_Input($dateFieldFilters, [], $productData);
         $productData = $inputFilter->getUnescaped();
-        $productOptions = [];
 
         if (isset($productData['options'])) {
-            foreach ($productData['options'] as $option) {
-                $productOptions[$option['option_id']] = $option;
-            }
-
+            $productOptions = $productData['options'];
             unset($productData['options']);
+        } else {
+            $productOptions = [];
         }
 
         $product->addData($productData);
@@ -317,11 +315,13 @@ public function mergeProductOptions($productOptions, $overwriteOptions)
             return $productOptions;
         }
 
-        foreach ($productOptions as $optionId => $option) {
+        foreach ($productOptions as $index => $option) {
+            $optionId = $option['option_id'];
+            
             if (isset($overwriteOptions[$optionId])) {
                 foreach ($overwriteOptions[$optionId] as $fieldName => $overwrite) {
                     if (!empty($overwrite) && isset($option[$fieldName]) && isset($option['default_' . $fieldName])) {
-                        $productOptions[$optionId][$fieldName] = $option['default_' . $fieldName];
+                        $productOptions[$index][$fieldName] = $option['default_' . $fieldName];
                     }
                 }
             }

app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/Initialization/HelperTest.php

@@ -212,8 +212,8 @@ public function testInitialize()
             ->method('setOptionId');
 
         $optionsData = [
-            'option1' => ['option_id' => 1, 'is_delete' => true, 'name' => 'name1', 'price' => 'price1'],
-            'option2' => ['option_id' => 2, 'is_delete' => false, 'name' => 'name1', 'price' => 'price1'],
+            'option1' => ['is_delete' => true, 'name' => 'name1', 'price' => 'price1'],
+            'option2' => ['is_delete' => false, 'name' => 'name1', 'price' => 'price1'],
         ];
         $productData = [
             'stock_data' => ['stock_data'],
@@ -326,25 +326,72 @@ public function testInitialize()
     public function mergeProductOptionsDataProvider()
     {
         return [
-            [
+            'options are not array, empty array is returned' => [
                 null,
                 [],
                 [],
             ],
-            [
-                ['key' => 'val'],
+            'replacement is not array, original options are returned' => [
+                ['val'],
                 null,
-                ['key' => 'val'],
+                ['val'],
             ],
-            [
-                ['key' => ['key1' => 'val1', 'key2' => 'val2', 'default_key' => 'val3', 'default_key2' => 'val4']],
-                ['key' => ['key1' => '0', 'key2' => '1']],
-                ['key' => ['key1' => 'val1', 'key2' => 'val4', 'default_key' => 'val3', 'default_key2' => 'val4']],
+            'ids do not match, no replacement occurs' => [
+                [
+                    [
+                        'option_id' => '3',
+                        'key1' => 'val1',
+                        'default_key1' => 'val2'
+                    ]
+                ],
+                [4 => ['key1' => '1']],
+                [
+                    [
+                        'option_id' => '3',
+                        'key1' => 'val1',
+                        'default_key1' => 'val2'
+                    ]
+                ]
             ],
-            [
-                ['key' => ['key1' => 'val1', 'key2' => 'val2', 'default_key1' => 'val3']],
-                ['key' => ['key1' => '1', 'key2' => '1']],
-                ['key' => ['key1' => 'val3', 'key2' => 'val2', 'default_key1' => 'val3']],
+            'key2 is replaced, key1 is not (checkbox is not checked)' => [
+                [
+                    [
+                        'option_id' => '5',
+                        'key1' => 'val1',
+                        'key2' => 'val2',
+                        'default_key1' => 'val3',
+                        'default_key2' => 'val4'
+                    ]
+                ],
+                [5 => ['key1' => '0', 'key2' => '1']],
+                [
+                    [
+                        'option_id' => '5',
+                        'key1' => 'val1',
+                        'key2' => 'val4',
+                        'default_key1' => 'val3',
+                        'default_key2' => 'val4'
+                    ]
+                ]
+            ],
+            'key1 is replaced, key2 has no default value' => [
+                [
+                    [
+                        'option_id' => '7',
+                        'key1' => 'val1',
+                        'key2' => 'val2',
+                        'default_key1' => 'val3'
+                    ]
+                ],
+                [7 => ['key1' => '1', 'key2' => '1']],
+                [
+                    [
+                        'option_id' => '7',
+                        'key1' => 'val3',
+                        'key2' => 'val2',
+                        'default_key1' => 'val3'
+                    ]
+                ],
             ],
         ];
     }