touchstudy-core 0.1.48 → 0.1.50

package/dist/containers/Textbooks/hooks/useTextbookList.d.ts

@@ -4,7 +4,7 @@ import { TextbookListProps } from "../views/TextbookList";
 declare const useTextbookList: (props: TextbookListProps) => {
     filter: import("../../../utils/types").SearchQuery;
     textSearchRef: import("react").RefObject<HTMLInputElement>;
-    totalPages: number;
+    paging: import("../../..").PagingResponse;
     textbooks: TextbookResponse[];
     selectedTextbook: TextbookResponse | undefined;
     handleSort: (sortColumnName: string) => void;

package/dist/index.d.ts

@@ -62,4 +62,5 @@ import SubjectSelector from "./components/Selectors/SubjectSelector";
 import * as timeUtils from "./utils/times";
 import LoginWithPassword from './containers/Login/views/LoginWithPassword';
 import Header from "./layouts/Header";
-export { diffFromNow, formatTime, utcToLocalTime, setLoading, setReadyRegisterPusher, BASE_URL, SUPER_ADMIN_BASE_URL, ACCESS_TOKEN, Login, store, setAlert, setUser, Loading, NotFound, LayoutContext, api, apiUpload, ConfirmDialog, CommonDialog, CustomPagination, useGoogleSignOut, PUSHER_CONFIG, ExamEvent, EXAM_CHANNEL, EXAM_STUDENT_CHANNEL, setLanguage, i18n, TheLanguageDropdown, TheAcademyDropdown, useTranslation, I18nextProvider, DATE_MIN_VALUE, DATE_TIME_MIN_VALUE, ACADEMY_DOMAIN, minutesToTimeSpan, toISOString, canAccessRoute, CustomSelect, CustomAsyncSelect, CustomSelectOption, LoginWithPassword, getAccessToken, ChatContainer, IChatContainerProps, IChatItemProps, IChatHeaderProps, IInputChatProps, ChatItemType, useChatContainer, ConversationResponse, usePusherConversation, ExamResultV2, ToastContainer, toast, Role, useLanguage, useSwitchAcademy, LANGUAGES, CustomCreatable, moment, ExamDetailView, ExamDetailViewProps, Exam, Question, ArticleGroup, getAcademyDomain, useSubjectSelect, useLogin, useAutoAcademyDomain, LoginAccessTokenRequest, LoginRequest, setReFetchUserAcademies, ChatTypes, AcademyHeaders, Types, Enums, CoreHooks, ArticleGroupView, AnswerCountSelector, QuestionCountSelector, ScoreSelector, ArticleCategorySelector, SubjectSelector, useCategorySelect, InputText, Textbook, TextbookDetail, TextbookList, timeUtils, Header };
+import { DEFAULT_PAGING_RESPONSE, PagingResponse } from "./utils/types/pagingResponse";
+export { diffFromNow, formatTime, utcToLocalTime, setLoading, setReadyRegisterPusher, BASE_URL, SUPER_ADMIN_BASE_URL, ACCESS_TOKEN, Login, store, setAlert, setUser, Loading, NotFound, LayoutContext, api, apiUpload, ConfirmDialog, CommonDialog, CustomPagination, useGoogleSignOut, PUSHER_CONFIG, ExamEvent, EXAM_CHANNEL, EXAM_STUDENT_CHANNEL, setLanguage, i18n, TheLanguageDropdown, TheAcademyDropdown, useTranslation, I18nextProvider, DATE_MIN_VALUE, DATE_TIME_MIN_VALUE, ACADEMY_DOMAIN, minutesToTimeSpan, toISOString, canAccessRoute, CustomSelect, CustomAsyncSelect, CustomSelectOption, LoginWithPassword, getAccessToken, ChatContainer, IChatContainerProps, IChatItemProps, IChatHeaderProps, IInputChatProps, ChatItemType, useChatContainer, ConversationResponse, usePusherConversation, ExamResultV2, ToastContainer, toast, Role, useLanguage, useSwitchAcademy, LANGUAGES, CustomCreatable, moment, ExamDetailView, ExamDetailViewProps, Exam, Question, ArticleGroup, getAcademyDomain, useSubjectSelect, useLogin, useAutoAcademyDomain, LoginAccessTokenRequest, LoginRequest, setReFetchUserAcademies, ChatTypes, AcademyHeaders, Types, Enums, CoreHooks, ArticleGroupView, AnswerCountSelector, QuestionCountSelector, ScoreSelector, ArticleCategorySelector, SubjectSelector, useCategorySelect, InputText, Textbook, TextbookDetail, TextbookList, timeUtils, Header, DEFAULT_PAGING_RESPONSE, PagingResponse };

package/dist/index.js

@@ -2118,6 +2118,11 @@ var grades_by_area = "영역별 성적";
 var problems_that_took_a_long_time = "시간이 오래 걸린 문제";
 var my_time = "나의 시간";
 var top_time = "상위권 시간";
+var easy_problem = "쉬운 문제";
+var trick_problem = "함정 문제";
+var differential_problem = "변별력 문제";
+var difficult_problem = "어려운 문제";
+var general_problem = "일반적인 문제";
 var fingerprint = "지문";
 var end = "종료";
 var ask_for_feedback = "피드백 요청하기";
@@ -2125,7 +2130,6 @@ var quit = "종료하기";
 var chosen = "정답";
 var sign_in_with_your_google_account = "Google 계정으로 로그인";
 var it_will_be_generated_automatically_if_not_provided = "제공되지 않으면 자동으로 생성됩니다";
-var go_back = "돌아가기";
 var academy_not_found = "아카데미를 찾을 수 없습니다";
 var full_notice = "전체 공";
 var academy_notice = "학원 공지";
@@ -2149,6 +2153,7 @@ var registration = "등록하기";
 var you_can_only_select_the_10_most_recent_exams = "최근 시험 10개만 선택 가능합니다.";
 var ask_a_question = "문제 질문하기";
 var request_a_consultation = "상담 요청하기";
+var go_back = "돌아가기";
 var next = "다음";
 var complete_processing = "완료 처리";
 var creation_date = "생성 날짜";
@@ -2530,6 +2535,11 @@ var lang_ko = {
 	problems_that_took_a_long_time: problems_that_took_a_long_time,
 	my_time: my_time,
 	top_time: top_time,
+	easy_problem: easy_problem,
+	trick_problem: trick_problem,
+	differential_problem: differential_problem,
+	difficult_problem: difficult_problem,
+	general_problem: general_problem,
 	fingerprint: fingerprint,
 	end: end,
 	ask_for_feedback: ask_for_feedback,
@@ -2537,7 +2547,6 @@ var lang_ko = {
 	chosen: chosen,
 	sign_in_with_your_google_account: sign_in_with_your_google_account,
 	it_will_be_generated_automatically_if_not_provided: it_will_be_generated_automatically_if_not_provided,
-	go_back: go_back,
 	academy_not_found: academy_not_found,
 	full_notice: full_notice,
 	academy_notice: academy_notice,
@@ -2563,6 +2572,7 @@ var lang_ko = {
 	you_can_only_select_the_10_most_recent_exams: you_can_only_select_the_10_most_recent_exams,
 	ask_a_question: ask_a_question,
 	request_a_consultation: request_a_consultation,
+	go_back: go_back,
 	next: next,
 	"i'm_waiting_for_the_teacher_to_start_the_test": "선생님의 시험 시작을 기다리고 있습니다...",
 	complete_processing: complete_processing,
@@ -2927,7 +2937,7 @@ var number_of_classes$1 = "{{ number }} classes";
 var complete_conversation_successfully$1 = "Complete conversation successfully";
 var fail_to_complete_conversation$1 = "Fail to complete conversation";
 var are_you_sure_you_want_to_complete_this_conversation$1 = "Are you sure you want to complete this conversation?";
-var switch_academy_fail$1 = "Academy conversion failed";
+var switch_academy_fail$1 = "Switch academy failed";
 var no_academy_available$1 = "No academy available";
 var my_classes_calendar$1 = "My classes calendar";
 var enter_exam_code$1 = "Enter exam code";
@@ -2992,11 +3002,11 @@ var grades_by_area$1 = "Grades by area";
 var problems_that_took_a_long_time$1 = "Problems that took a long time";
 var my_time$1 = "My time";
 var top_time$1 = "Top time";
-var easy_problem = "Easy problem";
-var trick_problem = "Trick problem";
-var differential_problem = "Differential problem";
-var difficult_problem = "Difficult problem";
-var general_problem = "General problem";
+var easy_problem$1 = "Easy problem";
+var trick_problem$1 = "Trick problem";
+var differential_problem$1 = "Differential problem";
+var difficult_problem$1 = "Difficult problem";
+var general_problem$1 = "General problem";
 var fingerprint$1 = "Fingerprint";
 var end$1 = "end";
 var ask_for_feedback$1 = "Ask for feedback";
@@ -3004,7 +3014,6 @@ var quit$1 = "Quit";
 var chosen$1 = "Answer";
 var sign_in_with_your_google_account$1 = "Sign in with your Google Account";
 var it_will_be_generated_automatically_if_not_provided$1 = "It will be generated automatically if not provided";
-var go_back$1 = "Go back";
 var academy_not_found$1 = "Academy not found";
 var full_notice$1 = "Full notice";
 var academy_notice$1 = "Academy Notice";
@@ -3028,6 +3037,7 @@ var registration$1 = "Registration";
 var you_can_only_select_the_10_most_recent_exams$1 = "You can only select the 10 most recent exams.";
 var ask_a_question$1 = "Ask a question";
 var request_a_consultation$1 = "Request a consultation";
+var go_back$1 = "Go back";
 var next$1 = "Next";
 var complete_processing$1 = "Complete processing";
 var creation_date$1 = "Creation date";
@@ -3443,11 +3453,11 @@ var lang_en = {
 	problems_that_took_a_long_time: problems_that_took_a_long_time$1,
 	my_time: my_time$1,
 	top_time: top_time$1,
-	easy_problem: easy_problem,
-	trick_problem: trick_problem,
-	differential_problem: differential_problem,
-	difficult_problem: difficult_problem,
-	general_problem: general_problem,
+	easy_problem: easy_problem$1,
+	trick_problem: trick_problem$1,
+	differential_problem: differential_problem$1,
+	difficult_problem: difficult_problem$1,
+	general_problem: general_problem$1,
 	fingerprint: fingerprint$1,
 	end: end$1,
 	ask_for_feedback: ask_for_feedback$1,
@@ -3455,7 +3465,6 @@ var lang_en = {
 	chosen: chosen$1,
 	sign_in_with_your_google_account: sign_in_with_your_google_account$1,
 	it_will_be_generated_automatically_if_not_provided: it_will_be_generated_automatically_if_not_provided$1,
-	go_back: go_back$1,
 	academy_not_found: academy_not_found$1,
 	full_notice: full_notice$1,
 	academy_notice: academy_notice$1,
@@ -3481,6 +3490,7 @@ var lang_en = {
 	you_can_only_select_the_10_most_recent_exams: you_can_only_select_the_10_most_recent_exams$1,
 	ask_a_question: ask_a_question$1,
 	request_a_consultation: request_a_consultation$1,
+	go_back: go_back$1,
 	next: next$1,
 	"i'm_waiting_for_the_teacher_to_start_the_test": "I'm waiting for the teacher to start the test...",
 	complete_processing: complete_processing$1,
@@ -3669,7 +3679,7 @@ var useSwitchAcademy = function useSwitchAcademy(role, navigate, homeAcademyUrl,
         });
       }, function (error) {
         var _error$response, _error$response$data;
-        reactToastify.toast.error((error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.tile) || "Get user academies failed");
+        reactToastify.toast.error((error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.title) || "Get user academies failed");
       });
       return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(_temp3) : _temp3(_temp2));
     } catch (e) {
@@ -8607,14 +8617,21 @@ var useAutoAcademyDomain = function useAutoAcademyDomain(logout, history, superU
   }, [window.location.pathname, user === null || user === void 0 ? void 0 : user.academyDomain]);
 };
 
+var DEFAULT_PAGING_RESPONSE = {
+  page: 0,
+  limit: 0,
+  totalItems: 0,
+  totalPages: 0
+};
+
 var useList = function useList(fetchData, defaultQuery) {
   var dispatch = reactRedux.useDispatch();
   var _useState = React.useState(defaultQuery),
     filter = _useState[0],
     setFilter = _useState[1];
-  var _useState2 = React.useState(0),
-    totalPages = _useState2[0],
-    setTotalPages = _useState2[1];
+  var _useState2 = React.useState(DEFAULT_PAGING_RESPONSE),
+    paging = _useState2[0],
+    setPaging = _useState2[1];
   var _useState3 = React.useState([]),
     data = _useState3[0],
     setData = _useState3[1];
@@ -8638,17 +8655,19 @@ var useList = function useList(fetchData, defaultQuery) {
       isLoading && dispatch(setLoading(true));
       var _temp = _catch(function () {
         return Promise.resolve(fetchData(filter)).then(function (res) {
-          var _res$data = res.data,
-            _res$data$items = _res$data.items,
-            items = _res$data$items === void 0 ? [] : _res$data$items,
-            _res$data$totalPages = _res$data.totalPages,
-            totalPages = _res$data$totalPages === void 0 ? 0 : _res$data$totalPages;
-          setTotalPages(totalPages);
+          var _res$data$items = res.data.items,
+            items = _res$data$items === void 0 ? [] : _res$data$items;
+          setPaging({
+            limit: res.data.limit || 0,
+            page: res.data.page || 0,
+            totalItems: res.data.totalItems || 0,
+            totalPages: res.data.totalPages || 0
+          });
           setData(items);
         });
       }, function (error) {
         var _error$response, _error$response$data;
-        setTotalPages(0);
+        setPaging(DEFAULT_PAGING_RESPONSE);
         setData([]);
         reactToastify.toast.error((error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.title) || "Get data failed");
       });
@@ -8681,8 +8700,8 @@ var useList = function useList(fetchData, defaultQuery) {
     }));
   };
   var calcOrderNumber = function calcOrderNumber(index) {
-    var _filter$currentPage, _filter$pageSize;
-    return (((_filter$currentPage = filter.currentPage) != null ? _filter$currentPage : 0) - 1) * ((_filter$pageSize = filter.pageSize) != null ? _filter$pageSize : 0) + index + 1;
+    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 = _.debounce(function () {
     var _textSearchRef$curren;
@@ -8697,7 +8716,7 @@ var useList = function useList(fetchData, defaultQuery) {
   return {
     filter: filter,
     textSearchRef: textSearchRef,
-    totalPages: totalPages,
+    paging: paging,
     data: data,
     selectedItem: selectedItem,
     handleSort: handleSort,
@@ -8726,7 +8745,7 @@ var useTextbookList = function useTextbookList(props) {
     }, TextbookDefaultQuery),
     filter = _useList.filter,
     textSearchRef = _useList.textSearchRef,
-    totalPages = _useList.totalPages,
+    paging = _useList.paging,
     textbooks = _useList.data,
     selectedTextbook = _useList.selectedItem,
     handleSort = _useList.handleSort,
@@ -8783,7 +8802,7 @@ var useTextbookList = function useTextbookList(props) {
   return {
     filter: filter,
     textSearchRef: textSearchRef,
-    totalPages: totalPages,
+    paging: paging,
     textbooks: textbooks,
     selectedTextbook: selectedTextbook,
     handleSort: handleSort,
@@ -8908,7 +8927,7 @@ var TextbookList = function TextbookList(props) {
   var _useTextbookList = useTextbookList(props),
     filter = _useTextbookList.filter,
     textbooks = _useTextbookList.textbooks,
-    totalPages = _useTextbookList.totalPages,
+    paging = _useTextbookList.paging,
     textSearchRef = _useTextbookList.textSearchRef,
     selectedTextbook = _useTextbookList.selectedTextbook,
     handleChangeSearchText = _useTextbookList.handleChangeSearchText,
@@ -8986,9 +9005,9 @@ var TextbookList = function TextbookList(props) {
     })))));
   }), !textbooks.length && React__default.createElement(EmptyRow, null))), React__default.createElement("div", {
     className: "d-flex justify-content-end mt-3"
-  }, !!totalPages && React__default.createElement(material.Pagination, {
-    count: totalPages,
-    page: filter.currentPage,
+  }, !!paging.totalPages && React__default.createElement(material.Pagination, {
+    count: paging.totalPages,
+    page: paging.page,
     onChange: handleChangePage
   })))), React__default.createElement(ConfirmDialog, {
     open: !!(selectedTextbook !== null && selectedTextbook !== void 0 && selectedTextbook.id),
@@ -12212,7 +12231,7 @@ var CompareGrass = function CompareGrass(_ref) {
           style: {
             border: "1px solid #FF0000"
           }
-        }, t("Difficult_problem")));
+        }, t("difficult_problem")));
       }))));
     });
   };
@@ -14011,6 +14030,7 @@ exports.CustomSelect = CustomSelect;
 exports.CustomSelectOption = CustomSelectOption;
 exports.DATE_MIN_VALUE = DATE_MIN_VALUE;
 exports.DATE_TIME_MIN_VALUE = DATE_TIME_MIN_VALUE;
+exports.DEFAULT_PAGING_RESPONSE = DEFAULT_PAGING_RESPONSE;
 exports.EXAM_CHANNEL = EXAM_CHANNEL;
 exports.EXAM_STUDENT_CHANNEL = EXAM_STUDENT_CHANNEL;
 exports.Enums = index;