fix: optimistic UI and type safety for draft queue handlers (#37)
- Add optimistic remove to handleRemoveFromQueue (was missing, causing visible lag) - Fix stale closure on previousQueue in reorder/remove by capturing inside setQueue updater - Replace filter(Boolean) with typed type guard filter in handleReorderQueue - Add QueueItem type alias from schema.$inferSelect, typed useState, remove all `any` casts - Complete temp item fields in handleAddToQueue to satisfy QueueItem type Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
b0521bb7f3
commit
61f3fa9a4e
1 changed files with 36 additions and 13 deletions
|
|
@ -29,6 +29,8 @@ import { formatClockTime, getTimerColorClass } from "~/lib/draft-timer";
|
||||||
import { Users, LayoutGrid, ListChecks, Settings } from "lucide-react";
|
import { Users, LayoutGrid, ListChecks, Settings } from "lucide-react";
|
||||||
import type { Route } from "./+types/$leagueId.draft.$seasonId";
|
import type { Route } from "./+types/$leagueId.draft.$seasonId";
|
||||||
|
|
||||||
|
type QueueItem = typeof schema.draftQueue.$inferSelect;
|
||||||
|
|
||||||
const MOBILE_TABS = [
|
const MOBILE_TABS = [
|
||||||
{ id: "lobby" as const, label: "Lobby", Icon: Users },
|
{ id: "lobby" as const, label: "Lobby", Icon: Users },
|
||||||
{ id: "board" as const, label: "Board", Icon: LayoutGrid },
|
{ id: "board" as const, label: "Board", Icon: LayoutGrid },
|
||||||
|
|
@ -250,7 +252,7 @@ export default function DraftRoom() {
|
||||||
const [hideDrafted, setHideDrafted] = useState(true);
|
const [hideDrafted, setHideDrafted] = useState(true);
|
||||||
const [hideIneligible, setHideIneligible] = useState(true);
|
const [hideIneligible, setHideIneligible] = useState(true);
|
||||||
const [sportFilter, setSportFilter] = useState<string>("all");
|
const [sportFilter, setSportFilter] = useState<string>("all");
|
||||||
const [queue, setQueue] = useState(userQueue);
|
const [queue, setQueue] = useState<QueueItem[]>(userQueue);
|
||||||
const [isPaused, setIsPaused] = useState(season.draftPaused || false);
|
const [isPaused, setIsPaused] = useState(season.draftPaused || false);
|
||||||
const [isDraftComplete, setIsDraftComplete] = useState(
|
const [isDraftComplete, setIsDraftComplete] = useState(
|
||||||
season.status === "active" || season.status === "completed"
|
season.status === "active" || season.status === "completed"
|
||||||
|
|
@ -566,21 +568,26 @@ export default function DraftRoom() {
|
||||||
if (!userTeam) return;
|
if (!userTeam) return;
|
||||||
|
|
||||||
// Check if participant is already in queue (client-side)
|
// Check if participant is already in queue (client-side)
|
||||||
const alreadyInQueue = queue.some((item: any) => item.participantId === participantId);
|
const alreadyInQueue = queue.some((item) => item.participantId === participantId);
|
||||||
if (alreadyInQueue) {
|
if (alreadyInQueue) {
|
||||||
toast.error("This participant is already in your queue");
|
toast.error("This participant is already in your queue");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Optimistic update - create a temporary queue item
|
// Optimistic update - create a temporary queue item
|
||||||
const tempQueueItem = {
|
const now = new Date();
|
||||||
id: `temp-${Date.now()}`, // Temporary ID
|
const tempQueueItem: QueueItem = {
|
||||||
|
id: `temp-${Date.now()}`,
|
||||||
participantId,
|
participantId,
|
||||||
queuePosition: queue.length + 1,
|
queuePosition: queue.length + 1,
|
||||||
|
seasonId: season.id,
|
||||||
|
teamId: userTeam.id,
|
||||||
|
createdAt: now,
|
||||||
|
updatedAt: now,
|
||||||
};
|
};
|
||||||
|
|
||||||
// Immediately update the UI
|
// Immediately update the UI
|
||||||
setQueue((prev: any) => [...prev, tempQueueItem]);
|
setQueue((prev) => [...prev, tempQueueItem]);
|
||||||
|
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
formData.append("seasonId", season.id);
|
formData.append("seasonId", season.id);
|
||||||
|
|
@ -596,25 +603,21 @@ export default function DraftRoom() {
|
||||||
if (response.ok) {
|
if (response.ok) {
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
// Replace temp item with real item from server
|
// Replace temp item with real item from server
|
||||||
setQueue((prev: any) =>
|
setQueue((prev) =>
|
||||||
prev.map((item: any) =>
|
prev.map((item) =>
|
||||||
item.id === tempQueueItem.id ? data.queueItem : item
|
item.id === tempQueueItem.id ? data.queueItem : item
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
// Revert the optimistic update on error
|
// Revert the optimistic update on error
|
||||||
setQueue((prev: any) =>
|
setQueue((prev) => prev.filter((item) => item.id !== tempQueueItem.id));
|
||||||
prev.filter((item: any) => item.id !== tempQueueItem.id)
|
|
||||||
);
|
|
||||||
|
|
||||||
const error = await response.json();
|
const error = await response.json();
|
||||||
toast.error(error.error || "Failed to add to queue");
|
toast.error(error.error || "Failed to add to queue");
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Revert the optimistic update on network error
|
// Revert the optimistic update on network error
|
||||||
setQueue((prev: any) =>
|
setQueue((prev) => prev.filter((item) => item.id !== tempQueueItem.id));
|
||||||
prev.filter((item: any) => item.id !== tempQueueItem.id)
|
|
||||||
);
|
|
||||||
toast.error("Network error - failed to add to queue");
|
toast.error("Network error - failed to add to queue");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -622,6 +625,13 @@ export default function DraftRoom() {
|
||||||
const handleRemoveFromQueue = async (queueId: string) => {
|
const handleRemoveFromQueue = async (queueId: string) => {
|
||||||
if (!userTeam) return;
|
if (!userTeam) return;
|
||||||
|
|
||||||
|
// Optimistically remove the item immediately
|
||||||
|
let previousQueue: QueueItem[] = [];
|
||||||
|
setQueue((prev) => {
|
||||||
|
previousQueue = prev;
|
||||||
|
return prev.filter((item) => item.id !== queueId);
|
||||||
|
});
|
||||||
|
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
formData.append("queueId", queueId);
|
formData.append("queueId", queueId);
|
||||||
formData.append("teamId", userTeam.id);
|
formData.append("teamId", userTeam.id);
|
||||||
|
|
@ -636,10 +646,12 @@ export default function DraftRoom() {
|
||||||
const data = await response.json();
|
const data = await response.json();
|
||||||
setQueue(data.queue);
|
setQueue(data.queue);
|
||||||
} else {
|
} else {
|
||||||
|
setQueue(previousQueue);
|
||||||
const error = await response.json();
|
const error = await response.json();
|
||||||
toast.error(error.error || "Failed to remove from queue");
|
toast.error(error.error || "Failed to remove from queue");
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
|
setQueue(previousQueue);
|
||||||
toast.error("Network error - failed to remove from queue");
|
toast.error("Network error - failed to remove from queue");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -647,6 +659,15 @@ export default function DraftRoom() {
|
||||||
const handleReorderQueue = async (participantIds: string[]) => {
|
const handleReorderQueue = async (participantIds: string[]) => {
|
||||||
if (!userTeam) return;
|
if (!userTeam) return;
|
||||||
|
|
||||||
|
// Optimistically reorder the queue immediately
|
||||||
|
let previousQueue: QueueItem[] = [];
|
||||||
|
setQueue((prev) => {
|
||||||
|
previousQueue = prev;
|
||||||
|
return participantIds
|
||||||
|
.map((pid) => prev.find((item) => item.participantId === pid))
|
||||||
|
.filter((item): item is QueueItem => item !== undefined);
|
||||||
|
});
|
||||||
|
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
formData.append("teamId", userTeam.id);
|
formData.append("teamId", userTeam.id);
|
||||||
formData.append("seasonId", season.id);
|
formData.append("seasonId", season.id);
|
||||||
|
|
@ -663,9 +684,11 @@ export default function DraftRoom() {
|
||||||
setQueue(data.queue);
|
setQueue(data.queue);
|
||||||
} else {
|
} else {
|
||||||
const error = await response.json();
|
const error = await response.json();
|
||||||
|
setQueue(previousQueue);
|
||||||
toast.error(error.error || "Failed to reorder queue");
|
toast.error(error.error || "Failed to reorder queue");
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
|
setQueue(previousQueue);
|
||||||
toast.error("Network error - failed to reorder queue");
|
toast.error("Network error - failed to reorder queue");
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue