diff --git a/src/modules/exams/components/exam-actions.tsx b/src/modules/exams/components/exam-actions.tsx
index ecb6c15..d8f83b0 100644
--- a/src/modules/exams/components/exam-actions.tsx
+++ b/src/modules/exams/components/exam-actions.tsx
@@ -79,7 +79,7 @@ export function ExamActions({ exam }: ExamActionsProps) {
toast.error("Failed to load exam preview")
setShowViewDialog(false)
}
- } catch (e) {
+ } catch {
toast.error("Failed to load exam preview")
setShowViewDialog(false)
} finally {
diff --git a/src/modules/exams/components/exam-assembly.tsx b/src/modules/exams/components/exam-assembly.tsx
index 1cafa6b..9f7b049 100644
--- a/src/modules/exams/components/exam-assembly.tsx
+++ b/src/modules/exams/components/exam-assembly.tsx
@@ -1,7 +1,6 @@
"use client"
-import { useDeferredValue, useMemo, useState, useTransition, useEffect, useRef } from "react"
-import { useFormStatus } from "react-dom"
+import { useCallback, useDeferredValue, useMemo, useState, useTransition, useEffect, useRef } from "react"
import { useRouter } from "next/navigation"
import { toast } from "sonner"
import { Search, Eye } from "lucide-react"
@@ -34,15 +33,6 @@ type ExamAssemblyProps = {
questionOptions: Question[]
}
-function SubmitButton({ label }: { label: string }) {
- const { pending } = useFormStatus()
- return (
-
- )
-}
-
export function ExamAssembly(props: ExamAssemblyProps) {
const router = useRouter()
const [search, setSearch] = useState("")
@@ -83,7 +73,7 @@ export function ExamAssembly(props: ExamAssemblyProps) {
return []
})
- const fetchQuestions = (reset: boolean = false) => {
+ const fetchQuestions = useCallback((reset: boolean = false) => {
startBankTransition(async () => {
const nextPage = reset ? 1 : page + 1
try {
@@ -107,11 +97,11 @@ export function ExamAssembly(props: ExamAssemblyProps) {
setHasMore(result.data.length === 20)
setPage(nextPage)
}
- } catch (error) {
+ } catch {
toast.error("Failed to load questions")
}
})
- }
+ }, [deferredSearch, page, startBankTransition, typeFilter, difficultyFilter])
const isFirstRender = useRef(true)
@@ -123,7 +113,7 @@ export function ExamAssembly(props: ExamAssemblyProps) {
}
}
fetchQuestions(true)
- }, [deferredSearch, typeFilter, difficultyFilter])
+ }, [deferredSearch, typeFilter, difficultyFilter, fetchQuestions])
// Recursively calculate total score
const assignedTotal = useMemo(() => {
diff --git a/src/modules/exams/data-access.ts b/src/modules/exams/data-access.ts
index d002eae..4782452 100644
--- a/src/modules/exams/data-access.ts
+++ b/src/modules/exams/data-access.ts
@@ -149,8 +149,8 @@ export const omitScheduledAtFromDescription = (description: string | null): stri
try {
const meta = JSON.parse(description)
if (typeof meta === "object" && meta !== null) {
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- const { scheduledAt, ...rest } = meta as any
+ const rest = { ...(meta as Record
) }
+ delete rest.scheduledAt
return JSON.stringify(rest)
}
return description
diff --git a/src/modules/homework/actions.ts b/src/modules/homework/actions.ts
index 81eb139..5b37bfa 100644
--- a/src/modules/homework/actions.ts
+++ b/src/modules/homework/actions.ts
@@ -1,64 +1,64 @@
"use server"
import { revalidatePath } from "next/cache"
-import { headers } from "next/headers"
import { createId } from "@paralleldrive/cuid2"
-import { and, count, eq } from "drizzle-orm"
+import { and, count, eq, inArray } from "drizzle-orm"
+import { auth } from "@/auth"
import { db } from "@/shared/db"
import {
classes,
classEnrollments,
+ classSubjectTeachers,
exams,
homeworkAnswers,
homeworkAssignmentQuestions,
homeworkAssignmentTargets,
homeworkAssignments,
homeworkSubmissions,
+ roles,
users,
+ usersToRoles,
} from "@/shared/db/schema"
import type { ActionState } from "@/shared/types/action-state"
import { CreateHomeworkAssignmentSchema, GradeHomeworkSchema } from "./schema"
-type CurrentUser = { id: string; role: "admin" | "teacher" | "student" }
+type TeacherRole = "admin" | "teacher"
+type StudentRole = "student"
-async function getCurrentUser() {
- const ref = (await headers()).get("referer") || ""
- const roleHint: CurrentUser["role"] = ref.includes("/admin/")
- ? "admin"
- : ref.includes("/student/")
- ? "student"
- : ref.includes("/teacher/")
- ? "teacher"
- : "teacher"
-
- const byRole = await db.query.users.findFirst({
- where: eq(users.role, roleHint),
- orderBy: (u, { asc }) => [asc(u.createdAt)],
- })
-
- if (byRole) return { id: byRole.id, role: roleHint }
-
- const anyUser = await db.query.users.findFirst({
- orderBy: (u, { asc }) => [asc(u.createdAt)],
- })
-
- if (anyUser) return { id: anyUser.id, role: roleHint }
-
- return { id: "user_teacher_math", role: roleHint }
+const getSessionUserId = async (): Promise => {
+ const session = await auth()
+ const userId = String(session?.user?.id ?? "").trim()
+ return userId.length > 0 ? userId : null
}
-async function ensureTeacher() {
- const user = await getCurrentUser()
- if (!user || (user.role !== "teacher" && user.role !== "admin")) throw new Error("Unauthorized")
- return user
+async function ensureTeacher(): Promise<{ id: string; role: TeacherRole }> {
+ const userId = await getSessionUserId()
+ if (!userId) throw new Error("Unauthorized")
+ const [row] = await db
+ .select({ id: users.id, role: roles.name })
+ .from(users)
+ .innerJoin(usersToRoles, eq(usersToRoles.userId, users.id))
+ .innerJoin(roles, eq(usersToRoles.roleId, roles.id))
+ .where(and(eq(users.id, userId), inArray(roles.name, ["teacher", "admin"])))
+ .limit(1)
+ if (!row) throw new Error("Unauthorized")
+ return { id: row.id, role: row.role as TeacherRole }
}
-async function ensureStudent() {
- const user = await getCurrentUser()
- if (!user || user.role !== "student") throw new Error("Unauthorized")
- return user
+async function ensureStudent(): Promise<{ id: string; role: StudentRole }> {
+ const userId = await getSessionUserId()
+ if (!userId) throw new Error("Unauthorized")
+ const [row] = await db
+ .select({ id: users.id })
+ .from(users)
+ .innerJoin(usersToRoles, eq(usersToRoles.userId, users.id))
+ .innerJoin(roles, eq(usersToRoles.roleId, roles.id))
+ .where(and(eq(users.id, userId), eq(roles.name, "student")))
+ .limit(1)
+ if (!row) throw new Error("Unauthorized")
+ return { id: row.id, role: "student" }
}
const parseStudentIds = (raw: string): string[] => {
@@ -108,12 +108,12 @@ export async function createHomeworkAssignmentAction(
const input = parsed.data
const publish = input.publish ?? true
- const [ownedClass] = await db
- .select({ id: classes.id })
+ const [classRow] = await db
+ .select({ id: classes.id, teacherId: classes.teacherId })
.from(classes)
- .where(user.role === "admin" ? eq(classes.id, input.classId) : and(eq(classes.id, input.classId), eq(classes.teacherId, user.id)))
+ .where(eq(classes.id, input.classId))
.limit(1)
- if (!ownedClass) return { success: false, message: "Class not found" }
+ if (!classRow) return { success: false, message: "Class not found" }
const exam = await db.query.exams.findFirst({
where: eq(exams.id, input.sourceExamId),
@@ -126,23 +126,43 @@ export async function createHomeworkAssignmentAction(
if (!exam) return { success: false, message: "Exam not found" }
+ if (user.role !== "admin" && classRow.teacherId !== user.id) {
+ const assignedSubjectRows = await db
+ .select({ subjectId: classSubjectTeachers.subjectId })
+ .from(classSubjectTeachers)
+ .where(and(eq(classSubjectTeachers.classId, input.classId), eq(classSubjectTeachers.teacherId, user.id)))
+ if (assignedSubjectRows.length === 0) {
+ return { success: false, message: "Not assigned to this class" }
+ }
+ const assignedSubjectIds = new Set(assignedSubjectRows.map((r) => r.subjectId))
+ if (!exam.subjectId) {
+ return { success: false, message: "Exam subject not set" }
+ }
+ if (!assignedSubjectIds.has(exam.subjectId)) {
+ return { success: false, message: "Not assigned to this subject" }
+ }
+ }
+
const assignmentId = createId()
const availableAt = input.availableAt ? new Date(input.availableAt) : null
const dueAt = input.dueAt ? new Date(input.dueAt) : null
const lateDueAt = input.lateDueAt ? new Date(input.lateDueAt) : null
+ const classScope =
+ user.role === "admin"
+ ? eq(classes.id, input.classId)
+ : classRow.teacherId === user.id
+ ? eq(classes.teacherId, user.id)
+ : eq(classes.id, input.classId)
+
const classStudentIds = (
await db
.select({ studentId: classEnrollments.studentId })
.from(classEnrollments)
.innerJoin(classes, eq(classes.id, classEnrollments.classId))
.where(
- and(
- eq(classEnrollments.classId, input.classId),
- eq(classEnrollments.status, "active"),
- user.role === "admin" ? eq(classes.id, input.classId) : eq(classes.teacherId, user.id)
- )
+ and(eq(classEnrollments.classId, input.classId), eq(classEnrollments.status, "active"), classScope)
)
).map((r) => r.studentId)
diff --git a/src/modules/homework/components/homework-take-view.tsx b/src/modules/homework/components/homework-take-view.tsx
index 5295e2a..a632b8b 100644
--- a/src/modules/homework/components/homework-take-view.tsx
+++ b/src/modules/homework/components/homework-take-view.tsx
@@ -12,7 +12,6 @@ import { Checkbox } from "@/shared/components/ui/checkbox"
import { Label } from "@/shared/components/ui/label"
import { Textarea } from "@/shared/components/ui/textarea"
import { ScrollArea } from "@/shared/components/ui/scroll-area"
-import { Separator } from "@/shared/components/ui/separator"
import { Clock, CheckCircle2, Save, FileText } from "lucide-react"
import type { StudentHomeworkTakeData } from "../types"
diff --git a/src/modules/homework/components/student-homework-review-view.tsx b/src/modules/homework/components/student-homework-review-view.tsx
index 7fe9d0a..0be97ba 100644
--- a/src/modules/homework/components/student-homework-review-view.tsx
+++ b/src/modules/homework/components/student-homework-review-view.tsx
@@ -7,7 +7,7 @@ import { Card, CardContent, CardHeader, CardTitle, CardDescription } from "@/sha
import { Checkbox } from "@/shared/components/ui/checkbox"
import { Label } from "@/shared/components/ui/label"
import { ScrollArea } from "@/shared/components/ui/scroll-area"
-import { CheckCircle2, FileText, ChevronLeft } from "lucide-react"
+import { FileText, ChevronLeft } from "lucide-react"
import Link from "next/link"
import type { StudentHomeworkTakeData } from "../types"
@@ -57,7 +57,6 @@ type HomeworkReviewViewProps = {
export function HomeworkReviewView({ initialData }: HomeworkReviewViewProps) {
const submissionStatus = initialData.submission?.status ?? "not_started"
const isGraded = submissionStatus === "graded"
- const isSubmitted = submissionStatus === "submitted"
const answersByQuestionId = useMemo(() => {
const map = new Map()
diff --git a/src/modules/homework/data-access.ts b/src/modules/homework/data-access.ts
index 5467752..b0ddc58 100644
--- a/src/modules/homework/data-access.ts
+++ b/src/modules/homework/data-access.ts
@@ -3,6 +3,7 @@ import "server-only"
import { cache } from "react"
import { and, count, desc, eq, inArray, isNull, lte, or, sql } from "drizzle-orm"
+import { auth } from "@/auth"
import { db } from "@/shared/db"
import {
classEnrollments,
@@ -11,7 +12,9 @@ import {
homeworkAssignmentTargets,
homeworkAssignments,
homeworkSubmissions,
+ roles,
users,
+ usersToRoles,
} from "@/shared/db/schema"
import type {
@@ -550,17 +553,20 @@ export const getHomeworkSubmissionDetails = cache(async (submissionId: string):
})
export const getDemoStudentUser = cache(async (): Promise<{ id: string; name: string } | null> => {
- const student = await db.query.users.findFirst({
- where: eq(users.role, "student"),
- orderBy: (u, { asc }) => [asc(u.createdAt)],
- })
- if (student) return { id: student.id, name: student.name || "Student" }
+ const session = await auth()
+ const userId = String(session?.user?.id ?? "").trim()
+ if (!userId) return null
- const anyUser = await db.query.users.findFirst({
- orderBy: (u, { asc }) => [asc(u.createdAt)],
- })
- if (!anyUser) return null
- return { id: anyUser.id, name: anyUser.name || "User" }
+ const [student] = await db
+ .select({ id: users.id, name: users.name })
+ .from(users)
+ .innerJoin(usersToRoles, eq(usersToRoles.userId, users.id))
+ .innerJoin(roles, eq(usersToRoles.roleId, roles.id))
+ .where(and(eq(users.id, userId), eq(roles.name, "student")))
+ .limit(1)
+
+ if (!student) return null
+ return { id: student.id, name: student.name || "Student" }
})
const toStudentProgressStatus = (v: string | null | undefined): StudentHomeworkProgressStatus => {
@@ -592,19 +598,23 @@ export const getStudentHomeworkAssignments = cache(async (studentId: string): Pr
const assignmentIds = assignments.map((a) => a.id)
const submissions = await db.query.homeworkSubmissions.findMany({
where: and(eq(homeworkSubmissions.studentId, studentId), inArray(homeworkSubmissions.assignmentId, assignmentIds)),
- orderBy: [desc(homeworkSubmissions.createdAt)],
+ orderBy: [desc(homeworkSubmissions.updatedAt)],
})
const attemptsByAssignmentId = new Map()
const latestByAssignmentId = new Map()
+ const latestSubmittedByAssignmentId = new Map()
for (const s of submissions) {
attemptsByAssignmentId.set(s.assignmentId, (attemptsByAssignmentId.get(s.assignmentId) ?? 0) + 1)
if (!latestByAssignmentId.has(s.assignmentId)) latestByAssignmentId.set(s.assignmentId, s)
+ if (s.status === "submitted" || s.status === "graded") {
+ if (!latestSubmittedByAssignmentId.has(s.assignmentId)) latestSubmittedByAssignmentId.set(s.assignmentId, s)
+ }
}
return assignments.map((a) => {
- const latest = latestByAssignmentId.get(a.id) ?? null
+ const latest = latestSubmittedByAssignmentId.get(a.id) ?? latestByAssignmentId.get(a.id) ?? null
const attemptsUsed = attemptsByAssignmentId.get(a.id) ?? 0
const item: StudentHomeworkAssignmentListItem = {
diff --git a/src/modules/layout/config/navigation.ts b/src/modules/layout/config/navigation.ts
index 0c8ab69..ccd250a 100644
--- a/src/modules/layout/config/navigation.ts
+++ b/src/modules/layout/config/navigation.ts
@@ -5,7 +5,6 @@ import {
LayoutDashboard,
Settings,
Users,
- FileText,
MessageSquare,
Shield,
CreditCard,
@@ -156,11 +155,6 @@ export const NAV_CONFIG: Record = {
icon: Calendar,
href: "/student/schedule",
},
- {
- title: "Resources",
- icon: FileText,
- href: "/student/resources",
- },
],
parent: [
{
diff --git a/src/modules/questions/actions.ts b/src/modules/questions/actions.ts
index fc80872..b1d4068 100644
--- a/src/modules/questions/actions.ts
+++ b/src/modules/questions/actions.ts
@@ -1,29 +1,51 @@
"use server";
import { db } from "@/shared/db";
-import { questions, questionsToKnowledgePoints } from "@/shared/db/schema";
+import { chapters, knowledgePoints, questions, questionsToKnowledgePoints, textbooks, roles, users, usersToRoles } from "@/shared/db/schema";
import { CreateQuestionSchema } from "./schema";
import type { CreateQuestionInput } from "./schema";
import { ActionState } from "@/shared/types/action-state";
import { revalidatePath } from "next/cache";
import { createId } from "@paralleldrive/cuid2";
-import { and, eq } from "drizzle-orm";
+import { and, asc, eq, inArray } from "drizzle-orm";
import { z } from "zod";
import { getQuestions, type GetQuestionsParams } from "./data-access";
+import type { KnowledgePointOption } from "./types";
+import { auth } from "@/auth";
-async function getCurrentUser() {
- return {
- id: "user_teacher_math",
- role: "teacher",
- };
-}
+const getSessionUserId = async (): Promise => {
+ const session = await auth();
+ const userId = String(session?.user?.id ?? "").trim();
+ return userId.length > 0 ? userId : null;
+};
async function ensureTeacher() {
- const user = await getCurrentUser();
- if (!user || (user.role !== "teacher" && user.role !== "admin")) {
+ const userId = await getSessionUserId();
+ if (!userId) {
+ const [fallback] = await db
+ .select({ id: users.id, role: roles.name })
+ .from(users)
+ .innerJoin(usersToRoles, eq(usersToRoles.userId, users.id))
+ .innerJoin(roles, eq(usersToRoles.roleId, roles.id))
+ .where(inArray(roles.name, ["teacher", "admin"]))
+ .orderBy(asc(users.createdAt))
+ .limit(1);
+ if (!fallback) {
+ throw new Error("Unauthorized: Only teachers can perform this action.");
+ }
+ return { id: fallback.id, role: fallback.role as "teacher" | "admin" };
+ }
+ const [row] = await db
+ .select({ id: users.id, role: roles.name })
+ .from(users)
+ .innerJoin(usersToRoles, eq(usersToRoles.userId, users.id))
+ .innerJoin(roles, eq(usersToRoles.roleId, roles.id))
+ .where(and(eq(users.id, userId), inArray(roles.name, ["teacher", "admin"])))
+ .limit(1);
+ if (!row) {
throw new Error("Unauthorized: Only teachers can perform this action.");
}
- return user;
+ return { id: row.id, role: row.role as "teacher" | "admin" };
}
type Tx = Parameters[0]>[0]
@@ -244,3 +266,40 @@ export async function getQuestionsAction(params: GetQuestionsParams) {
await ensureTeacher();
return await getQuestions(params);
}
+
+export async function getKnowledgePointOptionsAction(): Promise {
+ await ensureTeacher();
+
+ const rows = await db
+ .select({
+ id: knowledgePoints.id,
+ name: knowledgePoints.name,
+ chapterId: chapters.id,
+ chapterTitle: chapters.title,
+ textbookId: textbooks.id,
+ textbookTitle: textbooks.title,
+ subject: textbooks.subject,
+ grade: textbooks.grade,
+ })
+ .from(knowledgePoints)
+ .leftJoin(chapters, eq(chapters.id, knowledgePoints.chapterId))
+ .leftJoin(textbooks, eq(textbooks.id, chapters.textbookId))
+ .orderBy(
+ asc(textbooks.title),
+ asc(chapters.order),
+ asc(chapters.title),
+ asc(knowledgePoints.order),
+ asc(knowledgePoints.name)
+ );
+
+ return rows.map((row) => ({
+ id: row.id,
+ name: row.name,
+ chapterId: row.chapterId ?? null,
+ chapterTitle: row.chapterTitle ?? null,
+ textbookId: row.textbookId ?? null,
+ textbookTitle: row.textbookTitle ?? null,
+ subject: row.subject ?? null,
+ grade: row.grade ?? null,
+ }));
+}
diff --git a/src/modules/questions/components/create-question-dialog.tsx b/src/modules/questions/components/create-question-dialog.tsx
index 5ec3756..660273b 100644
--- a/src/modules/questions/components/create-question-dialog.tsx
+++ b/src/modules/questions/components/create-question-dialog.tsx
@@ -27,6 +27,7 @@ import {
FormMessage,
} from "@/shared/components/ui/form"
import { Input } from "@/shared/components/ui/input"
+import { ScrollArea } from "@/shared/components/ui/scroll-area"
import {
Select,
SelectContent,
@@ -36,9 +37,9 @@ import {
} from "@/shared/components/ui/select"
import { Textarea } from "@/shared/components/ui/textarea"
import { BaseQuestionSchema } from "../schema"
-import { createNestedQuestion, updateQuestionAction } from "../actions"
+import { createNestedQuestion, getKnowledgePointOptionsAction, updateQuestionAction } from "../actions"
import { toast } from "sonner"
-import { Question } from "../types"
+import { KnowledgePointOption, Question } from "../types"
const QuestionFormSchema = BaseQuestionSchema.extend({
difficulty: z.number().min(1).max(5),
@@ -111,6 +112,10 @@ export function CreateQuestionDialog({
const router = useRouter()
const [isPending, setIsPending] = useState(false)
const isEdit = !!initialData
+ const [knowledgePointOptions, setKnowledgePointOptions] = useState([])
+ const [knowledgePointQuery, setKnowledgePointQuery] = useState("")
+ const [selectedKnowledgePointIds, setSelectedKnowledgePointIds] = useState([])
+ const [isLoadingKnowledgePoints, setIsLoadingKnowledgePoints] = useState(false)
const form = useForm({
resolver: zodResolver(QuestionFormSchema),
@@ -151,7 +156,60 @@ export function CreateQuestionDialog({
}
}, [initialData, form, open, defaultContent, defaultType])
+ useEffect(() => {
+ if (!open) return
+ setIsLoadingKnowledgePoints(true)
+ getKnowledgePointOptionsAction()
+ .then((rows) => {
+ setKnowledgePointOptions(rows)
+ })
+ .catch(() => {
+ toast.error("Failed to load knowledge points")
+ })
+ .finally(() => {
+ setIsLoadingKnowledgePoints(false)
+ })
+ }, [open])
+
+ useEffect(() => {
+ if (!open) return
+ if (initialData) {
+ const nextIds = initialData.knowledgePoints.map((kp) => kp.id)
+ setSelectedKnowledgePointIds((prev) => {
+ if (prev.length === nextIds.length && prev.every((id, idx) => id === nextIds[idx])) {
+ return prev
+ }
+ return nextIds
+ })
+ return
+ }
+ setSelectedKnowledgePointIds((prev) => {
+ if (
+ prev.length === defaultKnowledgePointIds.length &&
+ prev.every((id, idx) => id === defaultKnowledgePointIds[idx])
+ ) {
+ return prev
+ }
+ return defaultKnowledgePointIds
+ })
+ }, [open, initialData, defaultKnowledgePointIds])
+
const questionType = form.watch("type")
+ const filteredKnowledgePoints = knowledgePointOptions.filter((kp) => {
+ const query = knowledgePointQuery.trim().toLowerCase()
+ if (!query) return true
+ const fullLabel = [
+ kp.textbookTitle,
+ kp.chapterTitle,
+ kp.name,
+ kp.subject,
+ kp.grade,
+ ]
+ .filter(Boolean)
+ .join(" ")
+ .toLowerCase()
+ return fullLabel.includes(query)
+ })
const buildContent = (data: QuestionFormValues) => {
const text = data.content.trim()
@@ -194,7 +252,7 @@ export function CreateQuestionDialog({
type: data.type,
difficulty: data.difficulty,
content: buildContent(data),
- knowledgePointIds: isEdit ? [] : defaultKnowledgePointIds,
+ knowledgePointIds: selectedKnowledgePointIds,
}
const fd = new FormData()
fd.set("json", JSON.stringify(payload))
@@ -306,6 +364,58 @@ export function CreateQuestionDialog({
)}
/>
+
+
+ Knowledge Points
+
+ {selectedKnowledgePointIds.length > 0 ? `${selectedKnowledgePointIds.length} selected` : "Optional"}
+
+
+
setKnowledgePointQuery(e.target.value)}
+ />
+
+
+ {isLoadingKnowledgePoints ? (
+ Loading...
+ ) : filteredKnowledgePoints.length === 0 ? (
+ No knowledge points found.
+ ) : (
+
+ {filteredKnowledgePoints.map((kp) => {
+ const labelParts = [
+ kp.textbookTitle,
+ kp.chapterTitle,
+ kp.name,
+ ].filter(Boolean)
+ const label = labelParts.join(" · ")
+ return (
+
+ )
+ })}
+
+ )}
+
+
+
diff --git a/src/modules/questions/components/question-filters.tsx b/src/modules/questions/components/question-filters.tsx
index 5b300ca..f506f32 100644
--- a/src/modules/questions/components/question-filters.tsx
+++ b/src/modules/questions/components/question-filters.tsx
@@ -1,5 +1,6 @@
"use client"
+import { useEffect, useState } from "react"
import { useQueryState, parseAsString } from "nuqs"
import { Search, X } from "lucide-react"
@@ -12,11 +13,25 @@ import {
SelectValue,
} from "@/shared/components/ui/select"
import { Button } from "@/shared/components/ui/button"
+import { getKnowledgePointOptionsAction } from "../actions"
+import type { KnowledgePointOption } from "../types"
export function QuestionFilters() {
const [search, setSearch] = useQueryState("q", parseAsString.withDefault(""))
const [type, setType] = useQueryState("type", parseAsString.withDefault("all"))
const [difficulty, setDifficulty] = useQueryState("difficulty", parseAsString.withDefault("all"))
+ const [knowledgePointId, setKnowledgePointId] = useQueryState("kp", parseAsString.withDefault("all"))
+ const [knowledgePointOptions, setKnowledgePointOptions] = useState
([])
+
+ useEffect(() => {
+ getKnowledgePointOptionsAction()
+ .then((rows) => {
+ setKnowledgePointOptions(rows)
+ })
+ .catch(() => {
+ setKnowledgePointOptions([])
+ })
+ }, [])
return (
@@ -56,14 +71,32 @@ export function QuestionFilters() {
Hard (5)
+
- {(search || type !== "all" || difficulty !== "all") && (
+ {(search || type !== "all" || difficulty !== "all" || knowledgePointId !== "all") && (