@nualang/nualang-ui-components 0.1.1233 → 0.1.1235

package/dist/Assignments/AssignmentCard/AssignmentCard.js

@@ -27,7 +27,8 @@ function AssignmentCard({
   getCourses,
   deleteAssignment,
   handleEditAssignment,
-  lastClickedExerciseId
+  lastClickedExerciseId,
+  handleViewProgress
 }) {
   const [confirm] = (0, _useConfirm.default)(t);
   const handleDeleteAssignment = async (classroomId, assignmentId) => {
@@ -242,6 +243,9 @@ function AssignmentCard({
                 marginTop: 2,
                 marginLeft: "15px"
               },
+              onClick: () => handleViewProgress({
+                assignmentId: assignment?.assignmentId
+              }),
               children: t("view_progress")
             })]
           })]

package/dist/Assignments/AssignmentCardsList/AssignmentCardsList.js

@@ -25,7 +25,8 @@ const AssignmentCardsList = ({
   getRoleplays,
   deleteAssignment,
   handleEditAssignment,
-  refreshAssignments
+  refreshAssignments,
+  handleViewProgress
 }) => {
   const [lastClickedExerciseId, setLastClickedExerciseId] = (0, _react.useState)(null);
   (0, _react.useEffect)(() => {
@@ -134,7 +135,8 @@ const AssignmentCardsList = ({
         getRoleplays: getRoleplays,
         deleteAssignment: deleteAssignment,
         handleEditAssignment: handleEditAssignment,
-        lastClickedExerciseId: lastClickedExerciseId
+        lastClickedExerciseId: lastClickedExerciseId,
+        handleViewProgress: handleViewProgress
       }, assignment.assignmentId))]
     })
   });

package/dist/Assignments/AssignmentExerciseSelection/AssignmentExerciseSelection.js

@@ -55,7 +55,7 @@ function Exercise({
     };
     localStorage.setItem("lastClickedExercise", JSON.stringify(lastClickedExercise));
     const assignmentParam = encodeURIComponent(JSON.stringify(assignment));
-    navigate(`/classrooms/${classroomId}/${courseId}/${sectionId}/${topicId}?exercise=${name}&assignment=${assignmentParam}`);
+    navigate(`/classrooms/${classroomId}/${courseId}/${sectionId}/${topicId}?exercise=${name}&assignmentId=${assignment.assignmentId}`);
   };
   const handleToggleRoleplays = () => {
     setRoleplaysOpen(!roleplaysOpen);

package/dist/Assignments/AssignmentRoleplaySelection/AssignmentRoleplaySelection.js

@@ -48,7 +48,7 @@ function Roleplay({
     };
     localStorage.setItem("lastClickedExercise", JSON.stringify(lastClickedExercise));
     const assignmentParam = encodeURIComponent(JSON.stringify(assignment));
-    navigate(`/classrooms/${classroomId}/${courseId}/${sectionId}/${topicId}/roleplays/${roleplay?.roleplayId}?game=${encodeURIComponent(exercise)}&assignment=${assignmentParam}`);
+    navigate(`/classrooms/${classroomId}/${courseId}/${sectionId}/${topicId}/roleplays/${roleplay?.roleplayId}?game=${encodeURIComponent(exercise)}&assignmentId=${assignment.assignmentId}`);
   };
   const [open, setOpen] = (0, _react.useState)(lastClickedRoleplayId === roleplay.roleplayId && lastClickedAssignmentId === assignment.assignmentId);
   const games = ["roleplay-story", "roleplay-fill-in-the-blanks", "roleplay-act-it-out", "roleplay-act-it-out-listening", "roleplay-act-it-out-speaking", "roleplay-act-it-out-listening-speaking"];

package/dist/Dialogs/ExerciseMenu/Menus/CloseExercise/CloseExercise.js

@@ -23,7 +23,7 @@ function CloseExerciseMenu({
 }) {
   const location = (0, _reactRouterDom.useLocation)();
   const searchParams = new URLSearchParams(location.search);
-  const assignment = JSON.parse(decodeURIComponent(searchParams.get("assignment")));
+  const assignmentId = searchParams.get('assignmentId');
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExerciseMenu.default, {
     open: open,
     handleClose: close,
@@ -41,7 +41,7 @@ function CloseExerciseMenu({
       color: "primary",
       onClick: saveProgress,
       disabled: isSpeaking
-    }, ...(assignment ? [{
+    }, ...(assignmentId ? [{
       dataCypress: "go_back_to_assignments",
       text: t("go_back_to_assignments"),
       variant: "",

package/dist/Dialogs/ExerciseMenu/Menus/CompletedExcercise/CompletedExcercise.js

@@ -23,7 +23,7 @@ function CompletedExerciseMenu({
 }) {
   const location = (0, _reactRouterDom.useLocation)();
   const searchParams = new URLSearchParams(location.search);
-  const assignment = JSON.parse(decodeURIComponent(searchParams.get("assignment")));
+  const assignmentId = searchParams.get('assignmentId');
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExerciseMenu.default, {
     open: open,
     handleClose: close,
@@ -48,7 +48,7 @@ function CompletedExerciseMenu({
       color: "primary",
       onClick: viewReport,
       disabled: disableViewReport
-    }, ...(assignment ? [{
+    }, ...(assignmentId ? [{
       dataCypress: "go_back_to_assignments",
       text: t("go_back_to_assignments"),
       variant: "",

package/dist/Dialogs/ExerciseMenu/Menus/InProgressExercise/InProgressExercise.js

@@ -20,7 +20,7 @@ function InProgressExercise({
 }) {
   const location = (0, _reactRouterDom.useLocation)();
   const searchParams = new URLSearchParams(location.search);
-  const assignment = JSON.parse(decodeURIComponent(searchParams.get("assignment")));
+  const assignmentId = searchParams.get('assignmentId');
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExerciseMenu.default, {
     open: open,
     handleClose: close,
@@ -34,7 +34,7 @@ function InProgressExercise({
       variant: "outlined",
       color: "primary",
       onClick: restartExercise
-    }, ...(assignment ? [{
+    }, ...(assignmentId ? [{
       text: t("go_back_to_assignments"),
       variant: "",
       color: "",

package/dist/Exercises/Listener/Listener.js

@@ -237,7 +237,8 @@ function Listener({
   courseSettings,
   parentClassroom,
   isHeritageSpeaker = false,
-  classroomId
+  classroomId,
+  assignment
 }) {
   (0, _useExerciseDocumentTitle.default)({
     exerciseTitle: "Listening",
@@ -276,7 +277,8 @@ function Listener({
     incorrectSound,
     disableShuffle,
     toggleMuteSound,
-    isHeritageSpeaker
+    isHeritageSpeaker,
+    classroomId
   });
   const {
     questions,
@@ -328,7 +330,8 @@ function Listener({
     checkAnswer,
     setCheckAnswer,
     isWordBankAttemptChanged,
-    setIsWordBankAttemptChanged
+    setIsWordBankAttemptChanged,
+    setIsAssignmentExercise
   } = exerciseState;
   const {
     handleSelectInAnswerBox,
@@ -468,6 +471,9 @@ function Listener({
     setCheckAnswer(false);
     setIsWordBankAttemptChanged(true);
   }, [listeningWords]);
+  (0, _react.useEffect)(() => {
+    assignment ? setIsAssignmentExercise(true) : setIsAssignmentExercise(false);
+  }, [assignment]);
   (0, _react.useEffect)(() => {
     if (open && !run && !localStorage.getItem(`listening-exercise-tour-completed`)) {
       setJoyrideState(prevState => ({

package/dist/Exercises/Pronouncer/Pronouncer.js

@@ -165,7 +165,8 @@ function Pronouncer({
   languageTag,
   trackRecommendedEvent,
   parentClassroom,
-  classroomId
+  classroomId,
+  assignment
 }) {
   (0, _useExerciseDocumentTitle.default)({
     exerciseTitle: "Pronunciation",
@@ -267,7 +268,8 @@ function Pronouncer({
     indicateEndStream,
     disableShuffle,
     toggleMuteSound,
-    audioBlob
+    audioBlob,
+    classroomId
   });
   const {
     questions,
@@ -314,13 +316,17 @@ function Pronouncer({
     handlePronunciationTourFinished,
     handleTryAgain,
     checked,
-    setChecked
+    setChecked,
+    setIsAssignmentExercise
   } = exerciseState;
   (0, _react.useEffect)(() => {
     if (currentPhrase?.phrase) {
       setCurrentPhraseText(currentPhrase.phrase);
     }
   }, [currentPhrase]);
+  (0, _react.useEffect)(() => {
+    assignment ? setIsAssignmentExercise(true) : setIsAssignmentExercise(false);
+  }, [assignment]);
   const unattemptedQuestionTotal = questions.filter(q => !q.questionAttempted).length;
   const joyrideSteps = [{
     content: /*#__PURE__*/(0, _jsxRuntime.jsx)("h2", {

package/dist/Exercises/Roleplay/Games/ActItOutGame/ActItOutGame.js

@@ -195,7 +195,9 @@ function RoleplayGame({
   translationEnabled,
   parentClassroom,
   isHeritageSpeaker = false,
-  goBackToAssignment
+  goBackToAssignment,
+  assignment,
+  classroomId
 }) {
   (0, _useExerciseDocumentTitle.default)({
     exerciseTitle: "Act it out",
@@ -248,7 +250,8 @@ function RoleplayGame({
     clearQueue,
     stopAudio,
     languageInformation,
-    isHeritageSpeaker
+    isHeritageSpeaker,
+    classroomId
   });
   const {
     muteSound,
@@ -299,13 +302,17 @@ function RoleplayGame({
     isSpeaking,
     isSpeakingTextContainer,
     actorHasBeenSelected,
-    setActorHasBeenSelected
+    setActorHasBeenSelected,
+    setIsAssignmentExercise
   } = exerciseState;
   (0, _react.useEffect)(() => {
     if (actorHasBeenSelected) {
       startRoleplay();
     }
   }, [actorHasBeenSelected]);
+  (0, _react.useEffect)(() => {
+    assignment ? setIsAssignmentExercise(true) : setIsAssignmentExercise(false);
+  }, [assignment]);
   const isRoleplayScriptLoaded = roleplay && roleplay.script;
   (0, _react.useEffect)(() => {
     if (isRoleplayScriptLoaded) {

package/dist/Exercises/Roleplay/Games/ActItOutGameListening/ActItOutGameListening.js

@@ -197,7 +197,9 @@ function RoleplayGame({
   languageInformation,
   translationEnabled,
   parentClassroom,
-  goBackToAssignment
+  goBackToAssignment,
+  assignment,
+  classroomId
 }) {
   (0, _useExerciseDocumentTitle.default)({
     exerciseTitle: "Act it out listening",
@@ -249,7 +251,8 @@ function RoleplayGame({
     toggleMuteSound,
     clearQueue,
     stopAudio,
-    languageInformation
+    languageInformation,
+    classroomId
   });
   const {
     muteSound,
@@ -300,13 +303,17 @@ function RoleplayGame({
     isSpeaking,
     isSpeakingTextContainer,
     actorHasBeenSelected,
-    setActorHasBeenSelected
+    setActorHasBeenSelected,
+    setIsAssignmentExercise
   } = exerciseState;
   (0, _react.useEffect)(() => {
     if (actorHasBeenSelected) {
       startRoleplay();
     }
   }, [actorHasBeenSelected]);
+  (0, _react.useEffect)(() => {
+    assignment ? setIsAssignmentExercise(true) : setIsAssignmentExercise(false);
+  }, [assignment]);
   const isRoleplayScriptLoaded = roleplay && roleplay.script;
   (0, _react.useEffect)(() => {
     if (isRoleplayScriptLoaded) {

package/dist/Exercises/Roleplay/Games/ActItOutGameListeningAndSpeaking/ActItOutGame.js

@@ -293,7 +293,9 @@ function RoleplayGame({
   translationEnabled,
   trackRecommendedEvent,
   parentClassroom,
-  goBackToAssignment
+  goBackToAssignment,
+  assignment,
+  classroomId
 }) {
   (0, _useExerciseDocumentTitle.default)({
     exerciseTitle: "Act it out listening and speaking",
@@ -369,7 +371,8 @@ function RoleplayGame({
     uploadAudioAttempt,
     clearQueue,
     stopAudio,
-    languageInformation
+    languageInformation,
+    classroomId
   });
   const {
     muteSound,
@@ -431,7 +434,8 @@ function RoleplayGame({
     isSpeaking,
     isSpeakingTextContainer,
     actorHasBeenSelected,
-    setActorHasBeenSelected
+    setActorHasBeenSelected,
+    setIsAssignmentExercise
   } = exerciseState;
   const handleMic = expectedTranscript => {
     const speechContexts = expectedTranscript ? [{
@@ -453,6 +457,9 @@ function RoleplayGame({
     }
     return () => clearTimeout(timer);
   }, [recognizing, interimTranscript, finalTranscript]);
+  (0, _react.useEffect)(() => {
+    assignment ? setIsAssignmentExercise(true) : setIsAssignmentExercise(false);
+  }, [assignment]);
   const getRandomNuala = () => {
     let finished = false;
     while (!finished) {

package/dist/Exercises/Roleplay/Games/ActItOutGameSpeaking/ActItOutGame.js

@@ -289,7 +289,9 @@ function RoleplayGame({
   trackRecommendedEvent,
   parentClassroom,
   isHeritageSpeaker,
-  goBackToAssignment
+  goBackToAssignment,
+  assignment,
+  classroomId
 }) {
   (0, _useExerciseDocumentTitle.default)({
     exerciseTitle: "Act it out speaking",
@@ -367,7 +369,8 @@ function RoleplayGame({
     clearQueue,
     stopAudio,
     languageInformation,
-    isHeritageSpeaker
+    isHeritageSpeaker,
+    classroomId
   });
   const {
     muteSound,
@@ -429,7 +432,8 @@ function RoleplayGame({
     isSpeaking,
     isSpeakingTextContainer,
     actorHasBeenSelected,
-    setActorHasBeenSelected
+    setActorHasBeenSelected,
+    setIsAssignmentExercise
   } = exerciseState;
   const handleMic = expectedTranscript => {
     const speechContexts = expectedTranscript ? [{
@@ -452,6 +456,9 @@ function RoleplayGame({
     }
     return () => clearTimeout(timer);
   }, [recognizing, interimTranscript, finalTranscript]);
+  (0, _react.useEffect)(() => {
+    assignment ? setIsAssignmentExercise(true) : setIsAssignmentExercise(false);
+  }, [assignment]);
   const getRandomNuala = () => {
     let finished = false;
     while (!finished) {

package/dist/Exercises/Roleplay/Games/FillInTheBlanksGame/FillInTheBlanksGame.js

@@ -70,7 +70,9 @@ function RoleplayGame({
   translationEnabled,
   parentClassroom,
   isHeritageSpeaker = false,
-  goBackToAssignment
+  goBackToAssignment,
+  assignment,
+  classroomId
 }) {
   (0, _useExerciseDocumentTitle.default)({
     exerciseTitle: "Fill in the blanks",
@@ -124,7 +126,8 @@ function RoleplayGame({
     clearQueue,
     stopAudio,
     languageInformation,
-    isHeritageSpeaker
+    isHeritageSpeaker,
+    classroomId
   });
   const {
     muteSound,
@@ -169,7 +172,8 @@ function RoleplayGame({
     speak,
     stopSpeaking,
     isSpeaking,
-    isSpeakingTextContainer
+    isSpeakingTextContainer,
+    setIsAssignmentExercise
   } = exerciseState;
   const [messagesSet, setMessagesSet] = (0, _react.useState)(false);
   const handleContinueExercise = () => {
@@ -181,6 +185,9 @@ function RoleplayGame({
       startRoleplay();
     }
   }, [currentMessages.length, messagesSet]);
+  (0, _react.useEffect)(() => {
+    assignment ? setIsAssignmentExercise(true) : setIsAssignmentExercise(false);
+  }, [assignment]);
   const isRoleplayScriptLoaded = roleplay && roleplay.script;
   (0, _react.useEffect)(() => {
     if (isRoleplayScriptLoaded) {

package/dist/Exercises/Roleplay/Games/StoryGame/StoryGame.js

@@ -63,7 +63,9 @@ function RoleplayGame({
   translationEnabled,
   parentClassroom,
   isHeritageSpeaker,
-  goBackToAssignment
+  goBackToAssignment,
+  assignment,
+  classroomId
 }) {
   (0, _useExerciseDocumentTitle.default)({
     exerciseTitle: "Story",
@@ -116,7 +118,8 @@ function RoleplayGame({
     clearQueue,
     stopAudio,
     languageInformation,
-    isHeritageSpeaker
+    isHeritageSpeaker,
+    classroomId
   });
   const {
     muteSound,
@@ -161,7 +164,8 @@ function RoleplayGame({
     speak,
     stopSpeaking,
     isSpeaking,
-    isSpeakingTextContainer
+    isSpeakingTextContainer,
+    setIsAssignmentExercise
   } = exerciseState;
   const [messagesSet, setMessagesSet] = (0, _react.useState)(false);
   const btnRef = (0, _react.useRef)();
@@ -174,6 +178,9 @@ function RoleplayGame({
       startRoleplay();
     }
   }, [currentMessages.length, game, messagesSet]);
+  (0, _react.useEffect)(() => {
+    assignment ? setIsAssignmentExercise(true) : setIsAssignmentExercise(false);
+  }, [assignment]);
   const isRoleplayScriptLoaded = roleplay && roleplay.script;
   (0, _react.useEffect)(() => {
     if (isRoleplayScriptLoaded) {

package/dist/Exercises/Roleplay/Roleplay.js

@@ -76,7 +76,9 @@ function Roleplay({
   const navigate = (0, _reactRouterDom.useNavigate)();
   const location = (0, _reactRouterDom.useLocation)();
   const searchParams = (0, _utils.searchStringToObj)(location.search);
+  const searchAssignmentParams = new URLSearchParams(location.search);
   const game = searchParams.game;
+  const assignmentId = searchAssignmentParams.get('assignmentId');
   const params = (0, _reactRouterDom.useParams)();
   const {
     classroomId
@@ -365,7 +367,9 @@ function Roleplay({
                 trackRecommendedEvent: trackRecommendedEvent,
                 parentClassroom: parentClassroom,
                 isHeritageSpeaker: isHeritageSpeaker,
-                goBackToAssignment: goBackToAssignment
+                goBackToAssignment: goBackToAssignment,
+                assignment: assignmentId,
+                classroomId: classroomId
               }, `roleplay-game-${RoleplayGame.gameId}`);
             }
             return null;

package/dist/Exercises/Translator/Translator.js

@@ -245,7 +245,8 @@ function Translator({
   isKeyboardHiddenTranslation,
   parentClassroom,
   isHeritageSpeaker,
-  classroomId
+  classroomId,
+  assignment
 }) {
   (0, _useExerciseDocumentTitle.default)({
     exerciseTitle: "Translation",
@@ -285,7 +286,8 @@ function Translator({
     disableShuffle,
     toggleMuteSound,
     isKeyboardHiddenTranslation,
-    isHeritageSpeaker
+    isHeritageSpeaker,
+    classroomId
   });
   const {
     questions,
@@ -335,7 +337,8 @@ function Translator({
     checkAnswer,
     setCheckAnswer,
     isWordBankAttemptChanged,
-    setIsWordBankAttemptChanged
+    setIsWordBankAttemptChanged,
+    setIsAssignmentExercise
   } = exerciseState;
   const unattemptedQuestionTotal = questions.filter(q => !q.questionAttempted).length;
   const {
@@ -459,6 +462,9 @@ function Translator({
     setIsWordBankAttemptChanged(true);
     setIncomplete(false);
   }, [translationWords]);
+  (0, _react.useEffect)(() => {
+    assignment ? setIsAssignmentExercise(true) : setIsAssignmentExercise(false);
+  }, [assignment]);
   (0, _react.useEffect)(() => {
     checkAnswer && checkCompletionAndNotify();
   }, [checkAnswer]);

package/dist/Lists/Exercises/Exercises.js

@@ -882,6 +882,7 @@ function Exercises(props) {
   const location = (0, _reactRouterDom.useLocation)();
   const searchParams = (0, _utils.searchStringToObj)(location.search);
   const exercise = searchParams.exercise;
+  const assignmentId = searchParams.assignmentId;
   const [showPronunciationOverflowMenu, setShowPronunciationOverflowMenu] = (0, _react.useState)(null);
   const [showTranslationOverflowMenu, setShowTranslationOverflowMenu] = (0, _react.useState)(null);
   const [showListeningOverflowMenu, setShowListeningOverflowMenu] = (0, _react.useState)(null);
@@ -1626,6 +1627,8 @@ function Exercises(props) {
             moveRoleplay: moveRoleplay,
             onDropRoleplay: onDropRoleplay,
             handleUpdateRoleplay: handleUpdateRoleplay,
+            classroomId: classroomId,
+            assignment: assignmentId,
             ...props
           }, roleplay.roleplayId)), isCreator ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.ListItemButton, {
             "data-cy": "add-roleplay-exercise",
@@ -1794,6 +1797,7 @@ function Exercises(props) {
       parentClassroom: parentClassroom,
       isHeritageSpeaker: isHeritageSpeaker,
       classroomId: classroomId,
+      assignment: assignmentId,
       ...pronunciationProgress
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Translator.default, {
       t: t,
@@ -1833,6 +1837,7 @@ function Exercises(props) {
       parentClassroom: parentClassroom,
       isHeritageSpeaker: isHeritageSpeaker,
       classroomId: classroomId,
+      assignment: assignmentId,
       ...translationProgress
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Listener.default, {
       t: t,
@@ -1872,6 +1877,7 @@ function Exercises(props) {
       parentClassroom: parentClassroom,
       isHeritageSpeaker: isHeritageSpeaker,
       classroomId: classroomId,
+      assignment: assignmentId,
       ...listeningProgress
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_SelectClassroom.default, {
       t: t,

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

@@ -457,6 +457,12 @@ function Classroom({
       handleOpenCreatorNotSubscribedUpgradeModal();
     }
   }, [creatorSubscription]);
+  const handleViewProgress = ({
+    assignmentId
+  }) => {
+    setOverwriteValue(tabs.findIndex(tab => tab.id === "Progress"));
+    navigate(`?assignmentId=${assignmentId}&reportType=assignments#Progress`);
+  };
   (0, _react.useEffect)(() => {
     const handleHashChange = () => {
       if (window.location.hash === "#Settings" && tabs) {
@@ -874,6 +880,7 @@ function Classroom({
     TabContent: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_AssignmentCardsList.default, {
         t: t,
+        handleViewProgress: handleViewProgress,
         isCreator: isCreator,
         assignments: assignments,
         courses: courses,

package/dist/Tables/Progress/Progress.js

@@ -132,7 +132,7 @@ const TableToolbar = ({
       mr: 1,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SelectMembers.default, {
         t: t,
-        members: members,
+        members: members.sort((a, b) => (a.username || "").localeCompare(b.username || "")),
         selectedMembers: selectedMembers,
         setSelectedMembers: setSelectedMembers
       })
@@ -334,7 +334,23 @@ function Progress({
     }
   }, [selectedCourse, selectedSection, selectedTopic, selectedRoleplay, selectedAssignment, reportType]); // If selections change, update the url to reflect those changes
 
-  let classroomMembers = members.sort((a, b) => (a.username || "").localeCompare(b.username || ""));
+  const [selectedMembers, setSelectedMembers] = (0, _react.useState)([]);
+  const classroomMembers = (0, _react.useMemo)(() => {
+    return members.filter(member => {
+      if (memberId) {
+        return member.memberId === memberId;
+      } else if (selectedMembers && selectedMembers.length && reportType === "assignments" && selectedAssignment?.assignedStudents) {
+        const selectedMemberIds = selectedMembers.map(m => m.memberId);
+        return selectedMemberIds.includes(member.memberId) && selectedAssignment?.assignedStudents.includes(member.memberId);
+      } else if (selectedMembers && selectedMembers.length) {
+        const selectedMemberIds = selectedMembers.map(m => m.memberId);
+        return selectedMemberIds.includes(member.memberId);
+      } else if (reportType === "assignments" && selectedAssignment?.assignedStudents) {
+        return selectedAssignment?.assignedStudents.includes(member.memberId);
+      }
+      return true;
+    });
+  }, [members, memberId, selectedMembers, reportType, selectedAssignment]);
   let currentView = "all_courses";
   if (reportType === "assignments" && selectedTopic && selectedRoleplay) {
     currentView = "assignment-roleplay";
@@ -351,13 +367,6 @@ function Progress({
   } else if (selectedCourse) {
     currentView = "course";
   }
-  const [selectedMembers, setSelectedMembers] = (0, _react.useState)([]);
-  if (memberId) {
-    classroomMembers = classroomMembers.filter(m => m.memberId === memberId);
-  } else if (selectedMembers && selectedMembers.length) {
-    const selectedMemberIds = selectedMembers.map(m => m.memberId);
-    classroomMembers = classroomMembers.filter(m => selectedMemberIds.includes(m.memberId));
-  }
   async function generateOverview(filter) {
     const XLSX = require("xlsx");
     let workbook = XLSX.utils.book_new();
@@ -441,7 +450,7 @@ function Progress({
       })]
     });
   }
-  if (classroomMembers.length === 0) {
+  if (members.length === 0) {
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
         variant: "h6",

package/dist/Tables/Progress/ProgressTable.js

@@ -791,6 +791,7 @@ function ProgressTable({
   classroomId,
   courses = [],
   members = [],
+  classroomMembers2 = [],
   fetchMemberCourseCompletions = () => {},
   currentView,
   filter,
@@ -811,11 +812,11 @@ function ProgressTable({
   featureFlags,
   reportType
 }) {
-  const selectedAssignmentTopics = selectedAssignment?.exercises?.map(e => e.courseSectionTopicId);
+  const selectedAssignmentTopics = (selectedAssignment?.exercises || [])?.map(e => e.courseSectionTopicId);
   const assignmentTopics = courses.flatMap(c => c.sections.flatMap(s => s.topics)).filter(t => selectedAssignmentTopics?.includes(`${t.courseSectionId}|${t.topicId}`));
   const topics = reportType === "exercises" && selectedCourse && selectedSection ? selectedCourse.sections[selectedCourse.sections.findIndex(s => s.sectionId === selectedSection.sectionId)].topics : [];
   const tableTopics = reportType === "assignments" ? assignmentTopics : topics;
-  const assignmentExercises = reportType === "assignments" && selectedTopic ? selectedAssignment?.exercises.filter(e => e.courseSectionTopicId === `${selectedTopic.courseSectionId}|${selectedTopic.topicId}`) : [];
+  const assignmentExercises = reportType === "assignments" && selectedTopic ? (selectedAssignment?.exercises || []).filter(e => e.courseSectionTopicId === `${selectedTopic.courseSectionId}|${selectedTopic.topicId}`) : [];
   const exercises = ["translation", "listening", "pronunciation"];
   const tableExercises = assignmentExercises && assignmentExercises.length ? exercises.filter(e => assignmentExercises.some(ae => ae.name === e)) : exercises;
   const tableRoleplays = assignmentExercises && assignmentExercises.length ? roleplays.filter(r => assignmentExercises.some(ae => ae.roleplayId === r.roleplayId)) : roleplays;
@@ -829,11 +830,6 @@ function ProgressTable({
   (0, _react.useEffect)(() => {
     setMembersState(stableSort(members, sortColumn, getComparator(sortDirection))); // sort alphabetically by default
   }, [filter, members]);
-  (0, _react.useEffect)(() => {
-    if (reportType === "assignments" && selectedAssignment?.assignedStudents) {
-      setMembersState(stableSort(members.filter(member => selectedAssignment?.assignedStudents.includes(member.memberId)), sortColumn, getComparator(sortDirection)));
-    }
-  }, [reportType, selectedAssignment, members]);
   function descendingComparator(a, b, property) {
     try {
       let a1;

package/dist/hooks/useExerciseState.js

@@ -67,7 +67,8 @@ function useExerciseState({
   isLiveGame = false,
   isCreator,
   isKeyboardHiddenTranslation,
-  isHeritageSpeaker = false
+  isHeritageSpeaker = false,
+  classroomId
 }) {
   const navigate = (0, _reactRouterDom.useNavigate)();
   const [questions, setQuestions] = (0, _react.useState)([]);
@@ -120,6 +121,7 @@ function useExerciseState({
   const [checkAnswer, setCheckAnswer] = (0, _react.useState)(false);
   const [isWordBankAttemptChanged, setIsWordBankAttemptChanged] = (0, _react.useState)(false);
   const [isKeyboardHidden, setIsKeyboardHidden] = (0, _react.useState)(false);
+  const [isAssignmentExercise, setIsAssignmentExercise] = (0, _react.useState)(false);
   (0, _react.useEffect)(() => {
     if (isLiveGame && existingMessages && existingMessages.length > 0) {
       setRoleplayMessages(existingMessages);
@@ -1568,7 +1570,7 @@ function useExerciseState({
   };
   const handleCloseClicked = () => {
     if (answerAttempts.length === 0 && botMessages.length === 0 && !roleplayHasStarted) {
-      handleClose();
+      isAssignmentExercise ? navigate(`/classrooms/${classroomId}#Assignments`) : handleClose();
     } else {
       openCloseModal();
     }
@@ -1988,6 +1990,7 @@ function useExerciseState({
     isWordBankAttemptChanged,
     setIsWordBankAttemptChanged,
     isKeyboardHidden,
-    setWordOptions
+    setWordOptions,
+    setIsAssignmentExercise
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nualang/nualang-ui-components",
-  "version": "0.1.1233",
+  "version": "0.1.1235",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -20,7 +20,7 @@
     "@mui/material": "^5.15.20",
     "@mui/system": "^5.15.20",
     "@mui/x-date-pickers": "^7.7.0",
-    "@nualang/nualang-api-and-queries": "^1.0.84",
+    "@nualang/nualang-api-and-queries": "^1.1.1",
     "@storybook/theming": "^8.1.10",
     "@stripe/react-stripe-js": "^2.1.1",
     "@stripe/stripe-js": "^1.54.2",