@nualang/nualang-ui-components 0.1.1249 → 0.1.1251

package/dist/Assignments/AssignmentCard/AssignmentCard.js

@@ -34,7 +34,6 @@ function AssignmentCard({
   handleViewProgress,
   lastAssignmentFetch
 }) {
-  console.log(assignment);
   const [confirm] = (0, _useConfirm.default)(t);
   const {
     useQuery

package/dist/Assignments/AssignmentCardsList/AssignmentCardsList.js

@@ -129,6 +129,9 @@ const AssignmentCardsList = ({
         })]
       }), assignments.filter(assignment => {
         if (isCreator) return true;
+        if (Array.isArray(assignment.assignedStudents) && !assignment.assignedStudents.includes(memberId)) {
+          return false;
+        }
         if (!assignment.scheduleDate) return true;
         return new Date(assignment.scheduleDate) <= new Date();
       }).map((assignment, index) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_AssignmentCard.default, {

package/dist/Assignments/CreateAssignmentDialog/CreateAssignmentDialog.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = CreateAssignmentDialog;
 var _react = _interopRequireWildcard(require("react"));
+var _Queries = require("@nualang/nualang-api-and-queries/Queries");
 var _material = require("@mui/material");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Add = _interopRequireDefault(require("@mui/icons-material/Add"));
@@ -17,8 +18,8 @@ var _ArrowDropDown = _interopRequireDefault(require("@mui/icons-material/ArrowDr
 var _ArrowDropUp = _interopRequireDefault(require("@mui/icons-material/ArrowDropUp"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _AssignmentSelectExercise = _interopRequireDefault(require("../AssignmentSelectExercise/AssignmentSelectExercise"));
-var _Queries = require("@nualang/nualang-api-and-queries/Queries");
 var _AssignmentExerciseSelector = _interopRequireDefault(require("../AssignmentExerciseSelector/AssignmentExerciseSelector"));
+var _config = require("../../config");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
@@ -61,6 +62,9 @@ function CreateAssignmentDialog({
   const {
     classes
   } = useStyles();
+  const {
+    useQueries
+  } = _Queries.ReactQuery;
   const [selectedExercises, setSelectedExercises] = (0, _react.useState)(initialData.exercises ? initialData.exercises : []);
   const [submittedExercises, setSubmittedExercises] = (0, _react.useState)(initialData.exercises ? initialData.exercises : []);
   const [members, setMembers] = (0, _react.useState)([]);
@@ -106,26 +110,38 @@ function CreateAssignmentDialog({
   }, {
     enabled: !!assignment.classroomId
   });
-  const membersQuery = _Queries.classrooms.useClassroomMembers(async (classroomId, username) => {
-    const allMembers = [];
-    await Promise.all(classroomId.map(async cId => {
-      const response = await getClassroomMembers(cId, username);
-      allMembers.push(response?.Items || []);
-    }));
-    const flatMembers = allMembers.flat();
-    const seen = new Set();
-    const uniqueMembers = flatMembers.filter(member => {
-      if (seen.has(member.memberId)) return false;
-      seen.add(member.memberId);
-      return true;
-    });
-    return uniqueMembers;
-  }, {
-    classroomId: assignment?.classroomId,
-    username: username
-  }, {
-    enabled: !!(assignment.classroomId.length > 0)
+  let filters = {
+    limit: _config.config.limits.classroomMembers
+  };
+  const classroomMembersQueries = useQueries({
+    queries: (Array.isArray(assignment.classroomId) ? assignment.classroomId : [assignment.classroomId]).map(cId => ({
+      queryKey: _Queries.classrooms.classroomKeys.itemMembers(cId, username),
+      queryFn: () => getClassroomMembers(cId, filters),
+      queryOptions: {
+        enabled: !!(Array.isArray(assignment.classroomId) ? assignment.classroomId.length > 0 : assignment.classroomId)
+      }
+    })),
+    combine: results => {
+      return {
+        data: results.map(result => result.data),
+        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 seen = new Set();
+      const uniqueMembers = flatMembers.filter(member => {
+        if (seen.has(member.memberId)) return false;
+        seen.add(member.memberId);
+        return true;
+      });
+      return uniqueMembers;
+    } else {
+      return [];
+    }
+  }, [classroomMembersQueries.data, classroomMembersQueries.pending]);
   const selectedCourses = (0, _react.useMemo)(() => {
     if (!coursesQuery.isSuccess || !Array.isArray(coursesQuery.data.Items)) {
       return [];
@@ -144,7 +160,6 @@ function CreateAssignmentDialog({
       courses: filteredCourses
     });
   }, [selectedCourses, submittedExercises]);
-  const selectedMembers = (0, _react.useMemo)(() => membersQuery.isSuccess && Array.isArray(membersQuery.data) && membersQuery.data.length ? membersQuery.data : [], [membersQuery.data, membersQuery.isSuccess]);
   const classroomMembers = async selectedMembers => {
     const formattedMembers = await getMemberDetails(selectedMembers);
     setMembers(formattedMembers);

package/dist/Dialogs/RecordingDialog/RecordingDialog.js

@@ -39,8 +39,6 @@ function TranscriptViewer({
       // console.log({ sentence, attendee, userImage, conversation })
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
         "aria-label": "go to time in recording",
-        display: "flex",
-        alignItems: "center",
         onClick: () => goToTimestamp(sentence.start_time, sentence.end_time),
         sx: {
           cursor: "pointer",

package/dist/Misc/ExerciseBottomBar/ExerciseBottomBar.js

@@ -13,7 +13,8 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 const useStyles = (0, _mui.makeStyles)()(theme => ({
   footer: {
     padding: theme.spacing(2),
-    borderTop: `2px solid ${theme.palette.grey[300]}`
+    borderTop: `2px solid ${theme.palette.grey[300]}`,
+    width: '100%'
   }
 }));
 function ExerciseBottomBar({

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

@@ -485,9 +485,6 @@ function Classroom({
   // Safe ref initialization
   if (initialStored.current === null) {
     const storedValue = localStorage.getItem("lastAssignmentsFetch");
-    console.log({
-      storedValue
-    });
     try {
       initialStored.current = storedValue ? JSON.parse(storedValue) : {};
     } catch (e) {

package/dist/Tables/Progress/Progress.js

@@ -240,7 +240,7 @@ function Progress({
       const searchParams = (0, _utils2.searchStringToObj)(window.location.search);
       const courseId = searchParams.courseId;
       const assignmentId = searchParams.assignmentId;
-      if (searchParams.reportType && reportTypes.includes(searchParams.reportType) && reportType !== searchParams.reportType) {
+      if (searchParams.reportType && !reportType && reportTypes.includes(searchParams.reportType) && reportType !== searchParams.reportType) {
         setReportType(searchParams.reportType);
       }
       if (assignmentId && !selectedAssignment && assignments && assignments.length) {

package/package.json

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