debug lesson library

UniversityOfHelsinkiCS · Jul 31, 2024 · 3e03b92 · 3e03b92
1 parent 73440dd
commit 3e03b92
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/client/components/Lessons/LessonLibrary/index.js b/client/components/Lessons/LessonLibrary/index.js
@@ -194,6 +194,10 @@ const LessonList = () => {
       libraries.private && savedLibrarySelection === 'group')) setLibrary(savedLibrarySelection)
   }, [savedLibrarySelection])
 
+  useEffect(() => {
+    if (teacherView) handleLibraryChange('group')
+  }, [teacherView])
+
   useEffect(() => {
     // Filter lessons based on search query
     if (searchQuery){

diff --git a/client/components/Tour.js b/client/components/Tour.js
@@ -4,7 +4,12 @@ import JoyRide, { ACTIONS, EVENTS, STATUS } from 'react-joyride'
 import { sidebarSetOpen } from 'Utilities/redux/sidebarReducer'
 import { useSelector, useDispatch } from 'react-redux'
 import { handleNextTourStep, startTour, stopTour } from 'Utilities/redux/tourReducer'
-import { getLessonInstance, setLessonInstance, setLessonStep } from 'Utilities/redux/lessonInstanceReducer'
+import { 
+  getLessonInstance, 
+  setLessonInstance, 
+  setLessonStep, 
+  clearLessonInstanceState 
+} from 'Utilities/redux/lessonInstanceReducer'
 import { updateLibrarySelect, saveSelfIntermediate } from 'Utilities/redux/userReducer'
 import { FormattedMessage } from 'react-intl'
 import useWindowDimensions from 'Utilities/windowDimensions'
@@ -105,16 +110,17 @@ const Tour = () => {
         }
         // lessons tour steps
         if (tourState.steps === lessonsTourSteps) {
-          console.log('lessons tour steps')
           if (!metaPending && !lessonPending && lesson.topic_ids.length === 0) {
             const newTopics = [lesson_topics.filter(topic=>topic.target?.length>0)[0].topic_id]
             dispatch(setLessonInstance({ topic_ids:  newTopics}))
           }
           switch (index) {
             case 0:
-              if (!teacherView) {
+              if (!teacherView && user.last_selected_library !== 'private') {
                 dispatch(updateLibrarySelect('private'))
                 dispatch(saveSelfIntermediate({ last_selected_library: 'private' }))
+                dispatch(clearLessonInstanceState())
+                dispatch(getLessonInstance(null))
               }
               dispatch(setLessonStep(0))
               break
@@ -221,16 +227,17 @@ const Tour = () => {
         }
         // lessons tour control
         if (tourState.steps === lessonsTourSteps) {
-          console.log('lessons tour steps')
           if (!metaPending && lesson.topic_ids.length === 0) {
             const newTopics = [lesson_topics.filter(topic=>topic.target?.length>0)[0].topic_id]
             dispatch(setLessonInstance({ topic_ids:  newTopics}))
           }
           switch (index) {
             case 0:
-              if (!teacherView) {
+              if (!teacherView && user.last_selected_library !== 'private') {
                 dispatch(updateLibrarySelect('private'))
                 dispatch(saveSelfIntermediate({ last_selected_library: 'private' }))
+                dispatch(clearLessonInstanceState())
+                dispatch(getLessonInstance(null))
               }
               dispatch(setLessonStep(0))
               break