MAGETWO-65466: [Backport] - Issue when deleting item from Product options grid containing more than 20 options - for 2.1

Author: Oleksandr Gorkun

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

@@ -453,8 +453,9 @@ private function fillProductOptions(Product $product, array $productOptions)
                 continue;
             }
 
-            //Ignoring ID because front-end messes it up.
-            $customOptionData['option_id'] = null;
+            if (empty($customOptionData['option_id'])) {
+                $customOptionData['option_id'] = null;
+            }
             if (isset($customOptionData['values'])) {
                 $customOptionData['values'] = array_filter(
                     $customOptionData['values'],

app/code/Magento/Catalog/view/adminhtml/web/js/components/dynamic-rows-import-custom-options.js

@@ -10,21 +10,6 @@ define([
 ], function (DynamicRows, _, utils) {
     'use strict';
 
-    var maxId = 0,
-
-    /**
-     * Stores max option_id value of the options from recordData once on initialization
-     * @param {Array} data - array with records data
-     */
-    initMaxId = function (data) {
-        if (data && data.length) {
-            maxId = _.max(data, function (record) {
-                return parseInt(record['option_id'], 10) || 0;
-            })['option_id'];
-            maxId = parseInt(maxId, 10) || 0;
-        }
-    };
-
     return DynamicRows.extend({
         defaults: {
             mappingSettings: {
@@ -39,14 +24,6 @@ define([
             identificationDRProperty: 'option_id'
         },
 
-        /** @inheritdoc */
-        initialize: function () {
-            this._super();
-            initMaxId(this.recordData());
-
-            return this;
-        },
-
         /** @inheritdoc */
         processingInsertData: function (data) {
             var options = [],
@@ -65,7 +42,16 @@ define([
                     if (currentOption.hasOwnProperty('sort_order')) {
                         delete currentOption['sort_order'];
                     }
-                    currentOption['option_id'] = ++maxId;
+                    if (currentOption.hasOwnProperty('option_id')) {
+                        delete currentOption['option_id'];
+                    }
+                    if (currentOption.values.length > 0) {
+                        currentOption.values.each(function (optionValue) {
+                            delete optionValue['option_id'];
+                            delete optionValue['option_type_id'];
+                        })
+                    }
+                    
                     options.push(currentOption);
                 });
             });
@@ -90,9 +76,7 @@ define([
 
         /** @inheritdoc */
         processingAddChild: function (ctx, index, prop) {
-            if (ctx && !_.isNumber(ctx['option_id'])) {
-                ctx['option_id'] = ++maxId;
-            } else if (!ctx) {
+            if (!ctx) {
                 this.showSpinner(true);
                 this.addChild(ctx, index, prop);