From 06f6e5a814279033dc5ef8dff998f66456eb3abd Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Mon, 16 Oct 2023 13:06:11 +0000 Subject: [PATCH 1/2] fix(site): do not return next page if the current size is lower than limit --- site/src/api/queries/workspaceBuilds.ts | 3 +++ site/src/pages/WorkspacePage/WorkspacePage.tsx | 2 ++ 2 files changed, 5 insertions(+) diff --git a/site/src/api/queries/workspaceBuilds.ts b/site/src/api/queries/workspaceBuilds.ts index fb35a735ab3ef..98049a89e7ffe 100644 --- a/site/src/api/queries/workspaceBuilds.ts +++ b/site/src/api/queries/workspaceBuilds.ts @@ -23,6 +23,9 @@ export const infiniteWorkspaceBuilds = ( return { queryKey: ["workspaceBuilds", workspaceId, req], getNextPageParam: (lastPage, pages) => { + if (lastPage.length < limit) { + return undefined; + } return pages.length + 1; }, queryFn: ({ pageParam = 0 }) => { diff --git a/site/src/pages/WorkspacePage/WorkspacePage.tsx b/site/src/pages/WorkspacePage/WorkspacePage.tsx index 2c8dc3d8b9d7d..db79f4e1fc134 100644 --- a/site/src/pages/WorkspacePage/WorkspacePage.tsx +++ b/site/src/pages/WorkspacePage/WorkspacePage.tsx @@ -41,6 +41,8 @@ export const WorkspacePage: FC = () => { enabled: Boolean(workspace), }); + console.log(buildsQuery.hasNextPage); + if (pageError) { return ( From 631fc7fd769c37d65f83566065024261f444018f Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Mon, 16 Oct 2023 13:27:00 +0000 Subject: [PATCH 2/2] Remove console log --- site/src/pages/WorkspacePage/WorkspacePage.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/site/src/pages/WorkspacePage/WorkspacePage.tsx b/site/src/pages/WorkspacePage/WorkspacePage.tsx index db79f4e1fc134..2c8dc3d8b9d7d 100644 --- a/site/src/pages/WorkspacePage/WorkspacePage.tsx +++ b/site/src/pages/WorkspacePage/WorkspacePage.tsx @@ -41,8 +41,6 @@ export const WorkspacePage: FC = () => { enabled: Boolean(workspace), }); - console.log(buildsQuery.hasNextPage); - if (pageError) { return (