diff --git a/app/features/calendar/CalendarRepository.server.ts b/app/features/calendar/CalendarRepository.server.ts index ddd8bec97..b87bd3bd6 100644 --- a/app/features/calendar/CalendarRepository.server.ts +++ b/app/features/calendar/CalendarRepository.server.ts @@ -153,6 +153,11 @@ export async function findAllBetweenTwoTimestamps({ "User.discordName", "User.discordDiscriminator", "CalendarEventRanks.nthAppearance", + eb + .selectFrom("Tournament") + .select("Tournament.settings") + .whereRef("Tournament.id", "=", "CalendarEvent.tournamentId") + .as("tournamentSettings"), hasBadge, jsonArrayFrom( eb @@ -227,7 +232,6 @@ function tagsArray(args: { ) as Array; if (args.hasBadge) tags.unshift("BADGE"); - if (args.tournamentId) tags.unshift("FULL_TOURNAMENT"); return tags; } diff --git a/app/features/calendar/calendar-constants.ts b/app/features/calendar/calendar-constants.ts index 9f4b4a860..ed69d8de3 100644 --- a/app/features/calendar/calendar-constants.ts +++ b/app/features/calendar/calendar-constants.ts @@ -47,9 +47,6 @@ export const tags = { CARDS: { color: "#E4D00A", }, - FULL_TOURNAMENT: { - color: "#FFC0CB", - }, }; export const REG_CLOSES_AT_OPTIONS = [ diff --git a/app/features/calendar/components/Tags.tsx b/app/features/calendar/components/Tags.tsx index 47f5a4f13..0aab426d4 100644 --- a/app/features/calendar/components/Tags.tsx +++ b/app/features/calendar/components/Tags.tsx @@ -12,9 +12,11 @@ export function Tags({ tags, badges, onDelete, + tournamentRankedStatus, }: { tags: Array; badges?: CalendarRepository.FindAllBetweenTwoTimestampsItem["badgePrizes"]; + tournamentRankedStatus?: "RANKED" | "UNRANKED"; /** Called when tag delete button clicked. If undefined delete buttons won't be shown. */ onDelete?: (tag: CalendarEventTag) => void; @@ -25,6 +27,12 @@ export function Tags({ return (