From 5eb62c070196f6a0b65d4c4bf64dfddfb22bd9b3 Mon Sep 17 00:00:00 2001 From: Presley Pizzo Date: Mon, 7 Nov 2022 22:38:07 +0000 Subject: [PATCH 1/6] Hide pagination widget when not needed. Don't merge until count is in. --- site/src/components/PaginationWidget/PaginationWidget.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/site/src/components/PaginationWidget/PaginationWidget.tsx b/site/src/components/PaginationWidget/PaginationWidget.tsx index e3765e524a398..e46bc0c53954d 100644 --- a/site/src/components/PaginationWidget/PaginationWidget.tsx +++ b/site/src/components/PaginationWidget/PaginationWidget.tsx @@ -36,10 +36,15 @@ export const PaginationWidget = ({ const numPages = numRecords ? Math.ceil(numRecords / numRecordsPerPage) - : undefined + : 0 const firstPageActive = currentPage === 1 && numPages !== 0 const lastPageActive = currentPage === numPages && numPages !== 0 + // if beyond page 1, show pagination widget on an empty page so the user can navigate + if (currentPage === 1 && numPages <= 1) { + return null + } + return (
- + +
+ - - -
+ +
+ ) } From bff70248635a703d16f4b50ef68299698c2b88a9 Mon Sep 17 00:00:00 2001 From: Presley Pizzo Date: Tue, 8 Nov 2022 16:42:54 +0000 Subject: [PATCH 4/6] Remove story --- .../components/PaginationWidget/PaginationWidget.stories.tsx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/site/src/components/PaginationWidget/PaginationWidget.stories.tsx b/site/src/components/PaginationWidget/PaginationWidget.stories.tsx index 6e36bff4ac1b8..e05a112e0729b 100644 --- a/site/src/components/PaginationWidget/PaginationWidget.stories.tsx +++ b/site/src/components/PaginationWidget/PaginationWidget.stories.tsx @@ -25,11 +25,6 @@ const Template: Story = ( args: PaginationWidgetProps, ) => -export const UnknownPageNumbers = Template.bind({}) -UnknownPageNumbers.args = { - numRecords: undefined, -} - export const LessThan8Pages = Template.bind({}) LessThan8Pages.args = { numRecords: 84, From 04564709952a855dfdf9419362b7c738129479a6 Mon Sep 17 00:00:00 2001 From: Presley Pizzo Date: Tue, 8 Nov 2022 17:49:48 +0000 Subject: [PATCH 5/6] Fix bug --- site/src/components/PaginationWidget/PaginationWidget.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/site/src/components/PaginationWidget/PaginationWidget.tsx b/site/src/components/PaginationWidget/PaginationWidget.tsx index 62ceaeb67ea95..930da4d164ee6 100644 --- a/site/src/components/PaginationWidget/PaginationWidget.tsx +++ b/site/src/components/PaginationWidget/PaginationWidget.tsx @@ -61,8 +61,7 @@ export const PaginationWidget = ({ /> - {numPages && - buildPagedList(numPages, currentPage).map((page) => + {buildPagedList(numPages, currentPage).map((page) => typeof page !== "number" ? ( Date: Tue, 8 Nov 2022 17:51:26 +0000 Subject: [PATCH 6/6] Format --- .../PaginationWidget/PaginationWidget.tsx | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/site/src/components/PaginationWidget/PaginationWidget.tsx b/site/src/components/PaginationWidget/PaginationWidget.tsx index 930da4d164ee6..d247f29ed59d7 100644 --- a/site/src/components/PaginationWidget/PaginationWidget.tsx +++ b/site/src/components/PaginationWidget/PaginationWidget.tsx @@ -62,23 +62,23 @@ export const PaginationWidget = ({ {buildPagedList(numPages, currentPage).map((page) => - typeof page !== "number" ? ( - - ) : ( - send({ type: "GO_TO_PAGE", page })} - /> - ), - )} + typeof page !== "number" ? ( + + ) : ( + send({ type: "GO_TO_PAGE", page })} + /> + ), + )}