Clean up

Author: r0bert1

client/components/Tests/ReadingTest/ReadingTest.js

@@ -296,7 +296,6 @@ const ReadingTest = ({ setCycle, setShowCyclePopup }) => {
 
   useEffect(() => {
     if (!currentReadingTestQuestion) {
-      console.log('no currentReadingTestQuestion')
       return
     }
 
@@ -305,7 +304,6 @@ const ReadingTest = ({ setCycle, setShowCyclePopup }) => {
         previousStatus?.is_correct &&
         previousStatus.last_question_id === currentReadingTestQuestion.question_id
       ) {
-        console.log('nextQuestion called 1')
         nextQuestion()
         return
       }
@@ -314,7 +312,6 @@ const ReadingTest = ({ setCycle, setShowCyclePopup }) => {
         previousStatus.last_question_id === currentReadingTestQuestion.question_id &&
         previousStatus.responses.length === 1
       ) {
-        console.log('setAttempts called')
         setAttempts(prev => prev + 1)
         return
       }
@@ -323,15 +320,24 @@ const ReadingTest = ({ setCycle, setShowCyclePopup }) => {
         previousStatus.last_question_id === currentReadingTestQuestion.question_id &&
         previousStatus?.responses?.length > 1
       ) {
-        console.log('nextQuestion called 2')
         nextQuestion()
         return
       }
     }
 
     if (in_experimental_grp) {
-      if (previousStatus?.is_correct) {
-        console.log('nextQuestion called 3')
+      if (
+        previousStatus?.is_correct &&
+        previousStatus.last_question_id === currentReadingTestQuestion.question_id
+      ) {
+        nextQuestion()
+        return
+      }
+
+      if (
+        previousStatus.last_question_id === currentReadingTestQuestion.question_id &&
+        previousStatus?.responses?.length > 3
+      ) {
         nextQuestion()
       }
     }
@@ -356,13 +362,6 @@ const ReadingTest = ({ setCycle, setShowCyclePopup }) => {
     }
   }, [testDone])
 
-  /* useEffect(() => {
-    dispatch(getGroups()); 
-    if (learningLanguage && readingTestSessionId && testDone && readingHistory == {}) {
-      dispatch(getReadingHistory(learningLanguage, readingTestSessionId));
-    }
-  }, [testDone]); */
-
   useEffect(() => {
     let experimental = false;
     let control = false;
@@ -388,9 +387,7 @@ const ReadingTest = ({ setCycle, setShowCyclePopup }) => {
   }, [groups]);
 
   useEffect(() => {
-    console.log('about to mark question as seen')
     if (currentReadingTestQuestion && !currentReadingTestQuestion?.seen) {
-      console.log('marking question as seen: ', currentReadingTestQuestion)
       dispatch(
         markQuestionAsSeen(
           learningLanguage,
@@ -456,10 +453,6 @@ const ReadingTest = ({ setCycle, setShowCyclePopup }) => {
     timer.start()
   }, [])
 
-  /* if (!currentReadingTestQuestion) {
-    return null
-  } */
-
   const testContainerOverflow = displaySpinner ? { overflow: "hidden" } : { overflowY: "auto" };
 
   if (showStats) {
@@ -556,18 +549,18 @@ const ReadingTest = ({ setCycle, setShowCyclePopup }) => {
               )}
             </div>
             {/* This button used to be in hiddenFeatures, now visible to all */}
-              <div className="test-top-info space-between" style={{ marginBottom: '0.2em' }}>
-                <Button
-                  className="restart-reading-test-button btn-secondary"
-                  style={{ marginRight: 'auto', marginTop: '1rem' }}
-                  onClick={() => restartTest()}
-                  disabled={showFeedbacks}
-                >
-                  <span>
-                    <FormattedMessage id="restart-reading-test" />
-                  </span>
-                </Button>
-              </div>
+            <div className="test-top-info space-between" style={{ marginBottom: '0.2em' }}>
+              <Button
+                className="restart-reading-test-button btn-secondary"
+                style={{ marginRight: 'auto', marginTop: '1rem' }}
+                onClick={() => restartTest()}
+                disabled={showFeedbacks}
+              >
+                <span>
+                  <FormattedMessage id="restart-reading-test" />
+                </span>
+              </Button>
+            </div>
           </div>
         </div>
       </Segment>

client/components/Tests/ReadingTest/index.js

@@ -7,34 +7,28 @@ import { getReadingTestQuestions, resetTests } from 'Utilities/redux/testReducer
 
 import { useLearningLanguage } from 'Utilities/common'
 import Spinner from 'Components/Spinner'
-import ReadingTest from './ReadingTest'
-
-// import ReadingPracticeChatbot from 'Components/ChatBot/ReadingPracticeChatbot'
 import DDLangIntroductory from 'Components/Tests/ReadingTest/ReadingTestIntroductory'
+import ReadingTest from './ReadingTest'
 
 import './index.css'
 
 const ReadingTestView = () => {
   const dispatch = useDispatch()
   const learningLanguage = useLearningLanguage()
-  // const bigScreen = useWindowDimension().width >= 650
   const [showDDLangIntroductory, setShowDDLangIntroductory] = useState(false)
   const [showCyclePopup, setShowCyclePopup] = useState(false)
   const [cycle, setCycle] = useState(null)
 
-  const { readingTestSessionId, pending, testDone, readingTestQuestions, allCycles, currentCycle } = useSelector(
-    ({ tests }) => tests
-  )
+  const { readingTestSessionId, pending, testDone, readingTestQuestions, allCycles, currentCycle } =
+    useSelector(({ tests }) => tests)
 
   useEffect(() => {
     if (testDone === undefined && readingTestQuestions.length === 0) {
-      console.log('getting reading test questions 1')
       dispatch(getReadingTestQuestions(learningLanguage, true))
     } else if (testDone === false && currentCycle) {
-      console.log('getting reading test questions 2')
       dispatch(getReadingTestQuestions(learningLanguage, true, Number(currentCycle)))
     }
-  }, [dispatch, learningLanguage /* , testDone */])
+  }, [dispatch, learningLanguage])
 
   const handleCycleSubmit = () => {
     dispatch(resetTests())
@@ -94,7 +88,6 @@ const ReadingTestView = () => {
           </Button>
         </div>
       </div>
-      {/* <ReadingPracticeChatbot /> */}
     </div>
   )
 }