Leahnaya/sendou.ink
1
0
Fork 0
mirror of https://github.com/Sendouc/sendou.ink.git synced 2026-09-28 22:31:22 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix unexpected server error when trying to access non-existing tournament team page

Browse Source
This commit is contained in:
Kalle
2025-03-02 11:43:23 +02:00
parent c73440b889
commit 3ab1ceaf60
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/features/tournament/routes/to.$id.teams.$tid.tsx
View File

@@ -5,12 +5,12 @@ import { useTranslation } from "react-i18next";
import { Avatar } from "~/components/Avatar";
import { ModeImage, StageImage } from "~/components/Image";
import { Placement } from "~/components/Placement";
import { Redirect } from "~/components/Redirect";
import { SendouButton } from "~/components/elements/Button";
import { SendouPopover } from "~/components/elements/Popover";
import type {
TournamentData,
TournamentDataTeam,
import {
type TournamentData,
type TournamentDataTeam,
tournamentDataCached,
} from "~/features/tournament-bracket/core/Tournament.server";
import { tournamentTeamPageParamsSchema } from "~/features/tournament-bracket/tournament-bracket-schemas.server";
import type { TournamentMaplistSource } from "~/modules/tournament-map-list-generator";
@@ -19,7 +19,6 @@ import { parseParams } from "~/utils/remix.server";
import {
teamPage,
tournamentMatchPage,
tournamentPage,
tournamentTeamPage,
userPage,
userSubmittedImage,
@@ -56,19 +55,27 @@ export const meta: MetaFunction<typeof loader> = (args) => {
});
};
export const loader = ({ params }: LoaderFunctionArgs) => {
export const loader = async ({ params }: LoaderFunctionArgs) => {
const tournamentId = tournamentIdFromParams(params);
const tournamentTeamId = parseParams({
params,
schema: tournamentTeamPageParamsSchema,
}).tid;
const tournament = await tournamentDataCached({ tournamentId });
if (
!tournament ||
!tournament.ctx.teams.some((t) => t.id === tournamentTeamId)
) {
throw new Response(null, { status: 404 });
}
// TODO: could be inferred from tournament data (winCounts too)
const sets = tournamentTeamSets({ tournamentTeamId, tournamentId });
return {
tournamentTeamId,
sets,
// TODO: could be inferred from tournament data
winCounts: winCounts(sets),
};
};
@@ -79,10 +86,7 @@ export default function TournamentTeamPage() {
const teamIndex = tournament.ctx.teams.findIndex(
(t) => t.id === data.tournamentTeamId,
);
const team = tournament.teamById(data.tournamentTeamId);
if (!team) {
return <Redirect to={tournamentPage(tournament.ctx.id)} />;
}
const team = tournament.teamById(data.tournamentTeamId)!;
return (
<div className="stack lg">