MAGETWO-63321: Issue when deleting item from Product options grid containing more than 20 options

Author: Sergii Kovalenko

app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js

@@ -156,7 +156,7 @@ define([
                 dnd: '${ $.dndConfig.name }'
             },
             pages: 1,
-            pageSize: 20,
+            pageSize: 2,
             relatedData: [],
             currentPage: 1,
             recordDataCache: [],
@@ -269,10 +269,12 @@ define([
          * @param {Number|String} id
          */
         deleteHandler: function (index, id) {
+            var defaultState;
             this.setDefaultState();
+            defaultState = this.defaultPagesState[this.currentPage()];
             this.processingDeleteRecord(index, id);
             this.pagesChanged[this.currentPage()] =
-                !compareArrays(this.defaultPagesState[this.currentPage()], this.arrayFilter(this.getChildItems()));
+                !compareArrays(defaultState, this.arrayFilter(this.getChildItems()));
             this.changed(_.some(this.pagesChanged));
         },
 
@@ -326,7 +328,7 @@ define([
         },
 
         /**
-         * Set default dynamic-rows state
+         * Set default dynamic-rows state or state before changing data
          *
          * @param {Array} data - defaultState data
          */
@@ -700,11 +702,6 @@ define([
          */
         processingDeleteRecord: function (index, recordId) {
             this.deleteRecord(index, recordId);
-
-            if (this.getChildItems().length <= 0 && this.pages() !== 1) {
-                this.pages(this.pages() - 1);
-                this.currentPage(this.pages());
-            }
         },
 
         /**
@@ -874,11 +871,14 @@ define([
                 this.update = false;
             }
 
+            this._reducePages();
+            this._sort();
+        },
+
+        _reducePages: function() {
             if (this.pages() < ~~this.currentPage()) {
                 this.currentPage(this.pages());
             }
-
-            this._sort();
         },
 
         /**

dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/dynamic-rows/dynamic.rows.test.js

@@ -9,7 +9,13 @@ define([
 ], function (DynamicRows) {
     'use strict';
 
-    var model;
+    var model,
+        ElementMock = function (index) {
+            return {
+                destroy: function () {},
+                index: index
+            };
+        };
 
     beforeEach(function(done) {
         model = new DynamicRows({});
@@ -53,11 +59,14 @@ define([
         });
 
         it ('deleteRecord with Delete Property', function () {
-            var elems, recordInstanceMock;
+            var elems,
+                recordInstanceMock = new ElementMock(1),
+                elem2 = new ElementMock(2);
 
+            spyOn(recordInstanceMock, "destroy").toHaveBeenCalled();
             elems = [
-                {index: 1, label: "a"},
-                {index: 2, label: "b"}
+                recordInstanceMock,
+                elem2
             ];
             model.elems(elems);
             model.deleteProperty = true;