touchstudy-core 0.1.149 → 0.1.150

package/dist/index.js

@@ -21,7 +21,7 @@ var Select = require('react-select');
 var Select__default = _interopDefault(Select);
 var CreatableSelect = _interopDefault(require('react-select/creatable'));
 var axios = _interopDefault(require('axios'));
-var _$6 = _interopDefault(require('lodash'));
+var _$8 = _interopDefault(require('lodash'));
 var reactGoogleLogin = require('@leecheuk/react-google-login');
 require('moment/locale/ko.js');
 require('moment/locale/en-au.js');
@@ -1473,6 +1473,7 @@ var order_matters = "순서 상관 있음";
 var order_does_not_matter = "순서 상관 없음";
 var synonym_processing = "답 이음동의어 처리";
 var compare_type = "비교 유형";
+var answer_cannot_be_empty = "답변은 비워둘 수 없습니다";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -2583,7 +2584,8 @@ var lang_ko = {
 	order_matters: order_matters,
 	order_does_not_matter: order_does_not_matter,
 	synonym_processing: synonym_processing,
-	compare_type: compare_type
+	compare_type: compare_type,
+	answer_cannot_be_empty: answer_cannot_be_empty
 };
 
 var problem_solving$1 = "Problem Solving";
@@ -3717,6 +3719,7 @@ var order_matters$1 = "Order matters";
 var order_does_not_matter$1 = "Order doesn't matter";
 var synonym_processing$1 = "Answer Synonym processing";
 var compare_type$1 = "Compare Type";
+var answer_cannot_be_empty$1 = "Answer cannot be empty";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -4829,7 +4832,8 @@ var lang_en = {
 	order_matters: order_matters$1,
 	order_does_not_matter: order_does_not_matter$1,
 	synonym_processing: synonym_processing$1,
-	compare_type: compare_type$1
+	compare_type: compare_type$1,
+	answer_cannot_be_empty: answer_cannot_be_empty$1
 };
 
 i18n__default.use(reactI18next.initReactI18next).init({
@@ -6426,7 +6430,7 @@ var getLocalDayOfWeek = function getLocalDayOfWeek(utcDateTime, dayOfWeek) {
   return moment.utc(utcDateTime).add(diff, "days").local().weekday();
 };
 var getUtcDayOfWeek = function getUtcDayOfWeek(localDateTime, dayOfWeek) {
-  var currentDayOfWeek = _$6.cloneDeep(localDateTime).local().weekday();
+  var currentDayOfWeek = _$8.cloneDeep(localDateTime).local().weekday();
   var diff = dayOfWeek - currentDayOfWeek;
   if (diff < 0) diff += 7;
   return localDateTime.add(diff, "days").utc().weekday();
@@ -6927,7 +6931,7 @@ var useList = function useList(fetchData, defaultQuery) {
     var _paging$page, _paging$limit;
     return (((_paging$page = paging.page) != null ? _paging$page : 0) - 1) * ((_paging$limit = paging.limit) != null ? _paging$limit : 0) + index + 1;
   };
-  var debounceSearch = _$6.debounce(function () {
+  var debounceSearch = _$8.debounce(function () {
     var _textSearchRef$curren;
     setFilter(_extends({}, filter, {
       currentPage: 1,
@@ -12764,7 +12768,7 @@ var ClassForm = function ClassForm(_ref) {
   };
   var handleDeleteWeeklyDays = function handleDeleteWeeklyDays(currentValue) {
     if (formikProp.values.courseWeeklyDays.length <= 1) return;
-    var courseWeeklyDays = _$6.cloneDeep(formikProp.values.courseWeeklyDays);
+    var courseWeeklyDays = _$8.cloneDeep(formikProp.values.courseWeeklyDays);
     var newValues = courseWeeklyDays.filter(function (i) {
       var _i$startTime, _currentValue$startTi, _i$endTime, _currentValue$endTime;
       return i.dayOfWeek !== currentValue.dayOfWeek || ((_i$startTime = i.startTime) === null || _i$startTime === void 0 ? void 0 : _i$startTime.format("HH:mm:ss")) !== ((_currentValue$startTi = currentValue.startTime) === null || _currentValue$startTi === void 0 ? void 0 : _currentValue$startTi.format("HH:mm:ss")) || ((_i$endTime = i.endTime) === null || _i$endTime === void 0 ? void 0 : _i$endTime.format("HH:mm:ss")) !== ((_currentValue$endTime = currentValue.endTime) === null || _currentValue$endTime === void 0 ? void 0 : _currentValue$endTime.format("HH:mm:ss"));
@@ -12800,7 +12804,7 @@ var ClassForm = function ClassForm(_ref) {
   var handleChangeWeeklyDayTime = function handleChangeWeeklyDayTime(key, newValue, currentValue) {
     var _extends2;
     var time = newValue === null || newValue === void 0 ? void 0 : newValue.local();
-    var courseWeeklyDays = _$6.cloneDeep(formikProp.values.courseWeeklyDays);
+    var courseWeeklyDays = _$8.cloneDeep(formikProp.values.courseWeeklyDays);
     var currentIndex = courseWeeklyDays.findIndex(function (i) {
       var _i$startTime2, _currentValue$startTi2, _i$endTime2, _currentValue$endTime2;
       return i.dayOfWeek === currentValue.dayOfWeek && ((_i$startTime2 = i.startTime) === null || _i$startTime2 === void 0 ? void 0 : _i$startTime2.format("HH:mm:ss")) === ((_currentValue$startTi2 = currentValue.startTime) === null || _currentValue$startTi2 === void 0 ? void 0 : _currentValue$startTi2.format("HH:mm:ss")) && ((_i$endTime2 = i.endTime) === null || _i$endTime2 === void 0 ? void 0 : _i$endTime2.format("HH:mm:ss")) === ((_currentValue$endTime2 = currentValue.endTime) === null || _currentValue$endTime2 === void 0 ? void 0 : _currentValue$endTime2.format("HH:mm:ss"));
@@ -12835,11 +12839,11 @@ var ClassForm = function ClassForm(_ref) {
   }, [JSON.stringify(data)]);
   var minDate = React.useMemo(function () {
     if (!formikProp.values.startDate) return undefined;
-    return _$6.cloneDeep(formikProp.values.startDate).add(1, "days");
+    return _$8.cloneDeep(formikProp.values.startDate).add(1, "days");
   }, [formikProp.values.startDate]);
   var maxDate = React.useMemo(function () {
     if (!formikProp.values.endDate) return undefined;
-    return _$6.cloneDeep(formikProp.values.endDate).add(1, "days");
+    return _$8.cloneDeep(formikProp.values.endDate).add(1, "days");
   }, [formikProp.values.endDate]);
   var WeeklyDayErrors = formikProp.touched.courseWeeklyDays && formikProp.errors.courseWeeklyDays && React__default.createElement("div", {
     className: "mt-1"
@@ -12856,7 +12860,7 @@ var ClassForm = function ClassForm(_ref) {
     });
   }, [JSON.stringify(formikProp.values.courseWeeklyDays)]);
   var courseWeeklyDays = React.useMemo(function () {
-    return _$6.sortBy(formikProp.values.courseWeeklyDays, ["dayOfWeek"]);
+    return _$8.sortBy(formikProp.values.courseWeeklyDays, ["dayOfWeek"]);
   }, [JSON.stringify(formikProp.values.courseWeeklyDays)]);
   return React__default.createElement("div", {
     className: "d-flex flex-column"
@@ -13007,7 +13011,7 @@ var ClassForm = function ClassForm(_ref) {
       value: v.startTime,
       format: "HH:mm",
       open: open === index + "-startTime",
-      maxTime: v.endTime ? _$6.cloneDeep(v.endTime).add(-1, "minutes") : undefined,
+      maxTime: v.endTime ? _$8.cloneDeep(v.endTime).add(-1, "minutes") : undefined,
       onAccept: function onAccept(newValue) {
         return handleChangeWeeklyDayTime("startTime", newValue, v);
       },
@@ -13037,7 +13041,7 @@ var ClassForm = function ClassForm(_ref) {
       components: ["TimePicker"]
     }, React__default.createElement(xDatePickers.TimePicker, {
       value: v.endTime,
-      minTime: v.startTime ? (_$cloneDeep = _$6.cloneDeep(v.startTime)) === null || _$cloneDeep === void 0 ? void 0 : _$cloneDeep.add(1, "minutes") : undefined,
+      minTime: v.startTime ? (_$cloneDeep = _$8.cloneDeep(v.startTime)) === null || _$cloneDeep === void 0 ? void 0 : _$cloneDeep.add(1, "minutes") : undefined,
       format: "HH:mm",
       open: open === index + "-endTime",
       onAccept: function onAccept(newValue) {
@@ -13170,7 +13174,7 @@ var useStudentInfoDrawer = function useStudentInfoDrawer(props) {
       return _extends({}, state, (_extends2 = {}, _extends2[newValue] = true, _extends2));
     });
   };
-  var debounceChangeTab = _$6.debounce(handleChangeTab, 300);
+  var debounceChangeTab = _$8.debounce(handleChangeTab, 300);
   React.useEffect(function () {
     var getStudent = function getStudent() {
       try {
@@ -14729,7 +14733,7 @@ var useNotes = function useNotes(setFilter, filter) {
           var items = (data === null || data === void 0 ? void 0 : data.items) || [];
           var newNotes = items;
           if (filter !== null && filter !== void 0 && filter.currentPage && (filter === null || filter === void 0 ? void 0 : filter.currentPage) > 1) {
-            newNotes = [].concat(_$6.uniqBy([].concat(notes, items), "id"));
+            newNotes = [].concat(_$8.uniqBy([].concat(notes, items), "id"));
           }
           setNotes(newNotes);
         });
@@ -14752,7 +14756,7 @@ var useNotes = function useNotes(setFilter, filter) {
     });
   }, [filter === null || filter === void 0 ? void 0 : filter.currentPage, totalPages]);
   var handleNoteAdded = function handleNoteAdded(note) {
-    var newNotes = [].concat(_$6.uniqBy([note].concat(notes), "id"));
+    var newNotes = [].concat(_$8.uniqBy([note].concat(notes), "id"));
     setNotes(newNotes);
   };
   var handleNoteUpdated = function handleNoteUpdated(note) {
@@ -15137,7 +15141,7 @@ var useVirtualList = function useVirtualList(studentId, defaultFilter, getItemsA
           var responseItems = (responseData === null || responseData === void 0 ? void 0 : responseData.items) || [];
           var results = responseItems;
           if (filter !== null && filter !== void 0 && filter.currentPage && filter.currentPage > 1) {
-            results = [].concat(_$6.uniqBy([].concat(items, responseItems), "id"));
+            results = [].concat(_$8.uniqBy([].concat(items, responseItems), "id"));
           }
           setItems(results);
         });
@@ -15160,7 +15164,7 @@ var useVirtualList = function useVirtualList(studentId, defaultFilter, getItemsA
     });
   }, [filter === null || filter === void 0 ? void 0 : filter.currentPage, totalPages]);
   var handleItemAdded = function handleItemAdded(item) {
-    var results = [].concat(_$6.uniqBy([item].concat(items), "id"));
+    var results = [].concat(_$8.uniqBy([item].concat(items), "id"));
     setItems(results);
   };
   var handleItemUpdated = function handleItemUpdated(item) {
@@ -19859,7 +19863,7 @@ var useExamResultData = function useExamResultData(props) {
           topAnswerOrder: i.topAnswerOrder == null ? 0 : i.topAnswerOrder
         });
       });
-      var sortedMySeriesQuestionData = _$6.sortBy(questionsData.filter(function (i) {
+      var sortedMySeriesQuestionData = _$8.sortBy(questionsData.filter(function (i) {
         return i.answerOrder !== 0;
       }), ["answerOrder", "questionOrder"]);
       var mySeriesData = [null].concat(sortedMySeriesQuestionData.map(function (item) {
@@ -19869,7 +19873,7 @@ var useExamResultData = function useExamResultData(props) {
       }).map(function () {
         return null;
       }), [null]);
-      var sortedTopSeriesQuestionData = _$6.sortBy(questionsData.filter(function (i) {
+      var sortedTopSeriesQuestionData = _$8.sortBy(questionsData.filter(function (i) {
         return i.topAnswerOrder !== 0;
       }), ["topAnswerOrder", "questionOrder"]);
       var topSeriesData = [null].concat(sortedTopSeriesQuestionData.map(function (item) {
@@ -21838,7 +21842,7 @@ var usePreparedExam = function usePreparedExam(_ref) {
       return Promise.reject(e);
     }
   };
-  var debounceSearch = _$6.debounce(function () {
+  var debounceSearch = _$8.debounce(function () {
     setTextbookFilter(_extends({}, textbookFilter, {
       currentPage: 1
     }));
@@ -23595,7 +23599,7 @@ var PreparedItem = function PreparedItem(_ref) {
     });
     return React__default.createElement(formik.Form, {
       style: {
-        height: !_$6.isEmpty(values) && !textbookList.length ? "100%" : "unset"
+        height: !_$8.isEmpty(values) && !textbookList.length ? "100%" : "unset"
       }
     }, React__default.createElement(material.Stack, null, React__default.createElement(material.Accordion, {
       sx: {
@@ -24001,7 +24005,7 @@ var PreparedItem = function PreparedItem(_ref) {
       open: openConfirmDialog,
       onClose: handleCloseConfirmDialog,
       onSubmit: handleResetFilter
-    }), !_$6.isEmpty(values) && !textbookList.length && React__default.createElement(material.Stack, {
+    }), !_$8.isEmpty(values) && !textbookList.length && React__default.createElement(material.Stack, {
       height: 1,
       justifyContent: "center",
       alignItems: "center"
@@ -25371,7 +25375,7 @@ var useStudentClassList = function useStudentClassList(courseId) {
       currentPage: 1
     }));
   };
-  var debounceSearch = _$6.debounce(function () {
+  var debounceSearch = _$8.debounce(function () {
     setFilter(_extends({}, filter, {
       currentPage: 1
     }));
@@ -25507,7 +25511,7 @@ var useTeacherClassList = function useTeacherClassList(courseId) {
       currentPage: 1
     }));
   };
-  var debounceSearch = _$6.debounce(function () {
+  var debounceSearch = _$8.debounce(function () {
     setFilter(_extends({}, filter, {
       currentPage: 1
     }));
@@ -25820,7 +25824,7 @@ var useClassDetail = function useClassDetail(_ref) {
     });
   }, [JSON.stringify(course)]);
   var convertToRequestBody = function convertToRequestBody(request) {
-    var localStartDate = _$6.cloneDeep(request.startDate);
+    var localStartDate = _$8.cloneDeep(request.startDate);
     return _extends({}, request, {
       startDate: request.startDate.utc().format(DATE_TIME_FORMAT),
       endDate: request.endDate.utc().format(DATE_TIME_FORMAT),
@@ -26069,13 +26073,13 @@ var useClassDetail = function useClassDetail(_ref) {
     });
     if (event.target.checked) {
       setSelected(function (prev) {
-        return _$6.uniq([].concat(prev, newSelected));
+        return _$8.uniq([].concat(prev, newSelected));
       });
       return;
     }
-    setSelected(_$6.difference(selected, newSelected));
+    setSelected(_$8.difference(selected, newSelected));
   };
-  var debounceSearch = _$6.debounce(function () {
+  var debounceSearch = _$8.debounce(function () {
     setFilter(_extends({}, filter, {
       currentPage: 1
     }));
@@ -26093,7 +26097,7 @@ var useClassDetail = function useClassDetail(_ref) {
     }) : userList.map(function (n) {
       return n.teacherId;
     });
-    var checkLength = _$6.intersection(selected, newSelected).length;
+    var checkLength = _$8.intersection(selected, newSelected).length;
     return checkLength === userLength;
   };
   var handleClear = function handleClear() {
@@ -26128,7 +26132,7 @@ var useClassDetail = function useClassDetail(_ref) {
     }));
     setSelected([]);
   };
-  var debounceSort = _$6.debounce(handleSort, 300);
+  var debounceSort = _$8.debounce(handleSort, 300);
   var handleChangePage = function handleChangePage(_, page) {
     setFilter(_extends({}, filter, {
       currentPage: page
@@ -26212,8 +26216,8 @@ var LessonFormBody = function LessonFormBody(_ref) {
   React.useEffect(function () {
     if (open && data) formikProp.setValues(data);else formikProp.setValues(DEFAULT_LESSON_REQUEST);
   }, [open, JSON.stringify(data)]);
-  var maxTime = formikProp.values.endTime ? _$6.cloneDeep(formikProp.values.endTime).add(-1, "minutes") : undefined;
-  var minTime = formikProp.values.startTime ? _$6.cloneDeep(formikProp.values.startTime).add(1, "minutes") : undefined;
+  var maxTime = formikProp.values.endTime ? _$8.cloneDeep(formikProp.values.endTime).add(-1, "minutes") : undefined;
+  var minTime = formikProp.values.startTime ? _$8.cloneDeep(formikProp.values.startTime).add(1, "minutes") : undefined;
   return React__default.createElement(React.Fragment, null, React__default.createElement(material.DialogContent, {
     sx: {
       overflowY: "unset"
@@ -26780,7 +26784,7 @@ var useClassList = function useClassList(history, classCreateUrl, classUpdateUrl
       currentPage: 1
     }));
   };
-  var debounceSearch = _$6.debounce(function () {
+  var debounceSearch = _$8.debounce(function () {
     setClassFilter(_extends({}, classFilter, {
       currentPage: 1
     }));
@@ -27904,7 +27908,7 @@ var useUserList = function useUserList(role) {
       currentPage: 1
     }));
   };
-  var debounceSort = _$6.debounce(handleSort, 300);
+  var debounceSort = _$8.debounce(handleSort, 300);
   var getUserById = function getUserById(id) {
     try {
       var _temp8 = function _temp8() {
@@ -28062,7 +28066,7 @@ var useUserList = function useUserList(role) {
       return Promise.reject(e);
     }
   };
-  var debounceSearch = _$6.debounce(function () {
+  var debounceSearch = _$8.debounce(function () {
     setFilter(_extends({}, filter, {
       currentPage: 1
     }));
@@ -29375,8 +29379,8 @@ var useExamDetailView = function useExamDetailView(props) {
   var handleAddArticle = function handleAddArticle() {
     var _$maxBy, _$maxBy2;
     if (!exam) return;
-    var maxArticle = ((_$maxBy = _$6.maxBy(exam.questions, "article")) === null || _$maxBy === void 0 ? void 0 : _$maxBy.article) || 0;
-    var maxOrder = ((_$maxBy2 = _$6.maxBy(exam.questions, "questionOrder")) === null || _$maxBy2 === void 0 ? void 0 : _$maxBy2.questionOrder) || 0;
+    var maxArticle = ((_$maxBy = _$8.maxBy(exam.questions, "article")) === null || _$maxBy === void 0 ? void 0 : _$maxBy.article) || 0;
+    var maxOrder = ((_$maxBy2 = _$8.maxBy(exam.questions, "questionOrder")) === null || _$maxBy2 === void 0 ? void 0 : _$maxBy2.questionOrder) || 0;
     onChangeExam(_extends({}, exam, {
       questions: [].concat(exam.questions, [{
         questionAnswerType: exports.QuestionAnswerType.SingleChoice,
@@ -29424,7 +29428,7 @@ var useExamDetailView = function useExamDetailView(props) {
   var examGroupByArticle = React.useMemo(function () {
     if (!exam) return [];
     var articles = [];
-    var groupedArticle = _$6.groupBy(exam.questions, "article");
+    var groupedArticle = _$8.groupBy(exam.questions, "article");
     for (var key in groupedArticle) {
       if (Object.prototype.hasOwnProperty.call(groupedArticle, key)) {
         var _questions$find, _$maxBy3;
@@ -29434,13 +29438,13 @@ var useExamDetailView = function useExamDetailView(props) {
           categoryId: (_questions$find = questions.find(function (i) {
             return !!i.categoryId;
           })) === null || _questions$find === void 0 ? void 0 : _questions$find.categoryId,
-          answerCount: ((_$maxBy3 = _$6.maxBy(questions, "numberOfAnswers")) === null || _$maxBy3 === void 0 ? void 0 : _$maxBy3.numberOfAnswers) || DEFAULT_ANSWER_COUNT,
+          answerCount: ((_$maxBy3 = _$8.maxBy(questions, "numberOfAnswers")) === null || _$maxBy3 === void 0 ? void 0 : _$maxBy3.numberOfAnswers) || DEFAULT_ANSWER_COUNT,
           questionCount: questions.length,
           questions: questions
         });
       }
     }
-    return _$6.sortBy(articles, "article");
+    return _$8.sortBy(articles, "article");
   }, [JSON.stringify(exam)]);
   var durationOptions = React.useMemo(function () {
     var options = DURATION_OPTIONS.map(function (i) {
@@ -31861,11 +31865,11 @@ var useTextbookShare = function useTextbookShare(props) {
     });
     if (event.target.checked) {
       setSelectedShare(function (prev) {
-        return _$6.uniq([].concat(prev, newSelected));
+        return _$8.uniq([].concat(prev, newSelected));
       });
       return;
     }
-    setSelectedShare(_$6.difference(selectedShare, newSelected));
+    setSelectedShare(_$8.difference(selectedShare, newSelected));
   };
   var isCheckAllShare = function isCheckAllShare(userLength) {
     var newSelected = isUpdate ? shared.map(function (n) {
@@ -31873,7 +31877,7 @@ var useTextbookShare = function useTextbookShare(props) {
     }) : notShared.map(function (n) {
       return n.id;
     });
-    var checkLength = _$6.intersection(selectedShare, newSelected).length;
+    var checkLength = _$8.intersection(selectedShare, newSelected).length;
     return checkLength === userLength;
   };
   var handleClickCheckboxShare = function handleClickCheckboxShare(id) {
@@ -32132,7 +32136,7 @@ var TextbookList = function TextbookList(props) {
     handleUpdateSharedTextbook = _useTextbookShare.handleUpdateSharedTextbook,
     currentModel = _useTextbookShare.currentModel;
   var textbookHeaders = React.useMemo(function () {
-    var headers = _$6.clone(TEXTBOOK_HEADERS);
+    var headers = _$8.clone(TEXTBOOK_HEADERS);
     if (isTeacher && isTeacherSite) headers.splice(5, 0, {
       title: "teacher_personal_textbook"
     });
@@ -32727,7 +32731,7 @@ var useNotificationList = function useNotificationList(_ref) {
       currentPage: 1
     }));
   };
-  var debounceSearch = _$6.debounce(function () {
+  var debounceSearch = _$8.debounce(function () {
     setNotificationFilter(_extends({}, notificationFilter, {
       currentPage: 1
     }));
@@ -33290,7 +33294,7 @@ var preparedTextbookSchema = function preparedTextbookSchema(t) {
         return !isTextType(answerType);
       },
       then: function then(schema) {
-        return schema.min(2, t("question_answer_required"));
+        return schema.min(1, t("answer_cannot_be_empty"));
       },
       otherwise: function otherwise(schema) {
         return schema.notRequired();
@@ -33299,12 +33303,12 @@ var preparedTextbookSchema = function preparedTextbookSchema(t) {
     score: yup.number().required(),
     questionOrder: yup.number().required(),
     questionTypeId: yup.number().notRequired(),
-    correctTextualAnswers: yup.array().of(yup.string().trim().required(t("short_string_answer_cannot_be_empty"))).when("questionAnswerType", {
+    correctTextualAnswers: yup.array().when("questionAnswerType", {
       is: function is(answerType) {
         return isTextType(answerType);
       },
       then: function then(schema) {
-        return schema.min(1, t("question_answer_required"));
+        return schema.of(yup.string().trim().required(t("answer_cannot_be_empty"))).min(1, t("answer_cannot_be_empty"));
       },
       otherwise: function otherwise(schema) {
         return schema.notRequired();
@@ -33314,7 +33318,7 @@ var preparedTextbookSchema = function preparedTextbookSchema(t) {
         return isTextType(answerType) && answerType !== exports.QuestionAnswerType.ShortAnswer;
       },
       then: function then(schema) {
-        return schema.min(2, t("question_answer_required"));
+        return schema.of(yup.string().trim().required(t("answer_cannot_be_empty"))).min(2, t("answer_cannot_be_empty"));
       }
     })
   });
@@ -33454,7 +33458,7 @@ var CustomTextbookTab = function CustomTextbookTab(props) {
 };
 
 var _reduceToMathArticles = function reduceToMathArticles(textbook, isMath) {
-  var values = isMath !== undefined ? _$6.cloneDeep(textbook) : textbook;
+  var values = isMath !== undefined ? _$8.cloneDeep(textbook) : textbook;
   if (isMath !== undefined) values.type = isMath;
   for (var key in values) {
     if (values.hasOwnProperty(key)) {
@@ -33469,7 +33473,7 @@ var _reduceToMathArticles = function reduceToMathArticles(textbook, isMath) {
   return values;
 };
 var _resetAllCategoriesAndQuestionTypesBySubject = function resetAllCategoriesAndQuestionTypesBySubject(textbook, subject) {
-  var values = subject ? _$6.cloneDeep(textbook) : textbook;
+  var values = subject ? _$8.cloneDeep(textbook) : textbook;
   if (subject) {
     values.subjectId = subject === null || subject === void 0 ? void 0 : subject.value;
     values.subject = subject;
@@ -33632,7 +33636,7 @@ var isSequentialQuestionGroups = function isSequentialQuestionGroups(questionGro
   return true;
 };
 
-var _ = _$6;
+var _ = _$8;
 var ArticleBlock = function ArticleBlock(_ref) {
   var errors = _ref.errors,
     expandedIndex = _ref.expandedIndex,
@@ -33977,13 +33981,18 @@ var QuestionOrderName = function QuestionOrderName(_ref) {
   }));
 };
 
+var _$1 = _$8;
 var QuestionShortInput = function QuestionShortInput(_ref) {
   var name = _ref.name,
     deletable = _ref.deletable,
+    errors = _ref.errors,
     onDelete = _ref.onDelete;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  return React__default.createElement(formik.Field, {
+  var error = _$1.get(errors, name);
+  return React__default.createElement(material.Stack, {
+    direction: "column"
+  }, React__default.createElement(formik.Field, {
     name: name,
     render: function render(_ref2) {
       var field = _ref2.field;
@@ -34000,7 +34009,8 @@ var QuestionShortInput = function QuestionShortInput(_ref) {
           "& input": {
             paddingRight: deletable ? "40px" : undefined
           }
-        }
+        },
+        error: !!error
       })), deletable && React__default.createElement(material.Stack, {
         justifyContent: "center",
         alignItems: "center",
@@ -34022,14 +34032,23 @@ var QuestionShortInput = function QuestionShortInput(_ref) {
         size: 12
       })))));
     }
-  });
+  }), !!error && React__default.createElement(material.Typography, {
+    fontWeight: 500,
+    fontSize: "10px",
+    lineHeight: "11.93px",
+    mt: 1,
+    color: !error ? "#97A1AF" : "#F34B4B"
+  }, error));
 };
 var isEqual$1 = function isEqual(prev, next) {
-  return prev.value === next.value && prev.name == next.name && prev.deletable == next.deletable;
+  var prevError = _$1.get(prev.errors, prev.name);
+  var nextError = _$1.get(next.errors, next.name);
+  return JSON.stringify(prevError) === JSON.stringify(nextError) && prev.value === next.value && prev.name == next.name && prev.deletable == next.deletable;
 };
 var QuestionShortInput$1 = React.memo(QuestionShortInput, isEqual$1);
 
 var _excluded$h = ["onChange"];
+var _$2 = _$8;
 var BpIcon$1 = material.styled("span")(function (_ref) {
   var theme = _ref.theme;
   return {
@@ -34060,6 +34079,7 @@ var BpCheckedIcon$1 = material.styled(BpIcon$1)({
   }
 });
 var QuestionBlock = function QuestionBlock(_ref2) {
+  var _data$correctTextualA4;
   var answerCount = _ref2.answerCount,
     isMath = _ref2.isMath,
     disabled = _ref2.disabled,
@@ -34069,6 +34089,7 @@ var QuestionBlock = function QuestionBlock(_ref2) {
     isLoadingQuestionTypes = _ref2.isLoadingQuestionTypes,
     optionKey = _ref2.optionKey,
     questionTypes = _ref2.questionTypes,
+    errors = _ref2.errors,
     setFieldValue = _ref2.setFieldValue,
     onCloseQuestionTypeMenu = _ref2.onCloseQuestionTypeMenu,
     onOpenQuestionTypeMenu = _ref2.onOpenQuestionTypeMenu;
@@ -34077,7 +34098,8 @@ var QuestionBlock = function QuestionBlock(_ref2) {
   var theme = material.useTheme();
   var isTabletUp = material.useMediaQuery(theme.breakpoints.up("lg"));
   var handleCheckMultiChoice = function handleCheckMultiChoice(choice) {
-    var updatedAnswers = data.correctAnswers;
+    var _data$correctAnswers;
+    var updatedAnswers = (_data$correctAnswers = data.correctAnswers) != null ? _data$correctAnswers : [];
     if (updatedAnswers.includes(choice)) {
       updatedAnswers = updatedAnswers.filter(function (item) {
         return item !== choice;
@@ -34088,36 +34110,41 @@ var QuestionBlock = function QuestionBlock(_ref2) {
     setFieldValue(path + ".correctAnswers", updatedAnswers);
   };
   var handleAddTextualAnswer = function handleAddTextualAnswer() {
-    data.correctTextualAnswers.length === 1 && setFieldValue(path + ".questionAnswerType", exports.QuestionAnswerType.OrderMatters);
-    setFieldValue(path + ".correctTextualAnswers", [].concat(data.correctTextualAnswers, [""]));
+    var _data$correctTextualA, _data$correctTextualA2;
+    ((_data$correctTextualA = data.correctTextualAnswers) === null || _data$correctTextualA === void 0 ? void 0 : _data$correctTextualA.length) === 1 && setFieldValue(path + ".questionAnswerType", exports.QuestionAnswerType.OrderMatters);
+    setFieldValue(path + ".correctTextualAnswers", [].concat((_data$correctTextualA2 = data.correctTextualAnswers) != null ? _data$correctTextualA2 : [], [""]));
   };
   var handleRemoveTextualAnswer = function handleRemoveTextualAnswer(remove, index) {
-    data.correctTextualAnswers.length === 2 && setFieldValue(path + ".questionAnswerType", exports.QuestionAnswerType.ShortAnswer);
+    var _data$correctTextualA3;
+    ((_data$correctTextualA3 = data.correctTextualAnswers) === null || _data$correctTextualA3 === void 0 ? void 0 : _data$correctTextualA3.length) === 2 && setFieldValue(path + ".questionAnswerType", exports.QuestionAnswerType.ShortAnswer);
     remove(index);
   };
   var handleChangeQuestionAnswerType = function handleChangeQuestionAnswerType(value) {
     switch (value === null || value === void 0 ? void 0 : value.value) {
       case exports.QuestionAnswerType.SingleChoice:
       case exports.QuestionAnswerType.MultipleChoice:
-        setFieldValue(path + ".correctTextualAnswers", []);
+        setFieldValue(path + ".correctTextualAnswers", null);
+        if (!data.correctAnswers || data.correctAnswers.length === 0) setFieldValue(path + ".correctAnswers", [1]);
         break;
       default:
-        if (data.correctTextualAnswers.length === 0) setFieldValue(path + ".correctTextualAnswers", [""]);
+        if (!data.correctTextualAnswers || data.correctTextualAnswers.length === 0) setFieldValue(path + ".correctTextualAnswers", [""]);
+        setFieldValue(path + ".correctAnswers", null);
         break;
     }
-    setFieldValue(path + ".questionAnswerType", (value === null || value === void 0 ? void 0 : value.value) || 0);
+    setFieldValue(path + ".questionAnswerType", (value === null || value === void 0 ? void 0 : value.value) || exports.QuestionAnswerType.SingleChoice);
   };
   var handleChangeCompareType = function handleChangeCompareType(_, value) {
-    setFieldValue(path + ".questionAnswerType", Number(value) || 0);
+    setFieldValue(path + ".questionAnswerType", Number(value) || exports.QuestionAnswerType.OrderMatters);
   };
   var handleOpenQuestionTypeMenu = function handleOpenQuestionTypeMenu() {
     onOpenQuestionTypeMenu(path + ".questionTypeId");
   };
-  var isIncomplatedTextualAnswers = data.correctTextualAnswers.some(function (i) {
-    return !i.trim();
-  });
   var isTextAnswerType = isTextType(data.questionAnswerType);
+  var isIncomplatedTextualAnswers = isTextAnswerType && ((_data$correctTextualA4 = data.correctTextualAnswers) === null || _data$correctTextualA4 === void 0 ? void 0 : _data$correctTextualA4.some(function (i) {
+    return !i.trim();
+  }));
   var renderAnswer = function renderAnswer() {
+    var _data$correctAnswers3;
     switch (data.questionAnswerType) {
       case exports.QuestionAnswerType.ShortAnswer:
       case exports.QuestionAnswerType.SynonymProcessing:
@@ -34126,6 +34153,7 @@ var QuestionBlock = function QuestionBlock(_ref2) {
         return React__default.createElement(formik.FieldArray, {
           name: path + ".correctTextualAnswers"
         }, function (_ref3) {
+          var _data$correctTextualA5;
           var remove = _ref3.remove;
           return React__default.createElement(material.Stack, {
             sx: {
@@ -34139,18 +34167,19 @@ var QuestionBlock = function QuestionBlock(_ref2) {
             gap: "12px",
             flexWrap: "wrap"
           }, React__default.createElement(ListView, {
-            data: data.correctTextualAnswers,
+            data: (_data$correctTextualA5 = data.correctTextualAnswers) != null ? _data$correctTextualA5 : [],
             render: function render(_, index) {
               return React__default.createElement(material.Box, {
                 key: index,
                 minWidth: "200px"
               }, React__default.createElement(QuestionShortInput$1, {
+                errors: errors,
                 value: data.correctTextualAnswers[index],
                 name: path + ".correctTextualAnswers[" + index + "]",
                 onDelete: function onDelete() {
                   return handleRemoveTextualAnswer(remove, index);
                 },
-                deletable: data.correctTextualAnswers.length > 1
+                deletable: data.correctTextualAnswers && data.correctTextualAnswers.length > 1
               }));
             }
           })));
@@ -34165,6 +34194,7 @@ var QuestionBlock = function QuestionBlock(_ref2) {
         }, function (_, i) {
           return i + 1;
         }).map(function (i) {
+          var _data$correctAnswers2;
           return React__default.createElement(material.FormControlLabel, {
             key: i,
             className: styles$a["question-label"] + " w-fit",
@@ -34172,7 +34202,7 @@ var QuestionBlock = function QuestionBlock(_ref2) {
             value: i,
             disabled: disabled,
             control: React__default.createElement(material.Checkbox, {
-              checked: data.correctAnswers.includes(i),
+              checked: (_data$correctAnswers2 = data.correctAnswers) === null || _data$correctAnswers2 === void 0 ? void 0 : _data$correctAnswers2.includes(i),
               onChange: function onChange(e) {
                 return handleCheckMultiChoice(+e.target.value);
               }
@@ -34190,7 +34220,7 @@ var QuestionBlock = function QuestionBlock(_ref2) {
         }, React__default.createElement(material.FormControl, {
           className: "flex-grow-1 w-100"
         }, React__default.createElement(material.RadioGroup, {
-          value: data.correctAnswers[0],
+          value: (_data$correctAnswers3 = data.correctAnswers) === null || _data$correctAnswers3 === void 0 ? void 0 : _data$correctAnswers3[0],
           name: "answers",
           className: "flex-row w-100"
         }, Array.from({
@@ -34198,6 +34228,7 @@ var QuestionBlock = function QuestionBlock(_ref2) {
         }, function (_, i) {
           return i + 1;
         }).map(function (i) {
+          var _data$correctAnswers4;
           return React__default.createElement(material.FormControlLabel, {
             key: i,
             className: styles$a["question-label"] + " w-fit",
@@ -34209,7 +34240,7 @@ var QuestionBlock = function QuestionBlock(_ref2) {
             disabled: disabled,
             control: React__default.createElement(material.Radio, {
               size: "small",
-              checked: +i === data.correctAnswers[0],
+              checked: +i === ((_data$correctAnswers4 = data.correctAnswers) === null || _data$correctAnswers4 === void 0 ? void 0 : _data$correctAnswers4[0]),
               checkedIcon: React__default.createElement(BpCheckedIcon$1, null),
               icon: React__default.createElement(BpIcon$1, null)
             }),
@@ -34257,7 +34288,7 @@ var QuestionBlock = function QuestionBlock(_ref2) {
     questionTitleStyle: questionTitleStyle
   })), React__default.createElement(material.Box, {
     flexGrow: 1
-  }, data.correctTextualAnswers.length > 1 && React__default.createElement(material.Box, null, React__default.createElement(QuestionCompareType, {
+  }, data.correctTextualAnswers && data.correctTextualAnswers.length > 1 && React__default.createElement(material.Box, null, React__default.createElement(QuestionCompareType, {
     value: data.questionAnswerType,
     onChange: handleChangeCompareType
   })), renderAnswer())), React__default.createElement(material.Stack, {
@@ -34362,6 +34393,8 @@ var QuestionBlock = function QuestionBlock(_ref2) {
   })))));
 };
 var isEqual$2 = function isEqual(prev, next) {
+  var prevError = _$2.get(prev.errors, prev.path);
+  var nextError = _$2.get(next.errors, next.path);
   var isPrevMatched = prev.optionKey === prev.path + ".questionTypeId";
   var isNextMatched = next.optionKey === next.path + ".questionTypeId";
   var prevOptionKey = isPrevMatched ? prev.optionKey : undefined;
@@ -34370,12 +34403,12 @@ var isEqual$2 = function isEqual(prev, next) {
   var nextIsLoadingQuestionTypes = isNextMatched ? next.isLoadingQuestionTypes : undefined;
   var prevQuestionTypes = isPrevMatched ? prev.questionTypes : undefined;
   var nextQuestionTypes = isNextMatched ? next.questionTypes : undefined;
-  return prevOptionKey === nextOptionKey && prevIsLoadingQuestionTypes === nextIsLoadingQuestionTypes && JSON.stringify(prev.data) === JSON.stringify(next.data) && JSON.stringify(prevQuestionTypes) === JSON.stringify(nextQuestionTypes) && prev.path === next.path && prev.isMath == next.isMath && prev.answerCount == next.answerCount && prev.disabled == next.disabled && JSON.stringify(prev.questionTitleStyle) === JSON.stringify(next.questionTitleStyle) && prev.onOpenQuestionTypeMenu == next.onOpenQuestionTypeMenu;
+  return JSON.stringify(prevError) === JSON.stringify(nextError) && prevOptionKey === nextOptionKey && prevIsLoadingQuestionTypes === nextIsLoadingQuestionTypes && JSON.stringify(prev.data) === JSON.stringify(next.data) && JSON.stringify(prevQuestionTypes) === JSON.stringify(nextQuestionTypes) && prev.path === next.path && prev.isMath == next.isMath && prev.answerCount == next.answerCount && prev.disabled == next.disabled && JSON.stringify(prev.questionTitleStyle) === JSON.stringify(next.questionTitleStyle) && prev.onOpenQuestionTypeMenu == next.onOpenQuestionTypeMenu;
 };
 var QuestionBlock$1 = React.memo(QuestionBlock, isEqual$2);
 
 var _excluded$i = ["data", "path", "isMath", "open", "isLoadingCategories", "isLoadingQuestionTypes", "optionKey", "categories", "questionTypes", "disabled", "onQuestioStartOrderChange", "onDelete", "onOpenSubCategoryMenu", "onOpenCategoryMenu", "onCloseCategoryMenu", "onCloseQuestionTypeMenu", "onOpenQuestionTypeMenu"];
-var _$1 = _$6;
+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;
   var data = _ref.data,
@@ -34400,13 +34433,12 @@ var QuestionGroupBlockBody = function QuestionGroupBlockBody(_ref) {
   var startOrderRef = React.useRef(null);
   var articles = data.articles,
     questions = data.questions;
-  var blockErrors = _$1.get(errors, path);
-  console.log(path + ": ", blockErrors);
+  var blockErrors = _$3.get(errors, path);
   var handleOpenQuestionTypeMenu = React.useCallback(function (key) {
     var _data$articles$, _data$articles$$categ, _data$articles$2, _data$articles$2$cate;
     onOpenQuestionTypeMenu(key, (_data$articles$ = data.articles[0]) === null || _data$articles$ === void 0 ? void 0 : (_data$articles$$categ = _data$articles$.categories) === null || _data$articles$$categ === void 0 ? void 0 : _data$articles$$categ[0], (_data$articles$2 = data.articles[0]) === null || _data$articles$2 === void 0 ? void 0 : (_data$articles$2$cate = _data$articles$2.categories) === null || _data$articles$2$cate === void 0 ? void 0 : _data$articles$2$cate[1]);
   }, [(_data$articles$3 = data.articles[0]) === null || _data$articles$3 === void 0 ? void 0 : (_data$articles$3$cate = _data$articles$3.categories) === null || _data$articles$3$cate === void 0 ? void 0 : _data$articles$3$cate[0], (_data$articles$4 = data.articles[0]) === null || _data$articles$4 === void 0 ? void 0 : (_data$articles$4$cate = _data$articles$4.categories) === null || _data$articles$4$cate === void 0 ? void 0 : _data$articles$4$cate[1]]);
-  var debounceQuestionStartOrderChange = _$1.debounce(onQuestioStartOrderChange, 300);
+  var debounceQuestionStartOrderChange = _$3.debounce(onQuestioStartOrderChange, 300);
   var handleChangeStartQuestionOrder = function handleChangeStartQuestionOrder(e) {
     var value = e.target.value.replace(/\D/g, '');
     var order = +value;
@@ -34518,8 +34550,8 @@ var isEqual$3 = function isEqual(prev, next) {
   var isNextMatched = next.optionKey.startsWith(next.path);
   var prevOptionKey = isPrevMatched ? prev.optionKey : undefined;
   var nextOptionKey = isNextMatched ? next.optionKey : undefined;
-  var prevBlockErrors = _$1.get(prev.errors, prev.path);
-  var nextBlockErrors = _$1.get(next.errors, next.path);
+  var prevBlockErrors = _$3.get(prev.errors, prev.path);
+  var nextBlockErrors = _$3.get(next.errors, next.path);
   var prevIsLoadingCategories = isPrevMatched ? prev.isLoadingCategories : undefined;
   var nextIsLoadingCategories = isNextMatched ? next.isLoadingCategories : undefined;
   var prevCategories = isPrevMatched ? prev.categories : undefined;
@@ -34539,7 +34571,7 @@ var isEqual$3 = function isEqual(prev, next) {
 var QuestionGroupBlockBody$1 = React.memo(QuestionGroupBlockBody, isEqual$3);
 
 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 _$2 = _$6;
+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;
   var expandedIndex = _ref.expandedIndex,
@@ -34612,9 +34644,11 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
       }));
     } else {
       setFieldValue(path + ".questions", questions.map(function (q) {
-        var correctAnswers = q.correctAnswers.filter(function (i) {
+        var _q$correctAnswers$fil, _q$correctAnswers;
+        if (isTextType(q.questionAnswerType)) return _extends({}, q);
+        var correctAnswers = (_q$correctAnswers$fil = (_q$correctAnswers = q.correctAnswers) === null || _q$correctAnswers === void 0 ? void 0 : _q$correctAnswers.filter(function (i) {
           return i <= newAnswerCount;
-        });
+        })) != null ? _q$correctAnswers$fil : [1];
         if (correctAnswers.length === 0) correctAnswers = [1];
         return _extends({}, q, {
           numberOfAnswers: newAnswerCount,
@@ -34664,10 +34698,10 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
   }).join(",") : ""].filter(function (i) {
     return !!i;
   }).join(" / ");
-  var pageFromError = _$2.get(errors, path + ".pageFrom");
-  var pageToError = _$2.get(errors, path + ".pageTo");
-  var categoryError = _$2.get(errors, path + ".articles[0].categories");
-  var blockErrors = _$2.get(errors, path);
+  var pageFromError = _$4.get(errors, path + ".pageFrom");
+  var pageToError = _$4.get(errors, path + ".pageTo");
+  var categoryError = _$4.get(errors, path + ".articles[0].categories");
+  var blockErrors = _$4.get(errors, path);
   return React__default.createElement(material.Accordion, {
     expanded: open,
     onChange: handleToggle,
@@ -35224,7 +35258,7 @@ var ChapterBlockBody = function ChapterBlockBody(_ref) {
 };
 
 var _excluded$l = ["data", "expandedIndex", "open", "path", "paths", "isMath", "isLoadingCategories", "isLoadingQuestionTypes", "categories", "questionTypes", "optionKey", "disabled", "onToggle", "onDelete", "onCopiedPrevQuestionGroup", "onCloseCategoryMenu", "onOpenCategoryMenu", "onOpenSubCategoryMenu", "onOpenQuestionTypeMenu", "onCloseQuestionTypeMenu"];
-var _$3 = _$6;
+var _$5 = _$8;
 var ChapterBlock = function ChapterBlock(_ref) {
   var data = _ref.data,
     expandedIndex = _ref.expandedIndex,
@@ -35264,10 +35298,10 @@ var ChapterBlock = function ChapterBlock(_ref) {
       chapter: title
     }), title, path.replace(/\[(\d+)\]$/, ""), expandedIndex);
   };
-  var pageNameError = _$3.get(errors, path + ".name");
-  var pageFromError = _$3.get(errors, path + ".pageFrom");
-  var pageToError = _$3.get(errors, path + ".pageTo");
-  var blockErrors = _$3.get(errors, path);
+  var pageNameError = _$5.get(errors, path + ".name");
+  var pageFromError = _$5.get(errors, path + ".pageFrom");
+  var pageToError = _$5.get(errors, path + ".pageTo");
+  var blockErrors = _$5.get(errors, path);
   return React__default.createElement(material.Accordion, {
     expanded: open,
     onChange: handleToggle,
@@ -35615,7 +35649,7 @@ var useTextbookOptions = function useTextbookOptions(subjectId, isMath, filter,
     return state === null || state === void 0 ? void 0 : (_state$common2 = state.common) === null || _state$common2 === void 0 ? void 0 : (_state$common2$user = _state$common2.user) === null || _state$common2$user === void 0 ? void 0 : _state$common2$user.academyDomain;
   });
   var getOptionFilter = function getOptionFilter() {
-    var cloneFilter = _$6.clone(filter);
+    var cloneFilter = _$8.clone(filter);
     for (var key in cloneFilter) {
       if (Object.prototype.hasOwnProperty.call(cloneFilter, key)) {
         var element = cloneFilter[key];
@@ -35765,7 +35799,7 @@ var useTextbookOptions = function useTextbookOptions(subjectId, isMath, filter,
   };
 };
 
-var _$4 = _$6;
+var _$6 = _$8;
 var TextbookContentsTab = function TextbookContentsTab(props) {
   var disabled = props.disabled,
     values = props.values,
@@ -35808,7 +35842,7 @@ var TextbookContentsTab = function TextbookContentsTab(props) {
   };
   var handleConfirmDeleteBlock = function handleConfirmDeleteBlock() {
     if (!(openConfirmDelete !== null && openConfirmDelete !== void 0 && openConfirmDelete.path)) return;
-    var items = _$4.get(values, openConfirmDelete.path, []);
+    var items = _$6.get(values, openConfirmDelete.path, []);
     setFieldValue(openConfirmDelete.path, items.filter(function (_, i) {
       return i !== openConfirmDelete.itemIndex;
     }));
@@ -35848,12 +35882,12 @@ var TextbookContentsTab = function TextbookContentsTab(props) {
     if (!newParts.length) return;
     if (newParts.length < parts.length) {
       var _$get, _$get2, _$get3;
-      var subChapters = (_$get = _$4.get(values, newPath + ".subChapters")) != null ? _$get : [];
+      var subChapters = (_$get = _$6.get(values, newPath + ".subChapters")) != null ? _$get : [];
       var questionGroups = [];
-      if (!subChapters.length) questionGroups = (_$get2 = _$4.get(values, newPath + ".questionGroups")) != null ? _$get2 : [];else questionGroups = (_$get3 = _$4.get(values, newPath + ".subChapters[" + (subChapters.length - 1) + "].questionGroups")) != null ? _$get3 : [];
-      return _$4.last(questionGroups);
+      if (!subChapters.length) questionGroups = (_$get2 = _$6.get(values, newPath + ".questionGroups")) != null ? _$get2 : [];else questionGroups = (_$get3 = _$6.get(values, newPath + ".subChapters[" + (subChapters.length - 1) + "].questionGroups")) != null ? _$get3 : [];
+      return _$6.last(questionGroups);
     }
-    return _$4.get(values, newPath);
+    return _$6.get(values, newPath);
   };
   var handleOpenSubCategoryMenu = React.useCallback(function (key, categoryId) {
     setOptionKey(key);
@@ -36345,7 +36379,7 @@ var useSelect = function useSelect(_ref) {
     setLoading = _useState2[1];
   React.useEffect(function () {
     if (!email || !academy) return;
-    var fetchData = _$6.debounce(function () {
+    var fetchData = _$8.debounce(function () {
       try {
         var _temp2 = function _temp2() {
           setLoading(false);
@@ -36459,7 +36493,7 @@ var OwnerSelector = function OwnerSelector(_ref) {
   }, errors === null || errors === void 0 ? void 0 : errors.textbookOwners[index].courseId)));
 };
 
-var _$5 = _$6;
+var _$7 = _$8;
 var TextbookOwnersTab = function TextbookOwnersTab(_ref) {
   var errors = _ref.errors,
     values = _ref.values,
@@ -36532,12 +36566,12 @@ var TextbookOwnersTab = function TextbookOwnersTab(_ref) {
               disabled: disabled || !!val.academyId && val.academyId !== (academy === null || academy === void 0 ? void 0 : academy.id)
             }));
           }
-        }), _$5.get(errors, "textbookOwners[" + index + "].email") && React__default.createElement(material.Typography, {
+        }), _$7.get(errors, "textbookOwners[" + index + "].email") && React__default.createElement(material.Typography, {
           fontWeight: 500,
           fontSize: "10px",
           lineHeight: "11.93px",
           color: "#F34B4B"
-        }, _$5.get(errors, "textbookOwners[" + index + "].email"))), !!(values !== null && values !== void 0 && (_values$textbookOwner = values.textbookOwners) !== null && _values$textbookOwner !== void 0 && _values$textbookOwner[index].email) && React__default.createElement(OwnerSelector, {
+        }, _$7.get(errors, "textbookOwners[" + index + "].email"))), !!(values !== null && values !== void 0 && (_values$textbookOwner = values.textbookOwners) !== null && _values$textbookOwner !== void 0 && _values$textbookOwner[index].email) && React__default.createElement(OwnerSelector, {
           values: values,
           errors: errors,
           index: index,
@@ -36715,7 +36749,7 @@ var PreparedTextbookForm = function PreparedTextbookForm(_ref) {
     variant: "contained",
     disabled: disabled,
     onClick: function onClick() {
-      if (!_$6.isEmpty(errors)) {
+      if (!_$8.isEmpty(errors)) {
         reactToastify.toast.error(i18n.t("please_fill_in_the_blank_fields"));
       }
     },