From 930b74b9f3c799d4c03526e3a6f25c38bdc11433 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Tue, 21 Mar 2023 10:35:09 -0500 Subject: [PATCH 1/2] fix: Page offset on workspace pagination was incorrect --- site/src/pages/WorkspacesPage/data.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/site/src/pages/WorkspacesPage/data.ts b/site/src/pages/WorkspacesPage/data.ts index 5ea3bbeeff1f9..a6aa4c536f95b 100644 --- a/site/src/pages/WorkspacesPage/data.ts +++ b/site/src/pages/WorkspacesPage/data.ts @@ -32,7 +32,9 @@ export const useWorkspacesData = ({ getWorkspaces({ q: query, limit: limit, - offset: page, + // If the page is <= 0, just use offset 0. This usually happens + // if the page is not provided. + offset: page <= 0 ? 0 : (page-1)*limit , }), refetchInterval: 5_000, }) From 89aa6ccb073314bfb38062680a5c74fa3319df74 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Tue, 21 Mar 2023 10:51:38 -0500 Subject: [PATCH 2/2] Make fmt --- site/src/pages/WorkspacesPage/data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/src/pages/WorkspacesPage/data.ts b/site/src/pages/WorkspacesPage/data.ts index a6aa4c536f95b..799d94dc6158e 100644 --- a/site/src/pages/WorkspacesPage/data.ts +++ b/site/src/pages/WorkspacesPage/data.ts @@ -34,7 +34,7 @@ export const useWorkspacesData = ({ limit: limit, // If the page is <= 0, just use offset 0. This usually happens // if the page is not provided. - offset: page <= 0 ? 0 : (page-1)*limit , + offset: page <= 0 ? 0 : (page - 1) * limit, }), refetchInterval: 5_000, })