* Fix flex pick count using unique sports drafted, not total season sports The flex count was calculated as `totalPicks - totalSportsInSeason`, which always returned 0 when a team drafted multiple participants from the same sport (e.g. 2 picks from UEFA Champions League with 2 sports in season = 2 - 2 = 0). Now uses the number of unique sports the team has actually drafted from, so 2 picks in 1 sport correctly shows 1 flex used. https://claude.ai/code/session_01DZ6jqgZTDEmJucanBtRCtM * Code review fixes for TeamsDraftedGrid and draft route - Fix misleading early-return message: "No picks have been made yet" only fires when there are no sports configured, so update to say "No sports have been configured for this season." - Remove unused draftOrder and team.seasonId from TeamsDraftedGrid props - Replace availableParticipants prop with sports prop to eliminate duplicate sports derivation; route already computes seasonSportsData - Add alphabetical sort to seasonSportsData so ordering is consistent - Fix availableParticipants: any[] in loader — restructure to ternary so TypeScript infers the Drizzle select type directly - Remove any annotation from seasonSportsData forEach callback (now typed) - Fix teamSportPicks.indexOf(pick) O(n) re-scan — use map callback index i https://claude.ai/code/session_01DZ6jqgZTDEmJucanBtRCtM --------- Co-authored-by: Claude <noreply@anthropic.com>
166 lines
5.3 KiB
TypeScript
166 lines
5.3 KiB
TypeScript
import { Badge } from "~/components/ui/badge";
|
|
import { useMemo } from "react";
|
|
|
|
interface TeamsDraftedGridProps {
|
|
draftSlots: Array<{
|
|
id: string;
|
|
team: {
|
|
id: string;
|
|
name: string;
|
|
};
|
|
}>;
|
|
picks: Array<{
|
|
id: string;
|
|
team: {
|
|
id: string;
|
|
name: string;
|
|
};
|
|
participant: {
|
|
id: string;
|
|
name: string;
|
|
};
|
|
sport: {
|
|
id: string;
|
|
name: string;
|
|
};
|
|
}>;
|
|
sports: Array<{
|
|
id: string;
|
|
name: string;
|
|
}>;
|
|
season: {
|
|
numFlexPicks: number;
|
|
};
|
|
}
|
|
|
|
export function TeamsDraftedGrid({
|
|
draftSlots,
|
|
picks,
|
|
sports,
|
|
season,
|
|
}: TeamsDraftedGridProps) {
|
|
// Calculate picks by team and sport
|
|
const picksByTeamAndSport = useMemo(() => {
|
|
const map = new Map<string, Map<string, typeof picks>>();
|
|
|
|
picks.forEach((pick) => {
|
|
if (!map.has(pick.team.id)) {
|
|
map.set(pick.team.id, new Map());
|
|
}
|
|
const teamMap = map.get(pick.team.id)!;
|
|
if (!teamMap.has(pick.sport.id)) {
|
|
teamMap.set(pick.sport.id, []);
|
|
}
|
|
teamMap.get(pick.sport.id)!.push(pick);
|
|
});
|
|
|
|
return map;
|
|
}, [picks]);
|
|
|
|
// Calculate flex picks used by each team
|
|
const flexPicksByTeam = useMemo(() => {
|
|
const map = new Map<string, number>();
|
|
|
|
draftSlots.forEach((slot) => {
|
|
const teamPicks = picks.filter((p) => p.team.id === slot.team.id);
|
|
const uniqueSportsPicked = new Set(teamPicks.map((p) => p.sport.id)).size;
|
|
const flexUsed = Math.max(0, teamPicks.length - uniqueSportsPicked);
|
|
map.set(slot.team.id, flexUsed);
|
|
});
|
|
|
|
return map;
|
|
}, [picks, draftSlots]);
|
|
|
|
if (sports.length === 0) {
|
|
return (
|
|
<div className="flex items-center justify-center h-full p-8 text-muted-foreground">
|
|
<p>No sports have been configured for this season.</p>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<div className="w-full h-full overflow-auto">
|
|
<table className="w-full border-collapse">
|
|
<thead className="sticky top-0 bg-background z-10">
|
|
<tr>
|
|
<th className="border-r border-b border-border p-2 text-left font-semibold min-w-[150px] bg-muted/50">
|
|
Sport
|
|
</th>
|
|
{draftSlots.map((slot, index) => {
|
|
const flexUsed = flexPicksByTeam.get(slot.team.id) || 0;
|
|
const isLast = index === draftSlots.length - 1;
|
|
return (
|
|
<th
|
|
key={slot.id}
|
|
className={`border-b border-border p-2 text-left font-semibold min-w-[180px] bg-muted/50 ${!isLast ? 'border-r' : ''}`}
|
|
>
|
|
<div className="flex flex-col gap-1">
|
|
<div className="font-semibold text-sm">
|
|
{slot.team.name}
|
|
</div>
|
|
<div className="text-xs text-muted-foreground font-normal">
|
|
{flexUsed} of {season.numFlexPicks} flex
|
|
</div>
|
|
</div>
|
|
</th>
|
|
);
|
|
})}
|
|
</tr>
|
|
</thead>
|
|
<tbody className="border-b border-border">
|
|
{sports.map((sport, sportIndex) => {
|
|
const isLastRow = sportIndex === sports.length - 1;
|
|
return (
|
|
<tr key={sport.id}>
|
|
<td className={`border-r border-border p-2 font-medium bg-muted/30 ${!isLastRow ? 'border-b' : ''}`}>
|
|
{sport.name}
|
|
</td>
|
|
{draftSlots.map((slot, slotIndex) => {
|
|
const teamSportPicks =
|
|
picksByTeamAndSport
|
|
.get(slot.team.id)
|
|
?.get(sport.id) || [];
|
|
const hasMultiplePicks = teamSportPicks.length > 1;
|
|
const isLastCol = slotIndex === draftSlots.length - 1;
|
|
|
|
return (
|
|
<td
|
|
key={`${slot.team.id}-${sport.id}`}
|
|
className={`border-border p-2 ${
|
|
hasMultiplePicks
|
|
? "bg-accent/30 font-semibold"
|
|
: "bg-background"
|
|
} ${!isLastRow ? 'border-b' : ''} ${!isLastCol ? 'border-r' : ''}`}
|
|
>
|
|
{teamSportPicks.length > 0 ? (
|
|
<div className="flex flex-col gap-1">
|
|
{teamSportPicks.map((pick, i) => (
|
|
<div
|
|
key={pick.id}
|
|
className="text-sm flex items-center gap-1"
|
|
>
|
|
<span>{pick.participant.name}</span>
|
|
{hasMultiplePicks && (
|
|
<Badge
|
|
variant="secondary"
|
|
className="text-xs px-1 py-0"
|
|
>
|
|
{i + 1}
|
|
</Badge>
|
|
)}
|
|
</div>
|
|
))}
|
|
</div>
|
|
) : null}
|
|
</td>
|
|
);
|
|
})}
|
|
</tr>
|
|
);
|
|
})}
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
);
|
|
}
|