Rename queue page to Set Pre-Draft Queue, remove VORP, fix re-add race condition
- Rename page title, h1, button, error message, and tests from "Pre-Draft Rankings" to "Set Pre-Draft Queue" - Remove VORP values and "Sorted by VORP" labels from the all-players list - Fix bug where removing a player then immediately re-adding would fail with "already in queue": track in-flight removes in a ref and guard handleAdd against firing while a remove is still in-flight https://claude.ai/code/session_01TGAV9A2c72PNkL1ffY7Xeq
This commit is contained in:
parent
973e56142f
commit
14b9a15a24
3 changed files with 16 additions and 17 deletions
|
|
@ -121,7 +121,7 @@ function DraftInfoCardVariant({
|
|||
</Button>
|
||||
) : queueBuilderHref ? (
|
||||
<Button asChild variant="outline">
|
||||
<Link to={queueBuilderHref}>Set Pre-Draft Rankings</Link>
|
||||
<Link to={queueBuilderHref}>Set Pre-Draft Queue</Link>
|
||||
</Button>
|
||||
) : null}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "~/components/ui/tabs";
|
|||
import type { Route } from "./+types/$leagueId.draft-queue.$seasonId";
|
||||
|
||||
export function meta({ data }: Route.MetaArgs): Route.MetaDescriptors {
|
||||
return [{ title: `Pre-Draft Rankings — ${data?.season?.league?.name ?? "League"} - Brackt` }];
|
||||
return [{ title: `Set Pre-Draft Queue — ${data?.season?.league?.name ?? "League"} - Brackt` }];
|
||||
}
|
||||
|
||||
export async function loader(args: Route.LoaderArgs) {
|
||||
|
|
@ -41,7 +41,7 @@ export async function loader(args: Route.LoaderArgs) {
|
|||
}
|
||||
|
||||
if (!userId) {
|
||||
throw new Response("You must be logged in to set pre-draft rankings", { status: 401 });
|
||||
throw new Response("You must be logged in to set pre-draft queue", { status: 401 });
|
||||
}
|
||||
|
||||
const userTeam = season.teams.find((t) => t.ownerId === userId);
|
||||
|
|
@ -79,6 +79,8 @@ export default function PreDraftRankings() {
|
|||
|
||||
// Always-current ref so reorder callback stays stable (no localQueue dependency)
|
||||
const queueRef = useRef(localQueue);
|
||||
// Track in-flight removes to prevent add racing ahead of a pending remove
|
||||
const pendingRemovesRef = useRef(new Set<string>());
|
||||
useEffect(() => {
|
||||
queueRef.current = localQueue;
|
||||
}, [localQueue]);
|
||||
|
|
@ -90,7 +92,7 @@ export default function PreDraftRankings() {
|
|||
|
||||
const handleAdd = useCallback(
|
||||
async (participantId: string) => {
|
||||
if (queuedParticipantIds.has(participantId)) return;
|
||||
if (queuedParticipantIds.has(participantId) || pendingRemovesRef.current.has(participantId)) return;
|
||||
const tempId = `temp-${Date.now()}-${participantId}`;
|
||||
setLocalQueue((prev) => [...prev, { id: tempId, participantId }]);
|
||||
|
||||
|
|
@ -118,7 +120,11 @@ export default function PreDraftRankings() {
|
|||
|
||||
const handleRemove = useCallback(
|
||||
async (queueId: string) => {
|
||||
setLocalQueue((prev) => prev.filter((item) => item.id !== queueId));
|
||||
const item = queueRef.current.find((q) => q.id === queueId);
|
||||
const participantId = item?.participantId;
|
||||
|
||||
setLocalQueue((prev) => prev.filter((q) => q.id !== queueId));
|
||||
if (participantId) pendingRemovesRef.current.add(participantId);
|
||||
|
||||
const formData = new FormData();
|
||||
formData.append("queueId", queueId);
|
||||
|
|
@ -134,6 +140,8 @@ export default function PreDraftRankings() {
|
|||
} catch {
|
||||
toast.error("Network error — failed to remove from rankings");
|
||||
revalidate();
|
||||
} finally {
|
||||
if (participantId) pendingRemovesRef.current.delete(participantId);
|
||||
}
|
||||
},
|
||||
[userTeam.id, revalidate]
|
||||
|
|
@ -194,11 +202,6 @@ export default function PreDraftRankings() {
|
|||
<p className="font-medium text-sm truncate">{p.name}</p>
|
||||
<p className="text-xs text-muted-foreground">{p.sport.name}</p>
|
||||
</div>
|
||||
{p.vorpValue !== null && p.vorpValue !== undefined && (
|
||||
<span className="text-xs text-muted-foreground tabular-nums shrink-0">
|
||||
{Number(p.vorpValue).toFixed(1)}
|
||||
</span>
|
||||
)}
|
||||
{inQueue ? (
|
||||
<Button
|
||||
size="sm"
|
||||
|
|
@ -269,7 +272,7 @@ export default function PreDraftRankings() {
|
|||
</Link>
|
||||
<div className="flex items-center gap-2 mb-1">
|
||||
<ListOrdered className="h-6 w-6" />
|
||||
<h1 className="text-2xl font-bold">Pre-Draft Rankings</h1>
|
||||
<h1 className="text-2xl font-bold">Set Pre-Draft Queue</h1>
|
||||
</div>
|
||||
<p className="text-sm text-muted-foreground">
|
||||
Rank the players you want. Your rankings carry into the live draft as your autopick
|
||||
|
|
@ -296,9 +299,6 @@ export default function PreDraftRankings() {
|
|||
</TabsTrigger>
|
||||
</TabsList>
|
||||
<TabsContent value="players">
|
||||
<div className="flex items-center justify-between mb-3">
|
||||
<span className="text-xs text-muted-foreground">Sorted by VORP</span>
|
||||
</div>
|
||||
{allPlayersPanel}
|
||||
</TabsContent>
|
||||
<TabsContent value="rankings">{rankingsPanel}</TabsContent>
|
||||
|
|
@ -310,7 +310,6 @@ export default function PreDraftRankings() {
|
|||
<div className="lg:col-span-2">
|
||||
<div className="flex items-center justify-between mb-3">
|
||||
<h2 className="font-semibold">All Players</h2>
|
||||
<span className="text-xs text-muted-foreground">Sorted by VORP</span>
|
||||
</div>
|
||||
{allPlayersPanel}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ function checkPreDraftRankingsAccess(opts: {
|
|||
}
|
||||
|
||||
if (!userId) {
|
||||
return { status: 401, message: 'You must be logged in to set pre-draft rankings' };
|
||||
return { status: 401, message: 'You must be logged in to set pre-draft queue' };
|
||||
}
|
||||
|
||||
if (!hasTeam) {
|
||||
|
|
@ -141,7 +141,7 @@ describe('Pre-Draft Rankings Access - Authentication', () => {
|
|||
userId: null,
|
||||
hasTeam: false,
|
||||
});
|
||||
expect(result).toMatchObject({ message: 'You must be logged in to set pre-draft rankings' });
|
||||
expect(result).toMatchObject({ message: 'You must be logged in to set pre-draft queue' });
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue