fix(web): satisfy React hook lint rules
This commit is contained in:
1 parent
bb68be14fa
commit
a4215f86fb
8 files changed
+374
-256
No files matched your search
@@ -2,6 +2,7 @@ import {
|
||||
lazy,
|
||||
memo,
|
||||
Suspense,
|
||||
useCallback,
|
||||
useEffect,
|
||||
useLayoutEffect,
|
||||
useMemo,
|
||||
@@ -51,7 +52,8 @@ import {
|
||||
teamIndexLabel,
|
||||
} from "../lib/league";
|
||||
import { internalMatchGamePath } from "../lib/internal-match-routes";
|
||||
import { formatRankDetail, RankBadge } from "../components/RankBadge";
|
||||
import { RankBadge } from "../components/RankBadge";
|
||||
import { formatRankDetail } from "../components/rankBadgeUtils";
|
||||
import type {
|
||||
ApiAuction,
|
||||
ApiAuctionChatMessage,
|
||||
@@ -1616,7 +1618,6 @@ function BidControls({
|
||||
serverTimeOffsetMs: number;
|
||||
onBid: (teamIndex: number, amount: number) => void;
|
||||
}) {
|
||||
const [bidAmount, setBidAmount] = useState(100);
|
||||
const minBid = state.currentBid + AUCTION_MIN_BID_POINTS;
|
||||
const activeTeam = captainRole
|
||||
? state.teams.find((team) => team.teamIndex === captainRole.teamIndex)
|
||||
@@ -1627,6 +1628,23 @@ function BidControls({
|
||||
? getReservedPointsAfterCurrentBid(activeTeam)
|
||||
: 0;
|
||||
const maxBid = activeTeam ? getMaxBidForTeam(activeTeam) : 0;
|
||||
const defaultBidAmount = Math.max(minBid, Math.ceil(minBid / 10) * 10);
|
||||
const bidContextKey = `${activeTeam?.teamIndex ?? "spectator"}:${maxBid}:${minBid}`;
|
||||
const [bidDraft, setBidDraft] = useState({
|
||||
contextKey: bidContextKey,
|
||||
amount: activeTeam
|
||||
? Math.min(maxBid, defaultBidAmount)
|
||||
: defaultBidAmount,
|
||||
});
|
||||
const bidAmount =
|
||||
bidDraft.contextKey === bidContextKey
|
||||
? bidDraft.amount
|
||||
: activeTeam
|
||||
? Math.min(maxBid, defaultBidAmount)
|
||||
: defaultBidAmount;
|
||||
const setBidAmount = (amount: number) => {
|
||||
setBidDraft({ contextKey: bidContextKey, amount });
|
||||
};
|
||||
const canAffordNextBid = !isActiveTeamFull && maxBid >= minBid;
|
||||
const isBidExpired = useIsDeadlineExpired(
|
||||
state.deadline,
|
||||
@@ -1637,11 +1655,6 @@ function BidControls({
|
||||
? Math.min(maxBid, Math.max(minBid, bidAmount))
|
||||
: Math.max(minBid, bidAmount);
|
||||
|
||||
useEffect(() => {
|
||||
const nextBid = Math.max(minBid, Math.ceil(minBid / 10) * 10);
|
||||
setBidAmount(activeTeam ? Math.min(maxBid, nextBid) : nextBid);
|
||||
}, [activeTeam, maxBid, minBid]);
|
||||
|
||||
if (state.phase !== "bidding") return null;
|
||||
|
||||
if (!activeTeam) {
|
||||
@@ -1843,7 +1856,10 @@ export default function AuctionPage() {
|
||||
const resetAuctionMutation = useResetAuction(DEFAULT_COMMUNITY_ID);
|
||||
const socket = useAuctionSocket(id);
|
||||
const captainTeamIndex = useDevCaptainTeamIndex();
|
||||
const [assignedPosition, setAssignedPosition] = useState<Position>("MID");
|
||||
const [assignedPositionDraft, setAssignedPositionDraft] = useState<{
|
||||
playerId: string | null;
|
||||
position: Position;
|
||||
}>({ playerId: null, position: "MID" });
|
||||
const [showCancelModal, setShowCancelModal] = useState(false);
|
||||
const [cancelConfirmText, setCancelConfirmText] = useState("");
|
||||
const [undoTargetSequence, setUndoTargetSequence] = useState<number | null>(
|
||||
@@ -1853,7 +1869,7 @@ export default function AuctionPage() {
|
||||
const historyBackTo = `${location.pathname}${location.search}${location.hash}`;
|
||||
const canConfirmAuctionCancel = cancelConfirmText.trim() === "예";
|
||||
|
||||
async function clearAuctionDataAfterCancel() {
|
||||
const clearAuctionDataAfterCancel = useCallback(async () => {
|
||||
if (!id) return;
|
||||
const auctionQueryKey = ["auction", DEFAULT_COMMUNITY_ID, id] as const;
|
||||
const auctionHistoryQueryKey = [
|
||||
@@ -1878,7 +1894,7 @@ export default function AuctionPage() {
|
||||
queryKey: ["match", DEFAULT_COMMUNITY_ID, id],
|
||||
exact: true,
|
||||
});
|
||||
}
|
||||
}, [id, queryClient]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!showCancelModal) return;
|
||||
@@ -1893,6 +1909,14 @@ export default function AuctionPage() {
|
||||
: null,
|
||||
[liveAuction, matchQuery.data],
|
||||
);
|
||||
const currentPlayerId = auctionState?.currentPlayer?.id ?? null;
|
||||
const assignedPosition =
|
||||
assignedPositionDraft.playerId === currentPlayerId
|
||||
? assignedPositionDraft.position
|
||||
: (auctionState?.currentPlayer?.mainPosition ?? "MID");
|
||||
const setAssignedPosition = (position: Position) => {
|
||||
setAssignedPositionDraft({ playerId: currentPlayerId, position });
|
||||
};
|
||||
const availableTeamIndexes = useMemo(() => {
|
||||
const indexes = new Set(
|
||||
(auctionState?.teams ?? []).map((team) => team.teamIndex),
|
||||
@@ -1907,12 +1931,6 @@ export default function AuctionPage() {
|
||||
};
|
||||
const chatSenderLabel = resolveChatSenderLabel(currentUser, captainRole);
|
||||
|
||||
useEffect(() => {
|
||||
if (auctionState?.currentPlayer) {
|
||||
setAssignedPosition(auctionState.currentPlayer.mainPosition);
|
||||
}
|
||||
}, [auctionState?.currentPlayer?.id]);
|
||||
|
||||
useEffect(() => {
|
||||
if (availableTeamIndexes.length === 0) return;
|
||||
if (
|
||||
@@ -1928,7 +1946,7 @@ export default function AuctionPage() {
|
||||
void clearAuctionDataAfterCancel().finally(() => {
|
||||
navigate(`/match/${id}`, { replace: true });
|
||||
});
|
||||
}, [id, navigate, socket.resetAt]);
|
||||
}, [clearAuctionDataAfterCancel, id, navigate, socket.resetAt]);
|
||||
|
||||
if (!DEFAULT_COMMUNITY_ID) {
|
||||
return (
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useEffect, useMemo, useState } from 'react';
|
||||
import { useMemo, useState } from 'react';
|
||||
import { useQueryClient } from '@tanstack/react-query';
|
||||
import { Link, useParams } from 'react-router';
|
||||
import {
|
||||
@@ -8,11 +8,17 @@ import {
|
||||
useMe,
|
||||
useStartLegacyImport,
|
||||
} from '../../api/hooks';
|
||||
import type { LegacyImportJob, StartLegacyImportRequest } from '../../api/types';
|
||||
import type {
|
||||
LegacyImportJob,
|
||||
LegacyImportMemberWindow,
|
||||
StartLegacyImportRequest,
|
||||
} from '../../api/types';
|
||||
import { DEFAULT_COMMUNITY_ID } from '../../config';
|
||||
|
||||
const DEFAULT_START = '2024-05-01T00:00:00.000Z';
|
||||
|
||||
type MemberWindowOverride = { startTime: string; endTime: string };
|
||||
|
||||
function toInputValue(value: string) {
|
||||
const date = new Date(value);
|
||||
const local = new Date(date.getTime() - date.getTimezoneOffset() * 60_000);
|
||||
@@ -44,6 +50,15 @@ function progress(job: LegacyImportJob) {
|
||||
return Math.round((job.processedMembers / job.totalMembers) * 100);
|
||||
}
|
||||
|
||||
function defaultMemberOverride(
|
||||
member: LegacyImportMemberWindow,
|
||||
): MemberWindowOverride {
|
||||
return {
|
||||
startTime: toInputValue(member.startTime),
|
||||
endTime: toInputValue(member.endTime),
|
||||
};
|
||||
}
|
||||
|
||||
function JobCard({
|
||||
job,
|
||||
onCancel,
|
||||
@@ -111,7 +126,7 @@ export default function LegacyImportPage() {
|
||||
const [windowEnd, setWindowEnd] = useState('');
|
||||
const [message, setMessage] = useState<string | null>(null);
|
||||
const [overrides, setOverrides] = useState<
|
||||
Record<string, { startTime: string; endTime: string }>
|
||||
Record<string, MemberWindowOverride>
|
||||
>({});
|
||||
const currentUser =
|
||||
meQuery.data?.memberships.find(
|
||||
@@ -131,20 +146,6 @@ export default function LegacyImportPage() {
|
||||
const cancelMutation = useCancelLegacyImport(communityId);
|
||||
const members = membersQuery.data?.members ?? [];
|
||||
|
||||
useEffect(() => {
|
||||
setOverrides(
|
||||
Object.fromEntries(
|
||||
members.map((member) => [
|
||||
member.userId,
|
||||
{
|
||||
startTime: toInputValue(member.startTime),
|
||||
endTime: toInputValue(member.endTime),
|
||||
},
|
||||
]),
|
||||
),
|
||||
);
|
||||
}, [members]);
|
||||
|
||||
const manageableMemberships =
|
||||
meQuery.data?.memberships.filter((membership) => {
|
||||
const role = membership.user.role;
|
||||
@@ -180,11 +181,15 @@ export default function LegacyImportPage() {
|
||||
const payload: StartLegacyImportRequest = {
|
||||
windowStart: fromInputValue(windowStart),
|
||||
windowEnd: fromInputValue(windowEnd),
|
||||
memberOverrides: members.map((member) => ({
|
||||
userId: member.userId,
|
||||
startTime: fromInputValue(overrides[member.userId]?.startTime ?? ''),
|
||||
endTime: fromInputValue(overrides[member.userId]?.endTime ?? ''),
|
||||
})),
|
||||
memberOverrides: members.map((member) => {
|
||||
const override =
|
||||
overrides[member.userId] ?? defaultMemberOverride(member);
|
||||
return {
|
||||
userId: member.userId,
|
||||
startTime: fromInputValue(override.startTime),
|
||||
endTime: fromInputValue(override.endTime),
|
||||
};
|
||||
}),
|
||||
};
|
||||
startMutation.mutate(payload, {
|
||||
onSuccess: async (result) => {
|
||||
@@ -323,53 +328,68 @@ export default function LegacyImportPage() {
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{members.map((member) => (
|
||||
<tr key={member.userId} className="border-b border-base-content/5">
|
||||
<td className="px-3 py-2 text-sm font-bold">
|
||||
{member.displayName}
|
||||
</td>
|
||||
<td className="px-3 py-2 text-xs text-base-content/45">
|
||||
{member.gameName}#{member.tagLine}
|
||||
</td>
|
||||
<td className="px-3 py-2 text-xs">
|
||||
{member.isActivated ? '활성' : '비활성'}
|
||||
</td>
|
||||
<td className="px-3 py-2">
|
||||
<input
|
||||
type="datetime-local"
|
||||
value={overrides[member.userId]?.startTime ?? ''}
|
||||
onChange={(event) =>
|
||||
setOverrides((current) => ({
|
||||
...current,
|
||||
[member.userId]: {
|
||||
...current[member.userId],
|
||||
startTime: event.target.value,
|
||||
endTime: current[member.userId]?.endTime ?? '',
|
||||
},
|
||||
}))
|
||||
}
|
||||
className="border border-base-content/10 bg-transparent px-2 py-1 text-xs"
|
||||
/>
|
||||
</td>
|
||||
<td className="px-3 py-2">
|
||||
<input
|
||||
type="datetime-local"
|
||||
value={overrides[member.userId]?.endTime ?? ''}
|
||||
onChange={(event) =>
|
||||
setOverrides((current) => ({
|
||||
...current,
|
||||
[member.userId]: {
|
||||
...current[member.userId],
|
||||
startTime: current[member.userId]?.startTime ?? '',
|
||||
endTime: event.target.value,
|
||||
},
|
||||
}))
|
||||
}
|
||||
className="border border-base-content/10 bg-transparent px-2 py-1 text-xs"
|
||||
/>
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
{members.map((member) => {
|
||||
const override =
|
||||
overrides[member.userId] ?? defaultMemberOverride(member);
|
||||
return (
|
||||
<tr
|
||||
key={member.userId}
|
||||
className="border-b border-base-content/5"
|
||||
>
|
||||
<td className="px-3 py-2 text-sm font-bold">
|
||||
{member.displayName}
|
||||
</td>
|
||||
<td className="px-3 py-2 text-xs text-base-content/45">
|
||||
{member.gameName}#{member.tagLine}
|
||||
</td>
|
||||
<td className="px-3 py-2 text-xs">
|
||||
{member.isActivated ? '활성' : '비활성'}
|
||||
</td>
|
||||
<td className="px-3 py-2">
|
||||
<input
|
||||
type="datetime-local"
|
||||
value={override.startTime}
|
||||
onChange={(event) =>
|
||||
setOverrides((current) => {
|
||||
const currentOverride =
|
||||
current[member.userId] ??
|
||||
defaultMemberOverride(member);
|
||||
return {
|
||||
...current,
|
||||
[member.userId]: {
|
||||
...currentOverride,
|
||||
startTime: event.target.value,
|
||||
},
|
||||
};
|
||||
})
|
||||
}
|
||||
className="border border-base-content/10 bg-transparent px-2 py-1 text-xs"
|
||||
/>
|
||||
</td>
|
||||
<td className="px-3 py-2">
|
||||
<input
|
||||
type="datetime-local"
|
||||
value={override.endTime}
|
||||
onChange={(event) =>
|
||||
setOverrides((current) => {
|
||||
const currentOverride =
|
||||
current[member.userId] ??
|
||||
defaultMemberOverride(member);
|
||||
return {
|
||||
...current,
|
||||
[member.userId]: {
|
||||
...currentOverride,
|
||||
endTime: event.target.value,
|
||||
},
|
||||
};
|
||||
})
|
||||
}
|
||||
className="border border-base-content/10 bg-transparent px-2 py-1 text-xs"
|
||||
/>
|
||||
</td>
|
||||
</tr>
|
||||
);
|
||||
})}
|
||||
{members.length === 0 && (
|
||||
<tr>
|
||||
<td colSpan={5} className="px-4 py-8 text-center text-sm text-base-content/35">
|
||||
|
||||
Reference in new issue
Block a user