From cbd052f4d9074fd7d5f12206740ab94f989b95c7 Mon Sep 17 00:00:00 2001 From: Kalle <38327916+Sendouc@users.noreply.github.com> Date: Sat, 2 Dec 2023 12:43:44 +0200 Subject: [PATCH] Show tournament team map pools to TO always --- .../tournament/routes/to.$id.teams.$tid.tsx | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/features/tournament/routes/to.$id.teams.$tid.tsx b/app/features/tournament/routes/to.$id.teams.$tid.tsx index 33efd6284..9539a6a32 100644 --- a/app/features/tournament/routes/to.$id.teams.$tid.tsx +++ b/app/features/tournament/routes/to.$id.teams.$tid.tsx @@ -34,11 +34,20 @@ import { Popover } from "~/components/Popover"; import type { TournamentMaplistSource } from "~/modules/tournament-map-list-generator"; import type { FindTeamsByTournamentIdItem } from "../queries/findTeamsByTournamentId.server"; import hasTournamentStarted from "../queries/hasTournamentStarted.server"; +import { canAdminTournament } from "~/permissions"; +import { getUserId } from "~/features/auth/core/user.server"; +import { notFoundIfFalsy } from "~/utils/remix"; +import * as TournamentRepository from "../TournamentRepository.server"; -export const loader = ({ params }: LoaderArgs) => { +export const loader = async ({ params, request }: LoaderArgs) => { + const user = await getUserId(request); const tournamentId = tournamentIdFromParams(params); const tournamentTeamId = tournamentTeamIdFromParams(params); + const tournament = notFoundIfFalsy( + await TournamentRepository.findById(tournamentId), + ); + const manager = getTournamentManager("SQL"); const bracket = manager.get.tournamentData(tournamentId); @@ -57,7 +66,9 @@ export const loader = ({ params }: LoaderArgs) => { : null; const sets = tournamentTeamSets({ tournamentTeamId, tournamentId }); - const revealMapPool = hasTournamentStarted(tournamentId); + const revealMapPool = + hasTournamentStarted(tournamentId) || + canAdminTournament({ user, tournament }); return { tournamentTeamId,