Skip to content

fix: 토너먼트 시작 후 참여자 화면에 담기 버튼이 남던 문제 #496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ychany merged 2 commits into from
Aug 12, 2026
Merged

fix: 토너먼트 시작 후 참여자 화면에 담기 버튼이 남던 문제 #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b8dc90
fix: 토너먼트 시작 후 참여자 화면에 담기 버튼이 남던 문제
ychany Aug 12, 2026
10e30a6
Merge branch 'dev' into fix/483-hide-add-after-start
ychany Aug 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions apps/web/src/app/tournament/[id]/create/_components/TournamentCreateClient.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ function TournamentCreateClient({ tournamentId }: TournamentCreateClientProps) {
// ownerStarted 면 어차피 시작 흐름으로 넘어가야 하므로 마감 처리하지 않는다.
// 협업 의도가 없는 토너먼트는 만료 자체를 무시한다.
const isDepositClosed = !tournamentData.isOwner && !ownerStarted && isExpired && isCollaborative;
// 참여자는 주최자가 시작한 뒤로 담을 수 없다(서버 409). 만료 마감과 별개 사유라 따로 둔다.
const isAddItemBlocked = isDepositClosed || (!tournamentData.isOwner && ownerStarted);

const participantImageMap = new Map(
(pending?.participants ?? []).map(p => [p.userId, p.profileImage])
Expand Down Expand Up @@ -195,7 +197,7 @@ function TournamentCreateClient({ tournamentId }: TournamentCreateClientProps) {
items={pending?.items}
scrollToLast={scrollToLast}
previousItemCount={previousItemCount}
isDepositClosed={isDepositClosed}
isAddItemBlocked={isAddItemBlocked}
participantImageMap={participantImageMap}
/>
<TournamentItemBasketStatus
Expand All @@ -218,7 +220,8 @@ function TournamentCreateClient({ tournamentId }: TournamentCreateClientProps) {
/>
</div>

<Dialog open={isGetItemDialogOpen} onOpenChange={setIsGetItemDialogOpen}>
{/* 쿼리 파라미터로 직접 열 수 있어 + 버튼과 같은 조건으로 막는다 */}
<Dialog open={isGetItemDialogOpen && !isAddItemBlocked} onOpenChange={setIsGetItemDialogOpen}>
<GetItemDialogContent type="tournament" />
</Dialog>

Expand Down
6 changes: 3 additions & 3 deletions ...rc/app/tournament/[id]/create/_components/tournament-item-basket/TournamentItemBasket.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ type TournamentItemBasketProps = {
basketIndex: number;
items: TournamentPendingItemT[];
maxHeight?: number;
isDepositClosed?: boolean;
isAddItemBlocked?: boolean;
participantImageMap?: Map<string, string>;
};

function TournamentItemBasket({
basketIndex,
items,
maxHeight,
isDepositClosed = false,
isAddItemBlocked = false,
participantImageMap,
}: TournamentItemBasketProps) {
const { id } = useParams<{ id: string }>();
Expand All @@ -41,7 +41,7 @@ function TournamentItemBasket({
};

const isFull = items.length >= ITEMS_PER_BASKET;
const showAddButton = !isDepositClosed && !isFull;
const showAddButton = !isAddItemBlocked && !isFull;

const addSlot = showAddButton ? (
<Dialog>
Expand Down
8 changes: 4 additions & 4 deletions ...ournament/[id]/create/_components/tournament-item-basket/TournamentItemBasketCarousel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ type TournamentItemBasketCarouselProps = {
scrollToLast?: boolean;
/** 위시 담기 등 재진입 시점의 기존 아이템 개수 */
previousItemCount?: number | null;
isDepositClosed?: boolean;
isAddItemBlocked?: boolean;
participantImageMap?: Map<string, string>;
};

function TournamentItemBasketCarousel({
items = [],
scrollToLast = false,
previousItemCount = null,
isDepositClosed = false,
isAddItemBlocked = false,
participantImageMap,
}: TournamentItemBasketCarouselProps) {
const [carouselApi, setCarouselApi] = useState<CarouselApi>();
Expand Down Expand Up @@ -116,7 +116,7 @@ function TournamentItemBasketCarousel({
<TournamentItemBasket
basketIndex={0}
items={items}
isDepositClosed={isDepositClosed}
isAddItemBlocked={isAddItemBlocked}
maxHeight={basketMaxHeight}
participantImageMap={participantImageMap}
/>
Expand Down Expand Up @@ -145,7 +145,7 @@ function TournamentItemBasketCarousel({
<TournamentItemBasket
basketIndex={i}
items={items.slice(i * ITEMS_PER_BASKET, (i + 1) * ITEMS_PER_BASKET)}
isDepositClosed={isDepositClosed}
isAddItemBlocked={isAddItemBlocked}
maxHeight={basketMaxHeight}
participantImageMap={participantImageMap}
/>
Expand Down
Loading