Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

fix: Prevent '0' being passed as the page param to paginated solution comments api (#1506)

Fahad Khan79673ac367da
diff --git a/apps/web/src/app/challenge/_components/comments/comments.hooks.tsx b/apps/web/src/app/challenge/_components/comments/comments.hooks.tsx
index 04194767..3231c604 100644
--- a/apps/web/src/app/challenge/_components/comments/comments.hooks.tsx
+++ b/apps/web/src/app/challenge/_components/comments/comments.hooks.tsx
@@ -93,7 +93,10 @@ export function useComments({ type, rootId, initialPage }: UseCommentsProps) {
description: 'The comment was successfully deleted.',
});
}
- const newPage = data?.comments.length === 1 ? commentsMeta.page - 1 : commentsMeta.page;
+ const newPage =
+ data?.comments.length === 1 && commentsMeta.page > 1
+ ? commentsMeta.page - 1
+ : commentsMeta.page;
changePage(newPage);
queryClient.invalidateQueries({
queryKey: getQueryKey({ sort: commentsMeta.sort.value, page: newPage }),
diff --git a/apps/web/src/app/challenge/_components/comments/getCommentRouteData.ts b/apps/web/src/app/challenge/_components/comments/getCommentRouteData.ts
index 5bd4e2ff..7fc3cea4 100644
--- a/apps/web/src/app/challenge/_components/comments/getCommentRouteData.ts
+++ b/apps/web/src/app/challenge/_components/comments/getCommentRouteData.ts
@@ -134,7 +134,7 @@ export async function getPaginatedComments({
});
const comments = await prisma.comment.findMany({
- skip: (page - 1) * take,
+ skip: ((page || 1) - 1) * take,
take,
where: {
rootType,
diff --git a/apps/web/src/components/Navigation/index.tsx b/apps/web/src/components/Navigation/index.tsx
index 81f469f8..c782ab0d 100644
--- a/apps/web/src/components/Navigation/index.tsx
+++ b/apps/web/src/components/Navigation/index.tsx
@@ -1,5 +1,4 @@
import { type Session } from '@repo/auth/server';
-import { Badge } from '@repo/ui/components/badge';
import {
DropdownMenu,
DropdownMenuContent,