chore: quick refactor for buildPagedList

Parkreiner · Parkreiner · commit 96553685614e · 2023-11-07T18:02:54.000Z
diff --git a/site/src/components/PaginationWidget/utils.ts b/site/src/components/PaginationWidget/utils.ts
@@ -29,36 +29,35 @@ export const buildPagedList = (
   numPages: number,
   activePage: number,
 ): ("left" | "right" | number)[] => {
-  if (numPages > TOTAL_PAGE_BLOCKS) {
-    let pages = [];
-    const leftBound = activePage - PAGE_NEIGHBORS;
-    const rightBound = activePage + PAGE_NEIGHBORS;
-    const beforeLastPage = numPages - 1;
-    const startPage = leftBound > 2 ? leftBound : 2;
-    const endPage = rightBound < beforeLastPage ? rightBound : beforeLastPage;
+  if (numPages <= TOTAL_PAGE_BLOCKS) {
+    return range(1, numPages);
+  }
 
-    pages = range(startPage, endPage);
+  const leftBound = activePage - PAGE_NEIGHBORS;
+  const rightBound = activePage + PAGE_NEIGHBORS;
+  const beforeLastPage = numPages - 1;
+  const startPage = leftBound > 2 ? leftBound : 2;
+  const endPage = rightBound < beforeLastPage ? rightBound : beforeLastPage;
 
-    const singleSpillOffset = PAGES_TO_DISPLAY - pages.length - 1;
-    const hasLeftOverflow = startPage > 2;
-    const hasRightOverflow = endPage < beforeLastPage;
-    const leftOverflowPage = "left" as const;
-    const rightOverflowPage = "right" as const;
+  let pages: ReturnType<typeof buildPagedList> = range(startPage, endPage);
 
-    if (hasLeftOverflow && !hasRightOverflow) {
-      const extraPages = range(startPage - singleSpillOffset, startPage - 1);
-      pages = [leftOverflowPage, ...extraPages, ...pages];
-    } else if (!hasLeftOverflow && hasRightOverflow) {
-      const extraPages = range(endPage + 1, endPage + singleSpillOffset);
-      pages = [...pages, ...extraPages, rightOverflowPage];
-    } else if (hasLeftOverflow && hasRightOverflow) {
-      pages = [leftOverflowPage, ...pages, rightOverflowPage];
-    }
+  const singleSpillOffset = PAGES_TO_DISPLAY - pages.length - 1;
+  const hasLeftOverflow = startPage > 2;
+  const hasRightOverflow = endPage < beforeLastPage;
+  const leftOverflowPage = "left";
+  const rightOverflowPage = "right";
 
-    return [1, ...pages, numPages];
+  if (hasLeftOverflow && !hasRightOverflow) {
+    const extraPages = range(startPage - singleSpillOffset, startPage - 1);
+    pages = [leftOverflowPage, ...extraPages, ...pages];
+  } else if (!hasLeftOverflow && hasRightOverflow) {
+    const extraPages = range(endPage + 1, endPage + singleSpillOffset);
+    pages = [...pages, ...extraPages, rightOverflowPage];
+  } else if (hasLeftOverflow && hasRightOverflow) {
+    pages = [leftOverflowPage, ...pages, rightOverflowPage];
   }
 
-  return range(1, numPages);
+  return [1, ...pages, numPages];
 };
 
 /**
