touchstudy-core 0.1.83 → 0.1.85

package/dist/index.modern.js

@@ -798,16 +798,11 @@ var BlockLogin = function BlockLogin(_ref3) {
     onSubmit: onSubmit
   }, function (_ref4) {
     var errors = _ref4.errors,
-      values = _ref4.values,
       setFieldValue = _ref4.setFieldValue;
-    console.log({
-      errors: errors,
-      values: values
-    });
     useEffect(function () {
-      if (isOTP) {
+      if (isEmail) setFieldValue("otp", "");
+      if (!isOTP && !isEmail) {
         setFieldValue("email", "");
-      } else {
         setFieldValue("otp", "");
       }
     }, [isOTP, isEmail]);
@@ -843,8 +838,9 @@ var BlockLogin = function BlockLogin(_ref3) {
       fontSize: "14px",
       fontWeight: 700,
       color: blue[700]
-    }, t("sign_in_with_email"))))), (isEmail || isOTP) && React__default.createElement(Stack, null, !isOTP ? React__default.createElement(Stack, {
+    }, t("sign_in_with_email"))))), (isEmail || isOTP) && React__default.createElement(Stack, null, React__default.createElement(Stack, {
       flexDirection: "column",
+      display: isOTP ? "none" : "flex",
       gap: 1
     }, React__default.createElement(Typography, {
       fontWeight: 700,
@@ -860,8 +856,9 @@ var BlockLogin = function BlockLogin(_ref3) {
       fontSize: "10px",
       lineHeight: "11.93px",
       color: !(errors !== null && errors !== void 0 && errors.email) ? "#97A1AF" : "#F34B4B"
-    }, errors === null || errors === void 0 ? void 0 : errors.email)) : React__default.createElement(Stack, {
+    }, errors === null || errors === void 0 ? void 0 : errors.email)), React__default.createElement(Stack, {
       flexDirection: "column",
+      display: !isOTP ? "none" : "flex",
       gap: 1
     }, React__default.createElement(Typography, {
       fontWeight: 700,
@@ -900,10 +897,18 @@ var BlockLogin = function BlockLogin(_ref3) {
       color: blue[700]
     }, t("sign_in_with_google_account"))), React__default.createElement(Stack, {
       flexDirection: "row",
-      justifyContent: "end",
+      justifyContent: isOTP ? "space-between" : "end",
       gap: 1,
       mt: 2
-    }, React__default.createElement(Button, {
+    }, isOTP && React__default.createElement(Button, {
+      variant: "contained",
+      color: "secondary",
+      className: "bg-secondary",
+      onClick: function onClick() {
+        handleSwitchEmail(true);
+        handleSwitchOTP(false);
+      }
+    }, t("back")), React__default.createElement(Button, {
       variant: "contained",
       color: "primary",
       type: "submit",
@@ -940,10 +945,14 @@ var signInWithEmailApi = function signInWithEmailApi(_ref2) {
 var signInWithOTPApi = function signInWithOTPApi(_ref3) {
   var academyDomain = _ref3.academyDomain,
     otp = _ref3.otp,
+    email = _ref3.email,
+    reCaptcha = _ref3.reCaptcha,
     role = _ref3.role;
   return api.post((academyDomain ? SIGN_IN_URL : SIGN_IN_SUPER_ADMIN_URL) + "/otp", {
     otp: otp,
-    role: role
+    email: email,
+    role: role,
+    reCaptcha: reCaptcha
   });
 };
 var signInWithKeyApi = function signInWithKeyApi(_ref4) {
@@ -1030,6 +1039,9 @@ var useLogin$1 = function useLogin(_ref) {
   var handleSubmit = function handleSubmit(values) {
     try {
       var _temp5 = function _temp5() {
+        setRefreshReCaptcha(function (b) {
+          return !b;
+        });
         dispatch(setLoading(false));
       };
       if (!tokenReCaptcha) return Promise.resolve();
@@ -1039,11 +1051,13 @@ var useLogin$1 = function useLogin(_ref) {
       var _temp4 = _catch(function () {
         function _temp3() {
           var _temp = function () {
-            if (otp) {
+            if (email && otp) {
               return Promise.resolve(signInWithOTPApi({
                 academyDomain: academyDomain,
+                email: email,
                 otp: otp,
-                role: role
+                role: role,
+                reCaptcha: tokenReCaptcha
               })).then(function (res) {
                 var loginResponse = res === null || res === void 0 ? void 0 : res.data;
                 var isFirstLogin = loginResponse.isFirstLogin,
@@ -1060,7 +1074,7 @@ var useLogin$1 = function useLogin(_ref) {
           if (_temp && _temp.then) return _temp.then(function () {});
         }
         var _temp2 = function () {
-          if (email) {
+          if (email && !otp) {
             return Promise.resolve(signInWithEmailApi({
               academyDomain: academyDomain,
               email: email,
@@ -1069,9 +1083,6 @@ var useLogin$1 = function useLogin(_ref) {
               toast.success(t("please_check_your_mailbox"));
               handleSwitchOTP(true);
               handleSwitchEmail(false);
-              setRefreshReCaptcha(function (b) {
-                return !b;
-              });
             });
           }
         }();
@@ -2068,11 +2079,17 @@ var useSubjectSelect = function useSubjectSelect(_ref) {
   }, []);
   var handleChangeSubject = function handleChangeSubject(value) {
     var id = value.value;
+    var examQuestions = exam.questions;
     var selectedSubject = subjectList === null || subjectList === void 0 ? void 0 : subjectList.find(function (subject) {
       return subject.id === id;
     });
     onChangeExam(_extends({}, exam, {
-      subjectId: (selectedSubject === null || selectedSubject === void 0 ? void 0 : selectedSubject.id) || 0
+      subjectId: (selectedSubject === null || selectedSubject === void 0 ? void 0 : selectedSubject.id) || 0,
+      questions: [].concat(examQuestions.map(function (q) {
+        return _extends({}, q, {
+          categoryId: undefined
+        });
+      }))
     }));
   };
   return {
@@ -2432,7 +2449,7 @@ var teachers = "교사";
 var lessons = "수업";
 var new_test = "새로운 시험";
 var manage_saved_exams = "저장된 시험 관리";
-var manage_textbook = "교과서 관리";
+var manage_textbooks = "교과서 관리";
 var my_question = "내 질문";
 var update_class = "수업 업데이트";
 var create_class = "수업 만들기";
@@ -2884,6 +2901,7 @@ var min_is_1 = "최소값은 1입니다.";
 var max_is_6 = "최대는 6입니다";
 var must_be_number = "숫자여야 합니다.";
 var sign_in_with_google_account = "구글 계정으로 로그인";
+var academy_role = "아카데미 역할";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -3215,7 +3233,7 @@ var lang_ko = {
 	lessons: lessons,
 	new_test: new_test,
 	manage_saved_exams: manage_saved_exams,
-	manage_textbook: manage_textbook,
+	manage_textbooks: manage_textbooks,
 	my_question: my_question,
 	update_class: update_class,
 	create_class: create_class,
@@ -3670,7 +3688,8 @@ var lang_ko = {
 	min_is_1: min_is_1,
 	max_is_6: max_is_6,
 	must_be_number: must_be_number,
-	sign_in_with_google_account: sign_in_with_google_account
+	sign_in_with_google_account: sign_in_with_google_account,
+	academy_role: academy_role
 };
 
 var problem_solving$1 = "Problem Solving";
@@ -4041,7 +4060,7 @@ var update_class$1 = "Update class";
 var create_class$1 = "Create class";
 var new_test$1 = "New Test";
 var manage_saved_exams$1 = "Manage saved exams";
-var manage_textbook$1 = "Manage Textbook";
+var manage_textbooks$1 = "Manage textbooks";
 var my_question$1 = "My Q&As";
 var problem_number$1 = "Problem number";
 var solve_time$1 = "Solve time";
@@ -4355,8 +4374,8 @@ var messages$1 = {
 var submit$1 = "Submit";
 var must_select_a_teacher_first$1 = "Must select a teacher first";
 var student_grade_is_invalid$1 = "Student grade must be from 1 to 12";
-var recent_users$1 = "Recent Users";
-var recent_students$1 = "Recent Students";
+var recent_users$1 = "Recent users";
+var recent_students$1 = "Recent students";
 var viewed_user$1 = "Viewed User";
 var viewed_QNA$1 = "Viewed Question&Answer";
 var viewed_exam_result$1 = "Viewed Exam Results";
@@ -4467,6 +4486,7 @@ var min_is_1$1 = "Min is 1";
 var max_is_6$1 = "Max is 6";
 var must_be_number$1 = "Must be number";
 var sign_in_with_google_account$1 = "Sign in with google account";
+var academy_role$1 = "Academy role";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -4825,7 +4845,7 @@ var lang_en = {
 	create_class: create_class$1,
 	new_test: new_test$1,
 	manage_saved_exams: manage_saved_exams$1,
-	manage_textbook: manage_textbook$1,
+	manage_textbooks: manage_textbooks$1,
 	my_question: my_question$1,
 	problem_number: problem_number$1,
 	solve_time: solve_time$1,
@@ -5254,7 +5274,8 @@ var lang_en = {
 	min_is_1: min_is_1$1,
 	max_is_6: max_is_6$1,
 	must_be_number: must_be_number$1,
-	sign_in_with_google_account: sign_in_with_google_account$1
+	sign_in_with_google_account: sign_in_with_google_account$1,
+	academy_role: academy_role$1
 };
 
 i18n.use(initReactI18next).init({
@@ -8403,40 +8424,22 @@ var ChapterBox = function ChapterBox(_ref) {
 };
 
 var TEXTBOOK_URL = BASE_URL + "/api/textbooks";
-var getTextbookListApi = function getTextbookListApi(query, role) {
+var getTextbookListApi = function getTextbookListApi(query) {
   return api.get("" + TEXTBOOK_URL, {
-    params: _extends({}, query, {
-      roles: role
-    })
+    params: query
   });
 };
-var getTextbookByIdApi = function getTextbookByIdApi(textbookId, role) {
-  return api.get(TEXTBOOK_URL + "/" + textbookId, {
-    params: {
-      roles: role
-    }
-  });
+var getTextbookByIdApi = function getTextbookByIdApi(textbookId) {
+  return api.get(TEXTBOOK_URL + "/" + textbookId);
 };
-var createTextbookApi = function createTextbookApi(data, role) {
-  return api.post("" + TEXTBOOK_URL, data, {
-    params: {
-      roles: role
-    }
-  });
+var createTextbookApi = function createTextbookApi(data) {
+  return api.post("" + TEXTBOOK_URL, data);
 };
-var updateTextbookApi = function updateTextbookApi(textbookId, data, role) {
-  return api.put(TEXTBOOK_URL + "/" + textbookId, data, {
-    params: {
-      roles: role
-    }
-  });
+var updateTextbookApi = function updateTextbookApi(textbookId, data) {
+  return api.put(TEXTBOOK_URL + "/" + textbookId, data);
 };
-var deleteTextbookApi = function deleteTextbookApi(textbookId, role) {
-  return api["delete"](TEXTBOOK_URL + "/" + textbookId, {
-    params: {
-      roles: role
-    }
-  });
+var deleteTextbookApi = function deleteTextbookApi(textbookId) {
+  return api["delete"](TEXTBOOK_URL + "/" + textbookId);
 };
 
 var ExamStatus$1;
@@ -8540,49 +8543,25 @@ var DEFAULT_ARTICLE_CREATE_REQUEST = {
 };
 
 var CHAPTER_URL = BASE_URL + "/api/chapters";
-var createChapterApi = function createChapterApi(chapter, role) {
-  return api.post("" + CHAPTER_URL, chapter, {
-    params: {
-      roles: role
-    }
-  });
+var createChapterApi = function createChapterApi(chapter) {
+  return api.post("" + CHAPTER_URL, chapter);
 };
-var updateChapterApi = function updateChapterApi(chapterId, chapter, role) {
-  return api.put(CHAPTER_URL + "/" + chapterId, chapter, {
-    params: {
-      roles: role
-    }
-  });
+var updateChapterApi = function updateChapterApi(chapterId, chapter) {
+  return api.put(CHAPTER_URL + "/" + chapterId, chapter);
 };
-var deleteChapterApi = function deleteChapterApi(chapterId, role) {
-  return api["delete"](CHAPTER_URL + "/" + chapterId, {
-    params: {
-      roles: role
-    }
-  });
+var deleteChapterApi = function deleteChapterApi(chapterId) {
+  return api["delete"](CHAPTER_URL + "/" + chapterId);
 };
 
 var ARTICLE_URL = BASE_URL + "/api/articles";
-var createArticleApi = function createArticleApi(article, role) {
-  return api.post("" + ARTICLE_URL, article, {
-    params: {
-      roles: role
-    }
-  });
+var createArticleApi = function createArticleApi(article) {
+  return api.post("" + ARTICLE_URL, article);
 };
-var updateArticleApi = function updateArticleApi(articleId, article, role) {
-  return api.put(ARTICLE_URL + "/" + articleId, article, {
-    params: {
-      roles: role
-    }
-  });
+var updateArticleApi = function updateArticleApi(articleId, article) {
+  return api.put(ARTICLE_URL + "/" + articleId, article);
 };
-var deleteArticleApi = function deleteArticleApi(articleId, role) {
-  return api["delete"](ARTICLE_URL + "/" + articleId, {
-    params: {
-      roles: role
-    }
-  });
+var deleteArticleApi = function deleteArticleApi(articleId) {
+  return api["delete"](ARTICLE_URL + "/" + articleId);
 };
 
 var EXAM_URL = BASE_URL + "/api/exam";
@@ -8712,9 +8691,31 @@ var useExam = function useExam(props) {
   };
 };
 
+var ADMIN_CATEGORY_URL = SUPER_ADMIN_BASE_URL + "/api/category";
+var CATEGORY_URL = BASE_URL + "/api/examcategory";
+var getCategoryListAdminApi = function getCategoryListAdminApi(data) {
+  try {
+    return Promise.resolve(api.get("" + ADMIN_CATEGORY_URL, {
+      params: data
+    }));
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+var getCategoryListApi = function getCategoryListApi(data) {
+  try {
+    return Promise.resolve(api.get("" + CATEGORY_URL, {
+      params: data
+    }));
+  } catch (e) {
+    return Promise.reject(e);
+  }
+};
+
 var PAGE_TITLE_DETAIL = "textbook_detail";
 var PAGE_TITLE_CREATE = "create_textbook";
 var useTextbookDetail = function useTextbookDetail(props) {
+  var _textbook$subject3;
   var role = props.role,
     isReadonlyParam = props.isReadonlyParam,
     navigate = props.navigate,
@@ -8751,6 +8752,9 @@ var useTextbookDetail = function useTextbookDetail(props) {
   var _useState9 = useState(false),
     isEditedTitle = _useState9[0],
     setEditedTitle = _useState9[1];
+  var _useState10 = useState([]),
+    categoryList = _useState10[0],
+    setCategoryList = _useState10[1];
   var textbookUrl = role === Role.Teacher ? TEXTBOOK_URL$1 : ADMIN_TEXTBOOK_URL;
   var _useExam = useExam({
       navigate: navigate
@@ -8762,6 +8766,40 @@ var useTextbookDetail = function useTextbookDetail(props) {
     handleSaveExam = _useExam.handleSaveExam,
     handleCloseDialog = _useExam.handleCloseDialog,
     handleCreateExam = _useExam.handleCreateExam;
+  var getCategoryList = function getCategoryList(isLoading) {
+    if (isLoading === void 0) {
+      isLoading = true;
+    }
+    try {
+      var _textbook$subject;
+      var _temp2 = function _temp2() {
+        isLoading && dispatch(setLoading(false));
+      };
+      if (!(textbook !== null && textbook !== void 0 && (_textbook$subject = textbook.subject) !== null && _textbook$subject !== void 0 && _textbook$subject.id)) {
+        setCategoryList([]);
+        return Promise.resolve();
+      }
+      isLoading && dispatch(setLoading(true));
+      var _temp = _catch(function () {
+        var _textbook$subject2;
+        return Promise.resolve(getCategoryListApi({
+          subjectId: textbook === null || textbook === void 0 ? void 0 : (_textbook$subject2 = textbook.subject) === null || _textbook$subject2 === void 0 ? void 0 : _textbook$subject2.id
+        })).then(function (res) {
+          var data = res.data.items;
+          setCategoryList(data || []);
+        });
+      }, function (error) {
+        setCategoryList([]);
+        console.log(error);
+      });
+      return Promise.resolve(_temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+  useEffect(function () {
+    getCategoryList();
+  }, [textbook === null || textbook === void 0 ? void 0 : (_textbook$subject3 = textbook.subject) === null || _textbook$subject3 === void 0 ? void 0 : _textbook$subject3.id]);
   var handleOpenAddArticleDialog = function handleOpenAddArticleDialog(chapter) {
     setSelectedChapter(chapter);
   };
@@ -8770,35 +8808,35 @@ var useTextbookDetail = function useTextbookDetail(props) {
   };
   var handleUpdateChapter = function handleUpdateChapter(chapterId, chapter, callback) {
     try {
-      var _temp2 = function _temp2() {
+      var _temp4 = function _temp4() {
         dispatch(setLoading(false));
       };
       if (!textbook) return Promise.resolve();
-      var _temp = _catch(function () {
+      var _temp3 = _catch(function () {
         var body = {
           name: chapter.name,
           pageFrom: chapter.pageFrom,
           pageTo: chapter.pageTo
         };
-        return Promise.resolve(updateChapterApi(chapterId, body, role)).then(function (res) {
+        return Promise.resolve(updateChapterApi(chapterId, body)).then(function (res) {
           callback === null || callback === void 0 ? void 0 : callback(res.data);
         });
       }, function (error) {
         toast.error(getErrorMessage(t, error));
       });
-      return Promise.resolve(_temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp));
+      return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3));
     } catch (e) {
       return Promise.reject(e);
     }
   };
   var handleCreateArticle = function handleCreateArticle(article, callback) {
     try {
-      var _temp4 = function _temp4() {
+      var _temp6 = function _temp6() {
         dispatch(setLoading(false));
       };
       if (!textbook) return Promise.resolve();
       dispatch(setLoading(true));
-      var _temp3 = _catch(function () {
+      var _temp5 = _catch(function () {
         var _article$category;
         var body = {
           articleNumber: article.articleNumber,
@@ -8814,45 +8852,45 @@ var useTextbookDetail = function useTextbookDetail(props) {
             };
           })
         };
-        return Promise.resolve(createArticleApi(body, role)).then(function (res) {
+        return Promise.resolve(createArticleApi(body)).then(function (res) {
           callback === null || callback === void 0 ? void 0 : callback(res.data);
         });
       }, function (error) {
         toast.error(getErrorMessage(t, error));
       });
-      return Promise.resolve(_temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3));
+      return Promise.resolve(_temp5 && _temp5.then ? _temp5.then(_temp6) : _temp6(_temp5));
     } catch (e) {
       return Promise.reject(e);
     }
   };
   var handleDeleteArticle = function handleDeleteArticle(articleId, callback) {
     try {
-      var _temp6 = function _temp6() {
+      var _temp8 = function _temp8() {
         dispatch(setLoading(false));
       };
       if (!textbook) return Promise.resolve();
       dispatch(setLoading(true));
-      var _temp5 = _catch(function () {
-        return Promise.resolve(deleteArticleApi(articleId, role)).then(function () {
+      var _temp7 = _catch(function () {
+        return Promise.resolve(deleteArticleApi(articleId)).then(function () {
           callback === null || callback === void 0 ? void 0 : callback();
         });
       }, function (error) {
         toast.error(getErrorMessage(t, error));
       });
-      return Promise.resolve(_temp5 && _temp5.then ? _temp5.then(_temp6) : _temp6(_temp5));
+      return Promise.resolve(_temp7 && _temp7.then ? _temp7.then(_temp8) : _temp8(_temp7));
     } catch (e) {
       return Promise.reject(e);
     }
   };
   var handleDeleteChapter = function handleDeleteChapter(chapterId, parentChapterId, callback) {
     try {
-      var _temp8 = function _temp8() {
+      var _temp10 = function _temp10() {
         dispatch(setLoading(false));
       };
       if (!textbook) return Promise.resolve();
       dispatch(setLoading(true));
-      var _temp7 = _catch(function () {
-        return Promise.resolve(deleteChapterApi(chapterId, role)).then(function () {
+      var _temp9 = _catch(function () {
+        return Promise.resolve(deleteChapterApi(chapterId)).then(function () {
           if (parentChapterId) {
             var parentIndex = textbook.chapters.findIndex(function (i) {
               return i.id === parentChapterId;
@@ -8877,7 +8915,7 @@ var useTextbookDetail = function useTextbookDetail(props) {
       }, function (error) {
         toast.error(getErrorMessage(t, error));
       });
-      return Promise.resolve(_temp7 && _temp7.then ? _temp7.then(_temp8) : _temp8(_temp7));
+      return Promise.resolve(_temp9 && _temp9.then ? _temp9.then(_temp10) : _temp10(_temp9));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -8885,7 +8923,7 @@ var useTextbookDetail = function useTextbookDetail(props) {
   var handleUpdateArticle = function handleUpdateArticle(article, callback) {
     try {
       if (!textbook || !article.id) return Promise.resolve();
-      var _temp9 = _catch(function () {
+      var _temp11 = _catch(function () {
         var _article$category2;
         var body = {
           articleNumber: article.articleNumber,
@@ -8901,13 +8939,13 @@ var useTextbookDetail = function useTextbookDetail(props) {
             };
           })
         };
-        return Promise.resolve(updateArticleApi(article.id, body, role)).then(function (res) {
+        return Promise.resolve(updateArticleApi(article.id, body)).then(function (res) {
           callback === null || callback === void 0 ? void 0 : callback(res.data);
         });
       }, function (error) {
         toast.error(getErrorMessage(t, error));
       });
-      return Promise.resolve(_temp9 && _temp9.then ? _temp9.then(function () {}) : void 0);
+      return Promise.resolve(_temp11 && _temp11.then ? _temp11.then(function () {}) : void 0);
     } catch (e) {
       return Promise.reject(e);
     }
@@ -9182,18 +9220,18 @@ var useTextbookDetail = function useTextbookDetail(props) {
   };
   var handleCreateChapter = function handleCreateChapter(chapterName) {
     try {
-      var _temp11 = function _temp11() {
+      var _temp13 = function _temp13() {
         dispatch(setLoading(false));
       };
       if (!textbookId && !parentChapter && !textbook) return Promise.resolve();
       dispatch(setLoading(true));
-      var _temp10 = _catch(function () {
+      var _temp12 = _catch(function () {
         var body = {
           name: chapterName,
           parentChapterId: parentChapter === null || parentChapter === void 0 ? void 0 : parentChapter.id,
           textbookId: textbookId
         };
-        return Promise.resolve(createChapterApi(body, role)).then(function (res) {
+        return Promise.resolve(createChapterApi(body)).then(function (res) {
           var chapter = _extends({}, res.data, {
             articles: [],
             subChapters: []
@@ -9219,7 +9257,7 @@ var useTextbookDetail = function useTextbookDetail(props) {
       }, function (error) {
         toast.error(getErrorMessage(t, error));
       });
-      return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(_temp11) : _temp11(_temp10));
+      return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(_temp13) : _temp13(_temp12));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -9229,12 +9267,12 @@ var useTextbookDetail = function useTextbookDetail(props) {
     setParentChapter(undefined);
   };
   var validateTextbook = function validateTextbook() {
-    var _textbook$subject;
+    var _textbook$subject4;
     if (!textbook.name.trim().length) {
       toast.error(t('textbook_name_is_required'));
       return false;
     }
-    if (!((_textbook$subject = textbook.subject) !== null && _textbook$subject !== void 0 && _textbook$subject.id)) {
+    if (!((_textbook$subject4 = textbook.subject) !== null && _textbook$subject4 !== void 0 && _textbook$subject4.id)) {
       toast.error(t('textbook_subject_is_required'));
       return false;
     }
@@ -9242,7 +9280,7 @@ var useTextbookDetail = function useTextbookDetail(props) {
   };
   var handleCreateOrUpdateTextbook = function handleCreateOrUpdateTextbook() {
     try {
-      var _temp15 = function _temp15() {
+      var _temp17 = function _temp17() {
         dispatch(setLoading(false));
       };
       if (!textbook) return Promise.resolve();
@@ -9253,22 +9291,22 @@ var useTextbookDetail = function useTextbookDetail(props) {
         return Promise.resolve();
       }
       dispatch(setLoading(true));
-      var _temp14 = _catch(function () {
-        function _temp13() {
+      var _temp16 = _catch(function () {
+        function _temp15() {
           toast.success(t(textbook.id ? "update_the_textbook_successfully" : "create_the_textbook_successfully"));
         }
-        var _temp12 = function () {
+        var _temp14 = function () {
           if (textbook.id) {
             var body = {
               name: textbook.name
             };
-            return Promise.resolve(updateTextbookApi(textbook.id, body, role)).then(function () {});
+            return Promise.resolve(updateTextbookApi(textbook.id, body)).then(function () {});
           } else {
             var _body = {
               name: textbook.name,
               subjectId: textbook.subject.id
             };
-            return Promise.resolve(createTextbookApi(_body, role)).then(function (res) {
+            return Promise.resolve(createTextbookApi(_body)).then(function (res) {
               var textbookId = res.data.id;
               navigate(textbookUrl + "/" + textbookId, {
                 replace: true
@@ -9276,11 +9314,11 @@ var useTextbookDetail = function useTextbookDetail(props) {
             });
           }
         }();
-        return _temp12 && _temp12.then ? _temp12.then(_temp13) : _temp13(_temp12);
+        return _temp14 && _temp14.then ? _temp14.then(_temp15) : _temp15(_temp14);
       }, function (error) {
         toast.error(getErrorMessage(t, error));
       });
-      return Promise.resolve(_temp14 && _temp14.then ? _temp14.then(_temp15) : _temp15(_temp14));
+      return Promise.resolve(_temp16 && _temp16.then ? _temp16.then(_temp17) : _temp17(_temp16));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -9346,12 +9384,12 @@ var useTextbookDetail = function useTextbookDetail(props) {
   useEffect(function () {
     var getTextbookDetail = function getTextbookDetail() {
       try {
-        var _temp17 = function _temp17() {
+        var _temp19 = function _temp19() {
           dispatch(setLoading(false));
         };
         dispatch(setLoading(true));
-        var _temp16 = _catch(function () {
-          return Promise.resolve(getTextbookByIdApi(+id, role)).then(function (res) {
+        var _temp18 = _catch(function () {
+          return Promise.resolve(getTextbookByIdApi(+id)).then(function (res) {
             setEditedTitle(false);
             setTextbook(res.data);
             setNotFound(false);
@@ -9360,7 +9398,7 @@ var useTextbookDetail = function useTextbookDetail(props) {
           var _error$response;
           if ((error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : _error$response.status) === 404) setNotFound(true);else toast.error(getErrorMessage(t, error));
         });
-        return Promise.resolve(_temp16 && _temp16.then ? _temp16.then(_temp17) : _temp17(_temp16));
+        return Promise.resolve(_temp18 && _temp18.then ? _temp18.then(_temp19) : _temp19(_temp18));
       } catch (e) {
         return Promise.reject(e);
       }
@@ -9436,6 +9474,7 @@ var useTextbookDetail = function useTextbookDetail(props) {
     articlesSelected: articlesSelected,
     isOpenDialog: isOpenDialog,
     examRequest: examRequest,
+    categoryList: categoryList,
     handleChangeExamRequest: handleChangeExamRequest,
     handleCheckArticle: handleCheckArticle,
     handleOpenCreateExamDialog: handleChangeExamRequestBeforeOpenDialog,
@@ -9870,27 +9909,6 @@ var DURATION_OPTIONS = Array.from({
 });
 var DEFAULT_ANSWER_COUNT$1 = 5;
 
-var ADMIN_CATEGORY_URL = SUPER_ADMIN_BASE_URL + "/api/category";
-var CATEGORY_URL = BASE_URL + "/api/examcategory";
-var getCategoryListAdminApi = function getCategoryListAdminApi(data) {
-  try {
-    return Promise.resolve(api.get("" + ADMIN_CATEGORY_URL, {
-      params: data
-    }));
-  } catch (e) {
-    return Promise.reject(e);
-  }
-};
-var getCategoryListApi = function getCategoryListApi(data) {
-  try {
-    return Promise.resolve(api.get("" + CATEGORY_URL, {
-      params: data
-    }));
-  } catch (e) {
-    return Promise.reject(e);
-  }
-};
-
 var useExamDetailView = function useExamDetailView(props) {
   var exam = props.exam,
     onChangeExam = props.onChangeExam;
@@ -10116,9 +10134,8 @@ var useExamDetailView = function useExamDetailView(props) {
     }
   };
   useEffect(function () {
-    if (categoryList !== null && categoryList !== void 0 && categoryList.length) return;
     getCategoryList();
-  }, [exam.subjectId, JSON.stringify(categoryList)]);
+  }, [exam.subjectId]);
   var examGroupByArticle = useMemo(function () {
     if (!exam) return [];
     var articles = [];
@@ -10351,6 +10368,7 @@ var TextbookViewDetail = function TextbookViewDetail(props) {
     isEditedTitle = _useTextbookDetail.isEditedTitle,
     isOpenDialog = _useTextbookDetail.isOpenDialog,
     examRequest = _useTextbookDetail.examRequest,
+    categoryList = _useTextbookDetail.categoryList,
     handleChangeExamRequest = _useTextbookDetail.handleChangeExamRequest,
     handleSaveExam = _useTextbookDetail.handleSaveExam,
     handleCloseDialog = _useTextbookDetail.handleCloseDialog,
@@ -10380,7 +10398,7 @@ var TextbookViewDetail = function TextbookViewDetail(props) {
     handleRemoveSelectedItem = _useTextbookDetail.handleRemoveSelectedItem,
     handleOpenRemoveChapterConfirmDialog = _useTextbookDetail.handleOpenRemoveChapterConfirmDialog;
   var _useCategorySelect = useCategorySelect({
-      subjectId: id ? textbookSubject === null || textbookSubject === void 0 ? void 0 : textbookSubject.value : undefined
+      categoryList: categoryList
     }),
     categoryOptions = _useCategorySelect.categoryOptions;
   if (isNotFound) return React__default.createElement(NotFound, {
@@ -10743,7 +10761,7 @@ var useTextbookList = function useTextbookList(props) {
   var role = props.role,
     navigate = props.navigate;
   var _useList = useList(function (search) {
-      return getTextbookListApi(search, role);
+      return getTextbookListApi(search);
     }, TextbookDefaultQuery),
     filter = _useList.filter,
     textSearchRef = _useList.textSearchRef,
@@ -10789,7 +10807,7 @@ var useTextbookList = function useTextbookList(props) {
       if (!(selectedTextbook !== null && selectedTextbook !== void 0 && selectedTextbook.id)) return Promise.resolve();
       dispatch(setLoading(true));
       var _temp = _catch(function () {
-        return Promise.resolve(deleteTextbookApi(selectedTextbook.id, role)).then(function () {
+        return Promise.resolve(deleteTextbookApi(selectedTextbook.id)).then(function () {
           return Promise.resolve(getData(false)).then(function () {
             toggleConfirmDialog();
           });