Skip to content

Fix: showcase pagination per-page selector now works correctly. #721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
an1ndra wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −7
Open

Fix: showcase pagination per-page selector now works correctly. #721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 deletions src/components/ShowcaseGallery.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { Button } from '~/ui'
import { useCurrentUser } from '~/hooks/useCurrentUser'
import { useLoginModal } from '~/contexts/LoginModalContext'
import type { LibraryId } from '~/libraries'
import { PAGE_SIZE_OPTIONS } from '~/routes/showcase'

export function ShowcaseGallery() {
const navigate = useNavigate({ from: '/showcase/' })
Expand All @@ -24,11 +25,13 @@ export function ShowcaseGallery() {
const currentUser = useCurrentUser()
const { openLoginModal } = useLoginModal()

const pageSize = search.pageSize ?? 24

const { data, isLoading } = useQuery(
getApprovedShowcasesQueryOptions({
pagination: {
page: search.page,
pageSize: 24,
pageSize,
},
filters: {
libraryIds: search.libraryIds,
Expand Down Expand Up @@ -69,7 +72,7 @@ export function ShowcaseGallery() {
// Snapshot previous values
const previousShowcases = queryClient.getQueryData(
getApprovedShowcasesQueryOptions({
pagination: { page: search.page, pageSize: 24 },
pagination: { page: search.page, pageSize },
filters: {
libraryIds: search.libraryIds,
useCases: search.useCases as ShowcaseUseCase[],
Expand Down Expand Up @@ -113,7 +116,7 @@ export function ShowcaseGallery() {
// Optimistically update showcase score
queryClient.setQueryData(
getApprovedShowcasesQueryOptions({
pagination: { page: search.page, pageSize: 24 },
pagination: { page: search.page, pageSize },
filters: {
libraryIds: search.libraryIds,
useCases: search.useCases as ShowcaseUseCase[],
Expand Down Expand Up @@ -154,7 +157,7 @@ export function ShowcaseGallery() {
if (context?.previousShowcases) {
queryClient.setQueryData(
getApprovedShowcasesQueryOptions({
pagination: { page: search.page, pageSize: 24 },
pagination: { page: search.page, pageSize },
filters: {
libraryIds: search.libraryIds,
useCases: search.useCases as ShowcaseUseCase[],
Expand Down Expand Up @@ -251,6 +254,16 @@ export function ShowcaseGallery() {
})
}

const handlePageSizeChange = (newPageSize: number) => {
navigate({
search: (prev: typeof search) => ({
...prev,
pageSize: newPageSize,
page: 1,
}),
})
}

const handleSearchChange = (q: string) => {
navigate({
search: (prev: typeof search) => ({
Expand Down Expand Up @@ -358,12 +371,14 @@ export function ShowcaseGallery() {
currentPage={search.page - 1}
totalPages={data.pagination.totalPages}
totalItems={data.pagination.total}
pageSize={24}
pageSize={pageSize}
onPageChange={handlePageChange}
onPageSizeChange={() => {}}
onPageSizeChange={handlePageSizeChange}
canGoPrevious={search.page > 1}
canGoNext={search.page < data.pagination.totalPages}
itemLabel="projects"
showPageSizeSelector
pageSizeOptions={[...PAGE_SIZE_OPTIONS]}
/>
</div>
)}
Expand Down
6 changes: 5 additions & 1 deletion src/routes/showcase/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,20 @@ import { libraryIdSchema, showcaseUseCaseSchema } from '~/utils/schemas'

const searchSchema = v.object({
page: v.optional(v.number(), 1),
pageSize: v.optional(v.number(), 24),
libraryIds: v.optional(v.array(libraryIdSchema)),
useCases: v.optional(v.array(showcaseUseCaseSchema)),
hasSourceCode: v.optional(v.boolean()),
q: v.optional(v.string()),
})

export const PAGE_SIZE_OPTIONS = [24, 48, 96, 192] as const

export const Route = createFileRoute('/showcase/')({
validateSearch: searchSchema,
loaderDeps: ({ search }) => ({
page: search.page,
pageSize: search.pageSize,
libraryIds: search.libraryIds,
useCases: search.useCases,
hasSourceCode: search.hasSourceCode,
Expand All @@ -27,7 +31,7 @@ export const Route = createFileRoute('/showcase/')({
getApprovedShowcasesQueryOptions({
pagination: {
page: deps.page,
pageSize: 24,
pageSize: deps.pageSize,
},
filters: {
libraryIds: deps.libraryIds,
Expand Down