l-min-components 1.7.1574 → 1.7.1575

package/package.json

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

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

@@ -435,21 +435,19 @@ const setupAnalysis = (data, audioData, score) => {
 
 const quizWrittenSelectedModel = (response, aiData) => {
   if (!response || !aiData) return null;
-  const index = response?.index || 0;
+
+  const index = response?.index ?? 0;
   const objectData = {};
 
-  if (aiData?.grammar?.[index] && aiData?.grammar?.length) {
-    const findData = aiData?.grammar?.[index];
-    objectData["grammar"] = [findData];
+  if (aiData?.grammar?.[index]) {
+    objectData.grammar = [aiData.grammar[index]];
   }
-  if (
-    aiData?.comprehension?.length &&
-    aiData?.comprehension?.[0] &&
-    index === 0
-  ) {
-    objectData["comprehension"] = aiData?.comprehension;
+
+  if (index === 0 && aiData?.comprehension?.length) {
+    objectData.comprehension = aiData.comprehension;
   }
-  return objectData;
+
+  return Object.keys(objectData).length ? objectData : null;
 };
 
 const quixSelectedModel = (response, aiData) => {
@@ -712,41 +710,75 @@ function toRGBA(rgbaString, alpha = 1) {
 }
 
 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" ||
-      question?.question_data?.question_data?.type === "Multiple Choice"
-    )
-      type = "quiz-multiple-choice";
-    else if (question?.question_data?.question_data?.type === "UnScripted")
-      type = "quiz-unscripted";
-    else if (question?.question_data?.question_data?.type === "Written")
-      type = "quiz-written";
-    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 if (question?.type === "MATCH_PAIR") type = "match-pair";
-  else type = "";
-
-  return { type, data: question };
+  if (!question) return { type: "", data: question };
+
+  const qType = question.type;
+  const qData = question.question_data || {};
+  const innerType = qData?.question_data?.type;
+  const dialoguesData = Object.values(qData?.dialogues_data || {})[0];
+  const answerFormatType = qData?.answer_format_data?.type;
+  const essayType = qData?.config?.type;
+
+  // SOUND PLAY
+  if (qType === "SOUND_PLAY") return { type: "sound-play", data: question };
+
+  // DIALOGUE
+  if (qData.type === "DIALOGUE") {
+    return {
+      type:
+        dialoguesData?.type === "Scripted"
+          ? "dialogue-scripted"
+          : "dialogue-unscripted",
+      data: question,
+    };
+  }
+
+  // WORD PLAY
+  if (qData.type === "WORD_PLAY") {
+    return {
+      type:
+        answerFormatType === "Multiple Choice"
+          ? "word-play-multiple-choice"
+          : "word-play-text",
+      data: question,
+    };
+  }
+
+  // QUIZ
+  if (qType === "QUIZ") {
+    switch (innerType) {
+      case "MultipleChoice":
+      case "Multiple Choice":
+        return { type: "quiz-multiple-choice", data: question };
+      case "UnScripted":
+        return { type: "quiz-unscripted", data: question };
+      case "Written":
+        return { type: "quiz-written", data: question };
+      default:
+        return { type: "quiz-scripted", data: question };
+    }
+  }
+
+  // ESSAY
+  if (qType === "ESSAY") {
+    switch (essayType) {
+      case "Scripted":
+        return { type: "essay-scripted", data: question };
+      case "Written":
+        return { type: "essay-written", data: question };
+      default:
+        return { type: "essay-unscripted", data: question };
+    }
+  }
+
+  // READING
+  if (qData.type === "READING") return { type: "reading", data: question };
+
+  // MATCH PAIR
+  if (qType === "MATCH_PAIR") return { type: "match-pair", data: question };
+
+  // DEFAULT
+  return { type: "", data: question };
 };
 
 const useReportUtils = () => {

package/src/components/reportsComponents/reportQuestions/questions/quizScripted.jsx

@@ -66,7 +66,7 @@ const QuizScripted = ({
             <QuizQuestion data={data} />
           </li>
           <li>
-            <h3>{findText("Qyestion")}</h3>
+            <h3>{findText("Question")}</h3>
             <p>{data?.question_data?.question_data?.question}</p>
           </li>
         </>

package/src/components/reportsComponents/reportQuestions/questions/quizUnsripted.jsx

@@ -3,54 +3,54 @@ import {
   QuestionSection,
   QuestionSectionAction,
   QuestionSectionWithAnalysis,
-  TitleAndSubtitle,
-} from "../style";
-import Tabs from "../components/tabs";
-import useReportUtils from "../../hooks/useRreportUtils";
-import Response from "../components/response";
-import AnalysisButton from "../components/analysisButton";
-import ResponseAudio from "../components/responseAudio";
-import QuestionDropdown from "../components/questionDropdown";
-import QuizQuestion from "../components/quizQuestion";
-import ResponseAudioV2 from "../components/responseAudio.v2";
+} from "../style.jsx";
+import Tabs from "../components/tabs.jsx";
+import useReportUtils from "../../hooks/useRreportUtils.jsx";
+import Response from "../components/response.jsx";
+import AnalysisButton from "../components/analysisButton.jsx";
+import QuestionDropdown from "../components/questionDropdown.jsx";
+import QuizQuestion from "../components/quizQuestion.jsx";
+
 import useTranslation from "../../../../hooks/useTranslation.jsx";
 import wordStore from "../../../../mc/wordStore.json";
-const QuizUnscripted = ({
+
+const QuizWritten = ({
   data,
   aiData,
   setToggle,
   answerData,
   isPersonal,
-
   defaultSelected = 1,
 }) => {
   const { findText } = useTranslation(wordStore);
   const [selected, setSelected] = useState(defaultSelected);
-  const { quizResponses, quixSelectedModel, setupAnalysis, getTrabScriptData } =
-    useReportUtils();
   const [analysis, setAnalysis] = useState(null);
+
+  const { quizResponses, setupAnalysis, quizWrittenSelectedModel } =
+    useReportUtils();
+
   const quizList = quizResponses({
     responses: answerData?.answer?.data?.data?.responses,
-    type: "unscripted",
+    type: "written",
   });
+
   const selectionList = quizList?.map((item) => ({
     value: item?.key,
-    label: `Reponses ${item?.key}`,
+    label: `Response ${item?.key}`, // fixed spacing
   }));
+
   const selectedResponse =
     quizList?.find((item) => item?.key === selected) || {};
-  const selectedModel = quixSelectedModel(selectedResponse, aiData);
+
+  const selectedModel = quizWrittenSelectedModel(selectedResponse, aiData);
+
   useEffect(() => {
     if (selectedResponse) {
-      const models = setupAnalysis(
-        selectedModel,
-        selectedResponse?.recording,
-        data?.ai_score
-      );
+      const models = setupAnalysis(selectedModel, null, data?.ai_score);
       setAnalysis(models);
     }
-  }, [selectedResponse?.key]);
-  const transcript = getTrabScriptData(analysis?.models);
+  }, [selected]); // changed from selectedResponse?.key
+
   return (
     <QuestionSection>
       <Tabs
@@ -58,50 +58,28 @@ const QuizUnscripted = ({
         selected={selected}
         onChange={setSelected}
       />
+
       <QuestionDropdown>
-        <>
-          <li>
-            <h3>{findText("Instruction")}</h3>
-            <p>{data?.question_data?.instruction}</p>
-          </li>
-          <li>
-            <QuizQuestion data={data} />
-          </li>
-          <li>
-            <h3>{findText("Qyestion")}</h3>
-            <p>{data?.question_data?.question_data?.question}</p>
-          </li>
-        </>
+        <li>
+          <h3>{findText("Instruction")}</h3>
+          <p>{data?.question_data?.instruction}</p>
+        </li>
+        <li>
+          <QuizQuestion data={data} />
+        </li>
+        <li>
+          <h3>{findText("Question")}</h3>
+          <p>{data?.question_data?.question_data?.question}</p>
+        </li>
       </QuestionDropdown>
 
+      <Response response={selectedResponse?.text} isPersonal={isPersonal} />
+
       <QuestionSectionWithAnalysis>
-        <Response
-          response={
-            analysis?.models?.length > 0 &&
-            transcript?.length > 0 &&
-            selectedResponse?.recording
-              ? transcript
-              : undefined
-          }
-          isAiWordFlow
-          defaultError={!selectedResponse?.recording}
-          isPersonal={isPersonal}
-        />
         <QuestionSectionAction>
-          {selectedResponse?.recording && (
-            <ResponseAudioV2
-              streamUrl={selectedResponse?.recording?.url}
-              url={selectedResponse?.recording?.uploaded_media_url}
-              audioData={selectedResponse?.recording}
-              key={selected}
-            />
-          )}
-
           {analysis?.models?.length > 0 && (
             <AnalysisButton
-              disabled={
-                !(analysis?.models?.length > 0 && selectedResponse?.recording)
-              }
+              disabled={!analysis?.models?.length}
               onClick={() => {
                 setToggle({
                   ...analysis,
@@ -115,4 +93,5 @@ const QuizUnscripted = ({
     </QuestionSection>
   );
 };
-export default QuizUnscripted;
+
+export default QuizWritten;

package/src/components/reportsComponents/reportQuestions/questions/quizWritten.jsx

@@ -63,7 +63,7 @@ const QuizWritten = ({
             <QuizQuestion data={data} />
           </li>
           <li>
-            <h3>{findText("Qyestion")}</h3>
+            <h3>{findText("Question")}</h3>
             <p>{data?.question_data?.question_data?.question}</p>
           </li>
         </>