@nualang/nualang-ui-components 0.1.1255 → 0.1.1256

package/dist/Assignments/CreateAssignmentDialog/CreateAssignmentDialog.js

@@ -79,33 +79,51 @@ function CreateAssignmentDialog({
     exercises: submittedExercises,
     ...initialData
   });
-  const classroomQuery = _Queries.classrooms.useClassroom(async classroomId => {
-    const allClassroomsCourses = [];
-    await Promise.all(classroomId.map(async cId => {
-      if (!cId) return;
-      const response = await getClassroom(cId);
-      allClassroomsCourses.push(response?.Item?.courses || []);
-    }));
-    const flatClassrooms = allClassroomsCourses.flat();
-    const seen = new Set();
-    const uniqueClassroomsCourses = flatClassrooms.filter(classR => {
-      if (seen.has(classR)) return false;
-      seen.add(classR);
-      return true;
-    });
-    return uniqueClassroomsCourses;
-  }, {
-    classroomId: assignment?.classroomId
-  }, {
-    enabled: !!(assignment.classroomId.length > 0)
+  const classroomQuery = useQueries({
+    queries: (Array.isArray(assignment.classroomId) ? assignment.classroomId : [assignment.classroomId]).map(cId => ({
+      queryKey: _Queries.classrooms.classroomKeys.item(cId, username),
+      queryFn: () => getClassroom(cId, filters),
+      queryOptions: {
+        enabled: !!(Array.isArray(assignment.classroomId) ? assignment.classroomId.length > 0 : assignment.classroomId)
+      }
+    })),
+    combine: results => {
+      const normalizedData = results.map(result => {
+        const data = result.data;
+        if (data?.classroomId) {
+          return data;
+        }
+        if (data?.Item?.classroomId) {
+          return data.Item;
+        }
+        return null;
+      }).filter(Boolean);
+      return {
+        data: normalizedData,
+        pending: results.some(result => result.isPending)
+      };
+    }
   });
-  const selectedClassroom = (0, _react.useMemo)(() => classroomQuery.isSuccess && classroomQuery.data ? classroomQuery.data : {}, [classroomQuery.data, classroomQuery.isSuccess]);
+  const selectedClassroomCourses = (0, _react.useMemo)(() => {
+    if (!classroomQuery.pending && classroomQuery.data.length > 0) {
+      const allCourses = classroomQuery.data.flatMap(classroom => classroom.courses || []);
+      const seen = new Set();
+      const uniqueCourses = allCourses.filter(courseId => {
+        if (seen.has(courseId)) return false;
+        seen.add(courseId);
+        return true;
+      });
+      return uniqueCourses;
+    } else {
+      return [];
+    }
+  }, [classroomQuery.data, classroomQuery.pending]);
   const coursesQuery = _Queries.courses.useCourses(async filters => {
     const response = await getCourses(filters);
     return response;
   }, {
     filters: {
-      courseIds: selectedClassroom?.toString()
+      courseIds: selectedClassroomCourses?.toString()
     }
   }, {
     enabled: !!assignment.classroomId
@@ -122,17 +140,22 @@ function CreateAssignmentDialog({
       }
     })),
     combine: results => {
+      const allMembers = results.flatMap(result => {
+        if (Array.isArray(result?.data?.Items)) {
+          return result.data.Items;
+        }
+        return [];
+      });
       return {
-        data: results.map(result => result.data),
+        data: allMembers,
         pending: results.some(result => result.isPending)
       };
     }
   });
-  const selectedMembers = (0, _react.useMemo)(() => {
-    if (!classroomMembersQueries.pending && Array.isArray(classroomMembersQueries.data[0].Items) && classroomMembersQueries.data[0].Items.length) {
-      const flatMembers = classroomMembersQueries.data[0].Items.flat();
+  const uniqueClassroomMembers = (0, _react.useMemo)(() => {
+    if (!classroomMembersQueries.pending && classroomMembersQueries.data.length > 0) {
       const seen = new Set();
-      const uniqueMembers = flatMembers.filter(member => {
+      const uniqueMembers = classroomMembersQueries.data.filter(member => {
         if (seen.has(member.memberId)) return false;
         seen.add(member.memberId);
         return true;
@@ -160,13 +183,13 @@ function CreateAssignmentDialog({
       courses: filteredCourses
     });
   }, [selectedCourses, submittedExercises]);
-  const classroomMembers = async selectedMembers => {
-    const formattedMembers = await getMemberDetails(selectedMembers);
+  const classroomMembers = async uniqueClassroomMembers => {
+    const formattedMembers = await getMemberDetails(uniqueClassroomMembers);
     setMembers(formattedMembers);
   };
   (0, _react.useEffect)(() => {
-    classroomMembers(selectedMembers);
-  }, [selectedMembers]);
+    classroomMembers(uniqueClassroomMembers);
+  }, [uniqueClassroomMembers]);
   (0, _react.useEffect)(() => {
     setAssignment(prev => ({
       ...prev,
@@ -227,7 +250,7 @@ function CreateAssignmentDialog({
   const handleCreateAssignment = async () => {
     try {
       await Promise.all(assignment.classroomId.map(async cId => {
-        const selectedClassroomMembers = selectedMembers.filter(member => member.classroomId === cId).map(student => student.memberId).filter(studentId => assignment?.assignedStudents.includes(studentId));
+        const selectedClassroomMembers = uniqueClassroomMembers.filter(member => member.classroomId === cId).map(student => student.memberId).filter(studentId => assignment?.assignedStudents.includes(studentId));
         const formattedAssignment = {
           ...assignment,
           classroomId: cId,

package/dist/Cards/SubscriptionPlan/SubscriptionPlan.js

@@ -108,18 +108,6 @@ const PlanButton = (0, _system.styled)(_material.Button)(({
     border: bgPrimary ? `1px solid ${theme.palette.primary.dark}` : null
   }
 }));
-const Badge = (0, _system.styled)(_material.Typography)(({
-  theme
-}) => ({
-  backgroundColor: theme.palette.common.white,
-  color: theme.palette.common.black,
-  fontSize: theme.typography.pxToRem(10),
-  borderRadius: "9px",
-  padding: theme.spacing(0.25, 1),
-  display: "flex",
-  alignItems: "center",
-  marginBottom: "2px"
-}));
 const Plus = (0, _system.styled)("img")(({
   theme
 }) => ({
@@ -239,8 +227,7 @@ function SubscriptionPlan({
             variant: "h3",
             priceSmall: displayPlan.priceSmall,
             children: displayPlan.price ? displayPlan.price : displayPrice
-          }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Grid, {
-            direction: "column",
+          }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Stack, {
             sx: {
               display: "flex",
               justifyContent: "center"
@@ -253,8 +240,18 @@ function SubscriptionPlan({
                   children: t(displayPlan.footnote)
                 })
               }),
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Badge, {
-                component: "div",
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+                sx: {
+                  fontSize: theme => theme.typography.pxToRem(10),
+                  backgroundColor: "common.white",
+                  color: "common.black",
+                  borderRadius: "9px",
+                  py: 0.25,
+                  px: 1,
+                  display: "flex",
+                  alignItems: "center",
+                  mb: "2px"
+                },
                 children: t(displayPlan.badge)
               })
             }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {}), priceInfo && priceInfo.interval && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Typography, {

package/dist/Dialogs/CreatePhrase/CreatePhrase.js

@@ -208,7 +208,7 @@ function CreatePhrase({
   };
 
   // // translation
-  // const generateTranslation = async () => {
+  // const generateTranslations = async () => {
   //   const translatedText = await handleTranslate(phrase, learnLang, forLang);
   //   if (translatedText && translatedText !== "") {
   //     setAutoTranslatedText(translatedText);
@@ -221,19 +221,35 @@ function CreatePhrase({
   //   }
   // };
 
-  const generateTranslation = async () => {
+  function validateResponse(response) {
+    if (!Array.isArray(response)) {
+      return false;
+    }
+    for (const item of response) {
+      if (item === null || Array.isArray(item)) {
+        return false;
+      }
+      if (typeof item !== "string" || item.trim() === "") {
+        return false;
+      }
+    }
+    return true;
+  }
+  const generateTranslations = async () => {
     try {
       let chatGptResponse = await makeChatGptApiRequest({
         model: "gpt-4o-mini",
-        promptKey: "generateTranslation",
+        promptKey: "generateTranslations",
         promptVariables: {
           learnLang,
           forLang,
           phrase
         }
       });
-      chatGptResponse = chatGptResponse.replaceAll("```", '').replaceAll("json", '');
-      const translations = JSON.parse(chatGptResponse);
+      const translations = chatGptResponse.translations;
+      if (!validateResponse(translations)) {
+        throw new Error("Invalid AI response");
+      }
       setTranslationList(prevTranslationList => {
         const newTranslations = translations.filter(text => !prevTranslationList.includes(text));
         return [...prevTranslationList, ...newTranslations];
@@ -409,7 +425,7 @@ function CreatePhrase({
           children: t("add_alternative_version")
         })
       }), learnLang !== forLang && /*#__PURE__*/(0, _jsxRuntime.jsx)(_DefaultColourButton.default, {
-        onClick: generateTranslation,
+        onClick: generateTranslations,
         disabled: !phrase || Array.isArray(translationList) && translationList.includes(autoTranslatedText),
         size: "sm",
         className: classes.alternativeVersionButton,

package/dist/Dialogs/GenerateBot/GenerateBot.js

@@ -17,6 +17,26 @@ var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 //components
 
+function validateResponse(response) {
+  if (!Array.isArray(response)) {
+    return false;
+  }
+  for (const item of response) {
+    if (typeof item !== "object" || item === null || Array.isArray(item)) {
+      return false;
+    }
+    if (!Object.hasOwn(item, "question") || !Object.hasOwn(item, "answer")) {
+      return false;
+    }
+    if (typeof item.question !== "string" || item.question.trim() === "") {
+      return false;
+    }
+    if (typeof item.answer !== "string" || item.answer.trim() === "") {
+      return false;
+    }
+  }
+  return true;
+}
 function GenerateBotDialog({
   t = text => text,
   isGenerateBotDialogOpen,
@@ -69,39 +89,42 @@ function GenerateBotDialog({
   const handleCloseDialog = () => {
     setIsGenerateBotDialogOpen(false);
   };
-  const removeExtraTextFromChatGptResponse = response => {
-    let stack = [];
-    let startIndex = -1;
-    let endIndex = -1;
-    for (let i = 0; i < response.length; i++) {
-      if (response[i] === "[") {
-        if (stack.length === 0) {
-          startIndex = i;
-        }
-        stack.push("[");
-      } else if (response[i] === "]") {
-        stack.pop();
-        if (stack.length === 0) {
-          endIndex = i;
-          break;
-        }
-      }
-    }
-    if (startIndex !== -1 && endIndex !== -1) {
-      return response.substring(startIndex, endIndex + 1);
-    }
-    return "";
-  };
-  function fixMissingComma(jsonString) {
-    const fixedJsonString = jsonString.replace(/}\s*{/g, "},{");
-    try {
-      const jsonObject = JSON.parse(fixedJsonString);
-      return jsonObject;
-    } catch (error) {
-      console.error("Invalid JSON after attempting to fix:", error);
-      return null;
-    }
-  }
+
+  // const removeExtraTextFromChatGptResponse = (response) => {
+  //   let stack = [];
+  //   let startIndex = -1;
+  //   let endIndex = -1;
+  //   for (let i = 0; i < response.length; i++) {
+  //     if (response[i] === "[") {
+  //       if (stack.length === 0) {
+  //         startIndex = i;
+  //       }
+  //       stack.push("[");
+  //     } else if (response[i] === "]") {
+  //       stack.pop();
+  //       if (stack.length === 0) {
+  //         endIndex = i;
+  //         break;
+  //       }
+  //     }
+  //   }
+  //   if (startIndex !== -1 && endIndex !== -1) {
+  //     return response.substring(startIndex, endIndex + 1);
+  //   }
+  //   return "";
+  // };
+
+  // function fixMissingComma(jsonString) {
+  //   const fixedJsonString = jsonString.replace(/}\s*{/g, "},{");
+  //   try {
+  //     const jsonObject = JSON.parse(fixedJsonString);
+  //     return jsonObject;
+  //   } catch (error) {
+  //     console.error("Invalid JSON after attempting to fix:", error);
+  //     return null;
+  //   }
+  // }
+
   const sampleQuestionArray = [{
     question: "What day comes after Monday? ",
     answer: "(Tuesday)"
@@ -137,7 +160,6 @@ function GenerateBotDialog({
     try {
       setIsBotGenerating(true);
       setErrorMessage("");
-      let response;
       let chatGptResponse = await makeChatGptApiRequest({
         model: "gpt-4o-mini",
         promptKey: "generateBot",
@@ -154,9 +176,10 @@ function GenerateBotDialog({
           usePhrasesContext: usePhrasesContext
         }
       });
-      response = chatGptResponse;
-      const jsonResponse = removeExtraTextFromChatGptResponse(response);
-      const botScript = fixMissingComma(jsonResponse);
+      const botScript = chatGptResponse.result;
+      if (!validateResponse(botScript)) {
+        throw new Error("Invalid AI response");
+      }
       setIsBotGenerating(false);
       return botScript;
     } catch (error) {

package/dist/Dialogs/GeneratePhrases/GeneratePhrases.js

@@ -113,29 +113,6 @@ function GeneratePhrases({
       [name]: value
     }));
   };
-  const extractPhrasesArray = response => {
-    let stack = [];
-    let startIndex = -1;
-    let endIndex = -1;
-    for (let i = 0; i < response.length; i++) {
-      if (response[i] === "[") {
-        if (stack.length === 0) {
-          startIndex = i;
-        }
-        stack.push("[");
-      } else if (response[i] === "]") {
-        stack.pop();
-        if (stack.length === 0) {
-          endIndex = i;
-          break;
-        }
-      }
-    }
-    if (startIndex !== -1 && endIndex !== -1) {
-      return response.substring(startIndex, endIndex + 1);
-    }
-    return "";
-  };
   function validateResponse(response) {
     if (!Array.isArray(response)) {
       return false;
@@ -184,12 +161,11 @@ function GeneratePhrases({
           phrases
         }
       });
-      const phrasesArray = extractPhrasesArray(chatGptResponse);
-      const parsedPhrases = JSON.parse(phrasesArray);
-      if (!validateResponse(parsedPhrases)) {
-        throw new Error("Invalid response from GPT-4o-mini");
+      const phrasesArray = chatGptResponse.result;
+      if (!validateResponse(phrasesArray)) {
+        throw new Error("Invalid AI response");
       }
-      setGeneratedPhrases(parsedPhrases);
+      setGeneratedPhrases(phrasesArray);
       setIsGenerating(false);
     } catch (error) {
       console.error(error);

package/dist/Dialogs/GenerateQuestion/GenerateQuestion.js

@@ -87,7 +87,7 @@ function GenerateQuestion({
     try {
       setIsMessageGenerating(true);
       setErrorMessage(null);
-      const chatGptResponse = await makeChatGptApiRequest({
+      const newQuestion = await makeChatGptApiRequest({
         model: "gpt-4o-mini",
         promptKey: "generateAnswer",
         promptVariables: {
@@ -100,8 +100,6 @@ function GenerateQuestion({
           questionLanguage
         }
       });
-      const jsonResponse = extractJsonObject(chatGptResponse);
-      const newQuestion = JSON.parse(jsonResponse);
       if (!validateResponse(newQuestion)) {
         throw new Error("Invalid response from GPT-3.5");
       }

package/dist/Dialogs/GenerateRoleplay/GenerateRoleplay.js

@@ -231,25 +231,37 @@ function GenerateRoleplayDialog({
           }
         });
         let isComplete = false;
+        let fullResult = [];
         while (!isComplete) {
-          if (chatGptResponse.endsWith("...") || chatGptResponse.trim().endsWith(",")) {
+          let parsed;
+          try {
+            parsed = typeof chatGptResponse === "string" ? JSON.parse(chatGptResponse) : chatGptResponse;
+          } catch (e) {
+            console.warn("Failed to parse response – assuming truncation");
+            parsed = {
+              result: []
+            }; // fallback
+          }
+          if (Array.isArray(parsed.result)) {
+            fullResult = [...fullResult, ...parsed.result];
+          }
+          // Check last item for signs of truncation
+          const lastItem = parsed.result?.[parsed.result.length - 1];
+          const endsSuspiciously = lastItem?.text?.trim?.().endsWith("...") || lastItem?.text?.trim?.().endsWith(",");
+          if (endsSuspiciously) {
+            const continuationPrompt = `Continue the following in the same JSON format:\n\n${JSON.stringify(parsed.result, null, 2)}`;
             const continuationResponse = await makeChatGptApiRequest({
               model: "gpt-4o-mini",
-              prompt: "Continue: " + chatGptResponse
+              prompt: continuationPrompt
             });
-            chatGptResponse += continuationResponse;
+            chatGptResponse = continuationResponse;
           } else {
             isComplete = true;
           }
         }
-        response = chatGptResponse;
+        response = fullResult;
       }
-
-      // Log the full response for debugging
-
-      const jsonResponse = removeExtraTextFromChatGptResponse(response);
-      const roleplayScript = fixMissingComma(jsonResponse);
-      if (validateScript(roleplayScript)) {
+      if (validateScript(response)) {
         const generatedRoleplay = {
           roleplayId: (0, _utils.randomId)(),
           roleplayName: values.roleplayTopic,
@@ -260,7 +272,7 @@ function GenerateRoleplayDialog({
           learnLang: learnLang,
           translationEnabled: "enable",
           repliesEnabled: "enable",
-          script: roleplayScript,
+          script: response,
           actor1: {
             name: getAllVoices()[0].name,
             voice: getAllVoices()[0].name,

package/dist/Editors/Bot/Editor/Editor.js

@@ -88,8 +88,7 @@ const useStyles = (0, _mui.makeStyles)()((theme, {
     color: theme.palette.text.secondary
   },
   characterDropdown: {
-    margin: theme.spacing(1),
-    marginTop: "26px"
+    margin: theme.spacing(1)
   },
   formattingOptionsButton: {
     backgroundColor: isFormattingOptionsOpen ? theme.palette.action.selected : null

package/dist/Screens/Classrooms/ViewClassroom/ViewClassroom.js

@@ -1423,7 +1423,7 @@ function Classroom({
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ResponsiveTabs.default, {
       t: t,
       tabs: tabs,
-      fabs: isCreator && isVideoChatEnabled && isVideoChatEnabledInSettings && !isArchived ? courses?.length ? fabs : [[vchatFab]] : isCreator && courses?.length && !isArchived ? [[fabs[0][0]]] : [],
+      fabs: isCreator && isVideoChatEnabled && isVideoChatEnabledInSettings && !isArchived ? courses?.length ? fabs : [[vchatFab]] : isCreator && courses?.length && !isArchived ? [[fabs[0][0], assignmentsFab]] : [],
       centered: true,
       scrollable: true,
       hasNewAssignments: hasNewAssignments,
@@ -1480,7 +1480,7 @@ function Classroom({
       open: isInviteDialogOpen,
       handleClose: handleCloseInviteDialog,
       onSubmit: handleInvites,
-      inviteLink: `${window.location.href}?plan=learn&learnlang=${classroom.learnLang}`,
+      inviteLink: `${window.location.origin}/classrooms/${classroomId}?plan=learn&learnlang=${classroom.learnLang}`,
       enrolmentKey: classroom.visibility === "private" ? classroom.enrolmentKey : "",
       inviteType: "classroom",
       attributes: attributes,

package/dist/Screens/Courses/ViewCourse/ViewCourse.js

@@ -960,7 +960,7 @@ function Course({
       open: isInviteDialogOpen,
       handleClose: handleCloseInviteDialog,
       onSubmit: handleInvites,
-      inviteLink: `${window.location.href}?plan=learn&learnlang=${course.learnLang}`,
+      inviteLink: `${window.location.origin}/courses/${courseId}?plan=learn&learnlang=${course.learnLang}`,
       enrolmentKey: course.visibility === "private" ? course.enrolmentKey : "",
       inviteType: "course",
       attributes: attributes,

package/dist/Tables/RecordingListCards/RecordingListCards.js

@@ -75,7 +75,7 @@ const RecordingListCards = (0, _mui.withStyles)(({
         variant: "headline",
         color: "inherit",
         fontSize: 24,
-        children: t("recordings")
+        children: t("submissions")
       })
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: classes.grow

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nualang/nualang-ui-components",
-  "version": "0.1.1255",
+  "version": "0.1.1256",
   "main": "dist/index.js",
   "files": [
     "dist",