mario-core 2.9.121-role → 2.9.122-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

@@ -266,6 +266,9 @@ var never = "Never";
 var on = "On";
 var after = "After";
 var pick_a_date = "Pick a date";
+var pick_a_time = "Pick a time";
+var change_date = "Change date";
+var change_time = "Change time";
 var apply = "Apply";
 var new_1_to_1 = "New 1-to-1";
 var new_check_in = "New Check In";
@@ -277,6 +280,15 @@ var search_question_category = "Search question category";
 var no_question = "No question";
 var select_question = "Select question";
 var select_student = "Select student";
+var select_teacher = "Select teacher";
+var do_you_want_to_talk_with = "Do you want to talk with";
+var please_select_a_student = "Please select a student";
+var please_select_a_teacher = "Please select a teacher";
+var please_provide_a_valid_student = "Please provide a valid student";
+var please_provide_a_valid_teacher = "Please provide a valid teacher";
+var select_a_student_and_launch_a_new_session_or_book_one_for_later = "Select a student and launch a new session or book one for later";
+var you_have_no_teacher = "You have no teacher";
+var search_teacher = "Search teacher";
 var select_date_time = "Select Date & Time";
 var book_1_to_1 = "Book 1-to-1";
 var book_new_check_in = "Book new Check In";
@@ -610,6 +622,7 @@ var current_secondary_teacher_email = "Current Secondary Teacher Email";
 var remove_secondary_teacher = "Remove Secondary Teacher";
 var select_secondary_teacher_change = "Select Secondary Teacher Change";
 var filter_calendar = "Filter calendar";
+var is_active = "Is Active";
 var lang_us = {
 	dashboard: dashboard,
 	user: user,
@@ -847,6 +860,9 @@ var lang_us = {
 	on: on,
 	after: after,
 	pick_a_date: pick_a_date,
+	pick_a_time: pick_a_time,
+	change_date: change_date,
+	change_time: change_time,
 	apply: apply,
 	new_1_to_1: new_1_to_1,
 	new_check_in: new_check_in,
@@ -858,6 +874,15 @@ var lang_us = {
 	no_question: no_question,
 	select_question: select_question,
 	select_student: select_student,
+	select_teacher: select_teacher,
+	do_you_want_to_talk_with: do_you_want_to_talk_with,
+	please_select_a_student: please_select_a_student,
+	please_select_a_teacher: please_select_a_teacher,
+	please_provide_a_valid_student: please_provide_a_valid_student,
+	please_provide_a_valid_teacher: please_provide_a_valid_teacher,
+	select_a_student_and_launch_a_new_session_or_book_one_for_later: select_a_student_and_launch_a_new_session_or_book_one_for_later,
+	you_have_no_teacher: you_have_no_teacher,
+	search_teacher: search_teacher,
 	select_date_time: select_date_time,
 	book_1_to_1: book_1_to_1,
 	book_new_check_in: book_new_check_in,
@@ -1193,7 +1218,8 @@ var lang_us = {
 	current_secondary_teacher_email: current_secondary_teacher_email,
 	remove_secondary_teacher: remove_secondary_teacher,
 	select_secondary_teacher_change: select_secondary_teacher_change,
-	filter_calendar: filter_calendar
+	filter_calendar: filter_calendar,
+	is_active: is_active
 };
 
 var dashboard$1 = "Dashboard";
@@ -1429,6 +1455,9 @@ var never$1 = "Never";
 var on$1 = "On";
 var after$1 = "After";
 var pick_a_date$1 = "Pick a date";
+var pick_a_time$1 = "Pick a time";
+var change_date$1 = "Change date";
+var change_time$1 = "Change time";
 var apply$1 = "Apply";
 var new_1_to_1$1 = "New 1-to-1";
 var new_check_in$1 = "New Check In";
@@ -1440,6 +1469,15 @@ var search_question_category$1 = "Search question category";
 var no_question$1 = "No question";
 var select_question$1 = "Select question";
 var select_student$1 = "Select student";
+var select_teacher$1 = "Select teacher";
+var do_you_want_to_talk_with$1 = "Do you want to talk with";
+var please_select_a_student$1 = "Please select a student";
+var please_select_a_teacher$1 = "Please select a teacher";
+var please_provide_a_valid_student$1 = "Please provide a valid student";
+var please_provide_a_valid_teacher$1 = "Please provide a valid teacher";
+var select_a_student_and_launch_a_new_session_or_book_one_for_later$1 = "Select a student and launch a new session or book one for later";
+var you_have_no_teacher$1 = "You have no teacher";
+var search_teacher$1 = "Search teacher";
 var select_date_time$1 = "Select Date & Time";
 var book_1_to_1$1 = "Book 1-to-1";
 var book_new_check_in$1 = "Book new Check In";
@@ -1773,6 +1811,7 @@ var current_secondary_teacher_email$1 = "Current Secondary Teacher Email";
 var remove_secondary_teacher$1 = "Remove Secondary Teacher";
 var select_secondary_teacher_change$1 = "Select Secondary Teacher Change";
 var filter_calendar$1 = "Filter calendar";
+var is_active$1 = "Is Active";
 var lang_uk = {
 	dashboard: dashboard$1,
 	user: user$1,
@@ -2010,6 +2049,9 @@ var lang_uk = {
 	on: on$1,
 	after: after$1,
 	pick_a_date: pick_a_date$1,
+	pick_a_time: pick_a_time$1,
+	change_date: change_date$1,
+	change_time: change_time$1,
 	apply: apply$1,
 	new_1_to_1: new_1_to_1$1,
 	new_check_in: new_check_in$1,
@@ -2021,6 +2063,15 @@ var lang_uk = {
 	no_question: no_question$1,
 	select_question: select_question$1,
 	select_student: select_student$1,
+	select_teacher: select_teacher$1,
+	do_you_want_to_talk_with: do_you_want_to_talk_with$1,
+	please_select_a_student: please_select_a_student$1,
+	please_select_a_teacher: please_select_a_teacher$1,
+	please_provide_a_valid_student: please_provide_a_valid_student$1,
+	please_provide_a_valid_teacher: please_provide_a_valid_teacher$1,
+	select_a_student_and_launch_a_new_session_or_book_one_for_later: select_a_student_and_launch_a_new_session_or_book_one_for_later$1,
+	you_have_no_teacher: you_have_no_teacher$1,
+	search_teacher: search_teacher$1,
 	select_date_time: select_date_time$1,
 	book_1_to_1: book_1_to_1$1,
 	book_new_check_in: book_new_check_in$1,
@@ -2356,7 +2407,8 @@ var lang_uk = {
 	current_secondary_teacher_email: current_secondary_teacher_email$1,
 	remove_secondary_teacher: remove_secondary_teacher$1,
 	select_secondary_teacher_change: select_secondary_teacher_change$1,
-	filter_calendar: filter_calendar$1
+	filter_calendar: filter_calendar$1,
+	is_active: is_active$1
 };
 
 var DEFAULT_LANGUAGE = localStorage.getItem("language") !== null ? localStorage.getItem("language") : "uk";
@@ -2602,9 +2654,6 @@ var QUESTION_TYPES_OPTIONS = [{
 }, {
   label: "Learning strategy",
   value: "LearningStrategy"
-}, {
-  label: "DropDown",
-  value: "DropDown"
 }];
 var QUESTION_TYPES = {
   SINGLE_CHOICE: "SingleChoice",
@@ -2617,8 +2666,7 @@ var QUESTION_TYPES = {
   EMOTIONAL: "Emotional",
   SUMMARIZE: "Summarize",
   RATING: "Rating",
-  LEARNING_STRATEGY: "LearningStrategy",
-  DROPDOWN: "DropDown"
+  LEARNING_STRATEGY: "LearningStrategy"
 };
 var STAR_OPTIONS = [{
   label: 2,
@@ -6939,10 +6987,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);
@@ -6961,14 +7005,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;
@@ -7023,9 +7066,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;
             });
           }
@@ -7047,10 +7090,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() {
@@ -7120,9 +7159,7 @@ var useUserDetail = function useUserDetail(id) {
     setEdited: setEdited,
     setEditedTrue: setEditedTrue,
     confirmChangePassword: confirmChangePassword,
-    forgotPasswordRequest: forgotPasswordRequest,
-    currentRoles: currentRoles,
-    handleDisableRoles: handleDisableRoles
+    forgotPasswordRequest: forgotPasswordRequest
   };
 };
 
@@ -7165,9 +7202,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: "",
@@ -7221,17 +7256,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"
@@ -7319,7 +7352,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
@@ -8094,14 +8127,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;
   });
@@ -8192,9 +8222,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;