@nualang/nualang-ui-components 0.1.1280 → 0.1.1282

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

@@ -504,6 +504,9 @@ function Classroom({
   isLoadingAssignments,
   ...otherProps
 }) {
+  // ensure these exist before any use (avoids TDZ / ReferenceError)
+  let tabs = [];
+  let classroomCreatorWelcome = "classroom_creator_welcome";
   const {
     handleJoinMeeting,
     discussions,
@@ -555,16 +558,89 @@ function Classroom({
   const [scrollToDiscuss, setScrollToDiscuss] = (0, _react.useState)(false);
   const [scrollToDynamicResponses, setScrollToDynamicResponses] = (0, _react.useState)(false);
   const [displayDynamicAiDialog, setDisplayDynamicAiDialog] = (0, _react.useState)(false);
+  const [scheduledDynamicAi, setScheduledDynamicAi] = (0, _react.useState)(false);
   const isWaysideClassroom = classroom?.classroomId?.toLowerCase().includes("wayside");
   const [isSubscriptionExpired, setIsSubscriptionExpired] = (0, _react.useState)(false);
-  let tabs;
+
+  // Joyride steps & state must be declared before any useEffect that reads `run`
+  const joyrideSteps = [{
+    content: /*#__PURE__*/(0, _jsxRuntime.jsx)("h2", {
+      children: t(`${classroomCreatorWelcome}`)
+    }),
+    placement: "center",
+    target: "body"
+  }, {
+    content: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("h2", {
+        children: t("classroom_creator_add_courses")
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
+        children: t("classroom_creator_add_courses_desc")
+      })]
+    }),
+    spotlightPadding: 8,
+    target: "#add-courses-fab"
+  }, {
+    content: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("h2", {
+        children: t("classroom_creator_add_students_email")
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
+        children: t("classroom_creator_add_students_email_desc")
+      })]
+    }),
+    spotlightPadding: 8,
+    target: "#invite"
+  }, {
+    content: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("h2", {
+        children: t("classroom_creator_play_live_game")
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
+        children: t("classroom_creator_play_live_game_desc")
+      })]
+    }),
+    spotlightPadding: 8,
+    target: "#play-live"
+  }, {
+    content: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("h2", {
+        children: t("classroom_creator_track_progress")
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
+        children: t("classroom_creator_track_progress_desc")
+      })]
+    }),
+    spotlightPadding: 8,
+    target: "#Progress"
+  }];
+  const [joyrideState, setJoyrideState] = (0, _react.useState)({
+    run: false,
+    steps: joyrideSteps
+  });
+  const {
+    run,
+    steps
+  } = joyrideState;
   (0, _react.useEffect)(() => {
     const hasDisplayed = localStorage.getItem("displayDynamicAiDialog");
     if (!hasDisplayed && classroom?.isCreator) {
+      setScheduledDynamicAi(true);
+    }
+  }, [classroom]);
+  (0, _react.useEffect)(() => {
+    if (scheduledDynamicAi && !run && !isPictureDialogOpen) {
       setDisplayDynamicAiDialog(true);
+      setScheduledDynamicAi(false);
+      // mark as displayed so it won't re-run on future page loads
       localStorage.setItem("displayDynamicAiDialog", "true");
     }
-  }, [classroom]);
+  }, [scheduledDynamicAi, run, isPictureDialogOpen]);
+  const handleUpdateAvatarAndLearnLang = () => {
+    if (!attributes || !attributes.picture) {
+      setIsPictureDialogOpen(true);
+    }
+    if ((!attributes || !attributes[`custom:learnLang`]) && classroom && classroom.learnLang) {
+      handleUpdateUserLearnLang(classroom.learnLang);
+    }
+    localStorage.setItem(`classroom-update-avatar-prompt-${username}`, "true");
+  };
   (0, _react.useEffect)(() => {
     if (creatorSubscription?.isPaidUser === false) {
       setIsSubscriptionExpired(true);
@@ -625,79 +701,12 @@ function Classroom({
   };
   const condition = !loading && !isCoursesLoading && assignments?.length > 0;
   useSetLastFetched(condition, assignments, setHasNewAssignments);
-  let classroomCreatorWelcome = "classroom_creator_welcome";
-  if (freeTrial) {
-    classroomCreatorWelcome = "classroom_creator_welcome_free_trial";
-  }
-  const joyrideSteps = [{
-    content: /*#__PURE__*/(0, _jsxRuntime.jsx)("h2", {
-      children: t(`${classroomCreatorWelcome}`)
-    }),
-    placement: "center",
-    target: "body"
-  }, {
-    content: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("h2", {
-        children: t("classroom_creator_add_courses")
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
-        children: t("classroom_creator_add_courses_desc")
-      })]
-    }),
-    spotlightPadding: 8,
-    target: "#add-courses-fab"
-  }, {
-    content: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("h2", {
-        children: t("classroom_creator_add_students_email")
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
-        children: t("classroom_creator_add_students_email_desc")
-      })]
-    }),
-    spotlightPadding: 8,
-    target: "#invite"
-  }, {
-    content: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("h2", {
-        children: t("classroom_creator_play_live_game")
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
-        children: t("classroom_creator_play_live_game_desc")
-      })]
-    }),
-    spotlightPadding: 8,
-    target: "#play-live"
-  }, {
-    content: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("h2", {
-        children: t("classroom_creator_track_progress")
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)("br", {}), /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
-        children: t("classroom_creator_track_progress_desc")
-      })]
-    }),
-    spotlightPadding: 8,
-    target: "#Progress"
-  }];
-  const [joyrideState, setJoyrideState] = (0, _react.useState)({
-    run: false,
-    steps: joyrideSteps
-  });
-  const {
-    run,
-    steps
-  } = joyrideState;
-  const handleUpdateAvatarAndLearnLang = () => {
-    if (!attributes || !attributes.picture) {
-      setIsPictureDialogOpen(true);
-    }
-    if ((!attributes || !attributes[`custom:learnLang`]) && classroom && classroom.learnLang) {
-      handleUpdateUserLearnLang(classroom.learnLang);
-    }
-    localStorage.setItem(`classroom-update-avatar-prompt-${username}`, "true");
-  };
+  classroomCreatorWelcome = freeTrial ? "classroom_creator_welcome_free_trial" : classroomCreatorWelcome;
   (0, _react.useEffect)(() => {
     const isClassroomCreator = classroom && classroom.isCreator;
     const tourCompleted = localStorage.getItem(`classroom-creator-tour-completed`);
     const shouldPromptAvatarUpdate = !localStorage.getItem(`classroom-update-avatar-prompt-${username}`);
-    if (isClassroomCreator && !tourCompleted) {
+    if (isClassroomCreator && !tourCompleted && !run) {
       setJoyrideState(prevState => ({
         ...prevState,
         run: true
@@ -707,7 +716,7 @@ function Classroom({
     if (shouldPromptAvatarUpdate && (isClassroomCreator && tourCompleted || isMember)) {
       handleUpdateAvatarAndLearnLang();
     }
-  }, [classroom, isMember, username]);
+  }, [classroom, isMember, username, run]);
   const handleJoyrideCallback = data => {
     const {
       status,

package/dist/Tables/Progress/Progress.js

@@ -320,13 +320,13 @@ function Progress({
     return members.filter(member => {
       if (memberId) {
         return member.memberId === memberId;
-      } else if (selectedMembers && selectedMembers.length && reportType === "assignments" && assignedStudents) {
+      } else if (selectedMembers && selectedMembers.length && reportType === "assignments" && selectedAssignment && assignedStudents) {
         const selectedMemberIds = selectedMembers.map(m => m.memberId);
         return selectedMemberIds.includes(member.memberId) && (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" && assignedStudents) {
+      } else if (reportType === "assignments" && selectedAssignment && assignedStudents) {
         return (assignedStudents || []).includes(member.memberId);
       }
       return true;

package/package.json

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