touchstudy-core 0.1.175 → 0.1.177

package/dist/containers/Classes/components/TeacherSelector.d.ts

@@ -2,7 +2,7 @@ import { FC } from "react";
 import { Option, TeacherSimpleResponse } from "../configs/types";
 interface Props {
     teachers: TeacherSimpleResponse[];
-    value?: number | null;
+    value?: any;
     onChange: (val: Option | null) => void;
     onInputChange: (inputText: string) => void;
     isDisabled?: boolean;

package/dist/containers/Classes/configs/types.d.ts

@@ -7,6 +7,8 @@ export declare type ClassResponse = {
     totalTeachers: number;
     totalLessons: number;
     mainTeacherId: number;
+    mainTeacherName?: string;
+    mainTeacherEmail?: string;
     courseWeeklyDays: WeeklyDayResponse[];
     hidden: boolean;
 };
@@ -51,6 +53,7 @@ export declare type ClassRequest = {
     endDate: moment.Moment | null;
     mainTeacherId: number | null;
     courseWeeklyDays: WeeklyDayRequest[];
+    mainTeacher?: Option | null;
 };
 export declare type ClassRequestBody = {
     name: string;
@@ -91,6 +94,7 @@ export declare type LessonRequest = {
     mainTeacherId: number | null;
     date: moment.Moment | null;
     isCancelled: boolean;
+    mainTeacher?: Option | null;
 };
 export declare type LessonRequestBody = {
     startTime: string;

package/dist/containers/Notes/components/NoteItemList.d.ts

@@ -9,6 +9,7 @@ interface Props {
     onDelete: (data: NoteResponse) => void;
     onUpdate: (data: NoteResponse) => void;
     onView: (data: NoteResponse) => void;
+    onViewStudentInfo: (note: NoteResponse) => void;
 }
 declare const NoteItemList: FC<Props>;
 export default NoteItemList;

package/dist/containers/Notes/views/NoteList.d.ts

@@ -6,6 +6,7 @@ interface Props {
     role: Role;
     headers: any[];
     isAdmin: boolean;
+    onViewQA?: (studentId: number, sessionId?: number, questionId?: number, isTextbook?: boolean) => void;
 }
 declare const NoteList: FC<Props>;
 export default NoteList;

package/dist/containers/Notes/views/NoteTabs.d.ts

@@ -2,6 +2,7 @@ import { FC } from "react";
 import { Role } from "../../../utils";
 interface Props {
     role: Role;
+    onViewQA?: (studentId: number, sessionId?: number, questionId?: number, isTextbook?: boolean) => void;
 }
 declare const NoteTabs: FC<Props>;
 export default NoteTabs;

package/dist/index.js

@@ -5993,6 +5993,7 @@ var customStyles = {
 
 var _excluded = ["isDefault", "defaultValue", "options", "isDisabled", "scrollBottom", "value", "isMulti"];
 var CustomAsyncSelect = function CustomAsyncSelect(_ref) {
+  var _value$;
   var isDefault = _ref.isDefault,
     options = _ref.options,
     isDisabled = _ref.isDisabled,
@@ -6000,7 +6001,8 @@ var CustomAsyncSelect = function CustomAsyncSelect(_ref) {
     value = _ref.value,
     isMulti = _ref.isMulti,
     rest = _objectWithoutPropertiesLoose(_ref, _excluded);
-  var initialValues = Array.isArray(value) ? options.filter(function (i) {
+  var isOptionValue = (value === null || value === void 0 ? void 0 : value.value) || (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.value);
+  var initialValues = isOptionValue ? value : Array.isArray(value) ? options.filter(function (i) {
     return value.includes(i.value);
   }) : isMulti ? options.filter(function (i) {
     return i.value == value;
@@ -13104,7 +13106,7 @@ var DefaultLessonFilter = {
 };
 var DefaultTeacherFilter = {
   currentPage: 1,
-  pageSize: 50,
+  pageSize: 100,
   sortColumnDirection: OrderBy$1.DESC,
   sortColumnName: TeacherSortBy.Name,
   textSearch: ""
@@ -13260,16 +13262,18 @@ var DEFAULT_USER_FILTERS = {
 
 var styles$3 = {"avatar":"_2rJkZ","date-picker":"_1iqE2","time-picker":"_20xtc","teacher-selector-wrapper":"_3L1Oj"};
 
+var _excluded$7 = ["teachers", "value"];
 var TeacherSelector = function TeacherSelector(_ref) {
   var teachers = _ref.teachers,
-    value = _ref.value;
+    value = _ref.value,
+    rest = _objectWithoutPropertiesLoose(_ref, _excluded$7);
   var teacherOptions = teachers.map(function (i) {
     return {
       label: i.teacherName + "/" + i.teacherEmail,
       value: i.id
     };
   });
-  return React__default.createElement(CustomAsyncSelect, {
+  return React__default.createElement(CustomAsyncSelect, Object.assign({
     options: teacherOptions,
     value: value,
     menuPlacement: "bottom",
@@ -13282,7 +13286,7 @@ var TeacherSelector = function TeacherSelector(_ref) {
     },
     menuPortalTarget: document.body,
     isClearable: true
-  });
+  }, rest));
 };
 
 var ErrorHandler = function ErrorHandler(_ref) {
@@ -13367,6 +13371,7 @@ var ClassForm = function ClassForm(_ref) {
   };
   var handleChangeTeacher = function handleChangeTeacher(val) {
     formikProp.setFieldValue("mainTeacherId", val === null || val === void 0 ? void 0 : val.value);
+    formikProp.setFieldValue("mainTeacher", val);
   };
   var handleChangeWeeklyDayTime = function handleChangeWeeklyDayTime(key, newValue, currentValue) {
     var _extends2;
@@ -13532,7 +13537,7 @@ var ClassForm = function ClassForm(_ref) {
   }, "*")), React__default.createElement("div", {
     className: "" + styles$3["teacher-selector-wrapper"]
   }, React__default.createElement(TeacherSelector, {
-    value: formikProp.values.mainTeacherId,
+    value: formikProp.values.mainTeacher,
     teachers: teachers,
     onInputChange: onSearchTeachers,
     onChange: handleChangeTeacher,
@@ -15922,14 +15927,15 @@ var getNoteType = function getNoteType(t, type) {
 };
 
 var NoteItemList = function NoteItemList(_ref) {
-  var _data$reciever, _data$reciever2, _data$recievers;
+  var _data$reciever, _data$recievers;
   var data = _ref.data,
     index = _ref.index,
     role = _ref.role,
     calcOrderNumber = _ref.calcOrderNumber,
     onDelete = _ref.onDelete,
     onUpdate = _ref.onUpdate,
-    onView = _ref.onView;
+    onView = _ref.onView,
+    onViewStudentInfo = _ref.onViewStudentInfo;
   var isAdminUser = reactRedux.useSelector(function (state) {
     var _state$common, _state$common$user, _state$common$user$ro;
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : (_state$common$user$ro = _state$common$user.roles) === null || _state$common$user$ro === void 0 ? void 0 : _state$common$user$ro.includes(exports.Role.Admin);
@@ -15952,6 +15958,9 @@ var NoteItemList = function NoteItemList(_ref) {
   var handleView = function handleView() {
     onView(data);
   };
+  var handleViewStudentInfo = function handleViewStudentInfo() {
+    onViewStudentInfo(data);
+  };
   var disabled = !data.isOwned && (!isAdminUser || data.type == undefined || data.type == exports.NoteType.TeacherToAllAdmin || data.type == exports.NoteType.TeacherToTeachers);
   var cleanedRichText = React.useMemo(function () {
     return cleanRichText(data.content);
@@ -15973,10 +15982,15 @@ var NoteItemList = function NoteItemList(_ref) {
     display: "inline-block",
     color: colors.grey[600],
     fontWeight: 600
-  }, "(", " " + t("me"), ")")), React__default.createElement(material.Typography, null, data.sender.email))), data.type === exports.NoteType.ToAcademy || data.type === exports.NoteType.ToStudent ? React__default.createElement(TableCell, null, React__default.createElement(material.Typography, {
-    color: colors.blue[700],
-    fontWeight: 600
-  }, (_data$reciever = data.reciever) === null || _data$reciever === void 0 ? void 0 : _data$reciever.fullName), React__default.createElement(material.Typography, null, (_data$reciever2 = data.reciever) === null || _data$reciever2 === void 0 ? void 0 : _data$reciever2.email)) : data.type === exports.NoteType.TeacherToTeachers ? React__default.createElement(TableCell, null, React__default.createElement(material.Stack, {
+  }, "(", " " + t("me"), ")")), React__default.createElement(material.Typography, null, data.sender.email))), data.type === exports.NoteType.ToAcademy || data.type === exports.NoteType.ToStudent ? React__default.createElement(TableCell, null, React__default.createElement(material.Button, {
+    variant: "text",
+    color: "success",
+    sx: {
+      color: colors.blue[700],
+      fontWeight: 600
+    },
+    onClick: handleViewStudentInfo
+  }, (_data$reciever = data.reciever) === null || _data$reciever === void 0 ? void 0 : _data$reciever.fullName)) : data.type === exports.NoteType.TeacherToTeachers ? React__default.createElement(TableCell, null, React__default.createElement(material.Stack, {
     direction: "column"
   }, (_data$recievers = data.recievers) === null || _data$recievers === void 0 ? void 0 : _data$recievers.slice(0, 2).map(function (i) {
     return React__default.createElement(material.Typography, null, i.fullName, " - ", i.email);
@@ -16614,10 +16628,12 @@ var GeneralNoteDialog = function GeneralNoteDialog(_ref) {
 };
 
 var NoteList = function NoteList(_ref) {
+  var _selectedStudentNote$;
   var defaultFilter = _ref.defaultFilter,
     role = _ref.role,
     headers = _ref.headers,
-    isAdmin = _ref.isAdmin;
+    isAdmin = _ref.isAdmin,
+    onViewQA = _ref.onViewQA;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   var _useList = useList(function (filter) {
@@ -16651,6 +16667,16 @@ var NoteList = function NoteList(_ref) {
   var _useState5 = React.useState(false),
     openDeleteNoteDialog = _useState5[0],
     setOpenDeleteNoteDialog = _useState5[1];
+  var _useState6 = React.useState(),
+    selectedStudentNote = _useState6[0],
+    setSelectedStudentNote = _useState6[1];
+  var handleChangeSelectedStudentNote = function handleChangeSelectedStudentNote(note) {
+    if (note.type !== exports.NoteType.ToAcademy && note.type !== exports.NoteType.ToStudent) return;
+    setSelectedStudentNote(note);
+  };
+  var handleCloseStudentInfo = function handleCloseStudentInfo() {
+    setSelectedStudentNote(undefined);
+  };
   var handleOpenCreateNoteDialog = function handleOpenCreateNoteDialog() {
     var _defaultFilter$types;
     if (((_defaultFilter$types = defaultFilter.types) === null || _defaultFilter$types === void 0 ? void 0 : _defaultFilter$types.length) === 1) setOpenNoteDialog(defaultFilter.types[0]);else if (defaultFilter.types && defaultFilter.types.length > 1) {
@@ -16804,7 +16830,8 @@ var NoteList = function NoteList(_ref) {
         role: role,
         onDelete: handleOpenDeleteNoteDialog,
         onUpdate: handleOpenNoteDialog,
-        onView: handleOpenNoteDrawer
+        onView: handleOpenNoteDrawer,
+        onViewStudentInfo: handleChangeSelectedStudentNote
       });
     }
   }), !data.length && !isLoading && React__default.createElement(material.TableRow, null, React__default.createElement(material.TableCell, {
@@ -16852,6 +16879,16 @@ var NoteList = function NoteList(_ref) {
     title: t("delete_note"),
     okText: t("delete_note"),
     cancelText: t("cancel")
+  }), React__default.createElement(StudentInfoDrawer, {
+    role: role,
+    open: !!selectedStudentNote,
+    studentId: (selectedStudentNote === null || selectedStudentNote === void 0 ? void 0 : (_selectedStudentNote$ = selectedStudentNote.reciever) === null || _selectedStudentNote$ === void 0 ? void 0 : _selectedStudentNote$.id) || 0,
+    onClose: handleCloseStudentInfo,
+    anchor: "right",
+    width: "80dvw",
+    history: history,
+    inert: true,
+    onViewQA: onViewQA
   }));
 };
 
@@ -16960,7 +16997,8 @@ var TEACHER_NOTE_FILTER = {
 };
 
 var NoteTabs = function NoteTabs(_ref) {
-  var role = _ref.role;
+  var role = _ref.role,
+    onViewQA = _ref.onViewQA;
   var roles = reactRedux.useSelector(function (state) {
     var _state$common$user$ro, _state$common, _state$common$user;
     return (_state$common$user$ro = state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : (_state$common$user = _state$common.user) === null || _state$common$user === void 0 ? void 0 : _state$common$user.roles) != null ? _state$common$user$ro : [];
@@ -17007,7 +17045,8 @@ var NoteTabs = function NoteTabs(_ref) {
     role: role,
     isAdmin: isAdmin,
     defaultFilter: ACADEMY_NOTE_FILTER,
-    headers: NOTE_STUDENT_HEADERS
+    headers: NOTE_STUDENT_HEADERS,
+    onViewQA: onViewQA
   })), React__default.createElement(NotetabPanel, {
     value: value,
     index: 1
@@ -17015,7 +17054,8 @@ var NoteTabs = function NoteTabs(_ref) {
     role: role,
     isAdmin: isAdmin,
     defaultFilter: STUDENT_PARENTS_NOTE_FILTER,
-    headers: NOTE_STUDENT_HEADERS
+    headers: NOTE_STUDENT_HEADERS,
+    onViewQA: onViewQA
   })), React__default.createElement(NotetabPanel, {
     value: value,
     index: 2
@@ -20250,12 +20290,12 @@ function CreateNewQuestionDialog(_ref) {
   });
 }
 
-var _excluded$7 = ["children", "value", "index"];
+var _excluded$8 = ["children", "value", "index"];
 var CustomTabPanel = function CustomTabPanel(props) {
   var children = props.children,
     value = props.value,
     index = props.index,
-    other = _objectWithoutPropertiesLoose(props, _excluded$7);
+    other = _objectWithoutPropertiesLoose(props, _excluded$8);
   return React__default.createElement("div", Object.assign({
     role: "tabpanel",
     hidden: value !== index,
@@ -24312,7 +24352,7 @@ var ChapterProblemSolvingResultsDialog = function ChapterProblemSolvingResultsDi
   }, t("cancel"))))));
 };
 
-var _excluded$8 = ["onChange"];
+var _excluded$9 = ["onChange"];
 var StartPageDialog = function StartPageDialog(_ref) {
   var t = _ref.t,
     onClose = _ref.onClose,
@@ -24378,7 +24418,7 @@ var StartPageDialog = function StartPageDialog(_ref) {
     }, t("page_to_start_with")), React__default.createElement(formik.Field, {
       name: "startPage",
       render: function render(_ref3) {
-        var field = _objectWithoutPropertiesLoose(_ref3, _excluded$8);
+        var field = _objectWithoutPropertiesLoose(_ref3, _excluded$9);
         return React__default.createElement(CustomSelectOption, Object.assign({
           maxMenuHeight: 150,
           menuPosition: "fixed",
@@ -26010,10 +26050,10 @@ var DrawerTextbookResultTab = function DrawerTextbookResultTab(_ref) {
 };
 
 var _styled$1;
-var _excluded$9 = ["className"];
+var _excluded$a = ["className"];
 var CustomTooltip$1 = material.styled(function (_ref) {
   var className = _ref.className,
-    props = _objectWithoutPropertiesLoose(_ref, _excluded$9);
+    props = _objectWithoutPropertiesLoose(_ref, _excluded$a);
   return React__default.createElement(material.Tooltip, Object.assign({}, props, {
     classes: {
       popper: className
@@ -27494,7 +27534,7 @@ var useTeacherList = function useTeacherList() {
   };
 };
 
-var _excluded$a = ["getStudents"],
+var _excluded$b = ["getStudents"],
   _excluded2 = ["getTeachers"],
   _excluded3 = ["getLessons"];
 var PAGE_TITLE$4 = "classes";
@@ -27545,7 +27585,7 @@ var useClassDetail = function useClassDetail(_ref) {
   };
   var _useStudentClassList = useStudentClassList(classId),
     getStudents = _useStudentClassList.getStudents,
-    studentListProps = _objectWithoutPropertiesLoose(_useStudentClassList, _excluded$a);
+    studentListProps = _objectWithoutPropertiesLoose(_useStudentClassList, _excluded$b);
   var _useTeacherClassList = useTeacherClassList(classId),
     getTeachers = _useTeacherClassList.getTeachers,
     teacherListProps = _objectWithoutPropertiesLoose(_useTeacherClassList, _excluded2);
@@ -27605,7 +27645,11 @@ var useClassDetail = function useClassDetail(_ref) {
           startTime: timeSpanToLocalMoment(i.startTime, course.startDate),
           endTime: timeSpanToLocalMoment(i.endTime, course.startDate)
         });
-      })
+      }),
+      mainTeacher: course.mainTeacherId ? {
+        label: course.mainTeacherName + "/" + course.mainTeacherEmail,
+        value: course.mainTeacherId
+      } : null
     });
   }, [JSON.stringify(course)]);
   var convertToRequestBody = function convertToRequestBody(request) {
@@ -27991,6 +28035,7 @@ var LessonFormBody = function LessonFormBody(_ref) {
     setOpenPicker = _useState[1];
   var handleChangeTeacher = function handleChangeTeacher(val) {
     formikProp.setFieldValue("mainTeacherId", val === null || val === void 0 ? void 0 : val.value);
+    formikProp.setFieldValue("mainTeacher", val);
   };
   React.useEffect(function () {
     if (open && data) formikProp.setValues(data);else formikProp.setValues(DEFAULT_LESSON_REQUEST);
@@ -28034,7 +28079,7 @@ var LessonFormBody = function LessonFormBody(_ref) {
   }, "*")), React__default.createElement("div", {
     className: "" + styles$3["teacher-selector-wrapper"]
   }, React__default.createElement(TeacherSelector, {
-    value: formikProp.values.mainTeacherId,
+    value: formikProp.values.mainTeacher,
     teachers: teachers,
     onInputChange: onSearchTeachers,
     onChange: handleChangeTeacher
@@ -28142,7 +28187,11 @@ var LessonFormDialog = function LessonFormDialog(_ref) {
     return _extends({}, data, {
       date: moment.utc(data.date).local(),
       startTime: timeSpanToLocalMoment(data.startTime, data.date),
-      endTime: timeSpanToLocalMoment(data.endTime, data.date)
+      endTime: timeSpanToLocalMoment(data.endTime, data.date),
+      mainTeacher: data.mainTeacherId ? {
+        label: data.mainTeacherName + "/" + data.mainTeacherEmail,
+        value: data.mainTeacherId
+      } : null
     });
   };
   var lessonRequest = React.useMemo(convertLessonRequest, [JSON.stringify(data)]);
@@ -28933,14 +28982,14 @@ var CSV_PREFIX = "data:text/csv;charset=utf-8,";
 
 var styles$8 = {"action-btn":"_1jXbz","action-btn--pencil":"_at4xP","icon-rotate-180":"_12gv9","drop-area":"_R4bn5"};
 
-var _excluded$b = ["text", "isRequired", "className"];
+var _excluded$c = ["text", "isRequired", "className"];
 var LabelRequired = function LabelRequired(_ref) {
   var text = _ref.text,
     _ref$isRequired = _ref.isRequired,
     isRequired = _ref$isRequired === void 0 ? true : _ref$isRequired,
     _ref$className = _ref.className,
     className = _ref$className === void 0 ? "" : _ref$className,
-    rest = _objectWithoutPropertiesLoose(_ref, _excluded$b);
+    rest = _objectWithoutPropertiesLoose(_ref, _excluded$c);
   return React__default.createElement(material.FormLabel, Object.assign({
     className: "fw-medium mb-1 " + className
   }, rest), text, isRequired && React__default.createElement("span", {
@@ -28994,7 +29043,7 @@ var deleteUserApi = function deleteUserApi(id) {
   return api["delete"](USER_URL$1 + "/delete/" + id);
 };
 
-var _excluded$c = ["ref"],
+var _excluded$d = ["ref"],
   _excluded2$1 = ["ref"],
   _excluded3$1 = ["ref"],
   _excluded4 = ["ref"],
@@ -29024,7 +29073,7 @@ var UserDialog = function UserDialog(_ref) {
     t = _useTranslation.t;
   var _register = register("fullName"),
     fullNameRef = _register.ref,
-    fullNameBio = _objectWithoutPropertiesLoose(_register, _excluded$c);
+    fullNameBio = _objectWithoutPropertiesLoose(_register, _excluded$d);
   var _register2 = register("email"),
     emailRef = _register2.ref,
     emailBio = _objectWithoutPropertiesLoose(_register2, _excluded2$1);
@@ -33095,12 +33144,12 @@ var ArticleDialog = function ArticleDialog(_ref) {
 
 var styles$a = {"drawer":"_11aYm","open":"_3Ydwm","drawer-overlay":"_3SQDf","drawer-header":"_2BwOx","drawer-form":"_2Zo7R","dropdown-content-academy":"_1lzjD","dropdown-change":"_1y7K9","dropdown-academy-item":"_1Y-55","dropdown-content-language":"_1fBXY","dropdown-item-language":"_3Szun","dropdown-item-language-active":"_2HhLb","item-address":"_3WYHC","item-logout":"_2-9ix","title-address":"_1r4pn","image-academy":"_2ZozT"};
 
-var _excluded$d = ["isOpen", "onClose", "handleSaveExam"];
+var _excluded$e = ["isOpen", "onClose", "handleSaveExam"];
 var CreateExamDrawer = function CreateExamDrawer(props) {
   var isOpen = props.isOpen,
     onClose = props.onClose,
     handleSaveExam = props.handleSaveExam,
-    examDetailViewProps = _objectWithoutPropertiesLoose(props, _excluded$d);
+    examDetailViewProps = _objectWithoutPropertiesLoose(props, _excluded$e);
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   var theme = material.useTheme();
@@ -34253,12 +34302,12 @@ var useNotificationDetail = function useNotificationDetail(_ref) {
 
 var styles$b = {"avatar":"_8niRT"};
 
-var _excluded$e = ["value", "disabled", "optionTypeNotification"];
+var _excluded$f = ["value", "disabled", "optionTypeNotification"];
 var TypeSelector = function TypeSelector(_ref) {
   var value = _ref.value,
     disabled = _ref.disabled,
     optionTypeNotification = _ref.optionTypeNotification,
-    rest = _objectWithoutPropertiesLoose(_ref, _excluded$e);
+    rest = _objectWithoutPropertiesLoose(_ref, _excluded$f);
   return React__default.createElement(CustomAsyncSelect, Object.assign({
     options: optionTypeNotification,
     value: value
@@ -34651,11 +34700,11 @@ var useNotificationList = function useNotificationList(_ref) {
   };
 };
 
-var _excluded$f = ["value", "optionTypeNotification"];
+var _excluded$g = ["value", "optionTypeNotification"];
 var SelectFilterType = function SelectFilterType(_ref) {
   var value = _ref.value,
     optionTypeNotification = _ref.optionTypeNotification,
-    rest = _objectWithoutPropertiesLoose(_ref, _excluded$f);
+    rest = _objectWithoutPropertiesLoose(_ref, _excluded$g);
   return React__default.createElement(CustomAsyncSelect, Object.assign({
     options: optionTypeNotification,
     value: value
@@ -35911,7 +35960,7 @@ var isEqual$1 = function isEqual(prev, next) {
 };
 var QuestionShortInput$1 = React.memo(QuestionShortInput, isEqual$1);
 
-var _excluded$g = ["onChange"];
+var _excluded$h = ["onChange"];
 var _$2 = _$8;
 var BpIcon$1 = material.styled("span")(function (_ref) {
   var theme = _ref.theme;
@@ -36222,7 +36271,7 @@ var QuestionBlock = function QuestionBlock(_ref2) {
     name: path + ".questionTypeId",
     render: function render(_ref5) {
       var _ref5$field = _ref5.field,
-        field = _objectWithoutPropertiesLoose(_ref5$field, _excluded$g);
+        field = _objectWithoutPropertiesLoose(_ref5$field, _excluded$h);
       return React__default.createElement(CustomSelectOption, Object.assign({}, field, {
         isDisabled: disabled,
         value: data.questionType,
@@ -36271,7 +36320,7 @@ var isEqual$2 = function isEqual(prev, next) {
 };
 var QuestionBlock$1 = React.memo(QuestionBlock, isEqual$2);
 
-var _excluded$h = ["data", "path", "isMath", "open", "isLoadingCategories", "isLoadingQuestionTypes", "optionKey", "categories", "questionTypes", "disabled", "onQuestioStartOrderChange", "onDelete", "onOpenSubCategoryMenu", "onOpenCategoryMenu", "onCloseCategoryMenu", "onCloseQuestionTypeMenu", "onOpenQuestionTypeMenu"];
+var _excluded$i = ["data", "path", "isMath", "open", "isLoadingCategories", "isLoadingQuestionTypes", "optionKey", "categories", "questionTypes", "disabled", "onQuestioStartOrderChange", "onDelete", "onOpenSubCategoryMenu", "onOpenCategoryMenu", "onCloseCategoryMenu", "onCloseQuestionTypeMenu", "onOpenQuestionTypeMenu"];
 var _$3 = _$8;
 var QuestionGroupBlockBody = function QuestionGroupBlockBody(_ref) {
   var _data$articles$3, _data$articles$3$cate, _data$articles$4, _data$articles$4$cate, _questions$2;
@@ -36292,7 +36341,7 @@ var QuestionGroupBlockBody = function QuestionGroupBlockBody(_ref) {
     onCloseCategoryMenu = _ref.onCloseCategoryMenu,
     onCloseQuestionTypeMenu = _ref.onCloseQuestionTypeMenu,
     onOpenQuestionTypeMenu = _ref.onOpenQuestionTypeMenu,
-    formikProps = _objectWithoutPropertiesLoose(_ref, _excluded$h);
+    formikProps = _objectWithoutPropertiesLoose(_ref, _excluded$i);
   var errors = formikProps.errors;
   var startOrderRef = React.useRef(null);
   var articles = data.articles,
@@ -36435,7 +36484,7 @@ var isEqual$3 = function isEqual(prev, next) {
 };
 var QuestionGroupBlockBody$1 = React.memo(QuestionGroupBlockBody, isEqual$3);
 
-var _excluded$i = ["expandedIndex", "open", "paths", "path", "isMath", "data", "categories", "isLoadingCategories", "isLoadingQuestionTypes", "questionTypes", "optionKey", "disabled", "onToggle", "onQuestionCountChange", "onDelete", "onOpenSubCategoryMenu", "onOpenCategoryMenu", "onCloseCategoryMenu", "onCopiedPrevQuestionGroup", "onCloseQuestionTypeMenu", "onOpenQuestionTypeMenu"];
+var _excluded$j = ["expandedIndex", "open", "paths", "path", "isMath", "data", "categories", "isLoadingCategories", "isLoadingQuestionTypes", "questionTypes", "optionKey", "disabled", "onToggle", "onQuestionCountChange", "onDelete", "onOpenSubCategoryMenu", "onOpenCategoryMenu", "onCloseCategoryMenu", "onCopiedPrevQuestionGroup", "onCloseQuestionTypeMenu", "onOpenQuestionTypeMenu"];
 var _$4 = _$8;
 var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
   var _data$articles$3, _data$articles$3$cate, _data$articles$3$cate2, _data$articles$4, _data$articles$4$cate, _data$articles$4$cate2;
@@ -36460,7 +36509,7 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
     onCopiedPrevQuestionGroup = _ref.onCopiedPrevQuestionGroup,
     onCloseQuestionTypeMenu = _ref.onCloseQuestionTypeMenu,
     onOpenQuestionTypeMenu = _ref.onOpenQuestionTypeMenu,
-    formikProps = _objectWithoutPropertiesLoose(_ref, _excluded$i);
+    formikProps = _objectWithoutPropertiesLoose(_ref, _excluded$j);
   var errors = formikProps.errors,
     setFieldValue = formikProps.setFieldValue;
   var _useTranslation = reactI18next.useTranslation(),
@@ -36923,7 +36972,7 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
   }, formikProps)))));
 };
 
-var _excluded$j = ["path", "paths", "isMath", "isLoadingCategories", "isLoadingQuestionTypes", "optionKey", "questionGroups", "subChapters", "categories", "questionTypes", "disabled", "onDelete", "onOpenSubCategoryMenu", "onOpenCategoryMenu", "onCloseCategoryMenu", "onCopiedPrevQuestionGroup", "onCloseQuestionTypeMenu", "onOpenQuestionTypeMenu"];
+var _excluded$k = ["path", "paths", "isMath", "isLoadingCategories", "isLoadingQuestionTypes", "optionKey", "questionGroups", "subChapters", "categories", "questionTypes", "disabled", "onDelete", "onOpenSubCategoryMenu", "onOpenCategoryMenu", "onCloseCategoryMenu", "onCopiedPrevQuestionGroup", "onCloseQuestionTypeMenu", "onOpenQuestionTypeMenu"];
 var ChapterBlockBody = function ChapterBlockBody(_ref) {
   var path = _ref.path,
     paths = _ref.paths,
@@ -36943,7 +36992,7 @@ var ChapterBlockBody = function ChapterBlockBody(_ref) {
     onCopiedPrevQuestionGroup = _ref.onCopiedPrevQuestionGroup,
     onCloseQuestionTypeMenu = _ref.onCloseQuestionTypeMenu,
     onOpenQuestionTypeMenu = _ref.onOpenQuestionTypeMenu,
-    formikProps = _objectWithoutPropertiesLoose(_ref, _excluded$j);
+    formikProps = _objectWithoutPropertiesLoose(_ref, _excluded$k);
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   var setFieldValue = formikProps.setFieldValue;
@@ -37122,7 +37171,7 @@ var ChapterBlockBody = function ChapterBlockBody(_ref) {
   }));
 };
 
-var _excluded$k = ["data", "expandedIndex", "open", "path", "paths", "isMath", "isLoadingCategories", "isLoadingQuestionTypes", "categories", "questionTypes", "optionKey", "disabled", "onToggle", "onDelete", "onCopiedPrevQuestionGroup", "onCloseCategoryMenu", "onOpenCategoryMenu", "onOpenSubCategoryMenu", "onOpenQuestionTypeMenu", "onCloseQuestionTypeMenu"];
+var _excluded$l = ["data", "expandedIndex", "open", "path", "paths", "isMath", "isLoadingCategories", "isLoadingQuestionTypes", "categories", "questionTypes", "optionKey", "disabled", "onToggle", "onDelete", "onCopiedPrevQuestionGroup", "onCloseCategoryMenu", "onOpenCategoryMenu", "onOpenSubCategoryMenu", "onOpenQuestionTypeMenu", "onCloseQuestionTypeMenu"];
 var _$5 = _$8;
 var ChapterBlock = function ChapterBlock(_ref) {
   var data = _ref.data,
@@ -37145,7 +37194,7 @@ var ChapterBlock = function ChapterBlock(_ref) {
     onOpenSubCategoryMenu = _ref.onOpenSubCategoryMenu,
     onOpenQuestionTypeMenu = _ref.onOpenQuestionTypeMenu,
     onCloseQuestionTypeMenu = _ref.onCloseQuestionTypeMenu,
-    formikProps = _objectWithoutPropertiesLoose(_ref, _excluded$k);
+    formikProps = _objectWithoutPropertiesLoose(_ref, _excluded$l);
   var errors = formikProps.errors;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
@@ -37836,7 +37885,7 @@ var TextbookContentsTab = function TextbookContentsTab(props) {
   }));
 };
 
-var _excluded$l = ["value"];
+var _excluded$m = ["value"];
 var VisuallyHiddenInput = material.styled("input")({
   clip: "rect(0 0 0 0)",
   clipPath: "inset(50%)",
@@ -38004,7 +38053,7 @@ var TextbookInfoTab = function TextbookInfoTab(_ref) {
     render: function render(_ref4) {
       var _ref4$field = _ref4.field,
         value = _ref4$field.value,
-        action = _objectWithoutPropertiesLoose(_ref4$field, _excluded$l);
+        action = _objectWithoutPropertiesLoose(_ref4$field, _excluded$m);
       return React__default.createElement(xDatePickers.LocalizationProvider, {
         dateAdapter: AdapterMoment.AdapterMoment
       }, React__default.createElement(xDatePickers.DatePicker, Object.assign({}, action, {
@@ -38478,7 +38527,7 @@ var TextbookOwnersTab = function TextbookOwnersTab(_ref) {
   }));
 };
 
-var _excluded$m = ["isCreatedByAdmin", "isSuperAdminUser", "isSuperAdmin", "isAdmin", "textbookId", "selected", "coverImage", "disabled", "ownersDisabled", "onChangeTab", "onUploadImage"];
+var _excluded$n = ["isCreatedByAdmin", "isSuperAdminUser", "isSuperAdmin", "isAdmin", "textbookId", "selected", "coverImage", "disabled", "ownersDisabled", "onChangeTab", "onUploadImage"];
 var PreparedTextbookForm = function PreparedTextbookForm(_ref) {
   var isCreatedByAdmin = _ref.isCreatedByAdmin,
     isSuperAdminUser = _ref.isSuperAdminUser,
@@ -38491,7 +38540,7 @@ var PreparedTextbookForm = function PreparedTextbookForm(_ref) {
     ownersDisabled = _ref.ownersDisabled,
     onChangeTab = _ref.onChangeTab,
     onUploadImage = _ref.onUploadImage,
-    formikProps = _objectWithoutPropertiesLoose(_ref, _excluded$m);
+    formikProps = _objectWithoutPropertiesLoose(_ref, _excluded$n);
   var values = formikProps.values,
     errors = formikProps.errors,
     dirty = formikProps.dirty,
@@ -39598,7 +39647,7 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
   var handleGoToMainPage = function handleGoToMainPage() {
     if (!user) return;
     var isAcademy = user.academyDomain || user.isLearningSpace;
-    var mainUrl = !isAcademy ? homeAcademyUrl : homeUrl;
+    var mainUrl = isAcademy ? homeAcademyUrl : homeUrl;
     pushTo(history, mainUrl);
   };
   var handleImageError = function handleImageError() {