@nualang/nualang-ui-components 0.1.1303 → 0.1.1305

package/dist/Assignments/AssignmentCourseSelection/AssignmentCourseSelection.js

@@ -31,7 +31,6 @@ function Course({
   lastClickedExerciseId,
   handleRemoveExercise,
   isPreview,
-  isChallengeModeEnabled = false,
   isChallengeModeStudent
 }) {
   const numOfIds = lastClickedExerciseId ? lastClickedExerciseId.split("|") : [];
@@ -88,7 +87,7 @@ function Course({
       }
     });
     if (courseSections && memberCourseCompletions && selectedExercises) {
-      const sectionsWithProgress = calcCompletions(courseSections.filter(section => assignedSectionIds.has(section.sectionId)), memberCourseCompletions, selectedExercises, true);
+      const sectionsWithProgress = calcCompletions(courseSections.filter(section => assignedSectionIds.has(section.sectionId)), memberCourseCompletions, selectedExercises, isChallengeModeStudent);
       const percentCompletion = calcPercentageCompletion(sectionsWithProgress);
       setCourseSectionCompletion(percentCompletion);
     }
@@ -177,7 +176,6 @@ function Course({
             progressHelpers: progressHelpers,
             memberCourseCompletions: memberCourseCompletions,
             lastClickedExerciseId: lastClickedExerciseId,
-            isChallengeModeEnabled: isChallengeModeEnabled,
             isChallengeModeStudent: isChallengeModeStudent
           })
         })
@@ -208,7 +206,6 @@ function Course({
         course: course,
         handleRemoveExercise: handleRemoveExercise,
         isPreview: isPreview,
-        isChallengeModeEnabled: isChallengeModeEnabled,
         isChallengeModeStudent: isChallengeModeStudent
       })
     })
@@ -236,7 +233,6 @@ function AssignmentCourseSelection({
   lastClickedExerciseId,
   handleRemoveExercise,
   isPreview,
-  isChallengeModeEnabled = false,
   isChallengeModeStudent,
   ...otherProps
 }) {
@@ -264,7 +260,6 @@ function AssignmentCourseSelection({
       lastClickedExerciseId: lastClickedExerciseId,
       handleRemoveExercise: handleRemoveExercise,
       isPreview: isPreview,
-      isChallengeModeEnabled: isChallengeModeEnabled,
       isChallengeModeStudent: isChallengeModeStudent
     }, course.courseId || index))
   });

package/dist/Assignments/AssignmentExerciseSelection/AssignmentExerciseSelection.js

@@ -48,7 +48,6 @@ function Exercise({
   lastClickedExerciseId,
   isPreview,
   handleRemoveExercise = null,
-  isChallengeModeEnabled = false,
   isChallengeModeStudent
 }) {
   const [listeningHidden, setListeningHidden] = useState(false);
@@ -269,8 +268,7 @@ function Exercise({
           isCreator: isCreator,
           lastClickedExerciseId: lastClickedExerciseId,
           handleRemoveExercise: handleRemoveExercise,
-          isPreview: isPreview,
-          isChallengeModeEnabled: isChallengeModeEnabled
+          isPreview: isPreview
         })
       })
     }), name.toLowerCase() === "bots" && /*#__PURE__*/_jsx(Collapse, {
@@ -298,7 +296,6 @@ function Exercise({
           lastClickedExerciseId: lastClickedExerciseId,
           handleRemoveExercise: handleRemoveExercise,
           isPreview: isPreview,
-          isChallengeModeEnabled: isChallengeModeEnabled,
           isChallengeModeStudent: isChallengeModeStudent
         })
       })
@@ -885,19 +882,16 @@ function SectionList({
   course,
   handleRemoveExercise,
   isPreview,
-  isChallengeModeEnabled = false,
   isChallengeModeStudent,
   ...otherProps
 }) {
   const [courseSectionWithProgress, setCourseSectionWithProgress] = useState([]);
   useEffect(() => {
     if (sections && memberCourseCompletions && selectedExercises) {
-      const sectionsWithProgress = calcCompletions(sections, memberCourseCompletions, selectedExercises, {
-        includeChallengeBots: isChallengeModeEnabled
-      });
+      const sectionsWithProgress = calcCompletions(sections, memberCourseCompletions, selectedExercises, isChallengeModeStudent);
       setCourseSectionWithProgress(sectionsWithProgress);
     }
-  }, [sections, memberCourseCompletions, selectedExercises, isChallengeModeEnabled]);
+  }, [sections, memberCourseCompletions, selectedExercises, isChallengeModeStudent]);
   const courseSections = courseSectionWithProgress && courseSectionWithProgress.length ? courseSectionWithProgress : sections;
   return /*#__PURE__*/_jsx(_Fragment, {
     children: courseSections.length > 0 ? courseSections.map((section, index) => {

package/dist/Assignments/AssignmentExerciseSelector/AssignmentExerciseSelector.js

@@ -20,7 +20,6 @@ function AssignmentExerciseSelector({
   lastClickedExerciseId,
   handleRemoveExercise,
   isPreview,
-  isChallengeModeEnabled = false,
   isChallengeModeStudent
 }) {
   return /*#__PURE__*/_jsx(Box, {
@@ -43,7 +42,6 @@ function AssignmentExerciseSelector({
       lastClickedExerciseId: lastClickedExerciseId,
       handleRemoveExercise: handleRemoveExercise,
       isPreview: isPreview,
-      isChallengeModeEnabled: isChallengeModeEnabled,
       isChallengeModeStudent: isChallengeModeStudent
     })
   });

package/dist/Assignments/AssignmentSelectExercise/AssignmentSelectExercise.js

@@ -20,7 +20,6 @@ function AssignmentSelectExercise({
   preferred_username,
   progressHelpers,
   memberCourseCompletions,
-  isChallengeModeEnabled = false,
   isChallengeModeStudent
 }) {
   const [isExerciseSelected, setIsExerciseSelected] = useState(false);
@@ -94,7 +93,6 @@ function AssignmentSelectExercise({
         preferred_username: preferred_username,
         progressHelpers: progressHelpers,
         memberCourseCompletions: memberCourseCompletions,
-        isChallengeModeEnabled: isChallengeModeEnabled,
         isChallengeModeStudent: isChallengeModeStudent
       })
     })]

package/dist/Assignments/CreateAssignmentDialog/CreateAssignmentDialog.js

@@ -50,8 +50,7 @@ export default function CreateAssignmentDialog({
   initialData = {},
   dialogTitle,
   userEmail = "",
-  assignedStudents,
-  isChallengeModeEnabled = false
+  assignedStudents
 }) {
   const {
     classes
@@ -447,8 +446,7 @@ export default function CreateAssignmentDialog({
             viewOnly: true,
             useCase: "assignment-view",
             handleRemoveExercise: handleRemoveExercise,
-            isPreview: true,
-            isChallengeModeEnabled: isChallengeModeEnabled
+            isPreview: true
           })]
         })
       }), /*#__PURE__*/_jsx(Card, {
@@ -637,8 +635,7 @@ export default function CreateAssignmentDialog({
       useCase: "assignment-select",
       selectedExercises: selectedExercises,
       setSelectedExercises: setSelectedExercises,
-      setSubmittedExercises: setSubmittedExercises,
-      isChallengeModeEnabled: isChallengeModeEnabled
+      setSubmittedExercises: setSubmittedExercises
     })]
   });
 }

package/dist/Lists/CourseOutline/CourseOutline.js

@@ -1149,7 +1149,7 @@ function CourseOutline({
   showViewTopicButton = true,
   isClassroomArchived = false,
   classroomId,
-  isChallengeModeEnabled = false,
+  isChallengeModeStudent = false,
   ...otherProps
 }) {
   const [percentageCompletion, setPercentageCompletion] = useState({
@@ -1160,11 +1160,19 @@ function CourseOutline({
   const [sects, setSects] = useState([]);
   useEffect(() => {
     if (isMember) {
-      setSects(calcCompletions(sections, completions));
+      const sectionsWithProgress = calcCompletions(sections, completions, null, isChallengeModeStudent);
+      const percentCompletion = calcPercentageCompletion(sectionsWithProgress);
+      setSects(sectionsWithProgress);
+      setPercentageCompletion(percentCompletion);
     } else {
       setSects(sections);
+      setPercentageCompletion({
+        completed: 0,
+        total: 0,
+        percentage: 0
+      });
     }
-  }, [isMember, JSON.stringify(sections), JSON.stringify(completions)]);
+  }, [isMember, isChallengeModeStudent, JSON.stringify(sections), JSON.stringify(completions)]);
   const moveSection = useCallback((dragIndex, hoverIndex) => {
     const dragSection = sects[dragIndex];
     const newSections = update(sects, {
@@ -1191,29 +1199,6 @@ function CourseOutline({
     });
     setSects(newSections);
   }, [sects]);
-  useEffect(() => {
-    if (isMember) {
-      const sectionsWithProgress = calcCompletions(sections, completions, [], {
-        includeChallengeBots: isChallengeModeEnabled
-      });
-      console.log({
-        sectionsWithProgress
-      });
-      const percentCompletion = calcPercentageCompletion(sectionsWithProgress);
-      console.log({
-        percentCompletion
-      });
-      setSects(sectionsWithProgress);
-      setPercentageCompletion(percentCompletion);
-    } else {
-      setSects(sections);
-      setPercentageCompletion({
-        completed: 0,
-        total: 0,
-        percentage: 0
-      });
-    }
-  }, [completions, isMember, sections, isChallengeModeEnabled]);
   const {
     percentage,
     completed,

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

@@ -494,7 +494,6 @@ function Classroom({
   assignmentMembersById,
   email,
   isLoadingAssignments,
-  isChallengeModeEnabled = false,
   isChallengeModeStudent,
   ...otherProps
 }) {
@@ -1132,7 +1131,6 @@ function Classroom({
         submissions: submissionsTableData,
         featureFlags: featureFlags,
         isVideoChatEnabled: isVideoChatEnabled && isVideoChatEnabledInSettings,
-        isChallengeModeEnabled: isChallengeModeEnabled,
         assignedCourses: assignedCourses,
         assignedCourseIds: assignedCourseIds
       })

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

@@ -326,6 +326,7 @@ function Course({
   classroomId,
   loading,
   featureFlags,
+  isChallengeModeStudent,
   ...otherProps
 }) {
   const {
@@ -646,7 +647,8 @@ function Course({
             isLoading: isSectionsLoading,
             courseSettings: courseSettings,
             verificationStatus: verificationStatus,
-            handleDeletePDF: handleDeleteSectionPDF
+            handleDeletePDF: handleDeleteSectionPDF,
+            isChallengeModeStudent: isChallengeModeStudent
           })
         })
       }), !isLoading && !isSectionsLoading && sections.length === 0 && /*#__PURE__*/_jsx(SectionsNotFound, {

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

@@ -532,14 +532,14 @@ function Topic({
   const [isUploadPhrasesDialogOpen, setIsUploadPhrasesDialogOpen] = useState(false);
   const topicCompletion = useMemo(() => {
     if (isMember && topic?.topicId && topic?.completions?.length) {
-      return calcTopicCompletions(topic, topic.completions, false).completion;
+      return calcTopicCompletions(topic, topic.completions, false, null, isChallengeModeStudent).completion;
     }
     return {
       completed: 0,
       total: 0,
       percentage: 0
     };
-  }, [isMember, topic?.topicId, topic?.completions?.length]);
+  }, [isMember, topic?.topicId, topic?.completions?.length, isChallengeModeStudent]);
   const {
     percentage,
     completed,

package/dist/Tables/Progress/Progress.js

@@ -664,7 +664,6 @@ function Progress({
       courseIds: courseIds,
       featureFlags: featureFlags,
       reportType: reportType,
-      isChallengeModeEnabled: Array.isArray(featureFlags?.classroomModes) && featureFlags.classroomModes.includes("challenge"),
       assignedCourseIds: assignedCourseIds
     })]
   });

package/dist/Tables/Progress/ProgressTable.js

@@ -461,6 +461,7 @@ function ExerciseCellData({
   topicId,
   memberId,
   roleplayId,
+  botId,
   index
 }) {
   if (isLoading) {
@@ -476,7 +477,14 @@ function ExerciseCellData({
       index: index
     });
   } else {
-    let completions = exercise === "roleplays" ? data?.completions.filter(completion => completion.exercise.startsWith("roleplay") && completion.roleplayId === roleplayId) : data?.completions.filter(completion => completion.exercise === exercise);
+    let completions = null;
+    if (exercise === "roleplays") {
+      completions = data?.completions.filter(completion => completion.exercise.startsWith("roleplay") && completion.roleplayId === roleplayId);
+    } else if (exercise === "bots") {
+      completions = data?.completions.filter(completion => completion.exercise === "bot" && completion.botId === botId);
+    } else {
+      completions = data?.completions.filter(completion => completion.exercise === exercise);
+    }
     let icon = null;
     let type = null;
     let color;
@@ -499,8 +507,9 @@ function ExerciseCellData({
         default:
           color = grey[400];
       }
-    } else if (exercise === "bots" && data?.percentComplete[exercise]?.completed) {
-      if (data.percentComplete[exercise].completed > 0) {
+    } else if (exercise === "bots" && botId && completions?.length > 0) {
+      const botCompletionData = data?.percentComplete["bots"].completedCounts.find(c => c.botId === botId);
+      if (botCompletionData?.completedCount > 0) {
         icon = /*#__PURE__*/_jsx(DoneIcon, {});
         type = "completed";
       } else {
@@ -592,12 +601,13 @@ function TableRow({
   tableBots,
   tableTopics,
   assignments,
-  courseIds,
-  isChallengeModeEnabled = false
+  courseIds
 }) {
   const {
-    memberId
+    memberId,
+    assignedLabels
   } = member;
+  const isChallengeModeStudent = assignedLabels?.isChallengeModeStudent;
   const memberCourseCompletionsQuery = useQuery({
     queryKey: ["memberCourseProgress", memberId, courseIds],
     queryFn: async () => {
@@ -611,8 +621,8 @@ function TableRow({
     error,
     isLoading
   } = memberCourseCompletionsQuery;
-  const tableData = useMemo(() => memberCourseCompletionsQuery.isSuccess && Array.isArray(memberCourseCompletionsQuery.data.Items) && memberCourseCompletionsQuery.data.Items.length ? formatMemberCourseCompletions(courses, memberCourseCompletionsQuery.data.Items, reportType === "assignments" && selectedAssignment ? selectedAssignment?.exercises : null, isChallengeModeEnabled) : [], [memberCourseCompletionsQuery.data, memberCourseCompletionsQuery.isSuccess, reportType, selectedAssignment, isChallengeModeEnabled]);
-  const assignmentsTableData = useMemo(() => memberCourseCompletionsQuery.isSuccess && Array.isArray(memberCourseCompletionsQuery.data.Items) && memberCourseCompletionsQuery.data.Items.length && assignments && assignments.length ? formatMemberAssignmentCompletions(assignments, courses, memberCourseCompletionsQuery.data.Items, isChallengeModeEnabled) : [], [memberCourseCompletionsQuery.data, memberCourseCompletionsQuery.isSuccess, assignments, isChallengeModeEnabled]);
+  const tableData = useMemo(() => memberCourseCompletionsQuery.isSuccess && Array.isArray(memberCourseCompletionsQuery.data.Items) && memberCourseCompletionsQuery.data.Items.length ? formatMemberCourseCompletions(courses, memberCourseCompletionsQuery.data.Items, reportType === "assignments" && selectedAssignment ? selectedAssignment?.exercises : null, isChallengeModeStudent) : [], [memberCourseCompletionsQuery.data, memberCourseCompletionsQuery.isSuccess, reportType, selectedAssignment, isChallengeModeStudent]);
+  const assignmentsTableData = useMemo(() => memberCourseCompletionsQuery.isSuccess && Array.isArray(memberCourseCompletionsQuery.data.Items) && memberCourseCompletionsQuery.data.Items.length && assignments && assignments.length ? formatMemberAssignmentCompletions(assignments, courses, memberCourseCompletionsQuery.data.Items, isChallengeModeStudent) : [], [memberCourseCompletionsQuery.data, memberCourseCompletionsQuery.isSuccess, assignments, isChallengeModeStudent]);
   let memberActivityLink = `/classrooms/${classroomId}/activity/member/${member.memberId}`;
   if (currentView === "course") {
     memberActivityLink = `${memberActivityLink}/${selectedCourse.courseId}`;
@@ -887,8 +897,7 @@ function ProgressTable({
   courseIds,
   featureFlags,
   reportType,
-  assignedCourseIds,
-  isChallengeModeEnabled = false
+  assignedCourseIds
 }) {
   const selectedAssignmentTopics = (selectedAssignment?.exercises || [])?.map(e => e.courseSectionTopicId);
   const currentCourseIds = reportType === "assignments" ? assignedCourseIds : courseIds;
@@ -929,12 +938,12 @@ function ProgressTable({
         const aCompletions = queryClient.getQueryData(["memberCourseProgress", a.memberId, currentCourseIds]).Items;
         const bCompletions = queryClient.getQueryData(["memberCourseProgress", b.memberId, currentCourseIds]).Items;
         if (currentView === "assignments") {
-          a.completions = formatMemberAssignmentCompletions(courses, aCompletions, assignmentExercises, isChallengeModeEnabled);
-          b.completions = formatMemberAssignmentCompletions(courses, bCompletions, assignmentExercises, isChallengeModeEnabled);
+          a.completions = formatMemberAssignmentCompletions(courses, aCompletions, assignmentExercises, a?.assignedLabels?.isChallengeModeStudent);
+          b.completions = formatMemberAssignmentCompletions(courses, bCompletions, assignmentExercises, b?.assignedLabels?.isChallengeModeStudent);
         } else {
           const assignmentExercises = reportType === "assignments" && selectedAssignment ? selectedAssignment?.exercises : null;
-          a.completions = formatMemberCourseCompletions(courses, aCompletions, assignmentExercises, isChallengeModeEnabled);
-          b.completions = formatMemberCourseCompletions(courses, bCompletions, assignmentExercises, isChallengeModeEnabled);
+          a.completions = formatMemberCourseCompletions(courses, aCompletions, assignmentExercises, a?.assignedLabels?.isChallengeModeStudent);
+          b.completions = formatMemberCourseCompletions(courses, bCompletions, assignmentExercises, b?.assignedLabels?.isChallengeModeStudent);
         }
         if (currentView === "all_courses" || currentView === "assignments") {
           a1 = a.completions[property][percentageAccessor].percentage;
@@ -1635,8 +1644,7 @@ function ProgressTable({
           tableBots: tableBots,
           tableTopics: tableTopics,
           assignments: assignments,
-          courseIds: currentCourseIds,
-          isChallengeModeEnabled: isChallengeModeEnabled
+          courseIds: currentCourseIds
         }, `student-progress-table-row-${i}`))
       })]
     })

package/dist/Tables/Progress/utils.js

@@ -1,5 +1,5 @@
 import { calcCompletions, calcPercentageCompletion, getScoreValues } from "../../utils";
-export const formatMemberCourseCompletions = (courses = [], completions = [], assignmentExercises, isChallengeModeEnabled = false) => {
+export const formatMemberCourseCompletions = (courses = [], completions = [], assignmentExercises, isChallengeModeStudent = false) => {
   const initialStatsObject = courses.reduce((obj, v) => {
     const scoreValues = getScoreValues("course", v.courseId, completions);
     obj[v.courseId] = {
@@ -17,7 +17,7 @@ export const formatMemberCourseCompletions = (courses = [], completions = [], as
     return obj;
   }, {});
   const stats = courses.reduce((previousValue, currentValue) => {
-    const sectionsWithProgress = calcCompletions(currentValue.sections, completions, assignmentExercises, isChallengeModeEnabled = false);
+    const sectionsWithProgress = calcCompletions(currentValue.sections, completions, assignmentExercises, isChallengeModeStudent);
     const percentCompletion = calcPercentageCompletion(sectionsWithProgress);
     previousValue[currentValue.courseId].percentComplete = percentCompletion;
     const initialSectionsObject = sectionsWithProgress.reduce((sectionObj, sectionVal) => {
@@ -81,7 +81,7 @@ export const formatMemberCourseCompletions = (courses = [], completions = [], as
   }, initialStatsObject);
   return stats;
 };
-export const formatMemberAssignmentCompletions = (assignments = [], courses = [], completions = [], isChallengeModeEnabled = false) => {
+export const formatMemberAssignmentCompletions = (assignments = [], courses = [], completions = [], isChallengeModeStudent = false) => {
   const stats = assignments.reduce((obj, assignment) => {
     const assignmentCompletions = completions.filter(completion => assignment.exercises?.some(e => {
       if (e.name && completion.exercise !== e.name) return false;
@@ -90,7 +90,7 @@ export const formatMemberAssignmentCompletions = (assignments = [], courses = []
       if (e.courseSectionTopicId && `${completion.courseSectionId}|${completion.topicId}` !== e.courseSectionTopicId) return false;
       return true;
     }));
-    const assignmentCourseCompletions = formatMemberCourseCompletions(courses, assignmentCompletions, assignment?.exercises, isChallengeModeEnabled = false);
+    const assignmentCourseCompletions = formatMemberCourseCompletions(courses, assignmentCompletions, assignment?.exercises, isChallengeModeStudent);
     const accumulator = {
       percentComplete: {
         completed: 0,

package/dist/utils/index.js

@@ -126,7 +126,7 @@ export const getScoreValues = (type, id, completions) => {
     }, avgPronunciationScore];
   }
 };
-export const calcTopicCompletions = (topic, completions = [], isSectionHidden, assignmentExercises = [], includeChallengeBots = false) => {
+export const calcTopicCompletions = (topic, completions = [], isSectionHidden, assignmentExercises, includeChallengeBots = false) => {
   let isRoleplaysHidden;
   let isPronunciationHidden;
   let isBotsHidden;
@@ -281,26 +281,12 @@ export const calcTopicCompletions = (topic, completions = [], isSectionHidden, a
       completedExerciseCount++;
     }
     totalExercises++;
-    console.log({
-      bot,
-      includeChallengeBots,
-      completedCount,
-      completions
-    });
     return {
       ...bot,
       completedCount
     };
   });
   const scoreValues = getScoreValues("topic", topic.topicId, completions);
-  console.log({
-    totalExercises,
-    completedExerciseCount,
-    topic,
-    roleplays,
-    bots,
-    scoreValues
-  });
   return {
     ...topic,
     roleplays,
@@ -330,6 +316,10 @@ export const calcTopicCompletions = (topic, completions = [], isSectionHidden, a
       },
       bots: {
         completed: completedBots,
+        completedCounts: bots.map(bot => ({
+          botId: bot.botId,
+          completedCount: bot.completedCount
+        })),
         total: bots.length,
         percentage: Math.floor(completedBots / bots.length * 100)
       }
@@ -340,21 +330,12 @@ export const calcTopicCompletions = (topic, completions = [], isSectionHidden, a
     }
   };
 };
-export const calcCompletions = (sections = [], completions = [], assignmentExercises = [], opts = {}) => sections.map(section => {
-  const {
-    includeChallengeBots = false
-  } = opts;
+export const calcCompletions = (sections = [], completions = [], assignmentExercises, includeChallengeBots = false) => sections.map(section => {
   const topics = section.topics.map(topic => {
     return calcTopicCompletions(topic, completions, section.isHidden, assignmentExercises?.filter(e => e.courseSectionTopicId === `${topic.courseSectionId}|${topic.topicId}`), includeChallengeBots);
   });
   const sectionExerciseCount = topics.reduce((currentValue, topic) => topic.completion.total + currentValue, 0);
   const sectionCompletedExerciseCount = topics.reduce((currentValue, topic) => topic.completion.completed + currentValue, 0);
-  console.log({
-    section,
-    sectionExerciseCount,
-    sectionCompletedExerciseCount,
-    topics
-  });
   if (section.isHidden) {
     return {
       ...section,
@@ -375,10 +356,6 @@ export const calcCompletions = (sections = [], completions = [], assignmentExerc
     };
   }
   const scoreValues = getScoreValues("section", section.sectionId, completions);
-  console.log({
-    scoreValues,
-    section
-  });
   return {
     ...section,
     completion: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nualang/nualang-ui-components",
-  "version": "0.1.1303",
+  "version": "0.1.1305",
   "type": "module",
   "main": "dist/index.js",
   "files": [