Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 9 additions & 17 deletions src/routes/showcase/index.tsx
Original file line number Diff line number Diff line change
@@ -1,27 +1,18 @@
import { createFileRoute } from '@tanstack/react-router'
import { createFileRoute, stripSearchParams } from '@tanstack/react-router'
import * as v from 'valibot'
import { seo } from '~/utils/seo'
import { ShowcaseGallery } from '~/components/ShowcaseGallery'
import { getApprovedShowcasesQueryOptions } from '~/queries/showcases'
import {
libraryIdSchema,
showcaseUseCaseSchema,
pageNumberSchema,
pageSizeSchema,
} from '~/utils/schemas'

const searchSchema = v.object({
page: v.optional(pageNumberSchema, 1),
pageSize: v.optional(pageSizeSchema, 24),
libraryIds: v.optional(v.pipe(v.array(libraryIdSchema), v.maxLength(16))),
useCases: v.optional(v.pipe(v.array(showcaseUseCaseSchema), v.maxLength(12))),
hasSourceCode: v.optional(v.boolean()),
q: v.optional(v.pipe(v.string(), v.maxLength(120))),
})
showcaseSearchSchema,
defaultShowcaseSearch,
} from '~/utils/showcase-search'

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

function hasNonCanonicalSearch(search: v.InferOutput<typeof searchSchema>) {
function hasNonCanonicalSearch(
search: v.InferOutput<typeof showcaseSearchSchema>,
) {
return Boolean(
search.page > 1 ||
search.pageSize !== PAGE_SIZE_OPTIONS[0] ||
Expand All @@ -33,7 +24,8 @@ function hasNonCanonicalSearch(search: v.InferOutput<typeof searchSchema>) {
}

export const Route = createFileRoute('/showcase/')({
validateSearch: searchSchema,
validateSearch: showcaseSearchSchema,
search: { middlewares: [stripSearchParams(defaultShowcaseSearch)] },
loaderDeps: ({ search }) => ({
page: search.page,
pageSize: search.pageSize,
Expand Down
18 changes: 18 additions & 0 deletions src/utils/showcase-search.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import * as v from 'valibot'
import {
libraryIdSchema,
showcaseUseCaseSchema,
pageNumberSchema,
pageSizeSchema,
} from '~/utils/schemas'

export const showcaseSearchSchema = v.object({
page: v.optional(pageNumberSchema, 1),
pageSize: v.optional(pageSizeSchema, 24),
libraryIds: v.optional(v.pipe(v.array(libraryIdSchema), v.maxLength(16))),
useCases: v.optional(v.pipe(v.array(showcaseUseCaseSchema), v.maxLength(12))),
hasSourceCode: v.optional(v.boolean()),
q: v.optional(v.pipe(v.string(), v.maxLength(120))),
})

export const defaultShowcaseSearch = v.parse(showcaseSearchSchema, {})
46 changes: 46 additions & 0 deletions tests/showcase-search.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import assert from 'node:assert/strict'
import test from 'node:test'
import * as v from 'valibot'
import {
createRootRoute,
createRoute,
createRouter,
createMemoryHistory,
stripSearchParams,
} from '@tanstack/react-router'
import {
showcaseSearchSchema,
defaultShowcaseSearch,
} from '../src/utils/showcase-search'

test('showcase defaults stay available to loaders without entering the URL', async () => {
const root = createRootRoute()
const showcase = createRoute({
getParentRoute: () => root,
path: '/showcase',
validateSearch: showcaseSearchSchema,
search: { middlewares: [stripSearchParams(defaultShowcaseSearch)] },
})
const router = createRouter({
routeTree: root.addChildren([showcase]),
history: createMemoryHistory({ initialEntries: ['/showcase'] }),
})
await router.load()
assert.deepEqual(v.parse(showcaseSearchSchema, {}), { page: 1, pageSize: 24 })
assert.equal(
router.buildLocation({ to: '/showcase', search: { page: 1, pageSize: 24 } })
.href,
'/showcase',
)
const filtered = {
page: 2,
pageSize: 48,
libraryIds: ['query'],
hasSourceCode: true,
q: 'dashboard',
}
assert.deepEqual(
router.buildLocation({ to: '/showcase', search: filtered }).search,
filtered,
)
})
Loading