From a2d3c9e20b08dbc232be8bd27834525c4c87357b Mon Sep 17 00:00:00 2001
From: Mil4n0r <morenocarmonaenrique@gmail.com>
Date: Thu, 26 Sep 2024 12:54:48 +0200
Subject: [PATCH] Added fix to cover filtering issue with paginator

---
 .../lib/src/resultset-table/ResultsetTable.tsx     | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/lib/src/resultset-table/ResultsetTable.tsx b/packages/lib/src/resultset-table/ResultsetTable.tsx
index f68330b574..ddc7e2fdfa 100644
--- a/packages/lib/src/resultset-table/ResultsetTable.tsx
+++ b/packages/lib/src/resultset-table/ResultsetTable.tsx
@@ -105,11 +105,15 @@ const DxcResultsetTable = ({
     if (!hidePaginator) {
       if (rows.length === 0) {
         changePage(0);
-      } else if (rows.length < prevRowCountRef.current) {
-        const lastPage = Math.ceil(rows.length / itemsPerPage);
-        const prevLastPage = Math.ceil(prevRowCountRef.current / itemsPerPage);
-        if (lastPage < prevLastPage) {
-          changePage(Math.min(lastPage, page));
+      } else {
+        if (page === 0) {
+          changePage(1);
+        } else if (rows.length < prevRowCountRef.current) {
+          const lastPage = Math.ceil(rows.length / itemsPerPage);
+          const prevLastPage = Math.ceil(prevRowCountRef.current / itemsPerPage);
+          if (lastPage < prevLastPage) {
+            changePage(Math.min(lastPage, page));
+          }
         }
       }
       prevRowCountRef.current = rows.length;