fix(edit-course): display all lessons under block

danilych · Feb 12, 2024 · 3b8d9c7 · 3b8d9c7
1 parent dfa1df3
commit 3b8d9c7
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/app/features/hidden-list-component.tsx b/app/features/hidden-list-component.tsx
@@ -87,7 +87,7 @@ export function HiddenListComponent({
       <div
         className={clsx(
           ' duration-1400 transition-all ease-in-out flex flex-col gap-2',
-          isVisibly ? 'max-h-72' : 'max-h-0 overflow-hidden'
+          isVisibly ? '' : 'max-h-0 overflow-hidden'
         )}
       >
         {items.map((item: any, index: number) => (

diff --git a/app/redux/slices/course.ts b/app/redux/slices/course.ts
@@ -19,6 +19,15 @@ export const fetchCourse = createAsyncThunk(
   }
 )
 
+export const fetchFullCourse = createAsyncThunk(
+  'course/fetchFullCourse',
+  async (params: any) => {
+    const { data } = await instance.post('/Course/GetCourseInfoList', params)
+
+    return data
+  }
+)
+
 export const updateBlock = createAsyncThunk(
   'course/updateBlock',
   async (params: any) => {
@@ -75,6 +84,22 @@ const courseSlice = createSlice({
       // @ts-ignore
       state.course.data = null
     })
+    builder.addCase(fetchFullCourse.pending, (state, action) => {
+      state.course.status = 'loading'
+
+      // @ts-ignore
+      state.course.data = null
+    })
+    builder.addCase(fetchFullCourse.fulfilled, (state, action) => {
+      state.course.status = 'loaded'
+      state.course.data = action.payload
+    })
+    builder.addCase(fetchFullCourse.rejected, (state, action) => {
+      state.course.status = 'error'
+
+      // @ts-ignore
+      state.course.data = null
+    })
     builder.addCase(updateBlock.fulfilled, (state, action) => {
       state.course.status = 'loaded'
       state.course.isError = action.payload.isError

diff --git a/app/routes/edit-course.$course.tsx b/app/routes/edit-course.$course.tsx
@@ -6,7 +6,7 @@ import { useForm } from 'react-hook-form'
 import toast from 'react-hot-toast'
 import { useDispatch, useSelector } from 'react-redux'
 import { HiddenListComponent } from '~/features'
-import { fetchCourse, updateBlock } from '~/redux/slices/course'
+import { fetchCourse, fetchFullCourse, updateBlock } from '~/redux/slices/course'
 import {
   Header3,
   Header4,
@@ -38,11 +38,11 @@ export default function Course() {
 
   useEffect(() => {
     let formData = new FormData()
-    formData.append('CourseID', params.course as string)
+    formData.append('ID', params.course as string)
     console.log(params.course)
     // formData.append('UserID', window.localStorage.getItem("userId") as string)
 
-    dispatch(fetchCourse(formData))
+    dispatch(fetchFullCourse(formData))
   }, [])
 
   useEffect(() => {