l-min-components 1.7.1430 → 1.7.1432

package/package.json

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

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

@@ -15,9 +15,6 @@ 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 DOMPurify from "dompurify";
 
 const Grammar = ({ Aidata }) => {
   const [selectedSection, setSelectedSection] = useState(1);
@@ -27,6 +24,7 @@ const Grammar = ({ Aidata }) => {
   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"];
@@ -51,7 +49,7 @@ const Grammar = ({ Aidata }) => {
     { label: "Feedback", value: 1, icon: ChatIcon },
     { label: "View script", value: 2, icon: AIcon },
     { label: "Corrected version", value: 3, icon: MarsIcon },
-  ];
+  ].filter((item) => !(item?.value === 3 && Aidata?.score >= 100));
 
   return (
     <ModelComtainer>
@@ -62,24 +60,38 @@ const Grammar = ({ Aidata }) => {
             <p>Click on the words to see detailed feedback</p>
           </div>
           <GrammarHeaderContent>
-            {wordsFeedback?.map((word, idx) => (
-              <span
-                // This now correctly checks if the word has an operation (i.e., a correction)
-                className={classNames({ "error-text": word?.operation })}
-                key={idx}
-                onClick={() => {
-                  if (!word?.operation) return;
-                  setSelectedWord(word);
-                  setSelectedSection(1);
-                }}
-              >
-                {/* This will only be true for words with a correction (and a position) */}
-                {word?.feedbackPosition && (
-                  <span>{word?.feedbackPosition}</span>
-                )}
-                {word?.text}
-              </span>
-            ))}
+            {wordsFeedback?.map((word, idx) => {
+              const isWord = /^\w+$/.test(word.text);
+              const isSymbol = /^[^\w\s]+$/.test(word.text);
+              const next = wordsFeedback[idx + 1];
+              const nextIsWord = /^\w+$/.test(next?.text || "");
+              const isCorrected = !!word.operation;
+              const showFeedback = !!word.feedbackPosition;
+
+              const shouldAddSpace =
+                (isWord && nextIsWord) || // word → word
+                (isSymbol && nextIsWord); // symbol → word
+
+              return (
+                <span
+                  className={classNames("inline", {
+                    "error-text": isCorrected,
+                  })}
+                  key={idx}
+                  style={{ whiteSpace: "pre" }}
+                  onClick={() => {
+                    if (!isCorrected) return;
+                    setSelectedWord(word);
+                    setSelectedSection(1);
+                  }}
+                >
+                  {/* This will only be true for words with a correction (and a position) */}
+                  {showFeedback && <sup>{word.feedbackPosition}</sup>}
+                  {word.text}
+                  {shouldAddSpace && " "}
+                </span>
+              );
+            })}
           </GrammarHeaderContent>
           <ul className="no-border ul_tabs">
             {tabs.map((tab) => (

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

@@ -153,7 +153,7 @@ const FullAnalysis = ({ data, onClose, accountType }) => {
                           className="progress-section"
                         >
                           <span style={{ color: model?.primaryColor }}>
-                            {model?.score || 0}%
+                            {Math.floor(model?.score) || 0}%
                           </span>
                           <Progress.Line
                             percent={model?.score || 0}

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

@@ -438,9 +438,7 @@ export const GrammarHeaderContent = styled.div`
   span {
     line-height: 22px;
     font-size: 16px;
-    &::after {
-      content: " ";
-    }
+
     &.error-text {
       display: inline-flex;
       padding-right: 4px;
@@ -448,7 +446,7 @@ export const GrammarHeaderContent = styled.div`
       align-items: center;
       gap: 2px;
       cursor: pointer;
-      > span {
+      > sup {
         display: inline-flex;
         justify-content: center;
         align-items: center;

package/src/components/reportsComponents/reportQuestions/components/modals/gradingModal.jsx

@@ -17,7 +17,6 @@ const GradingModal = ({
   const [value, setValue] = useState(defaultScore || "");
 
   const numberValue = parseFloat(value || 0);
-  const disable = selected === "manually" && (numberValue > 100 || !value);
 
   const isNumbter = parseFloat(aiValue) || 0;
   const isSuggestionNumber = parseFloat(suggestionValue) || 0;
@@ -111,7 +110,7 @@ const GradingModal = ({
           </TopSection>
           <ButtonComponent
             text="Save score"
-            disabled={disable}
+            // disabled={disable}
             onClick={handleSetValue}
           />
         </Content>

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

@@ -128,7 +128,7 @@ const ReportQuestions = ({
       {toggleGrade && (
         <GradingModal
           aiValue={formatNumber(data?.ai_score)}
-          suggestionValue={formatNumber(100)}
+          suggestionValue={formatNumber(data?.suggested_score)}
           noAi={noAi}
           setScore={handleScore}
           defaultScore={formatNumber(intructorScore)}