touchstudy-core 0.1.48 → 0.1.49

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

@@ -2927,7 +2927,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";
@@ -3669,7 +3669,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 +8607,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 +8645,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 +8690,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 +8706,7 @@ var useList = function useList(fetchData, defaultQuery) {
   return {
     filter: filter,
     textSearchRef: textSearchRef,
-    totalPages: totalPages,
+    paging: paging,
     data: data,
     selectedItem: selectedItem,
     handleSort: handleSort,
@@ -8726,7 +8735,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 +8792,7 @@ var useTextbookList = function useTextbookList(props) {
   return {
     filter: filter,
     textSearchRef: textSearchRef,
-    totalPages: totalPages,
+    paging: paging,
     textbooks: textbooks,
     selectedTextbook: selectedTextbook,
     handleSort: handleSort,
@@ -8908,7 +8917,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 +8995,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),
@@ -14011,6 +14020,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;