* feat: redesign playoff bracket UI with compact layout and owner display
- Replace per-match Card wrappers with compact left-vs-right rows (stacks on mobile)
- Add TeamOwnerBadge component (colored avatar + team name + username), matching the standings "Drafted By" style
- Show owner info below each participant name in bracket matches
- Add TBD forward-reference labels ("Winner of Quarterfinals M1") computed via buildFeederMap
- Add Final Rankings table below bracket showing all participants ranked by elimination round
- Fix round ordering in loader: sort by match count descending (more matches = earlier round)
- Add loser relation to playoff matches query for elimination tracking
- Extract getAvatarColor to app/lib/color-hash.ts (shared across GroupStageDisplay, SeasonStandings, TeamOwnerBadge)
- Extract groupMatchesByRound helper; share grouped map between feeder computation and render
- Remove dead getTeamAvatar from SeasonStandings after TeamOwnerBadge adoption
- Add tests for groupMatchesByRound and buildFeederMap (7 tests)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* feat: add draft order card to league home page
Show draft order on the league home page when order is set and season
is in pre_draft or draft status. Includes team name, owner name, and
a link to the draft room.
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
* feat: enhance playoff bracket with eliminated teams, points, and ownership highlights
- Show eliminated teams (including group-stage losers) in Final Rankings card
- Display computed fantasy points per participant in rankings table
- Card title switches between "Eliminated Teams" and "Final Rankings" based on bracket completion
- Highlight owned participants with electric blue name, dot indicator, and card border in bracket matches
- Highlight owned rows with electric border/background in rankings table
- Suppress EventSchedule for playoff_bracket sports seasons
- Fix title redundancy: bracket section title no longer repeats sport name
- Two-column match grid on desktop (md:grid-cols-2)
- Code review fixes: parallel DB fetches, targeted query for pre-eliminated, single-pass parseFloat, remove IIFE
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---------
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
160 lines
4.8 KiB
TypeScript
160 lines
4.8 KiB
TypeScript
import { getAuth } from "@clerk/react-router/server";
|
|
import {
|
|
findLeagueById,
|
|
findTeamsBySeasonId,
|
|
findCommissionersByLeagueId,
|
|
isUserLeagueMember,
|
|
isCommissioner,
|
|
findUserByClerkId,
|
|
findDraftSlotsBySeasonId,
|
|
} from "~/models";
|
|
import { findCurrentSeasonWithSports } from "~/models/season";
|
|
import { getSeasonStandings } from "~/models/standings";
|
|
import { getNextScoringEvent } from "~/models/scoring-event";
|
|
import type { Route } from "./+types/$leagueId";
|
|
|
|
export async function loader(args: Route.LoaderArgs) {
|
|
const { userId } = await getAuth(args);
|
|
const { params } = args;
|
|
const { leagueId } = params;
|
|
|
|
// Fetch league
|
|
const league = await findLeagueById(leagueId);
|
|
|
|
if (!league) {
|
|
throw new Response("League not found", { status: 404 });
|
|
}
|
|
|
|
// Fetch current season with sports
|
|
const seasonWithSports = await findCurrentSeasonWithSports(leagueId);
|
|
const season = seasonWithSports || null;
|
|
|
|
// Fetch commissioners
|
|
const commissioners = await findCommissionersByLeagueId(leagueId);
|
|
|
|
// Check if current user is a commissioner
|
|
const isUserCommissioner = userId
|
|
? await isCommissioner(leagueId, userId)
|
|
: false;
|
|
|
|
// Check if user is a member (has a team in current season)
|
|
const isUserMember = userId
|
|
? await isUserLeagueMember(leagueId, userId)
|
|
: false;
|
|
|
|
// Check access: user must be a commissioner, a member, or an admin
|
|
// If not logged in or not authorized, throw 403
|
|
if (!userId) {
|
|
throw new Response("You must be logged in to view this league", {
|
|
status: 401,
|
|
});
|
|
}
|
|
|
|
if (!isUserCommissioner && !isUserMember) {
|
|
throw new Response("You do not have access to this league", {
|
|
status: 403,
|
|
});
|
|
}
|
|
|
|
// Fetch teams for current season
|
|
const teams = season ? await findTeamsBySeasonId(season.id) : [];
|
|
|
|
// Fetch draft slots if season is in pre_draft or draft status
|
|
const draftSlots =
|
|
season && (season.status === "pre_draft" || season.status === "draft")
|
|
? await findDraftSlotsBySeasonId(season.id)
|
|
: [];
|
|
|
|
// Fetch standings for active/completed seasons
|
|
const standings =
|
|
season && (season.status === "active" || season.status === "completed")
|
|
? await getSeasonStandings(season.id)
|
|
: [];
|
|
|
|
// Fetch user data for team owners
|
|
const ownerIds = teams
|
|
.map((t) => t.ownerId)
|
|
.filter((id): id is string => id !== null);
|
|
const uniqueOwnerIds = [...new Set(ownerIds)];
|
|
const owners = await Promise.all(
|
|
uniqueOwnerIds.map(async (ownerId) => {
|
|
const user = await findUserByClerkId(ownerId);
|
|
return user
|
|
? { clerkId: ownerId, name: user.username || user.displayName }
|
|
: null;
|
|
})
|
|
);
|
|
const ownerMap = new Map(
|
|
owners
|
|
.filter((o): o is NonNullable<typeof o> => o !== null)
|
|
.map((o) => [o.clerkId, o.name])
|
|
);
|
|
|
|
// Fetch user data for commissioners
|
|
const commissionerIds = commissioners.map((c) => c.userId);
|
|
const commissionerUsers = await Promise.all(
|
|
commissionerIds.map(async (commissionerId) => {
|
|
const user = await findUserByClerkId(commissionerId);
|
|
return user
|
|
? { clerkId: commissionerId, name: user.username || user.displayName }
|
|
: null;
|
|
})
|
|
);
|
|
const commissionerMap = new Map(
|
|
commissionerUsers
|
|
.filter((c): c is NonNullable<typeof c> => c !== null)
|
|
.map((c) => [c.clerkId, c.name])
|
|
);
|
|
|
|
// Count available teams
|
|
const availableTeamCount = teams.filter((t) => !t.ownerId).length;
|
|
|
|
// Count teams with owners
|
|
const teamsWithOwners = teams.filter((t) => t.ownerId !== null).length;
|
|
|
|
// Get sports seasons data including next upcoming event for each
|
|
const rawSportsSeasons = seasonWithSports?.seasonSports?.map((ss) => ss.sportsSeason) || [];
|
|
|
|
const sportsSeasons = await Promise.all(
|
|
rawSportsSeasons.map(async (ss) => {
|
|
const nextEvent =
|
|
ss.status === "active" ? await getNextScoringEvent(ss.id) : null;
|
|
return {
|
|
id: ss.id,
|
|
name: ss.name,
|
|
status: ss.status as "upcoming" | "active" | "completed",
|
|
scoringPattern: ss.scoringPattern,
|
|
sport: ss.sport,
|
|
nextEvent: nextEvent
|
|
? { name: nextEvent.name, eventDate: nextEvent.eventDate }
|
|
: null,
|
|
};
|
|
})
|
|
);
|
|
const sportsCount = sportsSeasons.length;
|
|
|
|
// Check if draft order is set
|
|
const isDraftOrderSet = draftSlots.length > 0;
|
|
|
|
// Extract origin for client use (avoids SSR/client mismatch on invite URLs)
|
|
const origin = new URL(args.request.url).origin;
|
|
|
|
return {
|
|
league,
|
|
season,
|
|
teams,
|
|
commissioners,
|
|
currentUserId: userId,
|
|
isUserCommissioner,
|
|
ownerMap: Object.fromEntries(ownerMap),
|
|
commissionerMap: Object.fromEntries(commissionerMap),
|
|
availableTeamCount,
|
|
sportsCount,
|
|
teamsWithOwners,
|
|
isDraftOrderSet,
|
|
draftSlots,
|
|
sportsSeasons,
|
|
standings,
|
|
origin,
|
|
};
|
|
}
|