@nualang/nualang-ui-components 0.1.1250 → 0.1.1252

package/dist/Cards/Course/Course.js

@@ -51,7 +51,8 @@ function OverflowMenu({
   handleDuplicateCourse,
   course,
   classroomId,
-  isClassroomArchived = false
+  isClassroomArchived = false,
+  canDuplicateCourse
 }) {
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Menu, {
     id: `card-menu-${courseId}`,
@@ -86,19 +87,26 @@ function OverflowMenu({
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
         children: t("leave_course")
       })]
-    }), isCreator && !isClassroomArchived && /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-      children: handleDuplicateCourse && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
-        onClick: async () => {
-          handleClose();
-          await handleDuplicateCourse(course);
-        },
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_CardElements.CardMenuIcon, {
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_FileCopy.default, {
-            fontSize: "small"
+    }), !isClassroomArchived && /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Tooltip, {
+        title: !canDuplicateCourse ? t("duplicate_disabled_tooltip") : "",
+        disableHoverListener: canDuplicateCourse,
+        arrow: true,
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
+            onClick: async () => {
+              await handleDuplicateCourse(course, classroomId);
+            },
+            disabled: !canDuplicateCourse || course.duplicated,
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_CardElements.CardMenuIcon, {
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_FileCopy.default, {
+                fontSize: "small"
+              })
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+              children: t("duplicate_course")
+            })]
           })
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
-          children: t("duplicate_course")
-        })]
+        })
       })
     }), handleRemoveCourse && !isClassroomArchived && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.MenuItem, {
       onClick: () => handleRemoveCourse(courseId),
@@ -209,7 +217,8 @@ function CourseCard({
   ariaText = "",
   classroomId,
   cardTitleComponent = "h2",
-  isClassroomArchived = false
+  isClassroomArchived = false,
+  email
 }) {
   const [placeholderRef, visible] = (0, _reactIntersectionObserver.useInView)({
     rootMargin: "320px",
@@ -314,6 +323,8 @@ function CourseCard({
   // const memberCount = membersQuery.isSuccess ? membersQuery.data.Items.length : 0;
 
   const isPlaysVisible = !disablePlays && exerciseStartTotal > -1;
+  const isCollaborator = Array.isArray(course.collaborators) && course.collaborators.some(collab => (typeof collab === 'string' ? collab : collab?.S) === email);
+  const canDuplicateCourse = isCreator || course.isShareable === 'everyone' || course.isShareable === 'collaborators' && isCollaborator;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_CardElements.CardContainer, {
     sx: disableRaised ? {} : _CardElements.classes.hover,
     raised: disableRaised ? false : anchorEl || isOutlineOpen,
@@ -526,7 +537,8 @@ function CourseCard({
       handleRemoveCourse: handleRemoveCourse,
       handleDuplicateCourse: handleDuplicateCourse,
       course: course,
-      isClassroomArchived: isClassroomArchived
+      isClassroomArchived: isClassroomArchived,
+      canDuplicateCourse: canDuplicateCourse
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Members.default, {
       getMemberDetails: getMemberDetails,
       t: t,

package/dist/Forms/ChipInput/ChipInput.js

@@ -4,25 +4,62 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _react = require("react");
 var _CustomChipInput = _interopRequireDefault(require("../../Misc/CustomChipInput/CustomChipInput"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+// already present, just ensure it's used
+
 function ChipInput(props) {
   const {
+    t,
     name = "",
     value = [],
     handleChange = () => {},
     label,
     delimiter = /[\s,]+/
   } = props;
+  const [errorMessage, setErrorMessage] = (0, _react.useState)("");
+  const genericDomains = ['gmail.com', 'yahoo.com', 'hotmail.com', 'outlook.com', 'icloud.com'];
   const handleAddChip = chip => {
     const newChips = chip.split(delimiter).map(c => c.trim().toLowerCase()).filter(Boolean);
-    handleChange({
-      target: {
-        name: name,
-        value: [...value, ...newChips]
-      }
-    });
+    if (props.restrictCollaboratorDomains) {
+      const allowedDomain = props.userEmail?.split('@')[1];
+      const validChips = newChips.filter(c => {
+        const emailPattern = /^[^@]+@[^@]+\.[^@]+$/;
+        if (!emailPattern.test(c)) {
+          setErrorMessage(t("invalid_email_format"));
+          return false;
+        }
+        const domain = c.split('@')[1];
+        if (genericDomains.includes(domain)) {
+          setErrorMessage(t("generic_email_domain_error"));
+          return false;
+        }
+        if (domain !== allowedDomain) {
+          setErrorMessage(t("email_domain_mismatch_error", {
+            domain: allowedDomain
+          }));
+          return false;
+        }
+        return true;
+      });
+      if (validChips.length === 0) return;
+      setErrorMessage("");
+      handleChange({
+        target: {
+          name: name,
+          value: [...value, ...validChips]
+        }
+      });
+    } else {
+      handleChange({
+        target: {
+          name: name,
+          value: [...value, ...newChips]
+        }
+      });
+    }
   };
   const deleteChip = chip => {
     handleChange({
@@ -37,7 +74,9 @@ function ChipInput(props) {
     ...props,
     onAdd: handleAddChip,
     onDelete: deleteChip,
-    delimiter: delimiter
+    delimiter: delimiter,
+    helperText: errorMessage || props.helperText,
+    error: !!errorMessage || props.error
   });
 }
 var _default = exports.default = ChipInput;

package/dist/Forms/CreateCourse/CreateCourse.js

@@ -49,7 +49,9 @@ function CreateCourse({
       tags: [],
       collaborators: [],
       picture: _index.default.course,
-      userImage: userImage
+      userImage: userImage,
+      isShareable: "collaborators",
+      duplicated: false
     },
     getSteps: getSteps,
     onSubmit: onSubmit,

package/dist/Forms/CreateCourse/Steps/CourseSettings/CourseSettings.js

@@ -20,14 +20,20 @@ function CourseSettings({
   errors,
   handleChange,
   handleBlur,
-  subscription
+  subscription,
+  attributes
 }) {
   const {
     visibility,
     enrolmentKey,
     allowedDomains,
-    collaborators
+    collaborators,
+    isShareable,
+    duplicated
   } = values;
+  const {
+    email
+  } = attributes || {};
   const generateRandomEnrolmentKey = (0, _react.useCallback)(() => {
     return String(Math.floor(Math.random() * 90000) + 10000);
   }, []);
@@ -85,11 +91,44 @@ function CourseSettings({
             }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.FormControlLabel, {
               value: "public",
               control: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Radio, {}),
-              label: t("public")
+              label: t("public"),
+              disabled: duplicated
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.FormControlLabel, {
               value: "private",
               control: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Radio, {}),
-              label: t("private")
+              label: t("private"),
+              disabled: duplicated
+            })]
+          })]
+        })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Grid, {
+        size: {
+          xs: 12,
+          md: 12
+        },
+        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.FormControl, {
+          component: "fieldset",
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.FormLabel, {
+            component: "legend",
+            children: t("duplication")
+          }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.RadioGroup, {
+            "aria-label": "duplication",
+            name: "isShareable",
+            value: isShareable,
+            onChange: handleChange,
+            onBlur: handleBlur,
+            helperText: touched.isShareable ? errors.isShareable : "",
+            error: touched.isShareable && Boolean(errors.isShareable),
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.FormControlLabel, {
+              value: "everyone",
+              control: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Radio, {}),
+              label: t("everyone"),
+              disabled: duplicated
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.FormControlLabel, {
+              value: "collaborators",
+              control: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Radio, {}),
+              label: t("collaborators"),
+              disabled: duplicated
             })]
           })]
         })
@@ -176,7 +215,9 @@ function CourseSettings({
           margin: "normal",
           variant: "outlined",
           multiline: true,
-          fullWidth: true
+          fullWidth: true,
+          restrictCollaboratorDomains: duplicated,
+          userEmail: email
         }), !subscription.isPaidUser && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
           title: subscription.isUpgradePossible ? t("upgrade_plan_explanation") : t("upgrade_subscription_student"),
           placement: "top",
@@ -195,7 +236,9 @@ function CourseSettings({
             margin: "normal",
             variant: "outlined",
             multiline: true,
-            fullWidth: true
+            fullWidth: true,
+            restrictCollaboratorDomains: duplicated,
+            userEmail: email
           })
         })]
       })
@@ -212,6 +255,8 @@ CourseSettings.validationSchema = Yup.object().shape({
     otherwise: () => Yup.string().nullable()
   }),
   allowedDomains: Yup.array(Yup.string().test("noSpecialChars", "no_special_characters", value => !(0, _index.containsInvalidSymbols)(value)).matches(_index.domainPattern, "Must be a valid domain e.g 'schooldomain.com'")).nullable(),
-  collaborators: Yup.array(Yup.string().test("noSpecialChars", "no_special_characters", value => !(0, _index.containsInvalidSymbols)(value))).nullable()
+  collaborators: Yup.array(Yup.string().test("noSpecialChars", "no_special_characters", value => !(0, _index.containsInvalidSymbols)(value))).nullable(),
+  isShareable: Yup.string().required("required"),
+  duplicated: Yup.bool()
 });
 var _default = exports.default = CourseSettings;

package/dist/Forms/UpdateCourse/UpdateCourse.js

@@ -31,7 +31,9 @@ function UpdateCourse({
     allowedDomains: [],
     tags: [],
     collaborators: [],
-    picture: null
+    picture: null,
+    isShareable: "",
+    duplicated: false
   },
   difficulties = ["A1", "A2", "B1", "B2", "C1", "C2"],
   onSubmit,
@@ -40,7 +42,8 @@ function UpdateCourse({
   forLanguages,
   fileSizeLimit,
   subscription,
-  verificationStatus
+  verificationStatus,
+  attributes
 }) {
   const difficultyOptions = difficulties.map((d, idx) => {
     const keyId = `crearolax${(0, _index.randomId)()}${idx}`;
@@ -64,7 +67,9 @@ function UpdateCourse({
     picture,
     banner,
     tags,
-    collaborators
+    collaborators,
+    isShareable,
+    duplicated
   } = initialValues;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_formik.Formik, {
@@ -137,7 +142,9 @@ function UpdateCourse({
         visibility,
         enrolmentKey,
         allowedDomains,
-        collaborators
+        collaborators,
+        isShareable,
+        duplicated
       },
       enableReinitialize: enableReinitialize,
       validationSchema: _Steps.CourseSettings.validationSchema,
@@ -171,6 +178,7 @@ function UpdateCourse({
                 className: classes.formContent,
                 children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Steps.CourseSettings, {
                   t: t,
+                  attributes: attributes,
                   subscription: subscription,
                   handleChange: handleChange,
                   handleSubmit: handleSubmit,

package/dist/Lists/Courses/Courses.js

@@ -32,6 +32,7 @@ function CourseList({
   disableActions,
   classroomId,
   isClassroomArchived = false,
+  email,
   ...otherProps
 }) {
   const [items, ref] = (0, _useListScroll.default)({
@@ -96,6 +97,7 @@ function CourseList({
             handleDuplicateCourse: handleDuplicateCourse,
             classroomId: classroomId,
             isClassroomArchived: isClassroomArchived,
+            email: email,
             ...otherProps
           }, course.courseId)
         }, course.courseId);

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

@@ -395,6 +395,7 @@ function Classroom({
   preferred_username,
   isUserInternal,
   assignedCourses,
+  email,
   ...otherProps
 }) {
   const {
@@ -794,6 +795,12 @@ function Classroom({
       handleRemoveCourse(course);
     }
   };
+  const duplicateCourse = async course => {
+    const confirmed = await confirm(t("duplicate_course"), t("duplicate_course_confirmation"));
+    if (confirmed) {
+      handleDuplicateCourse(course);
+    }
+  };
   const deleteClassroom = async id => {
     const confirmed = await confirm(t("delete_classroom"), t("delete_classroom_confirmation"), "", true, t("classroom_deletion_note", {
       courseCount: courses ? courses.length : 0
@@ -858,9 +865,10 @@ function Classroom({
         memberId: memberId,
         username: username,
         disableActions: !(isMember || isCreator),
-        handleDuplicateCourse: handleDuplicateCourse,
+        handleDuplicateCourse: duplicateCourse,
         classroomId: classroomId,
-        isClassroomArchived: isArchived
+        isClassroomArchived: isArchived,
+        email: email
       }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         id: "add-courses-fab",
         children: isCreator ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_ClassCourses.default, {

package/dist/Screens/Courses/Courses.js

@@ -63,7 +63,8 @@ function Courses({
   getCourseMembers,
   username,
   memberId,
-  handleDuplicateCourse
+  handleDuplicateCourse,
+  email
 }) {
   const {
     classes
@@ -136,7 +137,8 @@ function Courses({
           memberId: memberId,
           username: username,
           handleDuplicateCourse: handleDuplicateCourse,
-          cardTitleComponent: "h2"
+          cardTitleComponent: "h2",
+          email: email
         }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
           py: 2,
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Courses2.default, {

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

@@ -701,7 +701,8 @@ function Course({
         onSubmit: handleUpdateCourse,
         fileSizeLimit: fileSizeLimit,
         subscription: subscription,
-        verificationStatus: verificationStatus
+        verificationStatus: verificationStatus,
+        attributes: attributes
       })
     }, `tab-content-settings`)
   }] : [])];

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.1250",
+  "version": "0.1.1252",
   "main": "dist/index.js",
   "files": [
     "dist",