mario-core 2.9.117-beta → 2.9.120-beta

package/dist/containers/User/hooks/useUserDetail.d.ts

@@ -20,7 +20,5 @@ declare const useUserDetail: (id?: string | undefined) => {
     setEditedTrue: () => Promise<void>;
     confirmChangePassword: (data: any) => Promise<void>;
     forgotPasswordRequest: (data: any) => Promise<void>;
-    currentRoles: string[];
-    handleDisableRoles: (currentRoles: string) => boolean;
 };
 export default useUserDetail;

package/dist/index.js

@@ -2602,9 +2602,6 @@ var QUESTION_TYPES_OPTIONS = [{
 }, {
   label: "Learning strategy",
   value: "LearningStrategy"
-}, {
-  label: "Dropdown",
-  value: "Dropdown"
 }];
 var QUESTION_TYPES = {
   SINGLE_CHOICE: "SingleChoice",
@@ -2617,8 +2614,7 @@ var QUESTION_TYPES = {
   EMOTIONAL: "Emotional",
   SUMMARIZE: "Summarize",
   RATING: "Rating",
-  LEARNING_STRATEGY: "LearningStrategy",
-  DROPDOWN: "Dropdown"
+  LEARNING_STRATEGY: "LearningStrategy"
 };
 var STAR_OPTIONS = [{
   label: 2,
@@ -2898,6 +2894,9 @@ var useLogin = function useLogin() {
               includeUtm: false
             });
             var hostName = window.location.hostname;
+            amplitude.getInstance().setUserProperties({
+              'domain': hostName
+            });
             amplitude.getInstance().logEvent("general: session start", {
               user_id: data.email,
               domain: hostName,
@@ -6936,10 +6935,6 @@ var useUserDetail = function useUserDetail(id) {
     }
   };
 
-  var _useState4 = React.useState([]),
-      currentRoles = _useState4[0],
-      setCurrentRoles = _useState4[1];
-
   React.useEffect(function () {
     document.title = TITLE$7;
     setEdited(false);
@@ -6958,14 +6953,13 @@ var useUserDetail = function useUserDetail(id) {
 
       var _temp4 = _catch(function () {
         return Promise.resolve(getById$3(id)).then(function (res) {
-          var _res$data$roles, _res$data, _res$data2;
+          var _res$data;
 
           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
           }));
-          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;
+          document.title = (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.fullName;
         });
       }, function (err) {
         var _err$response, _err$response$data;
@@ -7020,9 +7014,9 @@ var useUserDetail = function useUserDetail(id) {
             var name = file.name;
             formData.append("file", file, name);
             return Promise.resolve(systemProfileUpload(formData)).then(function (res) {
-              var _res$data3;
+              var _res$data2;
 
-              var imageUrl = res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.key;
+              var imageUrl = res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.key;
               data.profileImageFileName = imageUrl;
             });
           }
@@ -7044,10 +7038,6 @@ var useUserDetail = function useUserDetail(id) {
     }
   }, [id, file]);
 
-  var handleDisableRoles = function handleDisableRoles(currentRoles) {
-    return ["Student", "Parent", "EduTeacher"].includes(currentRoles);
-  };
-
   var confirmChangePassword = function confirmChangePassword(data) {
     try {
       var _temp13 = function _temp13() {
@@ -7117,9 +7107,7 @@ var useUserDetail = function useUserDetail(id) {
     setEdited: setEdited,
     setEditedTrue: setEditedTrue,
     confirmChangePassword: confirmChangePassword,
-    forgotPasswordRequest: forgotPasswordRequest,
-    currentRoles: currentRoles,
-    handleDisableRoles: handleDisableRoles
+    forgotPasswordRequest: forgotPasswordRequest
   };
 };
 
@@ -7162,9 +7150,7 @@ var UserDetail = function UserDetail() {
       setEdited = _useUserDetail.setEdited,
       setEditedTrue = _useUserDetail.setEditedTrue,
       confirmChangePassword = _useUserDetail.confirmChangePassword,
-      forgotPasswordRequest = _useUserDetail.forgotPasswordRequest,
-      currentRoles = _useUserDetail.currentRoles,
-      handleDisableRoles = _useUserDetail.handleDisableRoles;
+      forgotPasswordRequest = _useUserDetail.forgotPasswordRequest;
 
   var initialValueForm = {
     oldPassword: "",
@@ -7218,17 +7204,15 @@ var UserDetail = function UserDetail() {
         return;
       }
 
-      if ([ROLES.STUDENT, ROLES.PARENT, ROLES.EDUTEACHER].includes(role)) {
-        setFieldValue("roles", [role]);
-        return;
-      }
-
-      if (values.roles.includes(ROLES.EDUTEACHER) && ROLES.EDUTEACHER != role) {
+      if ([ROLES.ADMIN, ROLES.STUDENT, ROLES.PARENT, ROLES.EDUTEACHER, ROLES.COUNSELOR, ROLES.SECONDARY_TEACHER].includes(role)) {
         setFieldValue("roles", [role]);
         return;
       }
 
-      setFieldValue("roles", [].concat(values.roles, [role]));
+      var teacherAssistantRoles = values.roles.filter(function (item) {
+        return ![ROLES.STUDENT, ROLES.ADMIN, ROLES.PARENT, ROLES.EDUTEACHER, ROLES.COUNSELOR, ROLES.SECONDARY_TEACHER].includes(item);
+      });
+      setFieldValue("roles", [].concat(teacherAssistantRoles, [role]));
     }, [values.roles]);
     return React__default.createElement("div", {
       className: "animated fadeIn detail-buttons-padding"
@@ -7316,7 +7300,7 @@ var UserDetail = function UserDetail() {
           toggleRoles(role);
           setEditedTrue();
         },
-        disabled: !!id ? currentRoles.concat(["Student", "Parent", "General ED teacher"]).includes(role) || currentRoles.every(handleDisableRoles) : ["Student", "Parent"].includes(role)
+        disabled: !!id ? true : ["Student", "Parent"].includes(role)
       }));
     }))), touched.roles && errors.roles && React__default.createElement(ErrorHandler, {
       text: errors.roles
@@ -8091,14 +8075,11 @@ var NEW_NOTIFICATION$1 = "NEW_NOTIFICATION";
 
 var useNotificationList = function useNotificationList() {
   var dispatch = reactRedux.useDispatch();
+  var userId = reactRedux.useSelector(function (state) {
+    var _state$common$user;
 
-  var _useParams = reactRouterDom.useParams(),
-      roles = _useParams.roles;
-
-  var user = reactRedux.useSelector(function (state) {
-    return state.common.user;
+    return (_state$common$user = state.common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.id;
   });
-  var userId = user === null || user === void 0 ? void 0 : user.id;
   var notificationList = reactRedux.useSelector(function (state) {
     return state.notification.notificationList;
   });
@@ -8189,9 +8170,7 @@ var useNotificationList = function useNotificationList() {
       dispatch(setLoading(true));
 
       var _temp4 = _catch(function () {
-        return Promise.resolve(get(_extends({}, filters, {
-          roles: !(roles !== null && roles !== void 0 && roles.trim()) ? user === null || user === void 0 ? void 0 : user.roles : [roles] || []
-        }))).then(function (res) {
+        return Promise.resolve(get(filters)).then(function (res) {
           var _res$data = res.data,
               items = _res$data.items,
               totalItems = _res$data.totalItems;