[AP-6104] Fixing pagination issue (#778)

* fixing pagination issue

* fixing pagination issue

* fixing pagination issue

* fixing pagination issue

* bumped version to 11.4.1

* reverting non PR related changes

Author: aurimasatas

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nordcloud/gnui",
   "description": "Nordcloud Design System - a collection of reusable React components used in Nordcloud's SaaS products",
-  "version": "11.4.0",
+  "version": "11.4.1",
   "license": "MIT",
   "repository": {
     "type": "git",

src/components/extendedPagination/ExtendedPagination.spec.tsx

@@ -161,6 +161,42 @@ test("shows `prev` and 'next' button for start index 1", () => {
   expect(screen.getByTestId("prev-page")).toBeInTheDocument();
 });
 
+test("shows trailing jump on page 3 when there are 6 pages and start index is 1", () => {
+  getComponent({
+    count: 119,
+    from: 60,
+    size: 20,
+    firstPage: 1,
+  });
+
+  expect(screen.getByTestId("last-page")).toBeInTheDocument();
+  expect(screen.getByTestId("last-page-dots")).toBeInTheDocument();
+});
+
+test("does not show trailing jump on page 4 when there are 6 pages and start index is 1", () => {
+  getComponent({
+    count: 119,
+    from: 80,
+    size: 20,
+    firstPage: 1,
+  });
+
+  expect(screen.queryByTestId("last-page")).not.toBeInTheDocument();
+  expect(screen.queryByTestId("last-page-dots")).not.toBeInTheDocument();
+});
+
+test("keeps trailing jump visible on page 3 when there are 7 pages and start index is 1", () => {
+  getComponent({
+    count: 139,
+    from: 60,
+    size: 20,
+    firstPage: 1,
+  });
+
+  expect(screen.getByTestId("last-page")).toBeInTheDocument();
+  expect(screen.getByTestId("last-page-dots")).toBeInTheDocument();
+});
+
 test("notifies about changing page", () => {
   getComponent(getParams());
   const button = screen.getByTestId("button-1");

src/components/extendedPagination/ExtendedPagination.tsx

@@ -48,6 +48,8 @@ function Pagination({
     }
   };
 
+  const pages = [...getPages()].filter((index) => index < nPages);
+
   const setPage = (pageNumber: number) => {
     if (currentPage !== pageNumber) {
       set(pageNumber * size);
@@ -57,7 +59,7 @@ function Pagination({
   const showFirstPageJump =
     currentPage >= baseNumberOfPages && nPages > baseNumberOfPages;
   const showLastPageJump =
-    currentPage + baseNumberOfPages <= nPages && nPages > baseNumberOfPages;
+    nPages > baseNumberOfPages && !pages.includes(nPages - 1);
 
   return (
     <nav
@@ -96,26 +98,24 @@ function Pagination({
           </li>
         </When>
 
-        {[...getPages()]
-          .filter((index) => index < nPages)
-          .map((index) => {
-            return (
-              <li key={`p${index + firstPage}`}>
-                <button
-                  type="button"
-                  disabled={index < 0}
-                  data-testid={`button-${index + firstPage}`}
-                  className={`pagination-link ${
-                    index + firstPage === currentPage ? `current` : ""
-                  }`}
-                  onClick={() => setPage(index + firstPage)}
-                  onKeyDown={() => setPage(index + firstPage)}
-                >
-                  <span>{index + 1}</span>
-                </button>
-              </li>
-            );
-          })}
+        {pages.map((index) => {
+          return (
+            <li key={`p${index + firstPage}`}>
+              <button
+                type="button"
+                disabled={index < 0}
+                data-testid={`button-${index + firstPage}`}
+                className={`pagination-link ${
+                  index + firstPage === currentPage ? `current` : ""
+                }`}
+                onClick={() => setPage(index + firstPage)}
+                onKeyDown={() => setPage(index + firstPage)}
+              >
+                <span>{index + 1}</span>
+              </button>
+            </li>
+          );
+        })}
 
         <When condition={showLastPageJump}>
           <li className="dots" data-testid="last-page-dots">