l-min-components 1.7.1428 → 1.7.1430

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "l-min-components",
-  "version": "1.7.1428",
+  "version": "1.7.1430",
   "type": "module",
   "files": [
     "src/assets",
@@ -22,6 +22,7 @@
     "classnames": "^2.3.2",
     "dexie": "^4.0.8",
     "dexie-react-hooks": "^1.1.7",
+    "dompurify": "^3.2.6",
     "draft-convert": "^2.1.13",
     "draft-js": "^0.11.7",
     "draftjs-to-html": "^0.9.1",

package/src/components/reportsComponents/fullAnalysis/components/Grammar.jsx

@@ -15,18 +15,23 @@ import { useState } from "react";
 import GoodCheck from "../../../../assets/svg/goodCheck";
 import RedX from "../../../../assets/svg/redX";
 import useReportUtils from "../../hooks/useRreportUtils";
-import WarningGrey from "../../../../assets/svg/warningGrey";
+// import WarningGrey from "../../../../assets/svg/warningGrey";
+
+// import DOMPurify from "dompurify";
 
 const Grammar = ({ Aidata }) => {
   const [selectedSection, setSelectedSection] = useState(1);
   const [selectedWord, setSelectedWord] = useState(null);
 
   const data = Aidata?.data;
-  const feedbackCorrection = data?.["Correction Operations (Optional)"] || [];
+  const feedbackCorrection = (
+    data?.["Correction Operations (Optional)"] || []
+  )?.filter((item) => ["substituted", "formatting"].includes(item?.operation));
   const originalText = data?.["Original Speech"] || "";
   const correctText = data?.["Grammatical Correct Version"] || "";
   const feedbacks = data?.["Feedback"];
-  const { grammarFeekbackResult, renderCorrectedSentence } = useReportUtils();
+
+  const { grammarFeekbackResult } = useReportUtils();
 
   const wordsFeedback = grammarFeekbackResult(
     originalText,
@@ -34,10 +39,6 @@ const Grammar = ({ Aidata }) => {
     feedbacks
   );
 
-  console.log(JSON.stringify(wordsFeedback));
-
-  const sentenceParts = renderCorrectedSentence(wordsFeedback);
-
   useEffect(() => {
     if (wordsFeedback?.length) {
       const findWord = wordsFeedback?.find((word) => word?.operation);
@@ -114,39 +115,16 @@ const Grammar = ({ Aidata }) => {
                 <GoodCheck />
                 <span>{selectedWord?.correct}</span>
               </div>
-              <p>{selectedWord?.feedback}</p>
             </div>
           )}
           {selectedSection === 2 && originalText && <p>{originalText}</p>}
           {selectedSection === 3 && (
             <div className="correct_section">
-              <div className="warning">
+              {/* <div className="warning">
                 <WarningGrey />
                 <p>Introduced words are highlighted in green</p>
-              </div>
-              <p>
-                {sentenceParts.map((part, index) => {
-                  const nextPart = sentenceParts[index + 1];
-                  const needsSpace =
-                    nextPart && !/^[.,!?;:]/.test(nextPart.text);
-
-                  if (part.highlight) {
-                    return (
-                      <span key={index}>
-                        {part.text}
-                        {needsSpace ? " " : ""}
-                      </span>
-                    );
-                  } else {
-                    return (
-                      <React.Fragment key={index}>
-                        {part.text}
-                        {needsSpace ? " " : ""}
-                      </React.Fragment>
-                    );
-                  }
-                })}
-              </p>
+              </div> */}
+              <p>{correctText}</p>
             </div>
           )}
         </GrammarContent>

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

@@ -465,7 +465,7 @@ const grammarFeekbackResult = (originalText, feedbackCorrection, feedbacks) => {
         correction.original_word?.match(/\w+|[^\s\w]+/g) || [];
       const slice = originalTokens
         .slice(tokenIndex, tokenIndex + originalWordsFromCorrection.length)
-        .join(" ");
+        .join(""); // 🔥 Key fix: no space between tokens
 
       if (slice === correction.original_word) {
         result.push({
@@ -476,6 +476,7 @@ const grammarFeekbackResult = (originalText, feedbackCorrection, feedbacks) => {
           feedback: correction.feedback,
           feedbackPosition: correction.feedbackPosition,
         });
+
         tokenIndex += originalWordsFromCorrection.length;
         correctionIndex++;
         continue;
@@ -485,18 +486,19 @@ const grammarFeekbackResult = (originalText, feedbackCorrection, feedbacks) => {
     // Handle inserted correction
     if (correction && correction.operation === "inserted") {
       result.push({
-        text: correction.word,
-        correct: correction.word,
+        text: correction.word.trim(),
+        correct: correction.word.trim(),
         position: result.length + 1,
         operation: correction.operation,
         feedback: correction.feedback,
         feedbackPosition: correction.feedbackPosition,
       });
+
       correctionIndex++;
       continue;
     }
 
-    // Default: original token
+    // Default: push original token as-is
     if (tokenIndex < originalTokens.length) {
       result.push({
         text: token,

package/src/components/reportsComponents/reportQuestions/components/style/comment.style.jsx

@@ -65,7 +65,7 @@ export const CommentContent = styled.div`
     img {
       width: 100%;
       height: 100%;
-      object-fit: cover;
+      object-fit: contain;
     }
   }
 `;

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

@@ -1,9 +1,5 @@
 import React, { useContext, useEffect, useState } from "react";
-import constants, {
-  aiWordSample,
-  sampleResponse,
-  sampleResponseAudio,
-} from "./contants";
+import constants from "./contants";
 
 import ArrowLeft from "../../../assets/svg/arrowLeft";
 import YellowPen from "../../../assets/svg/yellow-pen";
@@ -16,10 +12,10 @@ import {
   ScoreRight,
   QuestionContent,
   QuestionTitle,
-  QuestionFooter,
+  // QuestionFooter,
 } from "./style";
 import Comment from "./components/comment";
-import ButtonComponent from "../../button";
+// import ButtonComponent from "../../button";
 import EssayWritten from "./questions/essayWritten";
 import EssayScripted from "./questions/essayScripted";
 import EssayUnscripted from "./questions/essayUnscripted";
@@ -296,12 +292,12 @@ const ReportQuestions = ({
             accountType === "instructor-affiliate"
           }
         />
-        {(accountType === "instructor-personal" ||
+        {/* {(accountType === "instructor-personal" ||
           accountType === "instructor-affiliate") && (
           <QuestionFooter>
             <ButtonComponent text="Save" onClick={onClose} />
           </QuestionFooter>
-        )}
+        )} */}
       </Content>
     </Container>
   );