Compare commits

...

2 Commits

Author SHA1 Message Date
e46e0314ed hierarchy cleanup 2026-04-10 03:20:53 -07:00
dd6fe3a9c8 new course management hierarchy integration 2026-04-10 03:05:29 -07:00
14 changed files with 363 additions and 157 deletions

View File

@ -58,14 +58,75 @@ import type {
CreateCourseVideoRequest,
} from "../types/course.types"
type UnifiedHierarchyRow = {
category_id: number
category_name: string
sub_category_id?: number | null
sub_category_name?: string | null
course_id?: number | null
course_title?: string | null
}
type CourseHierarchyRow = {
course_id: number
course_title: string
level_id?: number | null
cefr_level?: string | null
module_id?: number | null
module_title?: string | null
sub_module_id?: number | null
sub_module_title?: string | null
}
export const getCourseCategories = () =>
http.get<GetCourseCategoriesResponse>("/course-management/categories")
http.get("/course-management/hierarchy").then((res) => {
const rows: UnifiedHierarchyRow[] = res.data?.data ?? []
const categoriesMap = new Map<number, { id: number; name: string; is_active: boolean; created_at: string }>()
rows.forEach((r) => {
if (!categoriesMap.has(r.category_id)) {
categoriesMap.set(r.category_id, {
id: r.category_id,
name: r.category_name,
is_active: true,
created_at: new Date().toISOString(),
})
}
})
const categories = Array.from(categoriesMap.values())
return {
...res,
data: {
...res.data,
data: {
categories,
total_count: categories.length,
},
},
} as unknown as { data: GetCourseCategoriesResponse }
})
export const createCourseCategory = (data: CreateCourseCategoryRequest) =>
http.post("/course-management/categories", data)
http.post("/course-management/sub-categories", { category_id: data.parent_id ?? 1, name: data.name })
export const getCoursesByCategory = (categoryId: number) =>
http.get<GetCoursesResponse>(`/course-management/categories/${categoryId}/courses`)
http.get("/course-management/hierarchy").then((res) => {
const rows: UnifiedHierarchyRow[] = res.data?.data ?? []
const courses = rows
.filter((r) => r.category_id === categoryId && r.course_id)
.map((r) => ({
id: Number(r.course_id),
category_id: r.category_id,
sub_category_id: r.sub_category_id ?? null,
title: r.course_title ?? "",
description: "",
thumbnail: "",
is_active: true,
}))
return {
...res,
data: { ...res.data, data: { courses, total_count: courses.length } },
} as unknown as { data: GetCoursesResponse }
})
export const createCourse = (data: CreateCourseRequest) =>
http.post("/course-management/courses", data)
@ -84,59 +145,143 @@ export const updateCourseStatus = (courseId: number, isActive: boolean) =>
export const updateCourse = (courseId: number, data: UpdateCourseRequest) =>
http.put(`/course-management/courses/${courseId}`, data)
// SubCourse APIs (New Hierarchy)
export const getSubCoursesByCourse = (courseId: number) =>
http.get<GetSubCoursesResponse>(`/course-management/courses/${courseId}/sub-courses`)
// Sub-Module APIs (Unified Hierarchy)
export const getSubModulesByCourse = (courseId: number) =>
http.get(`/course-management/courses/${courseId}/hierarchy`).then((res) => {
const rows: CourseHierarchyRow[] = res.data?.data ?? []
const subModuleMap = new Map<number, { id: number; course_id: number; module_id?: number; title: string; description: string; level: string; cefr_level?: string; thumbnail: string; display_order: number; sub_level?: string; is_active: boolean }>()
rows.forEach((r, idx) => {
if (!r.sub_module_id) return
if (!subModuleMap.has(r.sub_module_id)) {
subModuleMap.set(r.sub_module_id, {
id: r.sub_module_id,
course_id: courseId,
module_id: r.module_id ?? undefined,
title: r.sub_module_title ?? "",
description: "",
level: r.cefr_level ?? "",
cefr_level: r.cefr_level ?? undefined,
thumbnail: "",
display_order: idx + 1,
sub_level: r.cefr_level ?? undefined,
is_active: true,
})
}
})
const sub_courses = Array.from(subModuleMap.values())
return {
...res,
data: {
...res.data,
data: { sub_courses, total_count: sub_courses.length },
},
} as unknown as { data: GetSubCoursesResponse }
})
export const createSubCourse = (data: CreateSubCourseRequest) =>
http.post("/course-management/sub-courses", data)
export const createSubModule = (data: CreateSubCourseRequest) =>
http
.post("/course-management/levels", {
course_id: data.course_id,
cefr_level: data.sub_level || data.level,
display_order: data.display_order ?? 0,
is_active: true,
})
.then((levelRes) =>
http.post("/course-management/modules", {
level_id: levelRes.data?.data?.id,
title: `${data.sub_level || data.level} Module`,
description: `${data.title} container module`,
display_order: 1,
is_active: true,
}),
)
.then((moduleRes) =>
http.post("/course-management/sub-modules", {
module_id: moduleRes.data?.data?.id,
title: data.title,
description: data.description,
display_order: data.display_order ?? 0,
is_active: true,
}),
)
export const updateSubCourseThumbnail = (subCourseId: number, thumbnailUrl: string) =>
http.post(`/course-management/sub-courses/${subCourseId}/thumbnail`, {
export const updateSubModuleThumbnail = (subModuleId: number, thumbnailUrl: string) =>
http.post(`/course-management/sub-courses/${subModuleId}/thumbnail`, {
thumbnail_url: thumbnailUrl,
})
export const updateSubCourse = (subCourseId: number, data: UpdateSubCourseRequest) =>
http.patch(`/course-management/sub-courses/${subCourseId}`, data)
export const updateSubModule = (subModuleId: number, data: UpdateSubCourseRequest) =>
http.put(`/course-management/sub-modules/${subModuleId}`, data)
export const updateSubCourseStatus = (subCourseId: number, data: UpdateSubCourseStatusRequest) =>
http.patch(`/course-management/sub-courses/${subCourseId}`, data)
export const updateSubModuleStatus = (subModuleId: number, data: UpdateSubCourseStatusRequest) =>
http.put(`/course-management/sub-modules/${subModuleId}`, data)
export const deleteSubCourse = (subCourseId: number) =>
http.delete(`/course-management/sub-courses/${subCourseId}`)
export const deleteSubModule = (subModuleId: number) =>
http.delete(`/course-management/sub-modules/${subModuleId}`)
// SubCourse Video APIs
export const getVideosBySubCourse = (subCourseId: number) =>
http.get<GetSubCourseVideosResponse>(`/course-management/sub-courses/${subCourseId}/videos`)
// Sub-Module Video APIs
export const getVideosBySubModule = (subModuleId: number) =>
http.get<GetSubCourseVideosResponse>(`/course-management/sub-modules/${subModuleId}/videos`)
export const createSubCourseVideo = (data: CreateSubCourseVideoRequest) =>
http.post("/course-management/sub-course-videos", data)
http.post("/course-management/sub-module-videos", {
sub_module_id: data.sub_module_id ?? data.sub_course_id,
title: data.title,
description: data.description,
video_url: data.video_url,
})
export const createCourseVideo = (data: CreateCourseVideoRequest) =>
http.post("/course-management/videos", data)
http.post("/course-management/sub-module-videos", {
sub_module_id: data.sub_module_id ?? data.sub_course_id,
title: data.title,
description: data.description,
video_url: data.video_url,
duration: data.duration,
resolution: data.resolution,
visibility: data.visibility,
display_order: data.display_order,
status: data.status,
})
export const updateSubCourseVideo = (videoId: number, data: UpdateSubCourseVideoRequest) =>
http.put(`/course-management/sub-course-videos/${videoId}`, data)
http.put(`/course-management/sub-module-videos/${videoId}`, data)
export const deleteSubCourseVideo = (videoId: number) =>
http.delete(`/course-management/sub-course-videos/${videoId}`)
http.delete(`/course-management/sub-module-videos/${videoId}`)
// Practice APIs - for SubCourse practices (New Hierarchy)
// Practices are question sets: POST /question-sets with set_type: "PRACTICE", owner_type: "SUB_COURSE".
export const getPracticesBySubCourse = (subCourseId: number) =>
// Practice APIs - for Sub-Module practices (Unified Hierarchy)
export const getPracticesBySubModule = (subModuleId: number) =>
http.get<GetQuestionSetsResponse>("/question-sets/by-owner", {
params: { owner_type: "SUB_COURSE", owner_id: subCourseId },
params: { owner_type: "SUB_MODULE", owner_id: subModuleId },
})
export const createPractice = (data: CreatePracticeRequest) =>
http.post<CreateQuestionSetResponse>("/question-sets", {
title: data.title,
set_type: "PRACTICE",
owner_type: "SUB_COURSE",
owner_id: data.sub_course_id,
...(data.description?.trim() ? { description: data.description.trim() } : {}),
...(data.persona ? { persona: data.persona } : {}),
})
http
.post<CreateQuestionSetResponse>("/question-sets", {
title: data.title,
set_type: "PRACTICE",
owner_type: "SUB_MODULE",
owner_id: data.sub_module_id ?? data.sub_course_id,
...(data.description?.trim() ? { description: data.description.trim() } : {}),
...(data.persona ? { persona: data.persona } : {}),
...(data.intro_video_url?.trim() ? { intro_video_url: data.intro_video_url.trim() } : {}),
})
.then((res) => {
const questionSetID = res.data?.data?.id
const subModuleID = data.sub_module_id ?? data.sub_course_id
if (!questionSetID || !subModuleID) return res
return http
.post("/course-management/sub-module-practices", {
sub_module_id: subModuleID,
title: data.title,
description: data.description,
thumbnail: data.thumbnail,
intro_video_url: data.intro_video_url,
question_set_id: questionSetID,
})
.then(() => res)
})
export const updatePractice = (practiceId: number, data: UpdatePracticeRequest) =>
http.put(`/course-management/practices/${practiceId}`, data)
@ -230,7 +375,10 @@ export const getQuestionSets = (params?: GetQuestionSetsParams) =>
export const getQuestionSetsByOwner = (ownerType: string, ownerId: number) =>
http.get<GetQuestionSetsResponse>("/question-sets/by-owner", {
params: { owner_type: ownerType, owner_id: ownerId },
params: {
owner_type: ownerType === "SUB_COURSE" ? "SUB_MODULE" : ownerType,
owner_id: ownerId,
},
})
export const getQuestionSetById = (questionSetId: number) =>
@ -278,15 +426,15 @@ export const deleteQuestionSet = (questionSetId: number) =>
export const createVimeoVideo = (data: CreateVimeoVideoRequest) =>
http.post("/course-management/videos/vimeo", data)
// Sub-course Prerequisite APIs
export const getSubCoursePrerequisites = (subCourseId: number) =>
http.get<GetSubCoursePrerequisitesResponse>(`/course-management/sub-courses/${subCourseId}/prerequisites`)
// Sub-module Prerequisite APIs
export const getSubModulePrerequisites = (subModuleId: number) =>
http.get<GetSubCoursePrerequisitesResponse>(`/course-management/sub-courses/${subModuleId}/prerequisites`)
export const addSubCoursePrerequisite = (subCourseId: number, data: AddSubCoursePrerequisiteRequest) =>
http.post(`/course-management/sub-courses/${subCourseId}/prerequisites`, data)
export const addSubModulePrerequisite = (subModuleId: number, data: AddSubCoursePrerequisiteRequest) =>
http.post(`/course-management/sub-courses/${subModuleId}/prerequisites`, data)
export const removeSubCoursePrerequisite = (subCourseId: number, prerequisiteId: number) =>
http.delete(`/course-management/sub-courses/${subCourseId}/prerequisites/${prerequisiteId}`)
export const removeSubModulePrerequisite = (subModuleId: number, prerequisiteId: number) =>
http.delete(`/course-management/sub-courses/${subModuleId}/prerequisites/${prerequisiteId}`)
// Learning Path APIs
export const getLearningPath = (courseId: number) =>
@ -298,14 +446,38 @@ export const getHumanLanguageLessonsByCourse = (courseId: number, cefr_level: st
})
export const getHumanLanguageHierarchy = () =>
http.get<GetHumanLanguageHierarchyResponse>("/course-management/human-language/hierarchy")
http.get<GetHumanLanguageHierarchyResponse>("/course-management/hierarchy")
export const createHumanLanguageLesson = (data: CreateHumanLanguageLessonRequest) =>
http.post("/course-management/human-language/lessons", data)
http
.post("/course-management/levels", {
course_id: data.course_id,
cefr_level: data.cefr_level,
display_order: data.display_order ?? 0,
is_active: true,
})
.then((levelRes) =>
http.post("/course-management/modules", {
level_id: levelRes.data?.data?.id,
title: `${data.cefr_level} Module`,
description: "Generated module for CEFR level",
display_order: 1,
is_active: true,
}),
)
.then((moduleRes) =>
http.post("/course-management/sub-modules", {
module_id: moduleRes.data?.data?.id,
title: data.title,
description: data.description ?? "",
display_order: data.display_order ?? 0,
is_active: true,
}),
)
export const getSubCourseEntryAssessment = (subCourseId: number) =>
export const getSubModuleEntryAssessment = (subModuleId: number) =>
http.get<GetSubCourseEntryAssessmentResponse>(
`/question-sets/sub-courses/${subCourseId}/entry-assessment`,
`/question-sets/sub-courses/${subModuleId}/entry-assessment`,
)
const buildReorderPayload = (items: ReorderItem[]) => {
@ -335,9 +507,24 @@ export const reorderCategories = (items: ReorderItem[]) =>
export const reorderCourses = (items: ReorderItem[]) =>
http.put("/course-management/courses/reorder", buildReorderPayload(items))
export const reorderSubCourses = (items: ReorderItem[]) =>
export const reorderSubModules = (items: ReorderItem[]) =>
http.put("/course-management/sub-courses/reorder", buildReorderPayload(items))
// Backward-compatible aliases
export const getSubCoursesByCourse = getSubModulesByCourse
export const createSubCourse = createSubModule
export const updateSubCourseThumbnail = updateSubModuleThumbnail
export const updateSubCourse = updateSubModule
export const updateSubCourseStatus = updateSubModuleStatus
export const deleteSubCourse = deleteSubModule
export const getVideosBySubCourse = getVideosBySubModule
export const getPracticesBySubCourse = getPracticesBySubModule
export const getSubCoursePrerequisites = getSubModulePrerequisites
export const addSubCoursePrerequisite = addSubModulePrerequisite
export const removeSubCoursePrerequisite = removeSubModulePrerequisite
export const getSubCourseEntryAssessment = getSubModuleEntryAssessment
export const reorderSubCourses = reorderSubModules
export const reorderVideos = (items: ReorderItem[]) =>
http.put("/course-management/videos/reorder", buildReorderPayload(items))

View File

@ -10,8 +10,8 @@ import { ContentOverviewPage } from "../pages/content-management/ContentOverview
import { CoursesPage } from "../pages/content-management/CoursesPage"
import { PracticeQuestionsPage } from "../pages/content-management/PracticeQuestionsPage"
import { AddNewPracticePage } from "../pages/content-management/AddNewPracticePage"
import { SubCoursesPage } from "../pages/content-management/SubCoursesPage"
import { SubCourseContentPage } from "../pages/content-management/SubCourseContentPage"
import { SubModulesPage } from "../pages/content-management/SubCoursesPage"
import { SubModuleContentPage } from "../pages/content-management/SubCourseContentPage"
import { SpeakingPage } from "../pages/content-management/SpeakingPage"
import { AddVideoPage } from "../pages/content-management/AddVideoPage"
import { AddPracticePage } from "../pages/content-management/AddPracticePage"
@ -80,24 +80,29 @@ export function AppRoutes() {
<Route path="flows" element={<CourseFlowBuilderPage />} />
<Route path="human-language" element={<HumanLanguagePage />} />
<Route
path="human-language/:categoryId/:courseId/sub-module/:subCourseId/add-practice"
path="human-language/:categoryId/:courseId/sub-module/:subModuleId/add-practice"
element={<AddNewPracticePage />}
/>
<Route
path="human-language/:categoryId/:courseId/sub-module/:subCourseId/practices/:practiceId/questions"
path="human-language/:categoryId/:courseId/sub-module/:subModuleId/practices/:practiceId/questions"
element={<PracticeQuestionsPage />}
/>
<Route
path="human-language/:categoryId/:courseId/sub-module/:subCourseId"
path="human-language/:categoryId/:courseId/sub-module/:subModuleId"
element={<HumanLanguageSubModulePage />}
/>
<Route path="category/:categoryId" element={<ContentOverviewPage />} />
<Route path="category/:categoryId/courses" element={<CoursesPage />} />
{/* Course → Sub-course → Video/Practice */}
<Route path="category/:categoryId/courses/:courseId/sub-courses" element={<SubCoursesPage />} />
<Route path="category/:categoryId/courses/:courseId/sub-courses/:subCourseId" element={<SubCourseContentPage />} />
<Route path="category/:categoryId/courses/:courseId/sub-courses/:subCourseId/add-practice" element={<AddNewPracticePage />} />
<Route path="category/:categoryId/courses/:courseId/sub-courses/:subCourseId/practices/:practiceId/questions" element={<PracticeQuestionsPage />} />
{/* Course → Sub-module → Lesson/Practice */}
<Route path="category/:categoryId/courses/:courseId/sub-modules" element={<SubModulesPage />} />
<Route path="category/:categoryId/courses/:courseId/sub-modules/:subModuleId" element={<SubModuleContentPage />} />
<Route path="category/:categoryId/courses/:courseId/sub-modules/:subModuleId/add-practice" element={<AddNewPracticePage />} />
<Route path="category/:categoryId/courses/:courseId/sub-modules/:subModuleId/practices/:practiceId/questions" element={<PracticeQuestionsPage />} />
{/* Legacy aliases */}
<Route path="category/:categoryId/courses/:courseId/sub-courses" element={<SubModulesPage />} />
<Route path="category/:categoryId/courses/:courseId/sub-courses/:subModuleId" element={<SubModuleContentPage />} />
<Route path="category/:categoryId/courses/:courseId/sub-courses/:subModuleId/add-practice" element={<AddNewPracticePage />} />
<Route path="category/:categoryId/courses/:courseId/sub-courses/:subModuleId/practices/:practiceId/questions" element={<PracticeQuestionsPage />} />
<Route path="category/:categoryId/courses/add-video" element={<AddVideoPage />} />
<Route path="speaking" element={<SpeakingPage />} />
<Route path="speaking/add-practice" element={<AddPracticePage />} />

View File

@ -219,7 +219,7 @@ export function DashboardPage() {
icon={BookOpen}
label="Courses"
value={dashboard.courses.total_courses.toLocaleString()}
deltaLabel={`${dashboard.courses.total_sub_courses} sub-courses, ${dashboard.courses.total_videos} videos`}
deltaLabel={`${dashboard.courses.total_sub_courses} sub-modules, ${dashboard.courses.total_videos} videos`}
deltaPositive
/>
<StatCard

View File

@ -167,18 +167,18 @@ function createEmptyQuestion(id: string): Question {
}
export function AddNewPracticePage() {
const { categoryId, courseId, subCourseId } = useParams()
const { categoryId, courseId, subModuleId } = useParams()
const location = useLocation()
const navigate = useNavigate()
const searchParams = new URLSearchParams(location.search)
const source = searchParams.get("source")
const backTo = useMemo(() => {
if (location.pathname.includes("/content/human-language/") && location.pathname.includes("/sub-module/")) {
return `/content/human-language/${categoryId}/${courseId}/sub-module/${subCourseId}`
return `/content/human-language/${categoryId}/${courseId}/sub-module/${subModuleId}`
}
if (source === "human-language") return "/content/human-language"
return `/content/category/${categoryId}/courses/${courseId}/sub-courses/${subCourseId}`
}, [location.pathname, source, categoryId, courseId, subCourseId])
return `/content/category/${categoryId}/courses/${courseId}/sub-modules/${subModuleId}`
}, [location.pathname, source, categoryId, courseId, subModuleId])
const [currentStep, setCurrentStep] = useState<Step>(1)
const [saving, setSaving] = useState(false)
@ -311,8 +311,8 @@ export function AddNewPracticePage() {
const setRes = await createQuestionSet({
title: practiceTitle || "Untitled Practice",
set_type: "PRACTICE",
owner_type: "SUB_COURSE",
owner_id: Number(subCourseId),
owner_type: "SUB_MODULE",
owner_id: Number(subModuleId),
...(practiceDescription.trim() ? { description: practiceDescription.trim() } : {}),
...(persona?.name ? { persona: persona.name } : {}),
shuffle_questions: shuffleQuestions,

View File

@ -332,7 +332,7 @@ export function AllCoursesPage() {
className="group cursor-pointer"
onClick={() =>
navigate(
`/content/category/${course.category_id}/courses/${course.id}/sub-courses`,
`/content/category/${course.category_id}/courses/${course.id}/sub-modules`,
)
}
>
@ -393,7 +393,7 @@ export function AllCoursesPage() {
onClick={(e) => {
e.stopPropagation()
navigate(
`/content/category/${course.category_id}/courses/${course.id}/sub-courses`,
`/content/category/${course.category_id}/courses/${course.id}/sub-modules`,
)
}}
>

View File

@ -34,10 +34,10 @@ import {
getCoursesByCategory,
getLearningPath,
getQuestionSetsByOwner,
getSubCourseEntryAssessment,
getSubModuleEntryAssessment,
reorderCategories,
reorderCourses,
reorderSubCourses,
reorderSubModules,
reorderVideos,
reorderPractices,
} from "../../api/courses.api"
@ -320,7 +320,7 @@ export function CourseFlowBuilderPage() {
try {
const [setsRes, entryRes] = await Promise.allSettled([
getQuestionSetsByOwner("SUB_COURSE", subCourseId),
getSubCourseEntryAssessment(subCourseId),
getSubModuleEntryAssessment(subCourseId),
])
// No practice sets is a valid empty-state scenario; do not toast for 404/empty.
@ -429,12 +429,12 @@ export function CourseFlowBuilderPage() {
}))
const previous = items
setLearningPath((prev) => (prev ? { ...prev, sub_courses: reordered } : prev))
setSavingKey("sub-courses")
setSavingKey("sub-modules")
try {
await reorderSubCourses(toReorderItems(reordered))
await reorderSubModules(toReorderItems(reordered))
} catch (err: any) {
setLearningPath((prev) => (prev ? { ...prev, sub_courses: previous } : prev))
toast.error(err?.response?.data?.message || "Failed to reorder sub-courses.")
toast.error(err?.response?.data?.message || "Failed to reorder sub-modules.")
} finally {
setSavingKey(null)
}

View File

@ -245,7 +245,7 @@ export function CoursesPage() {
}
const handleCourseClick = (courseId: number) => {
navigate(`/content/category/${categoryId}/courses/${courseId}/sub-courses`)
navigate(`/content/category/${categoryId}/courses/${courseId}/sub-modules`)
}
const handleViewRatings = async (courseId: number) => {

View File

@ -37,7 +37,7 @@ import {
createHumanLanguageLesson,
deleteQuestionSet,
deleteQuestion,
deleteSubCourse,
deleteSubModule,
getHumanLanguageHierarchy,
getQuestionById,
getPracticeQuestions,
@ -569,7 +569,7 @@ export function HumanLanguagePage() {
setDeletingKey(key)
try {
for (const id of ids) {
await deleteSubCourse(id)
await deleteSubModule(id)
}
toast.success(successMessage)
await loadHierarchy()

View File

@ -8,9 +8,9 @@ import { Badge } from "../../components/ui/badge"
import { Button } from "../../components/ui/button"
import { Input } from "../../components/ui/input"
import {
getSubCoursesByCourse,
getSubModulesByCourse,
getQuestionSetsByOwner,
getVideosBySubCourse,
getVideosBySubModule,
updatePractice,
deleteQuestionSet,
createCourseVideo,
@ -34,10 +34,10 @@ type StatusFilter = "all" | "published" | "draft" | "archived"
/** Human Languageonly sub-module editor: lesson (videos) + practice tabs; not used by general course flows. */
export function HumanLanguageSubModulePage() {
const { categoryId, courseId, subCourseId } = useParams<{
const { categoryId, courseId, subModuleId } = useParams<{
categoryId: string
courseId: string
subCourseId: string
subModuleId: string
}>()
const navigate = useNavigate()
@ -92,12 +92,12 @@ export function HumanLanguageSubModulePage() {
useEffect(() => {
const fetchData = async () => {
if (!subCourseId || !courseId) return
if (!subModuleId || !courseId) return
try {
const subCoursesRes = await getSubCoursesByCourse(Number(courseId))
const subCoursesRes = await getSubModulesByCourse(Number(courseId))
const foundSubCourse = subCoursesRes.data.data.sub_courses?.find(
(sc) => sc.id === Number(subCourseId)
(sc) => sc.id === Number(subModuleId)
)
setSubCourse(foundSubCourse ?? null)
} catch (err) {
@ -109,13 +109,13 @@ export function HumanLanguageSubModulePage() {
}
fetchData()
}, [subCourseId, courseId])
}, [subModuleId, courseId])
const fetchPractices = async () => {
if (!subCourseId) return
if (!subModuleId) return
setPracticesLoading(true)
try {
const res = await getQuestionSetsByOwner("SUB_COURSE", Number(subCourseId))
const res = await getQuestionSetsByOwner("SUB_MODULE", Number(subModuleId))
const raw = res.data.data
const list = Array.isArray(raw) ? raw : raw?.question_sets ?? []
setPractices(list)
@ -127,10 +127,10 @@ export function HumanLanguageSubModulePage() {
}
const fetchVideos = async () => {
if (!subCourseId) return
if (!subModuleId) return
setVideosLoading(true)
try {
const res = await getVideosBySubCourse(Number(subCourseId))
const res = await getVideosBySubModule(Number(subModuleId))
setVideos(res.data.data.videos ?? [])
} catch (err) {
console.error("Failed to fetch videos:", err)
@ -145,10 +145,10 @@ export function HumanLanguageSubModulePage() {
} else if (activeTab === "lesson") {
fetchVideos()
}
}, [activeTab, subCourseId])
}, [activeTab, subModuleId])
const handleAddPractice = () => {
navigate(`/content/human-language/${categoryId}/${courseId}/sub-module/${subCourseId}/add-practice`)
navigate(`/content/human-language/${categoryId}/${courseId}/sub-module/${subModuleId}/add-practice`)
}
@ -207,7 +207,7 @@ export function HumanLanguageSubModulePage() {
}
const handlePracticeClick = (practiceId: number) => {
navigate(`/content/human-language/${categoryId}/${courseId}/sub-module/${subCourseId}/practices/${practiceId}/questions`)
navigate(`/content/human-language/${categoryId}/${courseId}/sub-module/${subModuleId}/practices/${practiceId}/questions`)
}
const handleAddVideo = () => {
@ -248,7 +248,7 @@ export function HumanLanguageSubModulePage() {
}
const handleSaveNewVideo = async () => {
if (!subCourseId || !videoFile) return
if (!subModuleId || !videoFile) return
setSaving(true)
setSaveError(null)
try {
@ -270,7 +270,7 @@ export function HumanLanguageSubModulePage() {
const finalTitle = videoTitle.trim() || videoFile.name
await createCourseVideo({
sub_course_id: Number(subCourseId),
sub_module_id: Number(subModuleId),
title: finalTitle,
description: videoDescription.trim(),
video_url: finalVideoUrl,

View File

@ -58,7 +58,7 @@ const typeColors: Record<QuestionType, string> = {
}
export function PracticeQuestionsPage() {
const { categoryId, courseId, subCourseId, practiceId } = useParams()
const { categoryId, courseId, subModuleId, practiceId } = useParams()
const location = useLocation()
const [questions, setQuestions] = useState<PracticeQuestion[]>([])
@ -103,10 +103,10 @@ export function PracticeQuestionsPage() {
const backLink = useMemo(() => {
if (location.pathname.includes("/content/human-language/") && location.pathname.includes("/sub-module/")) {
return `/content/human-language/${categoryId}/${courseId}/sub-module/${subCourseId}`
return `/content/human-language/${categoryId}/${courseId}/sub-module/${subModuleId}`
}
return `/content/category/${categoryId}/courses/${courseId}/sub-courses/${subCourseId}`
}, [location.pathname, categoryId, courseId, subCourseId])
return `/content/category/${categoryId}/courses/${courseId}/sub-modules/${subModuleId}`
}, [location.pathname, categoryId, courseId, subModuleId])
const buildDefaultOptions = (type: QuestionType, sampleAnswerText?: string): DraftOption[] => {
if (type === "TRUE_FALSE") {

View File

@ -11,7 +11,7 @@ import {
getCourseCategories,
getCoursesByCategory,
getQuestionById,
getSubCoursesByCourse,
getSubModulesByCourse,
createQuestion,
createQuestionSet,
// getQuestions,
@ -441,7 +441,7 @@ export function SpeakingPage() {
const subCourseResponses = await Promise.all(
courseRecords.map(async ({ category, course }) => {
const res = await getSubCoursesByCourse(course.id)
const res = await getSubModulesByCourse(course.id)
const subCourses = res.data?.data?.sub_courses ?? []
return subCourses.map((subCourse: SubCourse) => ({
id: subCourse.id,

View File

@ -8,9 +8,9 @@ import { Badge } from "../../components/ui/badge"
import { Button } from "../../components/ui/button"
import { Input } from "../../components/ui/input"
import {
getSubCoursesByCourse,
getSubModulesByCourse,
getQuestionSetsByOwner,
getVideosBySubCourse,
getVideosBySubModule,
updatePractice,
deleteQuestionSet,
createCourseVideo,
@ -34,11 +34,11 @@ import { SpinnerIcon } from "../../components/ui/spinner-icon"
type TabType = "video" | "practice" | "ratings"
type StatusFilter = "all" | "published" | "draft" | "archived"
export function SubCourseContentPage() {
const { categoryId, courseId, subCourseId } = useParams<{
export function SubModuleContentPage() {
const { categoryId, courseId, subModuleId } = useParams<{
categoryId: string
courseId: string
subCourseId: string
subModuleId: string
}>()
const navigate = useNavigate()
@ -99,12 +99,12 @@ export function SubCourseContentPage() {
useEffect(() => {
const fetchData = async () => {
if (!subCourseId || !courseId) return
if (!subModuleId || !courseId) return
try {
const subCoursesRes = await getSubCoursesByCourse(Number(courseId))
const subCoursesRes = await getSubModulesByCourse(Number(courseId))
const foundSubCourse = subCoursesRes.data.data.sub_courses?.find(
(sc) => sc.id === Number(subCourseId)
(sc) => sc.id === Number(subModuleId)
)
setSubCourse(foundSubCourse ?? null)
} catch (err) {
@ -116,13 +116,13 @@ export function SubCourseContentPage() {
}
fetchData()
}, [subCourseId, courseId])
}, [subModuleId, courseId])
const fetchPractices = async () => {
if (!subCourseId) return
if (!subModuleId) return
setPracticesLoading(true)
try {
const res = await getQuestionSetsByOwner("SUB_COURSE", Number(subCourseId))
const res = await getQuestionSetsByOwner("SUB_MODULE", Number(subModuleId))
setPractices(res.data.data ?? [])
} catch (err) {
console.error("Failed to fetch practices:", err)
@ -132,10 +132,10 @@ export function SubCourseContentPage() {
}
const fetchVideos = async () => {
if (!subCourseId) return
if (!subModuleId) return
setVideosLoading(true)
try {
const res = await getVideosBySubCourse(Number(subCourseId))
const res = await getVideosBySubModule(Number(subModuleId))
setVideos(res.data.data.videos ?? [])
} catch (err) {
console.error("Failed to fetch videos:", err)
@ -145,12 +145,12 @@ export function SubCourseContentPage() {
}
const fetchRatings = async (offset = 0) => {
if (!subCourseId) return
if (!subModuleId) return
setRatingsLoading(true)
try {
const res = await getRatings({
target_type: "sub_course",
target_id: Number(subCourseId),
target_id: Number(subModuleId),
limit: ratingsPageSize,
offset,
})
@ -170,7 +170,7 @@ export function SubCourseContentPage() {
} else if (activeTab === "ratings") {
fetchRatings(ratingsPage * ratingsPageSize)
}
}, [activeTab, subCourseId])
}, [activeTab, subModuleId])
useEffect(() => {
if (activeTab === "ratings") {
@ -179,7 +179,7 @@ export function SubCourseContentPage() {
}, [ratingsPage])
const handleAddPractice = () => {
navigate(`/content/category/${categoryId}/courses/${courseId}/sub-courses/${subCourseId}/add-practice`)
navigate(`/content/category/${categoryId}/courses/${courseId}/sub-modules/${subModuleId}/add-practice`)
}
@ -238,7 +238,7 @@ export function SubCourseContentPage() {
}
const handlePracticeClick = (practiceId: number) => {
navigate(`/content/category/${categoryId}/courses/${courseId}/sub-courses/${subCourseId}/practices/${practiceId}/questions`)
navigate(`/content/category/${categoryId}/courses/${courseId}/sub-modules/${subModuleId}/practices/${practiceId}/questions`)
}
const handleAddVideo = () => {
@ -279,7 +279,7 @@ export function SubCourseContentPage() {
}
const handleSaveNewVideo = async () => {
if (!subCourseId || !videoFile) return
if (!subModuleId || !videoFile) return
setSaving(true)
setSaveError(null)
try {
@ -301,7 +301,7 @@ export function SubCourseContentPage() {
const finalTitle = videoTitle.trim() || videoFile.name
await createCourseVideo({
sub_course_id: Number(subCourseId),
sub_module_id: Number(subModuleId),
title: finalTitle,
description: videoDescription.trim(),
video_url: finalVideoUrl,
@ -444,7 +444,7 @@ export function SubCourseContentPage() {
<div className="space-y-6">
{/* Back Button */}
<Link
to={`/content/category/${categoryId}/courses/${courseId}/sub-courses`}
to={`/content/category/${categoryId}/courses/${courseId}/sub-modules`}
className="group inline-flex items-center gap-2 rounded-lg px-2 py-1.5 text-sm font-medium text-grayScale-500 transition-all hover:bg-grayScale-50 hover:text-grayScale-900"
>
<ArrowLeft className="h-4 w-4 transition-transform group-hover:-translate-x-0.5" />

View File

@ -24,16 +24,16 @@ import alertSrc from "../../assets/Alert.svg";
import { Badge } from "../../components/ui/badge";
import { Button } from "../../components/ui/button";
import {
getSubCoursesByCourse,
getSubModulesByCourse,
getCoursesByCategory,
getCourseCategories,
createSubCourse,
updateSubCourse,
updateSubCourseStatus,
deleteSubCourse,
getSubCoursePrerequisites,
addSubCoursePrerequisite,
removeSubCoursePrerequisite,
createSubModule,
updateSubModule,
updateSubModuleStatus,
deleteSubModule,
getSubModulePrerequisites,
addSubModulePrerequisite,
removeSubModulePrerequisite,
} from "../../api/courses.api";
import { uploadImageFile } from "../../api/files.api";
import { Input } from "../../components/ui/input";
@ -47,7 +47,7 @@ import type {
import { SpinnerIcon } from "../../components/ui/spinner-icon";
import { toast } from "sonner";
export function SubCoursesPage() {
export function SubModulesPage() {
const { categoryId, courseId } = useParams<{
categoryId: string;
courseId: string;
@ -122,10 +122,10 @@ export function SubCoursesPage() {
if (!courseId) return;
try {
const subCoursesRes = await getSubCoursesByCourse(Number(courseId));
const subCoursesRes = await getSubModulesByCourse(Number(courseId));
setSubCourses(subCoursesRes.data.data.sub_courses ?? []);
} catch (err) {
console.error("Failed to fetch sub-courses:", err);
console.error("Failed to fetch sub-modules:", err);
}
};
@ -135,7 +135,7 @@ export function SubCoursesPage() {
try {
const results = await Promise.all(
scs.map((sc) =>
getSubCoursePrerequisites(sc.id).then((res) => ({
getSubModulePrerequisites(sc.id).then((res) => ({
id: sc.id,
data: res.data.data ?? [],
})),
@ -159,7 +159,7 @@ export function SubCoursesPage() {
try {
const [subCoursesRes, coursesRes, categoriesRes] = await Promise.all([
getSubCoursesByCourse(Number(courseId)),
getSubModulesByCourse(Number(courseId)),
getCoursesByCategory(Number(categoryId)),
getCourseCategories(),
]);
@ -176,7 +176,7 @@ export function SubCoursesPage() {
);
setCategory(foundCategory ?? null);
} catch (err) {
console.error("Failed to fetch sub-courses:", err);
console.error("Failed to fetch sub-modules:", err);
setError("Failed to load courses");
} finally {
setLoading(false);
@ -195,7 +195,7 @@ export function SubCoursesPage() {
const handleToggleStatus = async (subCourse: SubCourse) => {
setTogglingId(subCourse.id);
try {
await updateSubCourseStatus(subCourse.id, {
await updateSubModuleStatus(subCourse.id, {
is_active: !subCourse.is_active,
level: subCourse.level,
title: subCourse.title,
@ -218,7 +218,7 @@ export function SubCoursesPage() {
setDeleting(true);
try {
await deleteSubCourse(subCourseToDelete.id);
await deleteSubModule(subCourseToDelete.id);
setShowDeleteModal(false);
setSubCourseToDelete(null);
await fetchSubCourses();
@ -264,7 +264,7 @@ export function SubCoursesPage() {
? parsedOrder
: nextSubCourseDisplayOrder();
await createSubCourse({
await createSubModule({
course_id: Number(courseId),
title: title.trim(),
description: description.trim(),
@ -309,7 +309,7 @@ export function SubCoursesPage() {
setSaving(true);
setSaveError(null);
try {
await updateSubCourse(subCourseToEdit.id, {
await updateSubModule(subCourseToEdit.id, {
title,
description,
level,
@ -328,9 +328,9 @@ export function SubCoursesPage() {
}
};
const handleSubCourseClick = (subCourseId: number) => {
const handleSubModuleClick = (subModuleId: number) => {
navigate(
`/content/category/${categoryId}/courses/${courseId}/sub-courses/${subCourseId}`,
`/content/category/${categoryId}/courses/${courseId}/sub-modules/${subModuleId}`,
);
};
@ -340,7 +340,7 @@ export function SubCoursesPage() {
setPrereqLoading(true);
setSelectedPrereqId(0);
try {
const res = await getSubCoursePrerequisites(subCourse.id);
const res = await getSubModulePrerequisites(subCourse.id);
setPrerequisites(res.data.data ?? []);
} catch (err) {
console.error("Failed to fetch prerequisites:", err);
@ -354,10 +354,10 @@ export function SubCoursesPage() {
if (!prereqSubCourse || !selectedPrereqId) return;
setPrereqAdding(true);
try {
await addSubCoursePrerequisite(prereqSubCourse.id, {
await addSubModulePrerequisite(prereqSubCourse.id, {
prerequisite_sub_course_id: selectedPrereqId,
});
const res = await getSubCoursePrerequisites(prereqSubCourse.id);
const res = await getSubModulePrerequisites(prereqSubCourse.id);
setPrerequisites(res.data.data ?? []);
setSelectedPrereqId(0);
} catch (err) {
@ -371,8 +371,8 @@ export function SubCoursesPage() {
if (!prereqSubCourse) return;
setPrereqRemoving(prereqId);
try {
await removeSubCoursePrerequisite(prereqSubCourse.id, prereqId);
const res = await getSubCoursePrerequisites(prereqSubCourse.id);
await removeSubModulePrerequisite(prereqSubCourse.id, prereqId);
const res = await getSubModulePrerequisites(prereqSubCourse.id);
setPrerequisites(res.data.data ?? []);
} catch (err) {
console.error("Failed to remove prerequisite:", err);
@ -385,7 +385,7 @@ export function SubCoursesPage() {
const flowLayers = (() => {
if (subCourses.length === 0) return [];
// Find sub-courses with no prerequisites (roots)
// Find sub-modules with no prerequisites (roots)
const hasPrereqs = new Set<number>();
const isPrereqOf = new Map<number, number[]>(); // prereqId -> [subCourseIds that depend on it]
@ -557,7 +557,7 @@ export function SubCoursesPage() {
<Card
key={subCourse.id}
className="group cursor-pointer overflow-hidden border border-grayScale-100 bg-white shadow-sm transition-all duration-200 hover:shadow-soft hover:-translate-y-1 hover:border-brand-100"
onClick={() => handleSubCourseClick(subCourse.id)}
onClick={() => handleSubModuleClick(subCourse.id)}
>
{/* Thumbnail with level badge */}
<div className="relative aspect-video w-full overflow-hidden">
@ -738,7 +738,7 @@ export function SubCoursesPage() {
</div>
)}
{/* Add Sub-course Modal — POST /course-management/sub-courses */}
{/* Add Sub-module Modal */}
{showAddModal && (
<div className="fixed inset-0 z-50 flex items-center justify-center overflow-y-auto overflow-x-hidden bg-black/40 p-3 backdrop-blur-sm sm:p-6">
<div

View File

@ -25,6 +25,7 @@ export interface GetCourseCategoriesResponse {
export interface Course {
id: number
category_id: number
sub_category_id?: number | null
title: string
description: string
thumbnail: string
@ -191,9 +192,11 @@ export interface UpdateModuleStatusRequest {
export interface SubCourse {
id: number
course_id: number
module_id?: number
title: string
description: string
level: string
cefr_level?: string
thumbnail: string
display_order: number
sub_level?: string
@ -211,7 +214,7 @@ export interface GetSubCoursesResponse {
metadata: unknown
}
/** POST /course-management/sub-courses */
/** Compatibility request used to create sub-modules */
export interface CreateSubCourseRequest {
course_id: number
title: string
@ -237,7 +240,8 @@ export interface UpdateSubCourseStatusRequest {
// SubCourse Video
export interface SubCourseVideo {
id: number
sub_course_id: number
sub_course_id?: number
sub_module_id?: number
title: string
description: string
video_url: string
@ -259,7 +263,8 @@ export interface GetSubCourseVideosResponse {
}
export interface CreateSubCourseVideoRequest {
sub_course_id: number
sub_course_id?: number
sub_module_id?: number
title: string
description: string
video_url: string
@ -269,7 +274,8 @@ export type VideoVisibility = "PUBLISHED" | "DRAFT" | "PRIVATE" | "UNLISTED" | s
export type VideoStatus = "PUBLISHED" | "DRAFT" | "ARCHIVED" | string
export interface CreateCourseVideoRequest {
sub_course_id: number
sub_course_id?: number
sub_module_id?: number
title: string
description: string
video_url: string
@ -281,7 +287,8 @@ export interface CreateCourseVideoRequest {
}
export interface CreateVimeoVideoRequest {
sub_course_id: number
sub_course_id?: number
sub_module_id?: number
title: string
description: string
source_url: string
@ -298,9 +305,13 @@ export interface UpdateSubCourseVideoRequest {
// Practice now belongs to SubCourse
export interface Practice {
id: number
sub_course_id: number
sub_course_id?: number
sub_module_id?: number
title: string
description: string
thumbnail?: string
intro_video_url?: string
question_set_id?: number
banner_image: string
persona: string
is_active: boolean
@ -318,9 +329,12 @@ export interface GetPracticesResponse {
}
export interface CreatePracticeRequest {
sub_course_id: number
sub_course_id?: number
sub_module_id?: number
title: string
description: string
thumbnail?: string
intro_video_url?: string
persona?: string
}
@ -390,7 +404,7 @@ export interface UpdatePracticeQuestionRequest {
// Question Sets (Practice sets fetched via /question-sets)
export type QuestionSetType = "PRACTICE" | "EXAM"
export type QuestionSetStatus = "PUBLISHED" | "DRAFT" | "ARCHIVED"
export type QuestionSetOwnerType = "SUB_COURSE" | "COURSE"
export type QuestionSetOwnerType = "SUB_COURSE" | "SUB_MODULE" | "COURSE"
export interface QuestionSet {
id: number
@ -415,7 +429,7 @@ export interface GetQuestionSetsResponse {
export interface GetQuestionSetsParams {
set_type?: "PRACTICE" | "INITIAL_ASSESSMENT" | "EXAM" | string
owner_type?: "SUB_COURSE" | "COURSE" | string
owner_type?: "SUB_COURSE" | "SUB_MODULE" | "COURSE" | string
owner_id?: number
status?: "DRAFT" | "PUBLISHED" | "ARCHIVED" | string
limit?: number