Merge remote-tracking branch 'origin/imported-magento-magento2-31492' into 2.4-develop-pr118

Author: zakdma

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

@@ -620,15 +620,12 @@ define([
          * @param {Array} data
          */
         parsePagesData: function (data) {
-            var pages;
-
             this.relatedData = this.deleteProperty ?
                 _.filter(data, function (elem) {
                     return elem && elem[this.deleteProperty] !== this.deleteValue;
                 }, this) : data;
 
-            pages = Math.ceil(this.relatedData.length / this.pageSize) || 1;
-            this.pages(pages);
+            this._updatePagesQuantity();
         },
 
         /**
@@ -885,6 +882,18 @@ define([
             this._sort();
         },
 
+        /**
+         * Update number of pages.
+         *
+         * @private
+         * @return void
+         */
+        _updatePagesQuantity: function () {
+            var pages = Math.ceil(this.relatedData.length / this.pageSize) || 1;
+
+            this.pages(pages);
+        },
+
         /**
          * Reduce the number of pages
          *
@@ -960,6 +969,7 @@ define([
         reload: function () {
             this.clear();
             this.initChildren(false, true);
+            this._updatePagesQuantity();
 
             /* After change page size need to check existing current page */
             this._reducePages();

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

@@ -171,5 +171,38 @@ define([
             };
             expect(JSON.stringify(model.labels())).toEqual(JSON.stringify(result));
         });
+
+        it('Check _updatePagesQuantity method call.', function () {
+            model._updatePagesQuantity = jasmine.createSpy();
+
+            model.reload();
+
+            expect(model._updatePagesQuantity).toHaveBeenCalled();
+        });
+
+        it('Check number of pages is updated after reloading dynamic-rows.', function () {
+            model.pageSize = 1;
+            model.relatedData = [
+                {
+                    name: 'first'
+                },
+                {
+                    name: 'second'
+                },
+                {
+                    name: 'third'
+                }
+            ];
+
+            model.reload();
+            expect(model.pages()).toEqual(3);
+
+            model.currentPage(3);
+            model.pageSize = 2;
+
+            model.reload();
+            expect(model.pages()).toEqual(2);
+            expect(model.currentPage()).toEqual(2);
+        });
     });
 });