Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion apps/client/src/app/api/groups/mutation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import { userQueryKey } from "@/app/api/users/query";
import { useToast } from "@/common/hook/useToast";
import { HTTP_ERROR_STATUS } from "@/shared/constant/api";
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { isBefore, startOfTomorrow } from "date-fns";
import type { HTTPError } from "ky";
import { useSession } from "next-auth/react";
import { useParams, useRouter } from "next/navigation";
Expand Down Expand Up @@ -287,7 +288,9 @@ export const usePostProblemMutation = (groupId: number) => {
]);
(
document.querySelector(
+variables.startDate < Date.now() ? "#tab-1" : "#tab-2",
isBefore(variables.startDate, startOfTomorrow())
? "#tab-1"
: "#tab-2",
) as HTMLLIElement
)?.click();

Expand Down
4 changes: 4 additions & 0 deletions apps/client/src/app/api/groups/query.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ export const groupQueryKey = {
...groupQueryKey.problems(groupId),
"queued",
],
expiredProblems: (groupId: number) => [
...groupQueryKey.problems(groupId),
"expired",
],
search: (params: SearchRequest) => [...groupQueryKey.all(), "search", params],
joinRequests: (groupId: number) =>
[...groupQueryKey.detail(groupId), "join-requests"] as const,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { getQueuedProblems } from "@/app/api/groups";
import { groupQueryKey } from "@/app/api/groups/query";
import PendingListItem from "@/app/group/[groupId]/problem-list/components/PendingList/Item";
import {
listStyle,
Expand All @@ -14,8 +15,9 @@ const PendingList = ({ groupId }: { groupId: number }) => {
totalPages: queuedTotalPages,
setCurrentPage: setQueuedPage,
} = usePaginationQuery({
queryKey: ["queuedProblem", groupId],
queryKey: groupQueryKey.queuedProblems(groupId),
queryFn: (page) => getQueuedProblems({ groupId, page, size: 7 }),
searchParam: "queued",
});
const queuedList = queuedData?.content;

Expand Down
9 changes: 5 additions & 4 deletions apps/client/src/app/group/[groupId]/problem-list/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use client";

import { getExpiredProblems, getInProgressProblems } from "@/app/api/groups";
import { useGroupRoleQueryObject } from "@/app/api/groups/query";
import { groupQueryKey, useGroupRoleQueryObject } from "@/app/api/groups/query";
import CheckBox from "@/common/component/CheckBox";
import Sidebar from "@/common/component/Sidebar";
import TabGroup from "@/common/component/Tab";
Expand Down Expand Up @@ -45,8 +45,7 @@ const ProblemListPage = ({
setCurrentPage: setInProgressPage,
} = usePaginationQuery({
queryKey: [
"inProgressProblem",
+groupId,
...groupQueryKey.inProgressProblems(+groupId),
{ unsolved: isUnsolvedOnlyChecked },
],
queryFn: (page) =>
Expand All @@ -56,6 +55,7 @@ const ProblemListPage = ({
size: 3,
unsolvedOnly: isUnsolvedOnlyChecked,
}),
searchParam: "inProgress",
});
const inProgressList = inProgressData?.content;

Expand All @@ -65,13 +65,14 @@ const ProblemListPage = ({
totalPages: expiredTotalPages,
setCurrentPage: setExpiredPage,
} = usePaginationQuery({
queryKey: ["expiredProblem", +groupId],
queryKey: groupQueryKey.expiredProblems(+groupId),
queryFn: (page) =>
getExpiredProblems({
groupId: +groupId,
page,
size: 3,
}),
searchParam: "expired",
});
const expiredList = expiredData?.content;

Expand Down