touchstudy-core 0.1.130 → 0.1.132

package/dist/index.modern.js

@@ -1426,6 +1426,7 @@ var subjective_answer = "주관식 정답";
 var current_correct_answer_entered = "현재 입력한 정답";
 var correct_answer_is_required = "정답은 필수입니다.";
 var cancel_2 = "취소하기";
+var article_required = "기사가 필요합니다";
 var lang_ko = {
 	problem_solving: problem_solving,
 	my_story: my_story,
@@ -2485,7 +2486,8 @@ var lang_ko = {
 	subjective_answer: subjective_answer,
 	current_correct_answer_entered: current_correct_answer_entered,
 	correct_answer_is_required: correct_answer_is_required,
-	cancel_2: cancel_2
+	cancel_2: cancel_2,
+	article_required: article_required
 };
 
 var problem_solving$1 = "Problem Solving";
@@ -3568,6 +3570,7 @@ var subjective_answer$1 = "Subjective answer";
 var current_correct_answer_entered$1 = "Current correct answer entered";
 var correct_answer_is_required$1 = "Correct answer is required";
 var cancel_2$1 = "Cancel";
+var article_required$1 = "Article is required";
 var lang_en = {
 	problem_solving: problem_solving$1,
 	my_story: my_story$1,
@@ -4629,7 +4632,8 @@ var lang_en = {
 	subjective_answer: subjective_answer$1,
 	current_correct_answer_entered: current_correct_answer_entered$1,
 	correct_answer_is_required: correct_answer_is_required$1,
-	cancel_2: cancel_2$1
+	cancel_2: cancel_2$1,
+	article_required: article_required$1
 };
 
 i18n.use(initReactI18next).init({
@@ -5976,6 +5980,11 @@ var customStyles = {
       color: styles.darker
     });
   },
+  placeholder: function placeholder(baseStyles, _) {
+    return _extends({}, baseStyles, {
+      whiteSpace: "nowrap"
+    });
+  },
   singleValue: function singleValue(baseStyles) {
     return _extends({}, baseStyles, {
       fontSize: "14px",
@@ -5993,7 +6002,7 @@ var customStyles = {
   },
   menuPortal: function menuPortal(base) {
     return _extends({}, base, {
-      zIndex: 1
+      zIndex: 99
     });
   }
 };
@@ -21637,7 +21646,8 @@ var UserDialog = function UserDialog(_ref) {
       setLoadingDefaultPassCode(true);
       var _temp3 = _catch(function () {
         return Promise.resolve(getUserDefaultPassCodeApi(parentPhoneNumber, phoneNumber, email, true)).then(function (res) {
-          setPassCode(res.data);
+          var _res$data;
+          setPassCode((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.toString());
         });
       }, function (error) {
         toast.error(getErrorMessage(t, error));
@@ -21693,6 +21703,9 @@ var UserDialog = function UserDialog(_ref) {
       setRoles([].concat((data === null || data === void 0 ? void 0 : data.roles) || [Role.Teacher]));
     }
   }, [open]);
+  useEffect(function () {
+    getDefaultPassCode();
+  }, [getValues().parentPhoneNumber, getValues().phoneNumber]);
   var handleUseDefaultPassCode = function handleUseDefaultPassCode() {
     setUseDefaultPassCode(true);
     setPassCode(undefined);
@@ -21921,16 +21934,9 @@ var UserDialog = function UserDialog(_ref) {
       color: theme.palette.success.main,
       fontWeight: 600
     }
-  }, defaultPassCodeValue), React__default.createElement(Box, null, isLoadingDefaultPassCode ? React__default.createElement(CircularProgress, {
+  }, defaultPassCodeValue), React__default.createElement(Box, null, isLoadingDefaultPassCode && React__default.createElement(CircularProgress, {
     size: "1rem"
-  }) : React__default.createElement(IconButton, {
-    className: "bg-success",
-    onClick: getDefaultPassCode,
-    disabled: disabled
-  }, React__default.createElement(FaRotateRight, {
-    color: "#FFF",
-    size: 10
-  }))))), React__default.createElement(FormControlLabel, {
+  })))), React__default.createElement(FormControlLabel, {
     control: React__default.createElement(Radio, {
       checked: !useDefaultPassCode,
       onChange: function onChange() {
@@ -27485,6 +27491,9 @@ var preparedTextbookSchema = function preparedTextbookSchema(t) {
           },
           then: function then(schema) {
             return schema.min(1, t("category_required"));
+          },
+          otherwise: function otherwise(schema) {
+            return schema.min(1, t("article_required"));
           }
         }),
         questions: array().of(object())
@@ -27503,7 +27512,17 @@ var preparedTextbookSchema = function preparedTextbookSchema(t) {
             title: string().notRequired(),
             author: string().notRequired(),
             subject: string().notRequired()
-          })),
+          })).when("$type", {
+            is: function is(type) {
+              return type === 2;
+            },
+            then: function then(schema) {
+              return schema.min(1, t("category_required"));
+            },
+            otherwise: function otherwise(schema) {
+              return schema.min(1, t("article_required"));
+            }
+          }),
           questions: array().of(object())
         }))
       }))
@@ -27739,6 +27758,14 @@ var ArticleBlock = function ArticleBlock(_ref) {
   var handleOpenCategoryMenu = function handleOpenCategoryMenu() {
     onOpenCategoryMenu(path + ".categories[0]");
   };
+  var handleChangeCategory = function handleChangeCategory(val) {
+    setFieldValue(path + ".categoryOptions", [val]);
+    setFieldValue(path + ".categories", [val === null || val === void 0 ? void 0 : val.value]);
+  };
+  var handleChangeSubCategory = function handleChangeSubCategory(val) {
+    setFieldValue(path + ".categoryOptions[1]", [val]);
+    setFieldValue(path + ".categories[1]", [val === null || val === void 0 ? void 0 : val.value]);
+  };
   return React__default.createElement(Stack, {
     direction: "row",
     alignItems: "center",
@@ -27805,10 +27832,7 @@ var ArticleBlock = function ArticleBlock(_ref) {
           onMenuOpen: handleOpenCategoryMenu,
           onMenuClose: onCloseCategoryMenu
         },
-        onChange: function onChange(val) {
-          setFieldValue(path + ".categories[0]", val === null || val === void 0 ? void 0 : val.value);
-          setFieldValue(path + ".categoryOptions[0]", val);
-        },
+        onChange: handleChangeCategory,
         placeholder: t("select_category")
       });
     }
@@ -27845,10 +27869,7 @@ var ArticleBlock = function ArticleBlock(_ref) {
           onMenuOpen: handleOpenSubCategoryMenu,
           onMenuClose: onCloseCategoryMenu
         },
-        onChange: function onChange(val) {
-          setFieldValue(path + ".categories[1]", val === null || val === void 0 ? void 0 : val.value);
-          setFieldValue(path + ".categoryOptions[1]", val);
-        },
+        onChange: handleChangeSubCategory,
         isDisabled: !data.categories[0],
         placeholder: t("select_category")
       });
@@ -27944,15 +27965,14 @@ var ArticleBlock$1 = memo(ArticleBlock, isEqual);
 
 var styles$9 = {"question":"_1_ONI","question-article":"_2FdrR","question-title":"_3mgRf","question-label":"_2h0kA","question-input":"_exAl-","question-btn":"_2ksp8"};
 
+var labelStyle = {
+  textOverflow: "ellipsis",
+  overflowX: "hidden",
+  width: "100%",
+  whiteSpace: "nowrap"
+};
+
 var _excluded$e = ["onChange"];
-var answerTypeOptions = Object.keys(QuestionAnswerType).filter(function (key) {
-  return Number.isNaN(+key);
-}).map(function (label, index) {
-  return {
-    label: t$1(label.toLowerCase()),
-    value: index
-  };
-});
 var BpIcon$1 = styled("span")(function (_ref) {
   var theme = _ref.theme;
   return {
@@ -28023,13 +28043,13 @@ var QuestionBlock = function QuestionBlock(_ref2) {
         }, React__default.createElement(FormLabel, {
           htmlFor: "textual_answer",
           className: styles$9["question-label"] + " form-label"
-        }, t$1("textual_answer")), React__default.createElement(Field, {
+        }, t("textual_answer")), React__default.createElement(Field, {
           name: path + ".textualAnswer",
           render: function render(_ref3) {
             var field = _ref3.field;
             return React__default.createElement(TextField, Object.assign({}, field, {
               size: "small",
-              placeholder: t$1("textual_answer")
+              placeholder: t("textual_answer")
             }));
           }
         }));
@@ -28055,7 +28075,7 @@ var QuestionBlock = function QuestionBlock(_ref2) {
                 return handleCheckMultiChoice(+e.target.value);
               }
             }),
-            label: t$1("number_question", {
+            label: t("number_question", {
               number: i
             })
           });
@@ -28091,7 +28111,7 @@ var QuestionBlock = function QuestionBlock(_ref2) {
               checkedIcon: React__default.createElement(BpCheckedIcon$1, null),
               icon: React__default.createElement(BpIcon$1, null)
             }),
-            label: t$1("number_question", {
+            label: t("number_question", {
               number: i
             })
           });
@@ -28100,10 +28120,27 @@ var QuestionBlock = function QuestionBlock(_ref2) {
         return null;
     }
   };
-  console.log({
-    isLoadingQuestionTypes: isLoadingQuestionTypes,
-    path: path
+  var handleChangeQuestionType = function handleChangeQuestionType(val) {
+    if (typeof (val === null || val === void 0 ? void 0 : val.value) === "string") {
+      setFieldValue(path + ".questionTypeId", 0);
+      setFieldValue(path + ".questionTypeName", val === null || val === void 0 ? void 0 : val.value);
+    } else {
+      setFieldValue(path + ".questionTypeId", (val === null || val === void 0 ? void 0 : val.value) || 0);
+    }
+    setFieldValue(path + ".questionType", val);
+  };
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  var answerTypeOptions = Object.keys(QuestionAnswerType).filter(function (key) {
+    return Number.isNaN(+key);
+  }).map(function (label, index) {
+    return {
+      label: t(label.toLowerCase()),
+      value: index
+    };
   });
+  var theme = useTheme();
+  var isTabletUp = useMediaQuery(theme.breakpoints.up('lg'));
   return React__default.createElement(Stack, {
     direction: "row",
     alignItems: "center",
@@ -28112,11 +28149,12 @@ var QuestionBlock = function QuestionBlock(_ref2) {
   }, React__default.createElement(Stack, {
     direction: "row",
     alignItems: "center",
+    minWidth: "50%",
     flexGrow: 1
   }, React__default.createElement(Box, null, React__default.createElement(Box, {
     className: styles$9["question-title"] + " me-2 text-nowrap",
     sx: questionTitleStyle
-  }, t$1("problem_number_question", {
+  }, t("problem_number_question", {
     number: data.questionOrder + 1
   }))), React__default.createElement(Box, {
     flexGrow: 1
@@ -28126,12 +28164,13 @@ var QuestionBlock = function QuestionBlock(_ref2) {
   }, React__default.createElement(FormControl, {
     sx: {
       flexGrow: 1,
-      width: "168px"
+      width: isTabletUp ? "120px" : "100px"
     }
   }, React__default.createElement(FormLabel, {
     htmlFor: "score",
-    className: styles$9["question-label"] + " form-label"
-  }, t$1("score")), React__default.createElement(Field, {
+    className: styles$9["question-label"] + " form-label",
+    sx: labelStyle
+  }, t("score")), React__default.createElement(Field, {
     name: path + ".score",
     render: function render(_ref4) {
       var field = _ref4.field;
@@ -28145,12 +28184,13 @@ var QuestionBlock = function QuestionBlock(_ref2) {
   })), isMath && React__default.createElement(FormGroup, {
     sx: {
       flexGrow: 1,
-      width: "240px"
+      width: isTabletUp ? "180px" : "120px"
     }
   }, React__default.createElement(FormLabel, {
     htmlFor: "type",
-    className: styles$9["question-label"] + " form-label"
-  }, t$1("type")), React__default.createElement(Field, {
+    className: styles$9["question-label"] + " form-label",
+    sx: labelStyle
+  }, t("type")), React__default.createElement(Field, {
     name: path + ".questionTypeId",
     render: function render(_ref5) {
       var _ref5$field = _ref5.field,
@@ -28162,26 +28202,20 @@ var QuestionBlock = function QuestionBlock(_ref2) {
         isLoading: optionKey === path + ".questionTypeId" ? isLoadingQuestionTypes : false,
         onMenuOpen: handleOpenQuestionTypeMenu,
         onMenuClose: onCloseQuestionTypeMenu,
-        onChange: function onChange(val) {
-          if (typeof (val === null || val === void 0 ? void 0 : val.value) === "string") {
-            setFieldValue(path + ".questionTypeId", 0);
-            setFieldValue(path + ".questionTypeName", val === null || val === void 0 ? void 0 : val.value);
-          } else {
-            setFieldValue(path + ".questionTypeId", (val === null || val === void 0 ? void 0 : val.value) || 0);
-          }
-          setFieldValue(path + ".questionType", val);
-        }
+        onChange: handleChangeQuestionType,
+        isClearable: true
       }));
     }
   })), React__default.createElement(FormGroup, {
     sx: {
       flexGrow: 1,
-      width: "240px"
+      width: isTabletUp ? "180px" : "100px"
     }
   }, React__default.createElement(FormLabel, {
     htmlFor: "question_answer_type",
-    className: styles$9["question-label"] + " form-label"
-  }, t$1("question_answer_type")), React__default.createElement(Field, {
+    className: styles$9["question-label"] + " form-label",
+    sx: labelStyle
+  }, t("question_answer_type")), React__default.createElement(Field, {
     name: path + ".questionAnswerType",
     render: function render(_ref6) {
       var field = _ref6.field;
@@ -28209,6 +28243,7 @@ var QuestionBlock$1 = memo(QuestionBlock, isEqual$1);
 
 var _excluded$f = ["data", "path", "isMath", "open", "isLoadingCategories", "isLoadingQuestionTypes", "optionKey", "categories", "questionTypes", "onDelete", "onOpenSubCategoryMenu", "onOpenCategoryMenu", "onCloseCategoryMenu", "onCloseQuestionTypeMenu", "onOpenQuestionTypeMenu"];
 var QuestionGroupBlockBody = function QuestionGroupBlockBody(_ref) {
+  var _data$articles$3, _data$articles$3$cate, _data$articles$4, _data$articles$4$cate;
   var data = _ref.data,
     path = _ref.path,
     isMath = _ref.isMath,
@@ -28229,6 +28264,10 @@ var QuestionGroupBlockBody = function QuestionGroupBlockBody(_ref) {
   var articles = data.articles,
     questions = data.questions;
   var blockErrors = _.get(errors, path);
+  var handleOpenQuestionTypeMenu = useCallback(function (key) {
+    var _data$articles$, _data$articles$$categ, _data$articles$2, _data$articles$2$cate;
+    onOpenQuestionTypeMenu(key, (_data$articles$ = data.articles[0]) === null || _data$articles$ === void 0 ? void 0 : (_data$articles$$categ = _data$articles$.categories) === null || _data$articles$$categ === void 0 ? void 0 : _data$articles$$categ[0], (_data$articles$2 = data.articles[0]) === null || _data$articles$2 === void 0 ? void 0 : (_data$articles$2$cate = _data$articles$2.categories) === null || _data$articles$2$cate === void 0 ? void 0 : _data$articles$2$cate[1]);
+  }, [(_data$articles$3 = data.articles[0]) === null || _data$articles$3 === void 0 ? void 0 : (_data$articles$3$cate = _data$articles$3.categories) === null || _data$articles$3$cate === void 0 ? void 0 : _data$articles$3$cate[0], (_data$articles$4 = data.articles[0]) === null || _data$articles$4 === void 0 ? void 0 : (_data$articles$4$cate = _data$articles$4.categories) === null || _data$articles$4$cate === void 0 ? void 0 : _data$articles$4$cate[1]]);
   return React__default.createElement(FieldArray, {
     name: path + ".articles",
     render: function render(arrayHelpers) {
@@ -28290,7 +28329,7 @@ var QuestionGroupBlockBody = function QuestionGroupBlockBody(_ref) {
             questionTypes: questionTypes,
             isLoadingQuestionTypes: isLoadingQuestionTypes,
             optionKey: optionKey,
-            onOpenQuestionTypeMenu: onOpenQuestionTypeMenu,
+            onOpenQuestionTypeMenu: handleOpenQuestionTypeMenu,
             onCloseQuestionTypeMenu: onCloseQuestionTypeMenu
           }, formikProps));
         }
@@ -28412,6 +28451,14 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
       setFieldValue(path + ".articles[0].categoryOptions", (_questionGroup$articl2 = questionGroup.articles[0]) === null || _questionGroup$articl2 === void 0 ? void 0 : _questionGroup$articl2.categoryOptions);
     }
   };
+  var handleChangeCategory = function handleChangeCategory(val) {
+    setFieldValue(path + ".articles[0].categoryOptions", [val]);
+    setFieldValue(path + ".articles[0].categories", [val === null || val === void 0 ? void 0 : val.value]);
+  };
+  var handleChangeSubCategory = function handleChangeSubCategory(val) {
+    setFieldValue(path + ".articles[0].categories[1]", val === null || val === void 0 ? void 0 : val.value);
+    setFieldValue(path + ".articles[0].categoryOptions[1]", val);
+  };
   var summary = open ? "" : [t("number_questions", {
     n: data.questionCount
   }), (_data$articles$2 = data.articles[0]) === null || _data$articles$2 === void 0 ? void 0 : (_data$articles$2$cate = _data$articles$2.categoryOptions) === null || _data$articles$2$cate === void 0 ? void 0 : (_data$articles$2$cate2 = _data$articles$2$cate[0]) === null || _data$articles$2$cate2 === void 0 ? void 0 : _data$articles$2$cate2.label, (_data$articles$3 = data.articles[0]) === null || _data$articles$3 === void 0 ? void 0 : (_data$articles$3$cate = _data$articles$3.categoryOptions) === null || _data$articles$3$cate === void 0 ? void 0 : (_data$articles$3$cate2 = _data$articles$3$cate[1]) === null || _data$articles$3$cate2 === void 0 ? void 0 : _data$articles$3$cate2.label, isMath ? data.questions.map(function (i) {
@@ -28524,10 +28571,7 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
           onMenuOpen: handleOpenCategoryMenu,
           onMenuClose: onCloseCategoryMenu
         },
-        onChange: function onChange(val) {
-          setFieldValue(path + ".articles[0].categories[0]", val === null || val === void 0 ? void 0 : val.value);
-          setFieldValue(path + ".articles[0].categoryOptions[0]", val);
-        },
+        onChange: handleChangeCategory,
         placeholder: t("select_category")
       });
     }
@@ -28562,14 +28606,12 @@ var QuestionGroupBlock = function QuestionGroupBlock(_ref) {
         optionValue: field.value,
         options: categories,
         rest: {
+          isClearable: true,
           isLoading: optionKey === path + ".articles[0].categories[1]" ? isLoadingCategories : false,
           onMenuOpen: handleOpenSubCategoryMenu,
           onMenuClose: onCloseCategoryMenu
         },
-        onChange: function onChange(val) {
-          setFieldValue(path + ".articles[0].categories[1]", val === null || val === void 0 ? void 0 : val.value);
-          setFieldValue(path + ".articles[0].categoryOptions[1]", val);
-        },
+        onChange: handleChangeSubCategory,
         isDisabled: isDisabled || !((_data$articles$4 = data.articles[0]) !== null && _data$articles$4 !== void 0 && (_data$articles$4$cate = _data$articles$4.categories) !== null && _data$articles$4$cate !== void 0 && _data$articles$4$cate[0]),
         placeholder: t("select_category")
       });
@@ -28859,7 +28901,7 @@ var ChapterBlock = function ChapterBlock(_ref) {
     e.stopPropagation();
     onDelete("" + t("are_you_sure_you_want_to_delete_the_chapter", {
       chapter: title
-    }), title, path.replace(/\[(\d+)\]$/, ''), expandedIndex);
+    }), title, path.replace(/\[(\d+)\]$/, ""), expandedIndex);
   };
   var pageNameError = _.get(errors, path + ".name");
   var pageFromError = _.get(errors, path + ".pageFrom");
@@ -29302,8 +29344,8 @@ var useTextbookOptions = function useTextbookOptions(subjectId, isMath, filter,
         var questionTypeFilters = getOptionFilter();
         return Promise.resolve(getQuestionTypesApi(isSuperAdmin, _extends({}, questionTypeFilters, {
           subjectId: subjectId,
-          parentCategorId: subCategoryId,
-          rootParentCategorId: categoryId,
+          parentCategoryId: subCategoryId,
+          rootParentCategoryId: categoryId,
           textSearch: (_inputRef$current7 = inputRef.current) === null || _inputRef$current7 === void 0 ? void 0 : _inputRef$current7.value
         }))).then(function (res) {
           setQuestionTypes(res.data.items.map(function (i) {
@@ -30097,19 +30139,35 @@ var TextbookOwnersTab = function TextbookOwnersTab(_ref) {
   }));
 };
 
-var _reduceToMathArticles = function reduceToMathArticles(textbook, isMath, isInit) {
-  if (isInit === void 0) {
-    isInit = true;
-  }
-  var values = isInit ? _.cloneDeep(textbook) : textbook;
-  if (isInit) values.type = isMath;
+var _reduceToMathArticles = function reduceToMathArticles(textbook, isMath) {
+  var values = isMath !== undefined ? _.cloneDeep(textbook) : textbook;
+  if (isMath !== undefined) values.type = isMath;
   for (var key in values) {
     if (values.hasOwnProperty(key)) {
       if (key === "articles") {
         var _values$key;
         values[key] = (_values$key = values[key]) !== null && _values$key !== void 0 && _values$key.length ? [values[key][0]] : [DEFAULT_ARTICLE];
       } else if (typeof values[key] === "object" && values[key] !== null) {
-        _reduceToMathArticles(values[key], isMath, false);
+        _reduceToMathArticles(values[key]);
+      }
+    }
+  }
+  return values;
+};
+var _resetAllCrategoriesAndQuestionTypesBySubject = function resetAllCrategoriesAndQuestionTypesBySubject(textbook, subject) {
+  var values = subject ? _.cloneDeep(textbook) : textbook;
+  if (subject) {
+    values.subjectId = subject === null || subject === void 0 ? void 0 : subject.value;
+    values.subject = subject;
+  }
+  for (var key in values) {
+    if (values.hasOwnProperty(key)) {
+      if (key === "categories" || key === "categoryOptions") {
+        values[key] = [];
+      } else if (key === "questionType" || key === "questionTypeId") {
+        values[key] = null;
+      } else if (typeof values[key] === "object" && values[key] !== null) {
+        _resetAllCrategoriesAndQuestionTypesBySubject(values[key]);
       }
     }
   }
@@ -30238,8 +30296,7 @@ var PreparedTextbookForm = function PreparedTextbookForm(_ref) {
     errors = formikProps.errors,
     dirty = formikProps.dirty,
     submitCount = formikProps.submitCount,
-    setValues = formikProps.setValues,
-    setFieldValue = formikProps.setFieldValue;
+    setValues = formikProps.setValues;
   useEffect(function () {
     var handleBeforeUnload = function handleBeforeUnload(event) {
       var message = t$1("are_you_sure_you_want_to_quit_yours_changes_may_not_be_saved");
@@ -30257,8 +30314,8 @@ var PreparedTextbookForm = function PreparedTextbookForm(_ref) {
     setValues(newValues);
   };
   var handleChangeSubject = function handleChangeSubject(val) {
-    setFieldValue("subject", val);
-    setFieldValue("subjectId", val === null || val === void 0 ? void 0 : val.value);
+    var newValues = _resetAllCrategoriesAndQuestionTypesBySubject(values, val);
+    setValues(newValues);
   };
   var inforErrors = errors.coverImage || errors.grade || errors.isbn || errors.preparedType || errors.publicationDate || errors.publisher;
   var contentsErrors = errors.chapters;
@@ -30343,9 +30400,6 @@ var PreparedTextbookForm = function PreparedTextbookForm(_ref) {
     },
     variant: "contained",
     onClick: function onClick() {
-      console.log({
-        errors: errors
-      });
       if (!_.isEmpty(errors)) {
         toast.error(t$1("please_fill_in_the_blank_fields"));
       }