Merge remote-tracking branch 'origin/MAGETWO-63321' into BUGS

Author: sevos1984

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

@@ -167,8 +167,7 @@ define([
          * Sets record data to cache
          */
         setRecordDataToCache: function (data) {
-            this.recordDataCache = this.recordDataCache && data.length > this.recordDataCache.length ?
-                data : this.recordDataCache;
+            this.recordDataCache = data;
         },
 
         /**
@@ -270,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));
         },
 
@@ -327,7 +328,7 @@ define([
         },
 
         /**
-         * Set default dynamic-rows state
+         * Set default dynamic-rows state or state before changing data
          *
          * @param {Array} data - defaultState data
          */
@@ -625,6 +626,19 @@ define([
             this.pages(pages);
         },
 
+        /**
+         * Reinit record data in order to remove deleted values
+         *
+         * @return void
+         */
+        reinitRecordData: function () {
+            this.recordData(
+                _.filter(this.recordData(), function (elem) {
+                    return elem && elem[this.deleteProperty] !== this.deleteValue;
+                }, this)
+            );
+        },
+
         /**
          * Get items to rendering on current page
          *
@@ -633,7 +647,6 @@ define([
         getChildItems: function (data, page) {
             var dataRecord = data || this.relatedData,
                 startIndex;
-
             this.startIndex = (~~this.currentPage() - 1) * this.pageSize;
 
             startIndex = page || this.startIndex;
@@ -672,9 +685,8 @@ define([
             this.bubble('addChild', false);
 
             if (this.relatedData.length && this.relatedData.length % this.pageSize === 0) {
-                this.clear();
                 this.pages(this.pages() + 1);
-                this.currentPage(this.pages());
+                this.nextPage();
             } else if (~~this.currentPage() !== this.pages()) {
                 this.currentPage(this.pages());
             }
@@ -690,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());
-            }
         },
 
         /**
@@ -717,8 +724,8 @@ define([
                 return false;
             }
 
-            this.clear();
             this.initChildren();
+            return true;
         },
 
         /**
@@ -743,13 +750,15 @@ define([
          * Change page to next
          */
         nextPage: function () {
+            this.clear();
             this.currentPage(this.currentPage() + 1);
         },
 
         /**
          * Change page to previous
          */
         previousPage: function () {
+            this.clear();
             this.currentPage(this.currentPage() - 1);
         },
 
@@ -827,24 +836,21 @@ define([
         deleteRecord: function (index, recordId) {
             var recordInstance,
                 lastRecord,
-                recordsData,
-                childs;
+                recordsData;
 
             if (this.deleteProperty) {
+                recordsData = this.recordData();
                 recordInstance = _.find(this.elems(), function (elem) {
                     return elem.index === index;
                 });
                 recordInstance.destroy();
                 this.elems([]);
                 this._updateCollection();
                 this.removeMaxPosition();
-                this.recordData()[recordInstance.index][this.deleteProperty] = this.deleteValue;
-                this.recordData.valueHasMutated();
-                childs = this.getChildItems();
-
-                if (childs.length > this.elems().length) {
-                    this.addChild(false, childs[childs.length - 1][this.identificationProperty], false);
-                }
+                recordsData[recordInstance.index][this.deleteProperty] = this.deleteValue;
+                this.recordData(recordsData);
+                this.reinitRecordData();
+                this.reload();
             } else {
                 this.update = true;
 
@@ -866,11 +872,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

@@ -0,0 +1,77 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+define([
+    'Magento_Ui/js/dynamic-rows/dynamic-rows'
+], function (DynamicRows) {
+    'use strict';
+
+    var model,
+        ElementMock = function (index) {
+            return {
+                destroy: function () {},
+                index: index
+            };
+        };
+
+    beforeEach(function(done) {
+        model = new DynamicRows({});
+        done();
+    });
+
+    describe('Magento_Ui/js/dynamic-rows/dynamic-rows', function () {
+        it('changePage without Records', function() {
+            model.recordData = function () {
+                return {
+                    length: 0
+                };
+            };
+
+            expect(model.changePage(1)).toBeFalsy();
+        });
+
+        it('changePage with Fake Page', function() {
+            model.pages = function () {
+                return 3;
+            };
+
+            expect(model.changePage(4)).toBeFalsy();
+        });
+
+        it('changePage', function() {
+            model.startIndex = 0;
+            model.pageSize = 3;
+            model.relatedData = [
+                {"a": "b"},
+                {"b": "c"},
+                {"v": "g"}
+            ];
+
+            model.pages = function () {
+                return 3;
+            };
+            model.changePage(2);
+
+            expect(model.templates.record.recordId).toBe(2);//last record number is 3
+        });
+
+        it ('deleteRecord with Delete Property', function () {
+            var elems,
+                recordInstanceMock = new ElementMock(1),
+                elem2 = new ElementMock(2);
+            spyOn(recordInstanceMock, "destroy");
+            model.recordData({1: {}});
+            elems = [
+                recordInstanceMock,
+                elem2
+            ];
+            model.elems(elems);
+            model.deleteProperty = true;
+            model.deleteRecord(1, 1);
+            expect(model.recordData()).toEqual([]);
+        });
+    });
+});