Merge remote-tracking branch 'origin/MC-33523' into 2.4.1-develop-pr25

Author: serhii-balko

app/code/Magento/ConfigurableProduct/view/adminhtml/web/js/components/dynamic-rows-configurable.js

@@ -212,7 +212,7 @@ define([
             );
 
             tmpData = data.slice(this.pageSize * (this.currentPage() - 1),
-                                 this.pageSize * (this.currentPage() - 1) + this.pageSize);
+                                 this.pageSize * (this.currentPage() - 1) + parseInt(this.pageSize, 10));
 
             this.source.set(this.dataScope + '.' + this.index, []);
 

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

@@ -657,7 +657,7 @@ define([
 
             startIndex = page || this.startIndex;
 
-            return dataRecord.slice(startIndex, this.startIndex + this.pageSize);
+            return dataRecord.slice(startIndex, this.startIndex + parseInt(this.pageSize, 10));
         },
 
         /**
@@ -960,6 +960,9 @@ define([
         reload: function () {
             this.clear();
             this.initChildren(false, true);
+
+            /* After change page size need to check existing current page */
+            this._reducePages();
         },
 
         /**