fix

Author: aster-void

packages/tests/index.ts

@@ -1,14 +1,7 @@
 {
   "name": "tests",
-  "module": "index.ts",
   "type": "module",
   "private": true,
-  "devDependencies": {
-    "@types/bun": "^1.2.19"
-  },
-  "peerDependencies": {
-    "typescript": "^5"
-  },
   "dependencies": {
     "@packages/class_data": "workspace:*",
     "@packages/models": "workspace:*",

packages/tests/package.json

@@ -1,64 +1,52 @@
-/*
- * セメスターフィルターのコンポーネント
- */
-
-import type { ClassType } from "@packages/models";
-import type React from "react";
+import type { ClassSeries } from "@packages/models";
 import { FlagButton } from "../UI/FlagButton.tsx";
 
-/**
- * クラス種別フィルターのプロパティ
- */
-interface SemesterProp {
-  selectedClassTypes?: ClassType[];
-  setSelectedClassTypes: (classType: ClassType[]) => void;
-}
-
-const ClassType1: ClassType[] = ["基礎", "要求", "主題", "展開"];
-const ClassType2: ClassType[] = ["L", "A", "B", "C", "D", "E", "F"];
+const ClassType: ClassSeries[] = ["基礎", "要求", "主題", "展開"];
+const GeneralSeries = ["L", "A", "B", "C", "D", "E", "F"] as const;
 
 /**
- * 種別フィルターのコンポーネント
- * @param prop 種別フィルターのプロパティ
- * @returns コンポーネント
+ * 成績種別・系列でフィルターする
  */
-export const ClassTypeFilter: React.FC<SemesterProp> = (prop: SemesterProp) => {
-  const selectedClassTypes = prop.selectedClassTypes ?? [];
+export function ClassSeriesFilter(props: {
+  selectedClassSeries?: ClassSeries[];
+  setSelectedClassSeries: (classSeries: ClassSeries[]) => void;
+}) {
+  const selectedClassSeries = props.selectedClassSeries ?? [];
 
   // ボタンがクリックされたときの関数
-  const onClick = (classType: ClassType) => {
-    if (selectedClassTypes.includes(classType)) {
+  const onClick = (classSeries: ClassSeries) => {
+    if (selectedClassSeries.includes(classSeries)) {
       // 既に含まれている場合、除外
-      prop.setSelectedClassTypes(
-        selectedClassTypes.filter((c) => c !== classType),
+      props.setSelectedClassSeries(
+        selectedClassSeries.filter((c) => c !== classSeries),
       );
     } else {
       // 含まれていた場合、追加
-      prop.setSelectedClassTypes([...selectedClassTypes, classType]);
+      props.setSelectedClassSeries([...selectedClassSeries, classSeries]);
     }
   };
 
   return (
     <div className="grid grid-cols-8 gap-2">
-      {ClassType1.map((c) => (
+      {ClassType.map((c) => (
         <FlagButton
           key={c}
           label={c}
-          isSelected={selectedClassTypes.includes(c)}
+          isSelected={selectedClassSeries.includes(c)}
           onClick={() => onClick(c)}
           className="col-span-2"
         />
       ))}
 
-      {ClassType2.map((c) => (
+      {GeneralSeries.map((c) => (
         <FlagButton
           key={c}
           label={c}
-          isSelected={selectedClassTypes.includes(c)}
-          onClick={() => onClick(c)}
+          isSelected={selectedClassSeries.includes(`総合${c}`)}
+          onClick={() => onClick(`総合${c}`)}
           className="aspect-square col-span-1"
         />
       ))}
     </div>
   );
-};
+}

packages/web/src/components/FilterUI/FilterComponents/ClassType.tsx

@@ -2,9 +2,14 @@
  * 全てのフィルターを表示するコンポーネント
  */
 
-import type { ClassType, Evaluation, Semester } from "@packages/models";
+import type {
+  ClassSeries,
+  ClassType,
+  Evaluation,
+  Semester,
+} from "@packages/models";
 import { useState } from "react";
-import { ClassTypeFilter } from "./FilterComponents/ClassType.tsx";
+import { ClassSeriesFilter } from "./FilterComponents/ClassType.tsx";
 import { EvaluationFilter } from "./FilterComponents/Evaluation.tsx";
 import { Freeword } from "./FilterComponents/Freeword.tsx";
 import { RegistrationFilter } from "./FilterComponents/RegistrationFilter.tsx";
@@ -19,7 +24,7 @@ type Filter = {
   semesters?: Semester[]; // セメスター
   evaluation_included?: Evaluation[]; // 含めたい評価方法
   evaluation_excluded?: Evaluation[]; // 除外したい評価方法
-  classTypes?: ClassType[]; // 種別
+  series?: ClassSeries[]; // 種別・系列
   showRegistered?: boolean; // 履修登録済みの授業を表示する
   showNotRegistered?: boolean; // 未履修の授業を表示する
 };
@@ -66,10 +71,10 @@ export const FilterUI: React.FC = () => {
       </FilterCard>
 
       <FilterCard title={"種別"}>
-        <ClassTypeFilter
-          selectedClassTypes={filter.classTypes}
-          setSelectedClassTypes={(classTypes: ClassType[]) =>
-            setFilter({ ...filter, classTypes })
+        <ClassSeriesFilter
+          selectedClassSeries={filter.series}
+          setSelectedClassSeries={(series: ClassSeries[]) =>
+            setFilter({ ...filter, series })
           }
         />
       </FilterCard>

packages/web/src/components/FilterUI/FilterUI.tsx

@@ -1,7 +1,6 @@
 import type React from "react";
 import { Link } from "react-router-dom";
 import DataLoadingIndicator from "@/components/DataLoadingIndicator";
-import { useCourseDataStatus } from "@/services/courses/data";
 import Logo from "/syllabus_icon.svg";
 // import { useCurrentUserQuery, useUpdateUserMutation } from "@/services/user/user.ts";