touchstudy-core 0.1.74 → 0.1.75

package/dist/index.js

@@ -462,9 +462,11 @@ var useLogin = function useLogin(history, homeAcademyUrl, homeUrl, registerUrl)
       isLogout = true;
     }
     try {
-      var _temp6 = function _temp6() {
+      var _temp6 = function _temp6(_result) {
+        if (_exit) return _result;
         dispatch(setLoading(false));
       };
+      var _exit = false;
       dispatch(setLoading(true));
       var _temp5 = _catch(function () {
         return Promise.resolve(apiLogin()).then(function (loginResponse) {
@@ -474,9 +476,10 @@ var useLogin = function useLogin(history, homeAcademyUrl, homeUrl, registerUrl)
           var isAcademy = !!(user !== null && user !== void 0 && user.academyDomain);
           var needToRegister = isStudent && isFirstLogin && isAcademy;
           var redirectUrl = getRedirectUrl();
+          if (isStudent && !registerUrl) throw new Error("an_unexpected_error_has_occurred");
           if (!redirectUrl) redirectUrl = needToRegister ? registerUrl : isAcademy ? homeAcademyUrl : homeUrl;
           redirectLoginUser(_extends({}, user, {
-            isFirstLogin: isFirstLogin
+            isNotEnoughStatements: isFirstLogin
           }), token, redirectUrl);
         });
       }, function (error) {
@@ -1388,9 +1391,7 @@ var useLayoutContext = function useLayoutContext(role, pusherRegisterUrls, showL
       dispatch(setLoading(true));
       var _temp3 = _catch(function () {
         return Promise.resolve(getAcademyDomain() ? getInfo() : getSuperAdminInfoFromWeb()).then(function (info) {
-          if (!info) {
-            resetAuth();
-          }
+          if (!info.data) resetAuth();
           dispatch(setUser(info.data));
         });
       }, function (err) {
@@ -2544,6 +2545,8 @@ var reset_passcode = "사용된 시간 비밀번호 재설정";
 var at_academy = "학원에서";
 var sent_at = "보낸 시간";
 var create_data_successfully = "데이터를 성공적으로 생성했습니다";
+var reduce_time = "시간 단축";
+var reduce_duration = "기간 단축";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -3291,7 +3294,9 @@ var lang_ko = {
 	reset_passcode: reset_passcode,
 	at_academy: at_academy,
 	sent_at: sent_at,
-	create_data_successfully: create_data_successfully
+	create_data_successfully: create_data_successfully,
+	reduce_time: reduce_time,
+	reduce_duration: reduce_duration
 };
 
 var problem_solving$1 = "Problem Solving";
@@ -4048,6 +4053,9 @@ var expired_date$1 = "Expired Date";
 var reset_passcode$1 = "Reset Used Times Pass Code";
 var at_academy$1 = "At academy";
 var sent_at$1 = "Sent at";
+var create_data_successfully$1 = "Data was created successfully";
+var reduce_time$1 = "Reduce time";
+var reduce_duration$1 = "Reduce duration";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -4795,7 +4803,10 @@ var lang_en = {
 	expired_date: expired_date$1,
 	reset_passcode: reset_passcode$1,
 	at_academy: at_academy$1,
-	sent_at: sent_at$1
+	sent_at: sent_at$1,
+	create_data_successfully: create_data_successfully$1,
+	reduce_time: reduce_time$1,
+	reduce_duration: reduce_duration$1
 };
 
 i18n__default.use(reactI18next.initReactI18next).init({
@@ -4890,7 +4901,7 @@ var TheLanguageDropdown = function TheLanguageDropdown(_ref) {
   })));
 };
 
-var useSwitchAcademy = function useSwitchAcademy(role, history, homeAcademyUrl, homeUrl, canFetchAcademies) {
+var useSwitchAcademy = function useSwitchAcademy(role, history, homeAcademyUrl, homeUrl, registerUrl, canFetchAcademies) {
   var _user$roles;
   if (role === void 0) {
     role = exports.Role.Student;
@@ -4899,7 +4910,7 @@ var useSwitchAcademy = function useSwitchAcademy(role, history, homeAcademyUrl,
     canFetchAcademies = false;
   }
   var dispatch = reactRedux.useDispatch();
-  var _useLogin = useLogin(history, homeAcademyUrl, homeUrl),
+  var _useLogin = useLogin(history, homeAcademyUrl, homeUrl, registerUrl),
     handleLoginAccessToken = _useLogin.handleLoginAccessToken;
   var academyList = reactRedux.useSelector(function (state) {
     var _state$academies;
@@ -5055,10 +5066,11 @@ var TheAcademyDropdown = function TheAcademyDropdown(_ref) {
     homeAcademyUrl = _ref.homeAcademyUrl,
     homeUrl = _ref.homeUrl,
     hideAcademyName = _ref.hideAcademyName,
+    registerUrl = _ref.registerUrl,
     onSignOut = _ref.onSignOut;
   var theme = material.useTheme();
   var isLargerThanLg = material.useMediaQuery(theme.breakpoints.up("lg"));
-  var _useSwitchAcademy = useSwitchAcademy(role, history, homeAcademyUrl, homeUrl, true),
+  var _useSwitchAcademy = useSwitchAcademy(role, history, homeAcademyUrl, homeUrl, registerUrl, true),
     academyList = _useSwitchAcademy.academyList,
     handleSwitchAcademy = _useSwitchAcademy.handleSwitchAcademy,
     selectedAcademy = _useSwitchAcademy.selectedAcademy,
@@ -13974,6 +13986,8 @@ var ProtractedProblem = function ProtractedProblem(_ref) {
   }, t("no_data"))));
 };
 
+var limitQuestions = 5;
+var correctRateThreshHold = 70;
 var Vulnerable = function Vulnerable(_ref) {
   var data = _ref.data,
     keyOpen = _ref.keyOpen,
@@ -13983,11 +13997,13 @@ var Vulnerable = function Vulnerable(_ref) {
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   var isOpen = openProblem === keyOpen;
-  var incorrectQuestions = data.questions.filter(function (i) {
-    return i.selectedAnswers !== "" && i.isCorrect === false;
-  }).sort(function (q1, q2) {
-    return q2.overallCorrectRate === q1.overallCorrectRate ? q1.questionOrder - q2.questionOrder : q2.overallCorrectRate - q1.overallCorrectRate;
-  });
+  var incorrectQuestions = React.useMemo(function () {
+    return data.questions.filter(function (i) {
+      return i.selectedAnswers !== "" && i.isCorrect === false && i.isStar === false && i.overallCorrectRate >= correctRateThreshHold;
+    }).sort(function (q1, q2) {
+      return q2.overallCorrectRate === q1.overallCorrectRate ? q1.questionOrder - q2.questionOrder : q2.overallCorrectRate - q1.overallCorrectRate;
+    }).slice(0, limitQuestions);
+  }, [JSON.stringify(data.questions)]);
   var renderTableBody = function renderTableBody(data) {
     return data.map(function (item, index) {
       return React__default.createElement("tr", {
@@ -15766,6 +15782,7 @@ var Header = function Header(_ref) {
   var _user$roles;
   var academyListRoute = _ref.academyListRoute,
     homeRoute = _ref.homeRoute,
+    registerRoute = _ref.registerRoute,
     headerTabs = _ref.headerTabs,
     role = _ref.role,
     history = _ref.history,
@@ -15814,6 +15831,7 @@ var Header = function Header(_ref) {
   }, React__default.createElement(TheAcademyDropdown, {
     homeAcademyUrl: academyListRoute.path,
     homeUrl: homeRoute.path,
+    registerUrl: registerRoute === null || registerRoute === void 0 ? void 0 : registerRoute.path,
     role: role,
     history: history,
     onSignOut: onSignOut,