Skip to content

Add bounds when trying to query creator pages #62

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

Merged
dylhack merged 1 commit into from
Mar 17, 2026
Merged

Add bounds when trying to query creator pages #62

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
37 changes: 32 additions & 5 deletions src/TTX.Web/routes/creators/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ const TAKE = 20;
export const handler = define.handlers({
async GET(ctx) {
const client = getApiClient(ctx.state.token);
const index = Number(ctx.url.searchParams.get("page") ?? "1");

const rawPage = Number(ctx.url.searchParams.get("page") ?? "1");
// Default to first page if we go to index 0 or invalid value
const index = rawPage >= 1 ? rawPage : 1;

const orderDir =
ctx.url.searchParams.get("orderDir") == OrderDirection.Ascending
? OrderDirection.Ascending
Expand Down Expand Up @@ -43,6 +47,17 @@ export const handler = define.handlers({
orderDir,
);

// Make sure we are in bounds, if not redirect to the last page
const totalPages = Math.max(1, Math.ceil(page.total / TAKE));
if (index > totalPages) {
const url = new URL(ctx.url);
url.searchParams.set("page", totalPages.toString());
return new Response(null, {
status: 302,
headers: { Location: url.toString() },
});
}

return { data: { page, orderBy, orderDir, index } };
},
});
Expand Down Expand Up @@ -320,9 +335,14 @@ function CreatorTable(props: {
</div>
<div class="join max-md:scale-90 max-md:flex-wrap max-md:justify-center">
<a
href={nav({ index: props.index - 1 })}
href={props.index > 1
? nav({ index: props.index - 1 })
: undefined}
aria-label="Previous page"
class="join-item btn rounded-l-2xl border-gray-200 max-md:px-2 max-md:text-sm dark:border-gray-700"
aria-disabled={props.index <= 1}
class={`join-item btn rounded-l-2xl border-gray-200 max-md:px-2 max-md:text-sm dark:border-gray-700 ${
props.index <= 1 ? "pointer-events-none opacity-50" : ""
}`}
>
«
</a>
Expand All @@ -340,8 +360,15 @@ function CreatorTable(props: {
</a>
))}
<a
href={nav({ index: props.index + 1 })}
class="join-item btn rounded-r-2xl border-gray-200 max-md:px-2 max-md:text-sm dark:border-gray-700"
href={props.index < totalPages
? nav({ index: props.index + 1 })
: undefined}
aria-disabled={props.index >= totalPages}
class={`join-item btn rounded-r-2xl border-gray-200 max-md:px-2 max-md:text-sm dark:border-gray-700 ${
props.index >= totalPages
? "pointer-events-none opacity-50"
: ""
}`}
>
»
</a>
Expand Down
Loading