l-min-components 1.7.1513 → 1.7.1515

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "l-min-components",
-  "version": "1.7.1513",
+  "version": "1.7.1515",
   "type": "module",
   "files": [
     "src/assets",

package/src/components/reportsComponents/hooks/useRreportUtils.jsx

@@ -655,6 +655,39 @@ function toRGBA(rgbaString, alpha = 1) {
   const [r, g, b] = rgbaString.match(/\d+/g).map(Number);
   return `rgba(${r}, ${g}, ${b}, ${alpha})`;
 }
+
+const getQuestionInfo = (question) => {
+  let type = "";
+  if (question?.type === "SOUND_PLAY") type = "sound-play";
+  else if (question?.question_data?.type === "DIALOGUE") {
+    if (
+      Object.values(question?.question_data?.dialogues_data || {})?.[0]
+        ?.type === "Scripted"
+    )
+      type = "dialogue-scripted";
+    else type = "dialogue-unscripted";
+  } else if (question?.question_data?.type === "WORD_PLAY") {
+    if (question?.question_data?.answer_format_data?.type === "Multiple Choice")
+      type = "word-play-multiple-choice";
+    else type = "word-play-text";
+  } else if (question?.type === "QUIZ") {
+    if (question?.question_data?.question_data?.type === "MultipleChoice")
+      type = "quiz-multiple-choice";
+    else if (question?.question_data?.question_data?.type === "UnScripted")
+      type = "quiz-unscripted";
+    else type = "quiz-scripted";
+  } else if (question?.type === "ESSAY") {
+    if (question?.question_data?.config?.type === "Scripted")
+      type = "essay-scripted";
+    else if (question?.question_data?.config?.type === "Written")
+      type = "essay-written";
+    else type = "essay-unscripted";
+  } else if (question?.question_data?.type === "READING") type = "reading";
+  else type = "match-pair";
+
+  return { type, data: question };
+};
+
 const useReportUtils = () => {
   return {
     renderCorrectedSentence,
@@ -673,6 +706,7 @@ const useReportUtils = () => {
     getColor,
     grammarFindOperation,
     toRGBA,
+    getQuestionInfo,
   };
 };
 

package/src/components/reportsComponents/reportQuestions/index.jsx

@@ -44,38 +44,6 @@ import { InfoIcon } from "lucide-react";
 import InfoIcon2 from "../fullAnalysis/icons/info";
 import { NavBack, NavForword } from "../fullAnalysis/icons/navArrow";
 
-const getQuestionInfo = (question) => {
-  let type = "";
-  if (question?.type === "SOUND_PLAY") type = "sound-play";
-  else if (question?.question_data?.type === "DIALOGUE") {
-    if (
-      Object.values(question?.question_data?.dialogues_data || {})?.[0]
-        ?.type === "Scripted"
-    )
-      type = "dialogue-scripted";
-    else type = "dialogue-unscripted";
-  } else if (question?.question_data?.type === "WORD_PLAY") {
-    if (question?.question_data?.answer_format_data?.type === "Multiple Choice")
-      type = "word-play-multiple-choice";
-    else type = "word-play-text";
-  } else if (question?.type === "QUIZ") {
-    if (question?.question_data?.question_data?.type === "MultipleChoice")
-      type = "quiz-multiple-choice";
-    else if (question?.question_data?.question_data?.type === "UnScripted")
-      type = "quiz-unscripted";
-    else type = "quiz-scripted";
-  } else if (question?.type === "ESSAY") {
-    if (question?.question_data?.config?.type === "Scripted")
-      type = "essay-scripted";
-    else if (question?.question_data?.config?.type === "Written")
-      type = "essay-written";
-    else type = "essay-unscripted";
-  } else if (question?.question_data?.type === "READING") type = "reading";
-  else type = "match-pair";
-
-  return { type, data: question };
-};
-
 /**
  * @param {Object} props
 
@@ -100,24 +68,20 @@ const ReportQuestions = ({
   answerData,
   onSwitchQuestion,
 }) => {
-  if (!(questionActivityID && questions?.length > 0 && answerData)) {
-    return null;
-  }
+  const [questionList, setQuestionList] = useState([]);
+
+  useEffect(() => {
+    if (questions?.length) {
+      setQuestionList(questions);
+    }
+  }, [questions]);
 
-  const findedQuestion = questions?.find(
+  const findedQuestion = questionList?.find(
     (question) => question?.question_activity_id === questionActivityID
   );
-
-  if (!findedQuestion) {
-    return null;
-  }
-
+  const { getQuestionInfo } = useReportUtils();
   const questionType = getQuestionInfo(findedQuestion)?.type;
 
-  if (!questionType) {
-    return null;
-  }
-
   const [comment, setComment] = useState(null);
 
   const [intructorScore, setInstructorScore] = useState(0);
@@ -190,11 +154,11 @@ const ReportQuestions = ({
   const nextId = questions?.[currentQuestionIndex + 1]?.question_activity_id;
 
   const handleNext = () => {
-    if (nextId) onSwitchQuestion(nextId);
+    if (nextId) onSwitchQuestion?.(nextId);
   };
 
   const handlePrev = () => {
-    if (prevId) onSwitchQuestion(prevId);
+    if (prevId) onSwitchQuestion?.(prevId);
   };
 
   return (