✨ Add task index to contest name (#1145)

Author: KATO-Hiro

src/lib/components/TaskForm.svelte

@@ -11,6 +11,7 @@
     Button,
   } from 'flowbite-svelte';
 
+  import { addContestNameToTaskIndex } from '$lib/utils/contest';
   import { taskGradeValues, type Task } from '$lib/types/task';
   import { getTaskGradeLabel, removeTaskIndexFromTitle } from '$lib/utils/task';
 
@@ -43,7 +44,7 @@
       <TableBodyRow>
         <TableBodyCell>出典</TableBodyCell>
         <TableBodyCell>
-          {task.contest_id}
+          {addContestNameToTaskIndex(task.contest_id, task.task_table_index)}
         </TableBodyCell>
       </TableBodyRow>
       <TableBodyRow>

src/lib/components/TaskList.svelte

@@ -18,7 +18,7 @@
   import ExternalLinkWrapper from '$lib/components/ExternalLinkWrapper.svelte';
   import AcceptedCounter from '$lib/components/SubmissionStatus/AcceptedCounter.svelte';
   import { getBackgroundColorFrom } from '$lib/services/submission_status';
-  import { getContestNameLabel } from '$lib/utils/contest';
+  import { addContestNameToTaskIndex } from '$lib/utils/contest';
   import { toWhiteTextIfNeeds, taskUrl, removeTaskIndexFromTitle } from '$lib/utils/task';
 
   export let grade: string;
@@ -92,7 +92,7 @@
                 />
               </TableBodyCell>
               <TableBodyCell class="pl-0 xs:text-lg text-gray-700 dark:text-gray-300">
-                {getContestNameLabel(taskResult.contest_id)}
+                {addContestNameToTaskIndex(taskResult.contest_id, taskResult.task_table_index)}
               </TableBodyCell>
               <TableBodyCell class="px-0">
                 {#if isAdmin}

src/lib/components/TaskListSorted.svelte

@@ -11,7 +11,7 @@
 
   import type { TaskResults } from '$lib/types/task';
 
-  import { getContestNameLabel } from '$lib/utils/contest';
+  import { addContestNameToTaskIndex } from '$lib/utils/contest';
   import { removeTaskIndexFromTitle } from '$lib/utils/task';
 
   export let taskResults: TaskResults;
@@ -43,7 +43,7 @@
           </a>
         </TableBodyCell>
         <TableBodyCell>
-          {getContestNameLabel(taskResult.contest_id)}
+          {addContestNameToTaskIndex(taskResult.contest_id, taskResult.task_table_index)}
         </TableBodyCell>
         <TableBodyCell>{taskResult.updated_at.toLocaleString()}</TableBodyCell>
       </TableBodyRow>

src/lib/components/WorkBookTasks/WorkBookTasksTable.svelte

@@ -10,7 +10,7 @@
   } from 'flowbite-svelte';
 
   import ExternalLinkWrapper from '$lib/components/ExternalLinkWrapper.svelte';
-  import { getContestNameLabel } from '$lib/utils/contest';
+  import { addContestNameToTaskIndex } from '$lib/utils/contest';
   import { taskUrl, removeTaskIndexFromTitle } from '$lib/utils/task';
 
   import type { WorkBookTaskBase, WorkBookTaskCreate, WorkBookTaskEdit } from '$lib/types/workbook';
@@ -128,7 +128,10 @@
 
           <!-- 出典 -->
           <TableBodyCell class="xs:text-lg text-gray-700 dark:text-gray-300 truncate">
-            {getContestNameLabel(task.contestId)}
+            {addContestNameToTaskIndex(
+              task.contestId,
+              getTaskTableIndex(tasksMapByIds, task.taskId),
+            )}
           </TableBodyCell>
 
           <!-- 一言（コメント・ヒント） -->

src/lib/utils/contest.ts

@@ -132,3 +132,9 @@ export const getContestNameLabel = (contest_id: string) => {
 
   return contest_id.toUpperCase();
 };
+
+export const addContestNameToTaskIndex = (contestId: string, taskTableIndex: string): string => {
+  const contestName = getContestNameLabel(contestId);
+
+  return `${contestName} - ${taskTableIndex}`;
+};

src/routes/workbooks/[slug]/+page.svelte

@@ -22,7 +22,7 @@
   import { getBackgroundColorFrom } from '$lib/services/submission_status';
 
   import { taskUrl, removeTaskIndexFromTitle } from '$lib/utils/task';
-  import { getContestNameLabel } from '$lib/utils/contest';
+  import { addContestNameToTaskIndex } from '$lib/utils/contest';
 
   import type { WorkBookTaskBase } from '$lib/types/workbook';
   import type { TaskResult, TaskGrade } from '$lib/types/task';
@@ -50,7 +50,9 @@
 
   const getContestNameFrom = (taskId: string): string => {
     const contestId = getContestIdFrom(taskId);
-    return getContestNameLabel(contestId);
+    const taskTableIndex = getTaskTableIndex(taskId);
+
+    return addContestNameToTaskIndex(contestId, taskTableIndex);
   };
 
   const getTaskName = (taskId: string): string => {