touchstudy-core 0.1.66 → 0.1.68

package/dist/index.js

@@ -1331,8 +1331,20 @@ var commonReducer = toolkit.createReducer(initialState, function (builder) {
   });
 });
 
+var setAcademies = toolkit.createAction("common/setAcademies");
+
+var initialState$1 = {
+  items: []
+};
+var commonReducer$1 = toolkit.createReducer(initialState$1, function (builder) {
+  builder.addCase(setAcademies, function (state, action) {
+    state.items = action.payload;
+  });
+});
+
 var rootReducer = combineReducers({
-  common: commonReducer
+  common: commonReducer,
+  academies: commonReducer$1
 });
 
 var store = toolkit.configureStore({
@@ -2256,6 +2268,7 @@ var creation_date = "생성 날짜";
 var total_use = "총 사용량";
 var duration = "지속";
 var code_header = "암호";
+var duration_header = "지속";
 var total_number_of_students_participating = "참여한 총 학생 수";
 var create = "생성하기";
 var to_show = "보여주다";
@@ -2501,6 +2514,9 @@ var number_of_correct_answers = "정답 수";
 var total_solve_time = "총 풀이 시간";
 var number_of_answer = "{{ number }} 개";
 var time_comparison = "시간 비교";
+var total_users = "총 사용자";
+var added_date = "추가된 날짜";
+var update_data_fail = "데이터 업데이트 실패";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -2904,6 +2920,7 @@ var lang_ko = {
 	total_use: total_use,
 	duration: duration,
 	code_header: code_header,
+	duration_header: duration_header,
 	total_number_of_students_participating: total_number_of_students_participating,
 	create: create,
 	to_show: to_show,
@@ -3151,7 +3168,10 @@ var lang_ko = {
 	number_of_correct_answers: number_of_correct_answers,
 	total_solve_time: total_solve_time,
 	number_of_answer: number_of_answer,
-	time_comparison: time_comparison
+	time_comparison: time_comparison,
+	total_users: total_users,
+	added_date: added_date,
+	update_data_fail: update_data_fail
 };
 
 var problem_solving$1 = "Problem Solving";
@@ -3587,6 +3607,7 @@ var creation_date$1 = "Creation date";
 var total_use$1 = "Total use";
 var duration$1 = "Duration";
 var code_header$1 = "Code";
+var duration_header$1 = "Duration";
 var total_number_of_students_participating$1 = "Total number of students participating";
 var create$1 = "Create";
 var to_show$1 = "To Show";
@@ -3809,6 +3830,9 @@ var number_of_correct_answers$1 = "Number of correct answers";
 var total_solve_time$1 = "Total solve time";
 var number_of_answer$1 = "{{ number }}";
 var time_comparison$1 = "Time comparison";
+var total_users$1 = "Total users";
+var added_date$1 = "Added date";
+var update_data_fail$1 = "Update data fail";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -4235,6 +4259,7 @@ var lang_en = {
 	total_use: total_use$1,
 	duration: duration$1,
 	code_header: code_header$1,
+	duration_header: duration_header$1,
 	total_number_of_students_participating: total_number_of_students_participating$1,
 	create: create$1,
 	to_show: to_show$1,
@@ -4459,7 +4484,10 @@ var lang_en = {
 	number_of_correct_answers: number_of_correct_answers$1,
 	total_solve_time: total_solve_time$1,
 	number_of_answer: number_of_answer$1,
-	time_comparison: time_comparison$1
+	time_comparison: time_comparison$1,
+	total_users: total_users$1,
+	added_date: added_date$1,
+	update_data_fail: update_data_fail$1
 };
 
 i18n.use(reactI18next.initReactI18next).init({
@@ -4554,13 +4582,20 @@ var TheLanguageDropdown = function TheLanguageDropdown(_ref) {
   })));
 };
 
-var useSwitchAcademy = function useSwitchAcademy(role, history, homeAcademyUrl, homeUrl) {
+var useSwitchAcademy = function useSwitchAcademy(role, history, homeAcademyUrl, homeUrl, canFetchAcademies) {
   if (role === void 0) {
     role = exports.Role.Student;
   }
+  if (canFetchAcademies === void 0) {
+    canFetchAcademies = false;
+  }
   var dispatch = reactRedux.useDispatch();
   var _useLogin = useLogin(history, homeAcademyUrl, homeUrl),
     handleLoginAccessToken = _useLogin.handleLoginAccessToken;
+  var academyList = reactRedux.useSelector(function (state) {
+    var _state$academies;
+    return state === null || state === void 0 ? void 0 : (_state$academies = state.academies) === null || _state$academies === void 0 ? void 0 : _state$academies.items;
+  }) || [];
   var _useState = React.useState(false),
     dropdownOpen = _useState[0],
     setDropdownOpen = _useState[1];
@@ -4569,9 +4604,6 @@ var useSwitchAcademy = function useSwitchAcademy(role, history, homeAcademyUrl,
       return !prevState;
     });
   };
-  var _useState2 = React.useState([]),
-    academyList = _useState2[0],
-    setAcademyList = _useState2[1];
   var user = reactRedux.useSelector(function (state) {
     var _state$common;
     return state === null || state === void 0 ? void 0 : (_state$common = state.common) === null || _state$common === void 0 ? void 0 : _state$common.user;
@@ -4598,7 +4630,7 @@ var useSwitchAcademy = function useSwitchAcademy(role, history, homeAcademyUrl,
         return Promise.resolve(isSuperAdminUser ? getAcademyList(role) : getUserAcademies(role)).then(function (res) {
           var items = res.data.items || [];
           if (isReFetchUserAcademies) dispatch(setReFetchUserAcademies(false));
-          setAcademyList(items);
+          dispatch(setAcademies(items));
           var _temp = function () {
             if (!isSuperAdminRole && isSuperAdminUser && role == exports.Role.Admin && items.length > 0) {
               return Promise.resolve(handleSwitchAcademy(items[0], false)).then(function () {});
@@ -4679,11 +4711,11 @@ var useSwitchAcademy = function useSwitchAcademy(role, history, homeAcademyUrl,
     }
   };
   React.useEffect(function () {
-    getAcademies();
-  }, [user === null || user === void 0 ? void 0 : user.academyDomain, user === null || user === void 0 ? void 0 : user.email]);
+    canFetchAcademies && getAcademies();
+  }, [canFetchAcademies, user === null || user === void 0 ? void 0 : user.academyDomain, user === null || user === void 0 ? void 0 : user.email]);
   React.useEffect(function () {
-    isReFetchUserAcademies && getAcademies(false);
-  }, [isReFetchUserAcademies]);
+    canFetchAcademies && isReFetchUserAcademies && getAcademies(false);
+  }, [canFetchAcademies, isReFetchUserAcademies]);
   var selectedAcademy = React.useMemo(function () {
     return academyList.find(function (i) {
       var _user$academyDomain;
@@ -4718,7 +4750,7 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
     onSignOut = _ref.onSignOut;
   var theme = material.useTheme();
   var isLargerThanLg = material.useMediaQuery(theme.breakpoints.up("lg"));
-  var _useSwitchAcademy = useSwitchAcademy(role, history, homeAcademyUrl, homeUrl),
+  var _useSwitchAcademy = useSwitchAcademy(role, history, homeAcademyUrl, homeUrl, true),
     academyList = _useSwitchAcademy.academyList,
     handleSwitchAcademy = _useSwitchAcademy.handleSwitchAcademy,
     selectedAcademy = _useSwitchAcademy.selectedAcademy,
@@ -9130,9 +9162,6 @@ var useExamDetailView = function useExamDetailView(props) {
   var exam = props.exam,
     selectedSubject = props.selectedSubject,
     onChangeExam = props.onChangeExam;
-  console.log({
-    exam: exam
-  });
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   var handleChangeQuestionCount = function handleChangeQuestionCount(article, questionCount, answerCount) {