Merge pull request #12 from ghiscoding/bugfix/invalid-pagination-preset

fix(demo): out of boundaries page Grid Preset should be unset
ghiscoding · May 23, 2024 · 34754b9 · 34754b9
2 parents 136637b + 6d08e67
commit 34754b9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/bootstrap5-i18n-demo/src/examples/slickgrid/Example31.tsx b/bootstrap5-i18n-demo/src/examples/slickgrid/Example31.tsx
@@ -332,7 +332,7 @@ export default class Example31 extends React.Component<Props, State> {
           }
 
           // Read the result field from the JSON response.
-          const firstRow = skip;
+          let firstRow = skip;
           let filteredData = data;
           if (columnFilters) {
             for (const columnId in columnFilters) {
@@ -366,6 +366,12 @@ export default class Example31 extends React.Component<Props, State> {
             }
             countTotalItems = filteredData.length;
           }
+
+          // make sure page skip is not out of boundaries, if so reset to first page & remove skip from query
+          if (firstRow > filteredData.length) {
+            query = query.replace(`$skip=${firstRow}`, '');
+            firstRow = 0;
+          }
           const updatedData = filteredData.slice(firstRow, firstRow + top!);
 
           setTimeout(() => {

diff --git a/bootstrap5-i18n-demo/src/examples/slickgrid/Example5.tsx b/bootstrap5-i18n-demo/src/examples/slickgrid/Example5.tsx
@@ -338,7 +338,7 @@ export default class Example5 extends React.Component<Props, State> {
           }
 
           // Read the result field from the JSON response.
-          const firstRow = skip;
+          let firstRow = skip;
           let filteredData = data;
           if (columnFilters) {
             for (const columnId in columnFilters) {
@@ -375,6 +375,12 @@ export default class Example5 extends React.Component<Props, State> {
             }
             countTotalItems = filteredData.length;
           }
+
+          // make sure page skip is not out of boundaries, if so reset to first page & remove skip from query
+          if (firstRow > filteredData.length) {
+            query = query.replace(`$skip=${firstRow}`, '');
+            firstRow = 0;
+          }
           const updatedData = filteredData.slice(firstRow, firstRow + top!);
 
           setTimeout(() => {