Merge pull request #1286 from AtCoder-NoviSteps/#1285

💥 Only curriculum workbooks are filtered by grades (#1285)

Author: KATO-Hiro

src/lib/components/WorkBooks/WorkBookList.svelte

@@ -36,19 +36,19 @@
     }
   }
 
-  // 手引き
+  // カリキュラム（手引き）、解法別、ユーザ作成
   let mainWorkbooks: WorkbooksList;
 
   $: mainWorkbooks =
-    workbookType === WorkBookType.CREATED_BY_USER
-      ? workbooks
-      : workbooks.filter((workbook: WorkbookList) => {
+    workbookType === WorkBookType.CURRICULUM
+      ? workbooks.filter((workbook: WorkbookList) => {
           const gradeMode = getGradeMode(workbook.id);
           return gradeMode === selectedGrade && !workbook.isReplenished;
-        });
+        })
+      : workbooks;
   $: readableMainWorkbooksCount = () => countReadableWorkbooks(mainWorkbooks);
 
-  // 補充
+  // カリキュラム（補充）
   let replenishedWorkbooks: WorkbooksList;
 
   $: replenishedWorkbooks = workbooks.filter((workbook: WorkbookList) => {
@@ -72,22 +72,22 @@
     return workbookGradeModes.get(workbookId) ?? TaskGrade.PENDING;
   }
 
-  function filterByGradeLower(grade: TaskGrade) {
+  function filterByGradeMode(grade: TaskGrade) {
     selectedGrade = grade;
     taskGradesByWorkBookTypeStore.updateTaskGrade(workbookType, grade);
   }
 </script>
 
 <!-- TODO: 6Q〜1Q?にも対応 -->
 <!-- TODO: 「ユーザ作成」の問題集には、検索機能を追加 -->
-{#if workbookType !== WorkBookType.CREATED_BY_USER}
+{#if workbookType === WorkBookType.CURRICULUM}
   <div class="mb-6">
     <div class="flex flex-col md:flex-row items-start md:items-center justify-between">
       <div class="flex items-center space-x-4">
         <ButtonGroup>
           {#each [TaskGrade.Q10, TaskGrade.Q9, TaskGrade.Q8, TaskGrade.Q7] as grade}
             <Button
-              on:click={() => filterByGradeLower(grade)}
+              on:click={() => filterByGradeMode(grade)}
               class={selectedGrade === grade ? 'text-primary-700' : 'text-gray-900'}
             >
               {getTaskGradeLabel(grade)}
@@ -100,11 +100,9 @@
         />
       </div>
 
-      {#if workbookType === WorkBookType.CURRICULUM}
-        <div class="mt-4 md:mt-0">
-          <Toggle bind:checked={isShowReplenishment}>「補充」があれば表示</Toggle>
-        </div>
-      {/if}
+      <div class="mt-4 md:mt-0">
+        <Toggle bind:checked={isShowReplenishment}>「補充」があれば表示</Toggle>
+      </div>
     </div>
   </div>
 {/if}

src/test/lib/stores/task_grades_by_workbook_type.test.ts

@@ -26,7 +26,6 @@ describe('Task grades by workbook type', () => {
   describe('initial values is 10Q in each workbook type', () => {
     const testCases = [
       { workBookType: WorkBookType.CURRICULUM, expected: TaskGrade.Q10 },
-      { workBookType: WorkBookType.TEXTBOOK, expected: TaskGrade.Q10 },
       { workBookType: WorkBookType.SOLUTION, expected: TaskGrade.Q10 },
     ];
     runTests('getTaskGrade', testCases, ({ workBookType, expected }: InitialState) => {
@@ -48,14 +47,6 @@ describe('Task grades by workbook type', () => {
       { workBookType: WorkBookType.CURRICULUM, newGrade: TaskGrade.Q9, expected: TaskGrade.Q9 },
       { workBookType: WorkBookType.CURRICULUM, newGrade: TaskGrade.Q8, expected: TaskGrade.Q8 },
       { workBookType: WorkBookType.CURRICULUM, newGrade: TaskGrade.Q7, expected: TaskGrade.Q7 },
-      { workBookType: WorkBookType.TEXTBOOK, newGrade: TaskGrade.Q10, expected: TaskGrade.Q10 },
-      { workBookType: WorkBookType.TEXTBOOK, newGrade: TaskGrade.Q9, expected: TaskGrade.Q9 },
-      { workBookType: WorkBookType.TEXTBOOK, newGrade: TaskGrade.Q8, expected: TaskGrade.Q8 },
-      { workBookType: WorkBookType.TEXTBOOK, newGrade: TaskGrade.Q7, expected: TaskGrade.Q7 },
-      { workBookType: WorkBookType.SOLUTION, newGrade: TaskGrade.Q10, expected: TaskGrade.Q10 },
-      { workBookType: WorkBookType.SOLUTION, newGrade: TaskGrade.Q9, expected: TaskGrade.Q9 },
-      { workBookType: WorkBookType.SOLUTION, newGrade: TaskGrade.Q8, expected: TaskGrade.Q8 },
-      { workBookType: WorkBookType.SOLUTION, newGrade: TaskGrade.Q7, expected: TaskGrade.Q7 },
     ];
     runTests(
       'updateTaskGradeOnce',