@nualang/nualang-ui-components 0.1.1330 → 0.1.1332

package/dist/Cards/FeedbackCard/FeedbackCard.js

@@ -1,6 +1,7 @@
 import { useState, useEffect, useRef } from "react";
 import { Card, CardContent, CardActions, Typography, Avatar, Box, Button, TextField, Chip, Grid, IconButton, Tooltip, Checkbox } from "@mui/material";
-import { grey, green } from "@mui/material/colors";
+import { grey, green, red } from "@mui/material/colors";
+import ErrorIcon from "@mui/icons-material/Error";
 import AutoFixHighIcon from "@mui/icons-material/AutoFixHigh";
 import ErrorOutlineIcon from "@mui/icons-material/ErrorOutline";
 import CheckCircleIcon from "@mui/icons-material/CheckCircle";
@@ -73,7 +74,8 @@ export default function FeedbackCard({
   startTimes = {},
   canSubmitAll = {},
   setCanSubmit = () => {},
-  setIsGeneratingIndividual = () => {}
+  setIsGeneratingIndividual = () => {},
+  hasBadLanguage
 }) {
   const [isRecordingDialogOpen, setIsRecordingDialogOpen] = useState(false);
   const [hasBeenEdited, setHasBeenEdited] = useState(false);
@@ -307,10 +309,37 @@ export default function FeedbackCard({
                   fontWeight: 600,
                   color: "text.secondary"
                 },
-                children: [/*#__PURE__*/_jsx(Checkbox, {
-                  checked: checkedSubmissions[discussionData.meetingId || discussionData.meetingID || discussionData.extMeetingId] || false,
-                  disabled: !hasSubmission,
-                  onChange: handleChangeCheckbox
+                children: [/*#__PURE__*/_jsxs(Box, {
+                  sx: {
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "space-between",
+                    mb: 1
+                  },
+                  children: [/*#__PURE__*/_jsx(Checkbox, {
+                    checked: checkedSubmissions[discussionData.meetingId || discussionData.meetingID || discussionData.extMeetingId] || false,
+                    disabled: !hasSubmission,
+                    onChange: handleChangeCheckbox
+                  }), hasBadLanguage && /*#__PURE__*/_jsxs(Box, {
+                    sx: {
+                      display: "flex",
+                      alignItems: "center",
+                      px: 2,
+                      py: 0.5,
+                      backgroundColor: red[800],
+                      borderRadius: "50px",
+                      color: "white"
+                    },
+                    children: [/*#__PURE__*/_jsx(ErrorIcon, {
+                      sx: {
+                        mr: 1
+                      }
+                    }), /*#__PURE__*/_jsx(Typography, {
+                      fontWeight: "bold",
+                      variant: "subtitle2",
+                      children: t("inappropriate_language_detected")
+                    })]
+                  })]
                 }), /*#__PURE__*/_jsxs(Grid, {
                   container: true,
                   alignItems: "center",
@@ -329,24 +358,32 @@ export default function FeedbackCard({
                       xs: 12,
                       md: 9.5
                     },
-                    children: /*#__PURE__*/_jsxs(Box, {
+                    children: /*#__PURE__*/_jsx(Box, {
                       sx: {
                         display: "flex",
-                        alignItems: "center"
+                        alignItems: "center",
+                        justifyContent: "space-between",
+                        width: "100%"
                       },
-                      children: [/*#__PURE__*/_jsx(Typography, {
-                        variant: "subtitle2",
-                        children: t("feedback")
-                      }), /*#__PURE__*/_jsx(Tooltip, {
-                        title: t("rubric_info_desc"),
-                        children: /*#__PURE__*/_jsx(IconButton, {
-                          onClick: handleOpenPDF,
-                          color: "primary",
-                          "aria-label": t("rubric_info"),
-                          size: "small",
-                          children: /*#__PURE__*/_jsx(HelpOutlineIcon, {})
-                        })
-                      })]
+                      children: /*#__PURE__*/_jsxs(Box, {
+                        sx: {
+                          display: "flex",
+                          alignItems: "center"
+                        },
+                        children: [/*#__PURE__*/_jsx(Typography, {
+                          variant: "subtitle2",
+                          children: t("feedback")
+                        }), /*#__PURE__*/_jsx(Tooltip, {
+                          title: t("rubric_info_desc"),
+                          children: /*#__PURE__*/_jsx(IconButton, {
+                            onClick: handleOpenPDF,
+                            color: "primary",
+                            "aria-label": t("rubric_info"),
+                            size: "small",
+                            children: /*#__PURE__*/_jsx(HelpOutlineIcon, {})
+                          })
+                        })]
+                      })
                     })
                   })]
                 })]
@@ -550,7 +587,6 @@ export default function FeedbackCard({
       s3Url: s3Url,
       playerRef: playerRef,
       aiGrade: aiGrade,
-      hasBadLanguage: discussionData?.hasBadLanguage || false,
       goToTimestamp: goToTimestamp,
       videoStartTime: startTimes[0]
     }), /*#__PURE__*/_jsx(PDFViewer, {

package/dist/Dialogs/GroupedFeedbackDialog/GroupedFeedbackDialog.js

@@ -221,6 +221,20 @@ export default function GroupFeedbackDialog({
       throw error;
     }
   };
+  const hasBadLanguageByMeetingId = useMemo(() => {
+    const badLanguageMap = {};
+    submissionsForGroup.forEach(submission => {
+      const extMeetingId = submission.extMeetingId;
+      if (!extMeetingId) return;
+      if (badLanguageMap[extMeetingId] === undefined) {
+        badLanguageMap[extMeetingId] = false;
+      }
+      if (submission.hasBadLanguage === true) {
+        badLanguageMap[extMeetingId] = true;
+      }
+    });
+    return badLanguageMap;
+  }, [submissionsForGroup]);
   const feedbackByMeetingId = useMemo(() => {
     const feedbackMap = {};
     submissionsForGroup.forEach(submission => {
@@ -531,7 +545,8 @@ export default function GroupFeedbackDialog({
               startTimes: startTimes,
               canSubmitAll: canSubmit,
               setCanSubmit: setCanSubmit,
-              setIsGeneratingIndividual: setIsGeneratingIndividual
+              setIsGeneratingIndividual: setIsGeneratingIndividual,
+              hasBadLanguage: hasBadLanguageByMeetingId[discMeetingId]
             }, discussion.meetingId || discussion.meetingID || index);
           }), /*#__PURE__*/_jsx("div", {
             ref: bottomRefCallback,

package/dist/Dialogs/RecordingDialog/RecordingDialog.js

@@ -176,7 +176,6 @@ export default function RecordingDialog({
   playerRef,
   conversation,
   attendeesData,
-  hasBadLanguage,
   videoStartTime
 }) {
   const theme = useTheme();
@@ -186,34 +185,15 @@ export default function RecordingDialog({
       open: open,
       handleClose: handleClose,
       maxWidth: 1,
-      dialogTitle: /*#__PURE__*/_jsxs(Box, {
+      dialogTitle: /*#__PURE__*/_jsx(Box, {
         sx: {
           display: "flex",
           alignItems: "center",
           gap: 2
         },
-        children: [/*#__PURE__*/_jsx(Typography, {
+        children: /*#__PURE__*/_jsx(Typography, {
           children: t("recording_info")
-        }), hasBadLanguage && /*#__PURE__*/_jsxs(Box, {
-          sx: {
-            display: "flex",
-            alignItems: "center",
-            px: 2,
-            py: 1,
-            backgroundColor: red[800],
-            borderRadius: "4px",
-            color: "white"
-          },
-          children: [/*#__PURE__*/_jsx(ErrorIcon, {
-            sx: {
-              mr: 1
-            }
-          }), /*#__PURE__*/_jsx(Typography, {
-            fontWeight: "bold",
-            variant: "subtitle1",
-            children: t("inappropriate_language_detected")
-          })]
-        })]
+        })
       }),
       children: /*#__PURE__*/_jsxs(Grid, {
         container: true,

package/dist/Forms/CreateMeetingMultiStepForm/MeetingForm.js

@@ -47,11 +47,6 @@ function MeetingForm({
     meetingDate,
     level
   } = values;
-  const currentDateTime = dayjs();
-  let defaultMeetingDate = currentDateTime.add(1, "day").format("MM/DD/YYYY");
-  const defaultMeetingTime = currentDateTime.format("h:mm A");
-  const [newMeetingDate, setNewMeetingDate] = useState(defaultMeetingDate);
-  const [newMeetingTime, setNewMeetingTime] = useState(defaultMeetingTime);
   const [initialBackgroundImages, setInitialBackgroundImages] = useState([]);
   const [initialMeetingImages, setInitialMeetingImages] = useState([]);
   const [openDialog, setOpenDialog] = useState(false);
@@ -92,20 +87,6 @@ function MeetingForm({
       setInitialMeetingImages(editMeetingImages);
     }
   }, [editMeetingImages, editBackgroundImages]);
-  useEffect(() => {
-    handleChange({
-      target: {
-        name: "meetingDate",
-        value: newMeetingDate
-      }
-    });
-    handleChange({
-      target: {
-        name: "meetingTime",
-        value: newMeetingTime
-      }
-    });
-  }, [newMeetingDate, newMeetingTime, handleChange]);
   const onChange = event => {
     handleChange({
       target: {
@@ -148,7 +129,40 @@ function MeetingForm({
       });
     }
   }, [level]);
-  const dateTimePlaceholder = meetingTime && meetingDate ? dayjs(meetingDate + " " + meetingTime) : dayjs(defaultMeetingDate + " " + defaultMeetingTime);
+  useEffect(() => {
+    // Initialize date/time if not set or invalid
+    const currentDateTime = dayjs();
+    const defaultDateTime = currentDateTime.add(1, "day");
+    const isDateValid = meetingDate && dayjs(meetingDate, "MM/DD/YYYY", true).isValid();
+    const isTimeValid = meetingTime && dayjs(meetingTime, "h:mm A", true).isValid();
+    if (!isDateValid) {
+      handleChange({
+        target: {
+          name: "meetingDate",
+          value: defaultDateTime.format("MM/DD/YYYY")
+        }
+      });
+    }
+    if (!isTimeValid) {
+      handleChange({
+        target: {
+          name: "meetingTime",
+          value: defaultDateTime.format("h:mm A")
+        }
+      });
+    }
+  }, [meetingDate, meetingTime]);
+
+  // Update the dateTimePlaceholder calculation
+  const dateTimePlaceholder = (() => {
+    if (meetingTime && meetingDate) {
+      const parsed = dayjs(`${meetingDate} ${meetingTime}`, "MM/DD/YYYY h:mm A", true);
+      if (parsed.isValid()) {
+        return parsed;
+      }
+    }
+    return dayjs().add(1, "day");
+  })();
   return /*#__PURE__*/_jsxs(Grid, {
     container: true,
     sx: {
@@ -170,6 +184,7 @@ function MeetingForm({
           children: [/*#__PURE__*/_jsx(TextField, {
             autoFocus: true,
             id: "meetingTopic",
+            "data-cy": "meetingTopic",
             name: "meetingTopic",
             label: t("add_a_discussion_topic"),
             value: meetingTopic ? meetingTopic : "",
@@ -417,10 +432,18 @@ function MeetingForm({
               value: dateTimePlaceholder,
               onChange: newValue => {
                 const datePickerValue = dayjs(newValue);
-                const date = datePickerValue.format("MM/DD/YYYY");
-                const time = datePickerValue.format("h:mm A");
-                setNewMeetingDate(date);
-                setNewMeetingTime(time);
+                handleChange({
+                  target: {
+                    name: "meetingDate",
+                    value: datePickerValue.format("MM/DD/YYYY")
+                  }
+                });
+                handleChange({
+                  target: {
+                    name: "meetingTime",
+                    value: datePickerValue.format("h:mm A")
+                  }
+                });
               }
             })
           })

package/dist/Lists/Exercises/Exercises.js

@@ -688,6 +688,7 @@ function BotListItem({
               disabled: isCreator ? false : true,
               onClick: handleClickMenu,
               "aria-expanded": Boolean(anchorEl),
+              "data-cy": `${bot.botName}-more-options`,
               children: /*#__PURE__*/_jsx(MoreVertIcon, {})
             })
           })
@@ -829,6 +830,7 @@ function BotListItem({
         onClick: () => handleRemoveBot(bot),
         "aria-label": "Remove Bot",
         disabled: isCreator ? false : true,
+        "data-cy": `${bot.botName}-remove-bot`,
         children: [/*#__PURE__*/_jsx(ListItemIcon, {
           children: /*#__PURE__*/_jsx(Delete, {})
         }), /*#__PURE__*/_jsx(ListItemText, {

package/dist/Live/WaitingRoom/WaitingRoom.js

@@ -153,7 +153,8 @@ export default function WaitingRoom({
                   color: "textSecondary",
                   children: t(exerciseDescription)
                 })
-              })
+              }),
+              "data-cy": "waitingRoomExercise"
             })]
           }), isCreator && videoUrl && /*#__PURE__*/_jsx(Button, {
             variant: "contained",
@@ -203,6 +204,7 @@ export default function WaitingRoom({
                     handleUpdateGame();
                   },
                   id: "startGame",
+                  "data-cy": "startGameButton",
                   children: t("start")
                 })
               })

package/dist/Misc/HoverText/HoverText.js

@@ -145,32 +145,33 @@ function HoverText({
     }
   }
   const words = props => {
-    const childrenArray = props.children ? [props.children] : [];
-    return childrenArray.map(child => child.map(childElement => {
-      if (childElement && typeof childElement === "string") {
-        return removeExtraWhiteSpaces(childElement).split(" ").map((word, index) => {
-          if (word && typeof word === "string") {
-            return /*#__PURE__*/_jsx(WordText, {
-              value: `${word} `,
-              disableTranslation: disableTranslation,
-              handleTranslate: handleTranslate,
-              handleSpeak: handleSpeak,
-              learnLang: learnLang,
-              forLang: forLang,
-              voice: voice,
-              voicePitch: voicePitch,
-              voiceSpeed: voiceSpeed,
-              muteSound: muteSound,
-              disableHover: disableHover
-            }, index);
-          } else {
+    const childrenArray = Array.isArray(props.children) ? props.children : [props.children];
+    return childrenArray.map(child => {
+      const childArray = Array.isArray(child) ? child : [child];
+      return childArray.map(childElement => {
+        if (childElement && typeof childElement === "string") {
+          return removeExtraWhiteSpaces(childElement).split(" ").map((word, index) => {
+            if (word && typeof word === "string") {
+              return /*#__PURE__*/_jsx(WordText, {
+                value: `${word} `,
+                disableTranslation: disableTranslation,
+                handleTranslate: handleTranslate,
+                handleSpeak: handleSpeak,
+                learnLang: learnLang,
+                forLang: forLang,
+                voice: voice,
+                voicePitch: voicePitch,
+                voiceSpeed: voiceSpeed,
+                muteSound: muteSound,
+                disableHover: disableHover
+              }, index);
+            }
             return word;
-          }
-        });
-      } else {
+          });
+        }
         return childElement;
-      }
-    }));
+      });
+    });
   };
   const components = {
     p: ({

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

@@ -536,7 +536,6 @@ function Classroom({
     editMeetingImages,
     setSelectedDiscussion,
     meetingRecsData,
-    hasBadLanguage,
     handleArchiveSubmissions,
     isVideoChatEnabled,
     isVideoChatEnabledInSettings,
@@ -1053,7 +1052,6 @@ function Classroom({
               selectedRecording: selectedRecording,
               setSelectedRecording: setSelectedRecording,
               meetingRecsData: meetingRecsData,
-              hasBadLanguage: hasBadLanguage,
               handleArchiveSubmissions: handleArchiveSubmissions,
               startTimes: startTimes,
               learnLang: classroom?.learnLang
@@ -1375,6 +1373,7 @@ function Classroom({
                     startIcon: /*#__PURE__*/_jsx(LiveTvIcon, {}),
                     size: "small",
                     id: "play-live",
+                    "data-cy": "playLiveButton",
                     sx: {
                       animation: createdGame && createdGame.createdBy === username ? `${theme.palette.mode === "light" ? glowPulseLight : glowPulseDark} 2s infinite ease-in-out` : null,
                       boxShadow: createdGame && createdGame.createdBy === username ? `0 0 0 0 ${theme.palette.mode === "light" ? "rgba(101, 0, 221, 0.7)" : "rgba(171, 120, 255, 0.7)"}` : null

package/dist/Tables/MeetingPrompstList/MeetingPromptsList.js

@@ -34,7 +34,6 @@ const MeetingPromptsList = withStyles(({
   aiGrade,
   meetingRecsData,
   resetVideoState,
-  hasBadLanguage,
   setSelectedRecording,
   selectedRecording,
   getMeeting,
@@ -446,8 +445,7 @@ const MeetingPromptsList = withStyles(({
           recordingsTableData: groupedData[groupedId],
           handleBatchGradeConversations: handleBatchGradeConversations,
           aiGrade: aiGrade,
-          playerRef: playerRef,
-          hasBadLanguage: hasBadLanguage
+          playerRef: playerRef
         })
       })
     }), /*#__PURE__*/_jsx(CreateMeetingMultiStepForm, {

package/dist/Tables/RecordingListCards/RecordingListCards.js

@@ -24,7 +24,6 @@ const RecordingListCards = withStyles(({
   selectedRecording,
   handleBatchGradeConversations,
   aiGrade,
-  hasBadLanguage,
   t = text => text,
   isTeacher = false,
   attendeesData = []
@@ -123,8 +122,7 @@ const RecordingListCards = withStyles(({
           getMeeting: getMeeting,
           conversation: conversation,
           handleBatchGradeConversations: handleBatchGradeConversations,
-          aiGrade: aiGrade,
-          hasBadLanguage: hasBadLanguage
+          aiGrade: aiGrade
         }), /*#__PURE__*/_jsx(FeedbackDialog, {
           t: t,
           attendees: attendeeUsernames,

package/dist/Tables/SubmissionsTableCards/SubmissionsTableCards.js

@@ -27,7 +27,6 @@ const SubmissionsTableCards = withStyles(({
   handleArchiveSubmissions = () => {},
   getMeeting = () => {},
   meetingRecsData,
-  hasBadLanguage,
   resetVideoState = () => {},
   t = text => text
 }) => {
@@ -163,8 +162,7 @@ const SubmissionsTableCards = withStyles(({
             recordingsTableData: groupedData[groupedId],
             handleBatchGradeConversations: handleBatchGradeConversations,
             aiGrade: aiGrade,
-            playerRef: playerRef,
-            hasBadLanguage: hasBadLanguage
+            playerRef: playerRef
           })
         })
       }), /*#__PURE__*/_jsx(List, {

package/package.json

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