@wavemaker/app-ng-runtime 11.15.4-rc.250 → 11.15.5-rc.253

package/components/data/pagination/bundles/index.umd.js

@@ -122,9 +122,40 @@
                 }
                 this.allowpagesizechange = this.parent.allowpagesizechange;
                 if (this.allowpagesizechange)
-                    this.defaultPageSizeOptions = this.parent?.pagesizeoptions ? this.parent.pagesizeoptions?.split(',').map(Number).sort((a, b) => a - b) : [];
+                    this.defaultPageSizeOptions = this.normalizeToNumberArray(this.parent?.pagesizeoptions);
             }, 0);
         }
+        normalizeToNumberArray(input) {
+            if (!input)
+                return [];
+            let arr;
+            if (Array.isArray(input)) {
+                arr = input;
+            }
+            else if (typeof input === "string") {
+                const trimmed = input.trim();
+                // handle "[1,2,3]"
+                if (trimmed.startsWith("[") && trimmed.endsWith("]")) {
+                    try {
+                        arr = JSON.parse(trimmed);
+                    }
+                    catch {
+                        arr = [];
+                    }
+                }
+                else {
+                    // handle "1,2,3"
+                    arr = trimmed.split(",");
+                }
+            }
+            else {
+                return [];
+            }
+            return arr
+                .map(v => Number(v))
+                .filter(v => !isNaN(v))
+                .sort((a, b) => a - b);
+        }
         setResult(result) {
             // TODO: Emit event only if result is changed
             this.result = result;
@@ -528,6 +559,9 @@
             if (parts[0] === 'Variables' || parts[0] === 'Widgets') {
                 bindPagingOptions = `${parts[0]}.${parts[1]}.pagination`;
             }
+            else if (parts[0] === 'App' && parts[1] === 'activePage' && parts[2] === 'Variables' && parts[3]) {
+                bindPagingOptions = `App.activePage.Variables.${parts[3]}.pagination`;
+            }
             if (!binddatasource && dataset && !datasetBoundExpr) {
                 this.dataset = dataset;
                 if (this._debouncedApplyDataset) {
@@ -597,11 +631,13 @@
                         else {
                             this.pageSizeOptions = lodashEs.range(this.actualPageSize, Math.max(this.actualPageSize + 1, this.actualPageSize + totalElements), this.actualPageSize); // here data has only that page data and pagesize has totalNoof Elements
                         }
-                        if (widgetState?.selectedItem && widgetState.actualpagesize !== widgetState.pagesize) {
+                        if (widgetState?.selectedItem && widgetState.actualpagesize !== widgetState.pagesize
+                            && +this.prevPageSize !== +(widgetState.pagesize || this.maxResults)) {
+                            const newPageSize = +(widgetState.pagesize || this.maxResults);
                             if (!this.prevPageSize) {
-                                this.prevPageSize = this.actualPageSize || data?.length;
+                                this.prevPageSize = widgetState.actualpagesize || this.actualPageSize || data?.length;
                             }
-                            const updatedItems = this.handleStateParamsforNewPageSize(widgetState.selectedItem, this.prevPageSize, data?.length);
+                            const updatedItems = this.handleStateParamsforNewPageSize(widgetState.selectedItem, this.prevPageSize, newPageSize);
                             if (updatedItems) {
                                 this.parent.statePersistence.setWidgetState(this.parent, {
                                     pagination: 1,
@@ -609,8 +645,8 @@
                                     actualpagesize: this.actualPageSize || this.maxResults,
                                     selectedItem: updatedItems
                                 });
-                                this.prevPageSize = undefined;
                             }
+                            this.prevPageSize = newPageSize;
                         }
                     }
                     else {
@@ -723,11 +759,13 @@
         onPageSizeChange($event, newPageSize) {
             const widgetState = this.parent.statePersistence.getWidgetState(this.parent);
             let updatedItems;
+            const oldPageSize = widgetState?.pagesize || this.maxResults;
             if (widgetState?.selectedItem) {
-                updatedItems = this.handleStateParamsforNewPageSize(widgetState.selectedItem, this.maxResults, +newPageSize);
+                updatedItems = this.handleStateParamsforNewPageSize(widgetState.selectedItem, oldPageSize, +newPageSize);
             }
-            this.actualPageSize = this.actualPageSize || this.maxResults;
+            this.actualPageSize = widgetState?.actualpagesize || this.actualPageSize || oldPageSize;
             this.maxResults = +newPageSize;
+            this.prevPageSize = +newPageSize;
             this.maxResultsEmitter.emit(this.maxResults);
             if (this.isDataSourceHasPaging() && this.datasource) {
                 this.datasource.maxResults = this.maxResults;