touchstudy-core 0.1.66 → 0.1.67

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({
@@ -4554,13 +4566,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 +4588,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 +4614,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 +4695,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 +4734,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 +9146,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) {