mario-core 2.9.383-feedback → 2.9.384-feedback

package/dist/index.js

@@ -43348,7 +43348,9 @@ var useUserList = function useUserList() {
 
           for (var _iterator = _createForOfIteratorHelperLoose(items), _step; !(_step = _iterator()).done;) {
             var user = _step.value;
-            user.roles = user.roles.includes("EduTeacher") ? [ROLES.EDUTEACHER] : user.roles;
+            user.roles = user.roles.map(function (r) {
+              return r != ROLES.EDUTEACHER ? r : "EduTeacher";
+            });
           }
 
           dispatch(setUserList({
@@ -45841,7 +45843,9 @@ var useUserDetail = function useUserDetail(id) {
 
           setUserDetail(_extends({}, res.data, {
             dateOfBirth: dateFns.format(new Date(res.data.dateOfBirth), DATE_FORMAT),
-            roles: res.data.roles.includes("EduTeacher") ? [ROLES.EDUTEACHER] : res.data.roles
+            roles: res.data.roles.map(function (r) {
+              return r != "EduTeacher" ? r : ROLES.EDUTEACHER;
+            })
           }));
           setCurrentRoles((_res$data$roles = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.roles) != null ? _res$data$roles : []);
           document.title = (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.fullName;
@@ -46325,7 +46329,9 @@ var UserDetail = function UserDetail() {
     validationSchema: userSchema,
     onSubmit: function onSubmit(values) {
       confirmData(_extends({}, values, {
-        roles: values.roles.includes(ROLES.EDUTEACHER) ? ["EduTeacher"] : values.roles
+        roles: values.roles.map(function (r) {
+          return r != ROLES.EDUTEACHER ? r : "EduTeacher";
+        })
       }));
       setEdited(false);
       if (!!localStorage.getItem(window.location.href)) localStorage.removeItem(window.location.href);
@@ -46346,12 +46352,12 @@ var UserDetail = function UserDetail() {
         return;
       }
 
-      if ([ROLES.STUDENT, ROLES.PARENT, ROLES.EDUTEACHER].includes(role)) {
+      if ([ROLES.STUDENT, ROLES.PARENT].includes(role)) {
         setFieldValue("roles", [role]);
         return;
       }
 
-      if (values.roles.includes(ROLES.EDUTEACHER) && ROLES.EDUTEACHER != role || values.roles.includes(ROLES.STUDENT) && ROLES.STUDENT != role) {
+      if (values.roles.includes(ROLES.STUDENT) && ROLES.STUDENT != role) {
         setFieldValue("roles", [role]);
         return;
       }
@@ -46441,14 +46447,14 @@ var UserDetail = function UserDetail() {
         label: role === "SecondaryTeacher" ? "SupportTeacher" : "" + role,
         checked: values.roles.includes(role),
         onChange: function onChange() {
-          if (!!id && (userHasData.isHasTeacherData && role === "Teacher" || userHasData.isHasAssistantData && role === "Assistant" || userHasData.isHasCounselorData && role === "Counselor" || userHasData.isHasSecondaryTeacherData && role === "SecondaryTeacher" || (role == "Student" || role == "General ED teacher") && (userHasData.isHasAssistantData || userHasData.isHasCounselorData || userHasData.isHasSecondaryTeacherData || userHasData.isHasTeacherData))) {
+          if (!!id && (userHasData.isHasTeacherData && role === "Teacher" || userHasData.isHasAssistantData && role === "Assistant" || userHasData.isHasCounselorData && role === "Counselor" || userHasData.isHasSecondaryTeacherData && role === "SecondaryTeacher" || role == "Student" && (userHasData.isHasAssistantData || userHasData.isHasCounselorData || userHasData.isHasSecondaryTeacherData || userHasData.isHasTeacherData))) {
             alert("Please switch data before removing the role");
           } else {
             toggleRoles(role);
             setEditedTrue();
           }
         },
-        disabled: currentRoles.includes("Parent") || currentRoles.includes("Student") && !!id ? currentRoles.concat(["Student", "Parent", "General ED teacher"]).includes(role) || currentRoles.every(handleDisableRoles) : ["Parent"].includes(role)
+        disabled: currentRoles.includes("Parent") || currentRoles.includes("Student") && !!id ? currentRoles.concat(["Student", "Parent"]).includes(role) || currentRoles.every(handleDisableRoles) : ["Parent"].includes(role)
       }));
     }))), touched.roles && errors.roles && React__default.createElement(ErrorHandler, {
       text: errors.roles