Fix pagination issue in grid view

Fixes #111
axelor · Jun 8, 2023 · 27341f8 · 27341f8
1 parent 94e52db
commit 27341f8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/axelor-front/src/views/grid/grid.tsx b/axelor-front/src/views/grid/grid.tsx
@@ -375,6 +375,8 @@ function GridInner(props: ViewProps<GridView>) {
 
   const canPrev = offset > 0;
   const canNext = offset + limit < totalCount;
+  const minPage = 1;
+  const maxPage = Math.ceil(totalCount / limit);
   const hasRowSelected = !!selectedRows?.length;
   const currentPage = useMemo(() => {
     const hasPageSet = pageSetRef.current;
@@ -596,11 +598,11 @@ function GridInner(props: ViewProps<GridView>) {
             canNext,
             onPrev: () =>
               switchTo("grid", {
-                route: { id: String(currentPage - 1) },
+                route: { id: String(Math.max(minPage, currentPage - 1)) },
               }),
             onNext: () =>
               switchTo("grid", {
-                route: { id: String(currentPage + 1) },
+                route: { id: String(Math.min(maxPage, currentPage + 1)) },
               }),
             text: () => <PageText dataStore={dataStore} />,
           }}