refactor: remove reference to problem.title

southball · southball · commit 5c071d4f49e6 · 2022-02-03T17:00:49.000+09:00
diff --git a/atcoder-problems-frontend/src/api/APIClient.ts b/atcoder-problems-frontend/src/api/APIClient.ts
@@ -226,10 +226,7 @@ export const useContestToProblems = () => {
       const problem = problemMap?.get(problem_id);
       if (problem) {
         const problems = map.get(contest_id) ?? [];
-        problems.push({
-          ...problem,
-          title: `${problem_index}. ${problem.title.replace(/^.+?\. */, "")}`,
-        });
+        problems.push({ ...problem, problem_index });
         map.set(contest_id, problems);
       }
       return map;
@@ -261,10 +258,7 @@ export const useContestToMergedProblems = () => {
       const problem = problemMap?.get(problem_id);
       if (problem) {
         const problems = map.get(contest_id) ?? [];
-        problems.push({
-          ...problem,
-          title: `${problem_index}. ${problem.title.replace(/^..*?\./, "")}`,
-        });
+        problems.push({ ...problem, problem_index });
         map.set(contest_id, problems);
       }
       return map;
diff --git a/atcoder-problems-frontend/src/components/ProblemLink.tsx b/atcoder-problems-frontend/src/components/ProblemLink.tsx
@@ -11,7 +11,8 @@ interface Props {
   className?: string;
   problemId: string;
   contestId: string;
-  problemTitle: string;
+  problemIndex?: string;
+  problemName: string;
   showDifficulty?: boolean;
   isExperimentalDifficulty?: boolean;
   showDifficultyUnavailable?: boolean;
@@ -25,13 +26,18 @@ export const ProblemLink: React.FC<Props> = (props) => {
   const {
     contestId,
     problemId,
-    problemTitle,
+    problemIndex,
+    problemName,
     showDifficulty,
     isExperimentalDifficulty,
     showDifficultyUnavailable,
     problemModel,
     userRatingInfo,
   } = props;
+  const problemTitle = problemIndex
+    ? `${problemIndex}. ${problemName}`
+    : problemName;
+
   const link = (
     <NewTabLink
       href={Url.formatProblemUrl(problemId, contestId)}
diff --git a/atcoder-problems-frontend/src/components/ProblemSearchBox.tsx b/atcoder-problems-frontend/src/components/ProblemSearchBox.tsx
@@ -17,7 +17,7 @@ const problemMatch = (text: string, problem: Problem): boolean => {
       .every(
         (word) =>
           (word.trim().length > 0 &&
-            problem.title.toLowerCase().includes(word.toLowerCase())) ||
+            problem.name.toLowerCase().includes(word.toLowerCase())) ||
           formatProblemUrl(problem.id, problem.contest_id)
             .toLowerCase()
             .includes(word.toLowerCase())
@@ -76,7 +76,9 @@ export const ProblemSearchBox: React.FC<Props> = (props) => {
               setFocusingId(-1);
             }}
           >
-            <ListGroupItemHeading>{problem.title}</ListGroupItemHeading>
+            <ListGroupItemHeading>
+              {problem.problem_index}. {problem.name}
+            </ListGroupItemHeading>
             <ListGroupItemText>
               {formatProblemUrl(problem.id, problem.contest_id)}
             </ListGroupItemText>
diff --git a/atcoder-problems-frontend/src/components/SubmissionListTable.tsx b/atcoder-problems-frontend/src/components/SubmissionListTable.tsx
@@ -23,10 +23,14 @@ export const SubmissionListTable: React.FC<Props> = (props) => {
   const { submissions, userRatingInfo } = props;
   const problems = useProblems() ?? [];
   const problemModels = useProblemModelMap();
-  const titleMap = problems.reduce((map, p) => {
-    map.set(p.id, p.title);
-    return map;
-  }, new Map<string, string>());
+  const [problemIndexMap, nameMap] = problems.reduce(
+    ([problemIndexMap, nameMap], p) => {
+      problemIndexMap.set(p.id, p.problem_index);
+      nameMap.set(p.id, p.name);
+      return [problemIndexMap, nameMap];
+    },
+    [new Map<string, string>(), new Map<string, string>()]
+  );
 
   const verdictOptions: { [_: string]: string } = Array.from(
     submissions.reduce((set, s) => {
@@ -56,7 +60,11 @@ export const SubmissionListTable: React.FC<Props> = (props) => {
     <BootstrapTable
       data={submissions
         .sort((a, b) => b.epoch_second - a.epoch_second)
-        .map((s) => ({ title: titleMap.get(s.problem_id), ...s }))}
+        .map((s) => ({
+          problemIndex: problemIndexMap.get(s.problem_id) ?? "",
+          name: nameMap.get(s.problem_id) ?? "",
+          ...s,
+        }))}
       keyField="id"
       height="auto"
       hover
@@ -107,9 +115,9 @@ export const SubmissionListTable: React.FC<Props> = (props) => {
       <TableHeaderColumn
         filterFormatted
         dataSort
-        dataField="title"
+        dataField="name"
         dataFormat={(
-          title: string | undefined,
+          name: string | undefined,
           { problem_id, contest_id }: Submission
         ): React.ReactElement => (
           <ProblemLink
@@ -118,7 +126,8 @@ export const SubmissionListTable: React.FC<Props> = (props) => {
             }
             showDifficulty={true}
             problemId={problem_id}
-            problemTitle={title || ""}
+            problemIndex={problemIndexMap.get(problem_id) || ""}
+            problemName={name || ""}
             contestId={contest_id}
             problemModel={problemModels?.get(problem_id) ?? null}
             userRatingInfo={userRatingInfo}
diff --git a/atcoder-problems-frontend/src/interfaces/MergedProblem.ts b/atcoder-problems-frontend/src/interfaces/MergedProblem.ts
@@ -11,7 +11,8 @@ export default interface MergedProblem {
   // Basic information
   readonly id: string;
   readonly contest_id: string;
-  readonly title: string;
+  readonly problem_index: string;
+  readonly name: string;
 
   // Information for first AC
   readonly first_user_id: string | null;
@@ -39,7 +40,8 @@ export const isMergedProblem = (obj: unknown): obj is MergedProblem =>
   obj !== null &&
   hasPropertyAsType(obj, "id", isString) &&
   hasPropertyAsType(obj, "contest_id", isString) &&
-  hasPropertyAsType(obj, "title", isString) &&
+  hasPropertyAsType(obj, "problem_index", isString) &&
+  hasPropertyAsType(obj, "name", isString) &&
   hasPropertyAsTypeOrNull(obj, "first_user_id", isString) &&
   hasPropertyAsTypeOrNull(obj, "first_contest_id", isString) &&
   hasPropertyAsTypeOrNull(obj, "first_submission_id", isNumber) &&
diff --git a/atcoder-problems-frontend/src/interfaces/Problem.ts b/atcoder-problems-frontend/src/interfaces/Problem.ts
@@ -4,10 +4,12 @@ import { hasPropertyAsType, isString } from "../utils/TypeUtils";
 export default interface Problem {
   readonly id: string;
   readonly contest_id: string;
-  readonly title: string;
+  readonly problem_index: string;
+  readonly name: string;
 }
 
 export const isProblem = (obj: unknown): obj is Problem =>
   hasPropertyAsType(obj, "id", isString) &&
   hasPropertyAsType(obj, "contest_id", isString) &&
-  hasPropertyAsType(obj, "title", isString);
+  hasPropertyAsType(obj, "problem_index", isString) &&
+  hasPropertyAsType(obj, "name", isString);
diff --git a/atcoder-problems-frontend/src/pages/Internal/MyAccountPage/ResetProgress.tsx b/atcoder-problems-frontend/src/pages/Internal/MyAccountPage/ResetProgress.tsx
@@ -52,7 +52,8 @@ export const ResetProgress: React.FC = () => {
                         <ProblemLink
                           problemId={problem.id}
                           contestId={problem.contest_id}
-                          problemTitle={problem.title}
+                          problemIndex={problem.problem_index}
+                          problemName={problem.name}
                         />
                       ) : (
                         item.problem_id
diff --git a/atcoder-problems-frontend/src/pages/Internal/ProblemList/SingleProblemList.tsx b/atcoder-problems-frontend/src/pages/Internal/ProblemList/SingleProblemList.tsx
@@ -188,7 +188,7 @@ const ProblemEntry: React.FC<{
       <ListGroupItemHeading>
         {problem ? (
           <NewTabLink href={formatProblemUrl(problem.id, problem.contest_id)}>
-            {problem.title}
+            {problem.problem_index}. {problem.name}
           </NewTabLink>
         ) : (
           item.problem_id
diff --git a/atcoder-problems-frontend/src/pages/Internal/VirtualContest/DraggableContestConfigProblemTable/ProblemCell.tsx b/atcoder-problems-frontend/src/pages/Internal/VirtualContest/DraggableContestConfigProblemTable/ProblemCell.tsx
@@ -22,7 +22,8 @@ export const ProblemCell: React.FC<ProblemCellProps> = ({
         <ProblemLink
           problemId={problem.id}
           contestId={problem.contest_id}
-          problemTitle={problem.title}
+          problemIndex={problem.problem_index}
+          problemName={problem.name}
           showDifficulty={true}
           problemModel={problemModel}
           isExperimentalDifficulty={problemModel?.is_experimental}
diff --git a/atcoder-problems-frontend/src/pages/Internal/VirtualContest/DraggableContestConfigProblemTable/index.tsx b/atcoder-problems-frontend/src/pages/Internal/VirtualContest/DraggableContestConfigProblemTable/index.tsx
@@ -87,7 +87,9 @@ export const DraggableContestConfigProblemTable: React.FC<Props> = (props) => {
       compare: (a: VirtualContestItem, b: VirtualContestItem): number => {
         const getTitle = (problemId: ProblemId): string => {
           const problem = problemMap?.get(problemId);
-          const title = problem?.title ? problem.title : "";
+          const title = `${problem?.problem_index ?? ""}. ${
+            problem?.name ?? ""
+          }`;
           return title;
         };
         const aTitle = getTitle(a.id);
diff --git a/atcoder-problems-frontend/src/pages/Internal/VirtualContest/ShowContest/ContestTable.tsx b/atcoder-problems-frontend/src/pages/Internal/VirtualContest/ShowContest/ContestTable.tsx
@@ -262,7 +262,7 @@ export const ContestTable = (props: Props) => {
                   <ProblemLink
                     problemId={p.id}
                     contestId={p.contestId}
-                    problemTitle={`${i + 1}`}
+                    problemName={`${i + 1}`}
                   />
                 ) : (
                   i + 1
diff --git a/atcoder-problems-frontend/src/pages/Internal/VirtualContest/ShowContest/LockoutContestTable/index.tsx b/atcoder-problems-frontend/src/pages/Internal/VirtualContest/ShowContest/LockoutContestTable/index.tsx
@@ -121,7 +121,7 @@ export const LockoutContestTable: React.FC<Props> = (props) => {
                         <ProblemLink
                           problemId={problem.item.id}
                           contestId={problem.contestId}
-                          problemTitle={problem.title}
+                          problemName={problem.title}
                           className={status ? "text-white" : "text-link"}
                         />
                       ) : (
diff --git a/atcoder-problems-frontend/src/pages/Internal/VirtualContest/ShowContest/TrainingContestTable/SmallScoreCell.tsx b/atcoder-problems-frontend/src/pages/Internal/VirtualContest/ShowContest/TrainingContestTable/SmallScoreCell.tsx
@@ -49,7 +49,7 @@ export const SmallScoreCell: React.FC<Props> = (props) => {
               <ProblemLink
                 problemId={problem.id}
                 contestId={problem.contestId}
-                problemTitle={problem.title}
+                problemName={problem.title}
               />
             ) : (
               <b>{problem.title}</b>
diff --git a/atcoder-problems-frontend/src/pages/Internal/VirtualContest/ShowContest/index.tsx b/atcoder-problems-frontend/src/pages/Internal/VirtualContest/ShowContest/index.tsx
@@ -136,7 +136,7 @@ const Problems = (props: {
                       <ProblemLink
                         problemId={p.id}
                         contestId={p.contestId}
-                        problemTitle={`${i + 1}`}
+                        problemName={`${i + 1}`}
                       />
                     ) : (
                       i + 1
@@ -147,7 +147,7 @@ const Problems = (props: {
                       <ProblemLink
                         problemId={p.id}
                         contestId={p.contestId}
-                        problemTitle={p.title}
+                        problemName={p.title}
                       />
                     ) : (
                       p.id
@@ -363,7 +363,7 @@ export const ShowContest = (props: Props) => {
         return {
           item,
           contestId: problem.contest_id,
-          title: problem.title,
+          title: `${problem.problem_index}. ${problem.name}`,
         };
       } else {
         return { item };
diff --git a/atcoder-problems-frontend/src/pages/ListPage/ListTable.tsx b/atcoder-problems-frontend/src/pages/ListPage/ListTable.tsx
@@ -162,7 +162,7 @@ export const ListTable: React.FC<Props> = (props) => {
         const problemModel = problemModels?.get(p.id);
         return {
           id: p.id,
-          title: p.title,
+          title: `${p.problem_index}. ${p.name}`,
           contest,
           contestDate,
           contestTitle,
@@ -257,7 +257,7 @@ export const ListTable: React.FC<Props> = (props) => {
             showDifficulty={true}
             isExperimentalDifficulty={row.problemModel?.is_experimental}
             problemId={row.mergedProblem.id}
-            problemTitle={row.title}
+            problemName={row.title}
             contestId={row.mergedProblem.contest_id}
             problemModel={row.problemModel}
             userRatingInfo={userRatingInfo}
diff --git a/atcoder-problems-frontend/src/pages/TablePage/AtCoderRegularTable.tsx b/atcoder-problems-frontend/src/pages/TablePage/AtCoderRegularTable.tsx
@@ -38,11 +38,12 @@ interface Props {
 }
 
 const getProblemHeaderAlphabet = (problem: MergedProblem, contest: Contest) => {
-  const list = problem.title.split(".");
-  if (list.length === 0) return "";
-  if (list[0] === "H" && classifyContest(contest).startsWith("ABC"))
+  if (
+    problem.problem_index === "H" &&
+    classifyContest(contest).startsWith("ABC")
+  )
     return "Ex";
-  return list[0];
+  return problem.problem_index;
 };
 
 const AtCoderRegularTableSFC: React.FC<Props> = (props) => {
@@ -181,7 +182,8 @@ const AtCoderRegularTableSFC: React.FC<Props> = (props) => {
                       showDifficulty={props.showDifficulty}
                       contestId={contest.id}
                       problemId={problem.problem.id}
-                      problemTitle={problem.problem.title}
+                      problemIndex={problem.problem.problem_index}
+                      problemName={problem.problem.name}
                       problemModel={model}
                       userRatingInfo={userRatingInfo}
                     />
diff --git a/atcoder-problems-frontend/src/pages/TablePage/ContestTable.test.tsx b/atcoder-problems-frontend/src/pages/TablePage/ContestTable.test.tsx
@@ -1,21 +1,21 @@
-import { convertProblemTitleForSorting } from "./ContestTable";
+import { convertProblemIndexForSorting } from "./ContestTable";
 
-describe("Convert a problem title", () => {
+describe("Convert a problem index", () => {
   it("No number", () => {
-    const title = "J. Kuru Kuru Kururin";
-    expect(convertProblemTitleForSorting(title)).toMatchObject(["J", NaN]);
+    const index = "J";
+    expect(convertProblemIndexForSorting(index)).toMatchObject(["J", NaN]);
   });
 
   it("No string", () => {
-    const title = "1000000007. The Most Famous Prime Number";
-    expect(convertProblemTitleForSorting(title)).toMatchObject([
+    const index = "1000000007";
+    expect(convertProblemIndexForSorting(index)).toMatchObject([
       "",
       1000000007,
     ]);
   });
 
   it("Both exists", () => {
-    const title = "EX1. 1.01";
-    expect(convertProblemTitleForSorting(title)).toMatchObject(["EX", 1]);
+    const index = "EX1";
+    expect(convertProblemIndexForSorting(index)).toMatchObject(["EX", 1]);
   });
 });
diff --git a/atcoder-problems-frontend/src/pages/TablePage/ContestTable.tsx b/atcoder-problems-frontend/src/pages/TablePage/ContestTable.tsx
@@ -25,12 +25,11 @@ interface Props {
   userRatingInfo: RatingInfo;
 }
 
-export const convertProblemTitleForSorting = (
-  title: string
+export const convertProblemIndexForSorting = (
+  problem_index: string
 ): [string, number] => {
-  const idx = title.split(".")[0];
-  const str = idx.replace(/[0-9]/g, "");
-  const num = parseInt(idx.replace(/[^0-9]/g, ""), 10);
+  const str = problem_index.replace(/[0-9]/g, "");
+  const num = parseInt(problem_index.replace(/[^0-9]/g, ""), 10);
   return [str, num];
 };
 
@@ -51,8 +50,8 @@ export const ContestTable: React.FC<Props> = (props) => {
     .map((contest) => ({
       contest,
       problems: (contestToProblems.get(contest.id) ?? []).sort((a, b) => {
-        const [str_a, num_a] = convertProblemTitleForSorting(a.title);
-        const [str_b, num_b] = convertProblemTitleForSorting(b.title);
+        const [str_a, num_a] = convertProblemIndexForSorting(a.problem_index);
+        const [str_b, num_b] = convertProblemIndexForSorting(b.problem_index);
         const cmp = str_a.localeCompare(str_b);
         return cmp === 0 ? num_a - num_b : cmp;
       }),
@@ -118,8 +117,9 @@ export const ContestTable: React.FC<Props> = (props) => {
                             showDifficultyUnavailable={isRatedContest(contest)}
                             showDifficulty={props.showDifficulty}
                             problemId={problem.id}
-                            problemTitle={problem.title}
                             contestId={problem.contest_id}
+                            problemIndex={problem.problem_index}
+                            problemName={problem.name}
                             problemModel={model}
                             userRatingInfo={userRatingInfo}
                           />
diff --git a/atcoder-problems-frontend/src/pages/TrainingPage/SingleCourseView.tsx b/atcoder-problems-frontend/src/pages/TrainingPage/SingleCourseView.tsx
@@ -51,7 +51,8 @@ const ProblemTable: React.FC<ProblemTableProps> = (props) => {
               <td>
                 <ProblemLink
                   problemId={problem.id}
-                  problemTitle={problem.title}
+                  problemIndex={problem.problem_index}
+                  problemName={problem.name}
                   contestId={problem.contest_id}
                   problemModel={model}
                   isExperimentalDifficulty={!!model && model.is_experimental}
diff --git a/atcoder-problems-frontend/src/pages/UserPage/PieChartBlock/index.tsx b/atcoder-problems-frontend/src/pages/UserPage/PieChartBlock/index.tsx
@@ -80,7 +80,7 @@ const solvedCountForPieChart = (
           : validSubmissions?.find((s) => isAccepted(s.result))
           ? SubmissionStatus.ACCEPTED
           : SubmissionStatus.REJECTED;
-        return { title: problem.title, status };
+        return { title: problem.name, status };
       });
       return { titleStatus };
     })
@@ -104,7 +104,7 @@ const solvedCountForPieChart = (
     );
   const totalCount = contestToProblems
     .map(([, problems]) => {
-      const problemTitles = problems.map((problem) => problem.title);
+      const problemTitles = problems.map((problem) => problem.name);
       return { problemTitles };
     })
     .map(({ problemTitles }) =>
diff --git a/atcoder-problems-frontend/src/pages/UserPage/Recommendations/index.tsx b/atcoder-problems-frontend/src/pages/UserPage/Recommendations/index.tsx
