Merge pull request #1141 from kenkoooo/pr/MatsuTaku/1137

Pr/matsu taku/1137

Author: kenkoooo

atcoder-problems-frontend/src/api/APIClient.ts

@@ -295,25 +295,45 @@ export const useVirtualContestSubmissions = (
 ) => {
   const PROBLEM_CHUNK_SIZE = 10;
   const USER_CHUNK_SIZE = 10;
-  const requestCount =
-    Math.ceil(users.length / USER_CHUNK_SIZE) *
-    Math.ceil(problems.length / PROBLEM_CHUNK_SIZE);
-
-  const refreshInterval = enableAutoRefresh
-    ? Math.max(1, requestCount / 10) * 60_000
-    : 1_000_000_000;
+  const SEPARATOR = "###";
 
-  const userChunks = toChunks(users, USER_CHUNK_SIZE);
-  const problemChunks = toChunks(problems, PROBLEM_CHUNK_SIZE);
   const singleFetch = async (users: UserId[], problems: ProblemId[]) => {
     const userList = users.join(",");
     const problemList = problems.join(",");
     const url = `${ATCODER_API_URL}/v3/users_and_time?users=${userList}&problems=${problemList}&from=${fromSecond}&to=${toSecond}`;
     const submissions = await fetchTypedArray(url, isSubmission);
     return submissions.filter((submission) => isValidResult(submission.result));
   };
-
-  const fetcher = async () => {
+  const serialize = (users: UserId[], problems: ProblemId[]) => {
+    const sortedUsers = Array.from(users);
+    sortedUsers.sort();
+    const userKey = sortedUsers.join(",");
+
+    const sortedProblems = Array.from(problems);
+    sortedProblems.sort();
+    const problemKey = sortedProblems.join(",");
+
+    return (
+      "useVirtualContestSubmissions" +
+      SEPARATOR +
+      userKey +
+      SEPARATOR +
+      problemKey
+    );
+  };
+  const deserialize = (key: string) => {
+    const keys = key.split("###");
+    const userKey = keys[1];
+    const problemKey = keys[2];
+
+    const users = userKey.split(",");
+    const problems = problemKey.split(",");
+    return { users, problems };
+  };
+  const fetcher = async (key: string) => {
+    const { users, problems } = deserialize(key);
+    const userChunks = toChunks(users, USER_CHUNK_SIZE);
+    const problemChunks = toChunks(problems, PROBLEM_CHUNK_SIZE);
     const promises = userChunks
       .flatMap((users) =>
         problemChunks.map((problems) => ({ users, problems }))
@@ -323,13 +343,15 @@ export const useVirtualContestSubmissions = (
     return submissionChunks.flatMap((x) => x);
   };
 
-  return useSWRData(
-    "useVirtualContestSubmissions",
-    () => (users.length > 0 ? fetcher() : Promise.resolve([])),
-    {
-      refreshInterval,
-    }
-  );
+  const requestCount =
+    Math.ceil(users.length / USER_CHUNK_SIZE) *
+    Math.ceil(problems.length / PROBLEM_CHUNK_SIZE);
+  const refreshInterval = enableAutoRefresh
+    ? Math.max(1, requestCount / 10) * 60_000
+    : 1_000_000_000;
+
+  const customKey = serialize(users, problems);
+  return useSWRData(customKey, fetcher, { refreshInterval });
 };
 
 export const useRecentSubmissions = () => {

atcoder-problems-frontend/src/pages/Internal/VirtualContest/ShowContest/ContestTable.tsx

@@ -154,11 +154,11 @@ export const ContestTable = (props: Props) => {
     end,
     props.enableAutoRefresh
   );
-  if (!submissions.data && !submissions.error) {
-    return <Spinner />;
+  if (submissions.error) {
+    return <Alert color="danger">Failed to fetch submissions.</Alert>;
   }
   if (!submissions.data) {
-    return <Alert color="danger">Failed to fetch submissions.</Alert>;
+    return <Spinner />;
   }
 
   const modelArray = consolidateModels(problems, problemMap, problemModels);

atcoder-problems-frontend/src/pages/Internal/VirtualContest/ShowContest/index.tsx

@@ -68,25 +68,22 @@ const Problems = (props: {
 }) => {
   const { alreadyJoined } = props;
   const submissions = useVirtualContestSubmissions(
-    [props.atCoderUserId],
+    alreadyJoined ? [props.atCoderUserId] : [],
     props.problems.map((p) => p.item.id),
     props.start,
     props.end,
     false
   );
   const pointOverrideMap = constructPointOverrideMap(props.problems);
-  const showUserResults =
-    props.atCoderUserId !== "" &&
-    submissions.data !== null &&
-    submissions.data !== undefined;
+  const showUserResults = alreadyJoined && submissions.data;
   const results = submissions.data
     ? reduceUserContestResult(submissions.data, (id) =>
         pointOverrideMap.get(id)
       )
     : new Map<UserId, ReducedProblemResult>();
   const ResultIcon = (props: { id: ProblemId }) => {
     const result = results.get(props.id);
-    if (!alreadyJoined || !result) return null;
+    if (!result) return null;
     if (result.accepted) {
       return <FcCheckmark />;
     } else {
@@ -210,7 +207,7 @@ const Standings = (props: StandingsProps) => {
                 checked={showRating}
                 onChange={(): void => setShowRating(!showRating)}
               />
-              {alreadyJoined && (
+              {alreadyJoined && contestInfo.mode === null && (
                 <CustomInput
                   type="switch"
                   id="pinMe"