Compare commits

..

No commits in common. "e1caae9157059f352f16d48a1e88331dd4f77cc0" and "dc94403160a57fffb038cdd8fd89a7796ec4fc99" have entirely different histories.

10 changed files with 18 additions and 41 deletions

View file

@ -11,7 +11,6 @@ import {
} from "~/components/ui/card";
import { formatEventDate } from "~/lib/date-utils";
import type { UpcomingParticipantEvent } from "~/models/scoring-event";
import { isBracketMajor } from "~/lib/event-utils";
export interface CalendarPanelEvent extends UpcomingParticipantEvent {
sportName: string;
@ -62,7 +61,7 @@ function EventRow({ event, showLeague }: { event: CalendarPanelEvent; showLeague
? format(gameDate, "MMM d")
: formatEventDate(event.eventDate);
const participantCount = event.relevantParticipants.length;
const isAllCompete = event.eventType !== "playoff_game" && event.eventType !== "group_stage_match" && !isBracketMajor(event.simulatorType);
const isAllCompete = event.eventType !== "playoff_game" && event.eventType !== "group_stage_match";
const displayName = event.matchLabel
? `${event.name}${event.matchLabel}`
: event.name;

View file

@ -8,7 +8,6 @@ import { GradientIcon } from "~/components/ui/GradientIcon";
import { formatEventDate } from "~/lib/date-utils";
import { BRACKT_GRADIENT } from "~/lib/brand";
import type { CalendarPanelEvent } from "./UpcomingCalendarPanel";
import { isBracketMajor } from "~/lib/event-utils";
interface Props {
events: CalendarPanelEvent[];
@ -46,7 +45,7 @@ function groupEvents(events: CalendarPanelEvent[]): GroupedEvent[] {
for (const event of events) {
const existing = map.get(event.id);
const isAllCompete = event.eventType !== "playoff_game" && event.eventType !== "group_stage_match" && !isBracketMajor(event.simulatorType);
const isAllCompete = event.eventType !== "playoff_game" && event.eventType !== "group_stage_match";
const leagueEntry: LeagueParticipants = {
leagueId: event.leagueId ?? "unknown",

View file

@ -11,7 +11,6 @@ import {
import { Trophy, Target, Flag, Calendar, Users } from "lucide-react";
import { formatEventDate } from "~/lib/date-utils";
import type { UpcomingParticipantEvent } from "~/models/scoring-event";
import { isBracketMajor } from "~/lib/event-utils";
import { SportIcon } from "~/components/SportIcon";
interface SportSeasonCardProps {
@ -32,7 +31,7 @@ function EventLine({ event }: { event: UpcomingParticipantEvent }) {
const dateStr = gameDate
? format(gameDate, "MMM d")
: formatEventDate(event.eventDate);
const isAllCompete = event.eventType !== "playoff_game" && !isBracketMajor(event.simulatorType);
const isAllCompete = event.eventType !== "playoff_game";
const count = event.relevantParticipants.length;
const displayName = event.matchLabel
? `${event.name}${event.matchLabel}`

View file

@ -1,12 +0,0 @@
const BRACKET_MAJOR_SIMULATOR_TYPES = [
"cs2_major_qualifying_points",
"tennis_qualifying_points",
] as const;
/**
* Returns true for major_tournament events that use a bracket (CS2, Tennis).
* Golf (golf_qualifying_points) uses manual result entry and returns false.
*/
export function isBracketMajor(simulatorType: string | null | undefined): boolean {
return BRACKET_MAJOR_SIMULATOR_TYPES.includes(simulatorType as typeof BRACKET_MAJOR_SIMULATOR_TYPES[number]);
}

View file

@ -232,7 +232,7 @@ export async function deleteScoringEvent(
}
await db.transaction(async (tx) => {
if (event.eventType === "playoff_game" || event.eventType === "major_tournament") {
if (event.eventType === "playoff_game") {
await tx
.delete(schema.seasonParticipantResults)
.where(eq(schema.seasonParticipantResults.sportsSeasonId, event.sportsSeasonId));
@ -241,7 +241,7 @@ export async function deleteScoringEvent(
await tx.delete(schema.scoringEvents).where(eq(schema.scoringEvents.id, eventId));
});
if (event.eventType === "playoff_game" || event.eventType === "major_tournament") {
if (event.eventType === "playoff_game") {
await recalculateAffectedLeagues(event.sportsSeasonId, db);
}
@ -355,8 +355,6 @@ export interface UpcomingParticipantEvent {
matchLabel: string | null;
eventType: string;
sportsSeasonId: string;
/** simulatorType from the parent sport — used to distinguish bracket-majors from manual-entry majors */
simulatorType?: string | null;
/** Only the current user's drafted participants involved in this event */
relevantParticipants: Array<{ id: string; name: string }>;
}

View file

@ -26,7 +26,6 @@ export interface SeasonWithSportsSeasons extends Season {
type: string;
slug: string;
iconUrl: string | null;
simulatorType: string | null;
};
};
}>;

View file

@ -68,7 +68,7 @@ export async function loader({ params }: Route.LoaderArgs) {
throw new Response("Event not found", { status: 404 });
}
if (event.eventType !== "playoff_game" && event.eventType !== "major_tournament") {
if (event.eventType !== "playoff_game") {
throw new Response("This event is not a playoff event", { status: 400 });
}

View file

@ -22,7 +22,6 @@ import {
import { Badge } from "~/components/ui/badge";
import { ArrowLeft, Trophy, CheckCircle2, Pencil, Trash2, Brackets, Save } from "lucide-react";
import { getEventTypeLabel } from "~/models/scoring-event";
import { isBracketMajor } from "~/lib/event-utils";
import {
Table,
TableBody,
@ -98,8 +97,6 @@ export default function EventResults({
const { sportsSeason, event, participants, results, participantResults, seasonResults, notParticipatingIds } = loaderData;
const [hasChanges, setHasChanges] = useState(false);
const isBracketEvent = event.eventType === "playoff_game" || isBracketMajor(sportsSeason.sport?.simulatorType);
// Create a map of participants with results for easy lookup
const participantResultsMap = new Map(
results.map((r: { seasonParticipant: { id: string } }) => [r.seasonParticipant.id, r])
@ -235,7 +232,7 @@ export default function EventResults({
</p>
</div>
<div className="flex items-center gap-2">
{isBracketEvent && (
{event.eventType === "playoff_game" && (
<Button variant="outline" asChild>
<Link to={`/admin/sports-seasons/${sportsSeason.id}/events/${event.id}/bracket`}>
<Brackets className="mr-2 h-4 w-4" />
@ -493,7 +490,7 @@ export default function EventResults({
)}
{/* Batch Paste Results — primary entry for qualifying events */}
{event.isQualifyingEvent && event.eventType !== "final_standings" && !isBracketEvent && !event.isComplete && (
{event.isQualifyingEvent && event.eventType !== "final_standings" && event.eventType !== "playoff_game" && !event.isComplete && (
<BatchResultEntry
participants={participants}
sportsSeasonId={sportsSeason.id}
@ -504,7 +501,7 @@ export default function EventResults({
)}
{/* Regular Result Entry for other event types */}
{event.eventType !== "final_standings" && !isBracketEvent && !event.isComplete && (
{event.eventType !== "final_standings" && event.eventType !== "playoff_game" && !event.isComplete && (
<Card>
<CardHeader>
<CardTitle>Add Result</CardTitle>
@ -596,8 +593,8 @@ export default function EventResults({
</Card>
)}
{/* Current Results - Hide for bracket events since they use the bracket */}
{!isBracketEvent && (
{/* Current Results - Hide for playoff events since they use the bracket */}
{event.eventType !== "playoff_game" && (
<Card>
<CardHeader>
<div className="flex items-center justify-between">
@ -719,8 +716,8 @@ export default function EventResults({
</Card>
)}
{/* Bracket Explanation Card for Bracket Events */}
{isBracketEvent && !participantResults?.length && (
{/* Bracket Explanation Card for Playoff Events */}
{event.eventType === "playoff_game" && !participantResults?.length && (
<Card className="border-electric/30 bg-electric/10">
<CardHeader>
<CardTitle className="text-electric">
@ -754,12 +751,12 @@ export default function EventResults({
{/* Participant Results with Fantasy Points */}
{participantResults && participantResults.length > 0 && (
<Card className={isBracketEvent ? "border-emerald-500/30" : ""}>
<Card className={event.eventType === "playoff_game" ? "border-emerald-500/30" : ""}>
<CardHeader>
<div className="flex items-center justify-between">
<div>
<CardTitle className={isBracketEvent ? "text-emerald-400" : ""}>
{isBracketEvent ? (
<CardTitle className={event.eventType === "playoff_game" ? "text-emerald-400" : ""}>
{event.eventType === "playoff_game" ? (
<>
<Trophy className="inline mr-2 h-5 w-5" />
Fantasy Points Awarded (from Bracket)
@ -769,13 +766,13 @@ export default function EventResults({
)}
</CardTitle>
<CardDescription>
{isBracketEvent
{event.eventType === "playoff_game"
? `${participantResults.length} participants assigned placements from bracket results`
: "Points calculated from bracket placements (sorted by position)"
}
</CardDescription>
</div>
{isBracketEvent && event.isComplete && (
{event.eventType === "playoff_game" && event.isComplete && (
<Badge variant="default" className="bg-emerald-500">
<CheckCircle2 className="mr-1 h-3 w-3" />
Bracket Finalized

View file

@ -130,7 +130,6 @@ export async function loader(args: Route.LoaderArgs) {
return events.map((event) => ({
...event,
simulatorType: ss.sport.simulatorType ?? null,
sportName: ss.sport.name,
sportSeasonName: ss.name,
leagueName: league.name,

View file

@ -62,7 +62,6 @@ export async function loader(args: Route.LoaderArgs) {
return events.map((event) => ({
...event,
simulatorType: ss.sport.simulatorType ?? null,
sportName: ss.sport.name,
sportSeasonName: ss.name,
leagueName: league.name,