mario-education 2.4.300-layout → 2.4.301-layout

package/dist/containers/QuestionBank/hooks/useQuestionDetail.d.ts

@@ -39,5 +39,6 @@ declare const useQuestionDetail: (id?: number | undefined, type?: number | undef
     setEditedTrue: () => Promise<void>;
     handleGetLabelQuestions: (questionType: any) => Promise<void>;
     labelQuestions: IQuestionLabel;
+    tinyMCEKey: string;
 };
 export default useQuestionDetail;

package/dist/index.js

@@ -1656,6 +1656,7 @@ var SkillSelector = function SkillSelector(_ref) {
 };
 
 var QUESTION_URL = marioCore.BASE_URL + "/api/question";
+var TINY_MCE_KEY_URL = "/api/TinyMCEKey";
 var get$2 = function get(filter) {
   return marioCore.api.get(QUESTION_URL, {
     params: filter
@@ -1691,6 +1692,9 @@ var getLabelQuestions = function getLabelQuestions(filter) {
     params: filter
   });
 };
+var getTinyMCEKeyApi = function getTinyMCEKeyApi() {
+  return marioCore.api.get("" + TINY_MCE_KEY_URL);
+};
 
 var QuestionSelector = function QuestionSelector(_ref) {
   var value = _ref.value,
@@ -14460,7 +14464,9 @@ var SliderScale = function SliderScale(_ref) {
     id: "combo-box-demo",
     freeSolo: true,
     options: fromLabels.filter(function (r) {
-      return !fromLabel.trim() ? true : r.toLocaleLowerCase().includes(fromLabel.toLocaleLowerCase().trim());
+      var _fromLabel$toLocaleLo;
+
+      return !(fromLabel !== null && fromLabel !== void 0 && fromLabel.trim()) ? true : r.toLocaleLowerCase().includes(fromLabel === null || fromLabel === void 0 ? void 0 : (_fromLabel$toLocaleLo = fromLabel.toLocaleLowerCase()) === null || _fromLabel$toLocaleLo === void 0 ? void 0 : _fromLabel$toLocaleLo.trim());
     }) || [],
     value: fromLabel || null,
     onChange: function onChange(_e, value) {
@@ -14481,7 +14487,9 @@ var SliderScale = function SliderScale(_ref) {
     id: "combo-box-demo",
     freeSolo: true,
     options: toLabels.filter(function (r) {
-      return !toLabel.trim() ? true : r.toLocaleLowerCase().includes(toLabel.toLocaleLowerCase().trim());
+      var _toLabel$toLocaleLowe;
+
+      return !(toLabel !== null && toLabel !== void 0 && toLabel.trim()) ? true : r.toLocaleLowerCase().includes(toLabel === null || toLabel === void 0 ? void 0 : (_toLabel$toLocaleLowe = toLabel.toLocaleLowerCase()) === null || _toLabel$toLocaleLowe === void 0 ? void 0 : _toLabel$toLocaleLowe.trim());
     }) || [],
     value: toLabel || null,
     onChange: function onChange(_e, value) {
@@ -15110,6 +15118,10 @@ var useQuestionDetail$1 = function useQuestionDetail(id, type) {
       labelQuestions = _useState3[0],
       setLabelQuestions = _useState3[1];
 
+  var _useState4 = React.useState(""),
+      tinyMCEKey = _useState4[0],
+      setTinyMCEKey = _useState4[1];
+
   var getMinIdCategory = function getMinIdCategory(categories) {
     var sortedCategory = categories.sort(function (c1, c2) {
       return c1.id - c2.id;
@@ -15118,7 +15130,7 @@ var useQuestionDetail$1 = function useQuestionDetail(id, type) {
     return (firstCategory === null || firstCategory === void 0 ? void 0 : firstCategory.id) || 1;
   };
 
-  var getQuestionCategories = function getQuestionCategories() {
+  var getTinyMCEKey = function getTinyMCEKey() {
     try {
       var _temp3 = function _temp3() {
         dispatch(marioCore.setLoading(false));
@@ -15127,6 +15139,37 @@ var useQuestionDetail$1 = function useQuestionDetail(id, type) {
       dispatch(marioCore.setLoading(true));
 
       var _temp4 = _catch(function () {
+        return Promise.resolve(getTinyMCEKeyApi()).then(function (res) {
+          var data = res.data;
+
+          if (!!data) {
+            setTinyMCEKey(data.key);
+          }
+        });
+      }, function (err) {
+        var _err$response, _err$response$data;
+
+        dispatch(marioCore.setAlert({
+          type: "danger",
+          message: ((_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.title) || "Get question failed"
+        }));
+      });
+
+      return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp3) : _temp3(_temp4));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+
+  var getQuestionCategories = function getQuestionCategories() {
+    try {
+      var _temp7 = function _temp7() {
+        dispatch(marioCore.setLoading(false));
+      };
+
+      dispatch(marioCore.setLoading(true));
+
+      var _temp8 = _catch(function () {
         return Promise.resolve(get$i()).then(function (res) {
           var items = res.data.items;
           var categoryId = getMinIdCategory(items);
@@ -15135,15 +15178,15 @@ var useQuestionDetail$1 = function useQuestionDetail(id, type) {
           }));
         });
       }, function (err) {
-        var _err$response, _err$response$data;
+        var _err$response2, _err$response2$data;
 
         dispatch(marioCore.setAlert({
           type: "danger",
-          message: ((_err$response = err.response) === null || _err$response === void 0 ? void 0 : (_err$response$data = _err$response.data) === null || _err$response$data === void 0 ? void 0 : _err$response$data.title) || "Get question failed"
+          message: ((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : _err$response2$data.title) || "Get question failed"
         }));
       });
 
-      return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp3) : _temp3(_temp4));
+      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -15162,13 +15205,13 @@ var useQuestionDetail$1 = function useQuestionDetail(id, type) {
   }, [id, type]);
   var getData = React.useCallback(function () {
     try {
-      var _temp7 = function _temp7() {
+      var _temp11 = function _temp11() {
         dispatch(marioCore.setLoading(false));
       };
 
       dispatch(marioCore.setLoading(true));
 
-      var _temp8 = _catch(function () {
+      var _temp12 = _catch(function () {
         return Promise.resolve(getById$2(id)).then(function (res) {
           var _res$data$category, _res$data, _res$data2, _res$data3;
 
@@ -15183,15 +15226,15 @@ var useQuestionDetail$1 = function useQuestionDetail(id, type) {
           }
         });
       }, function (err) {
-        var _err$response2, _err$response2$data;
+        var _err$response3, _err$response3$data;
 
         dispatch(marioCore.setAlert({
           type: "danger",
-          message: ((_err$response2 = err.response) === null || _err$response2 === void 0 ? void 0 : (_err$response2$data = _err$response2.data) === null || _err$response2$data === void 0 ? void 0 : _err$response2$data.title) || "Get question failed"
+          message: ((_err$response3 = err.response) === null || _err$response3 === void 0 ? void 0 : (_err$response3$data = _err$response3.data) === null || _err$response3$data === void 0 ? void 0 : _err$response3$data.title) || "Get key failed"
         }));
       });
 
-      return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
+      return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(_temp11) : _temp11(_temp12));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -15208,14 +15251,14 @@ var useQuestionDetail$1 = function useQuestionDetail(id, type) {
     try {
       var _exit2 = false;
 
-      var _temp11 = function _temp11(_result) {
+      var _temp15 = function _temp15(_result) {
         if (_exit2) return _result;
         dispatch(marioCore.setLoading(false));
       };
 
       dispatch(marioCore.setLoading(true));
 
-      var _temp12 = _catch(function () {
+      var _temp16 = _catch(function () {
         var next = !!id ? update$2 : create$2;
         var validator = validationChoices(data);
         if (validator.isError) throw new Error(validator.message);
@@ -15228,28 +15271,28 @@ var useQuestionDetail$1 = function useQuestionDetail(id, type) {
           backToList();
         });
       }, function (err) {
-        var _err$response3, _err$response3$data;
+        var _err$response4, _err$response4$data;
 
         dispatch(marioCore.setAlert({
           type: "danger",
-          message: ((_err$response3 = err.response) === null || _err$response3 === void 0 ? void 0 : (_err$response3$data = _err$response3.data) === null || _err$response3$data === void 0 ? void 0 : _err$response3$data.title) || err.message
+          message: ((_err$response4 = err.response) === null || _err$response4 === void 0 ? void 0 : (_err$response4$data = _err$response4.data) === null || _err$response4$data === void 0 ? void 0 : _err$response4$data.title) || err.message
         }));
       });
 
-      return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(_temp11) : _temp11(_temp12));
+      return Promise.resolve(_temp16 && _temp16.then ? _temp16.then(_temp15) : _temp15(_temp16));
     } catch (e) {
       return Promise.reject(e);
     }
   }, [id]);
   var handleGetLabelQuestions = React.useCallback(function (questionType) {
     try {
-      var _temp15 = function _temp15() {
+      var _temp19 = function _temp19() {
         dispatch(marioCore.setLoading(false));
       };
 
       dispatch(marioCore.setLoading(true));
 
-      var _temp16 = _catch(function () {
+      var _temp20 = _catch(function () {
         return Promise.resolve(getLabelQuestions({
           isDefaultSurvey: true,
           questionType: questionType
@@ -15257,19 +15300,22 @@ var useQuestionDetail$1 = function useQuestionDetail(id, type) {
           setLabelQuestions(res.data);
         });
       }, function (err) {
-        var _err$response4, _err$response4$data;
+        var _err$response5, _err$response5$data;
 
         dispatch(marioCore.setAlert({
           type: "danger",
-          message: ((_err$response4 = err.response) === null || _err$response4 === void 0 ? void 0 : (_err$response4$data = _err$response4.data) === null || _err$response4$data === void 0 ? void 0 : _err$response4$data.title) || err.message
+          message: ((_err$response5 = err.response) === null || _err$response5 === void 0 ? void 0 : (_err$response5$data = _err$response5.data) === null || _err$response5$data === void 0 ? void 0 : _err$response5$data.title) || err.message
         }));
       });
 
-      return Promise.resolve(_temp16 && _temp16.then ? _temp16.then(_temp15) : _temp15(_temp16));
+      return Promise.resolve(_temp20 && _temp20.then ? _temp20.then(_temp19) : _temp19(_temp20));
     } catch (e) {
       return Promise.reject(e);
     }
   }, []);
+  React.useEffect(function () {
+    getTinyMCEKey();
+  }, []);
   return {
     questionDetail: questionDetail,
     setEditorRef: setEditorRef,
@@ -15279,7 +15325,8 @@ var useQuestionDetail$1 = function useQuestionDetail(id, type) {
     setEdited: setEdited,
     setEditedTrue: setEditedTrue,
     handleGetLabelQuestions: handleGetLabelQuestions,
-    labelQuestions: labelQuestions
+    labelQuestions: labelQuestions,
+    tinyMCEKey: tinyMCEKey
   };
 };
 
@@ -15356,7 +15403,8 @@ var QuestionDetail = function QuestionDetail() {
       setEdited = _useQuestionDetail.setEdited,
       setEditedTrue = _useQuestionDetail.setEditedTrue,
       handleGetLabelQuestions = _useQuestionDetail.handleGetLabelQuestions,
-      labelQuestions = _useQuestionDetail.labelQuestions;
+      labelQuestions = _useQuestionDetail.labelQuestions,
+      tinyMCEKey = _useQuestionDetail.tinyMCEKey;
 
   var header = !!id ? t(EDIT_QUESTION_HEADER) : t(CREATE_QUESTION_HEADER);
   var confirmText = !!id ? t("update") : t("create");
@@ -15461,8 +15509,8 @@ var QuestionDetail = function QuestionDetail() {
       className: styles["form-question-text"] + " mb-2"
     }, React__default.createElement(marioCore.RequiredLabel, {
       text: t("question_text")
-    }), (questionDetail.text || !id) && React__default.createElement(tinymceReact.Editor, {
-      apiKey: marioCore.TINY_MCE_API_KEY,
+    }), (questionDetail.text || !id) && !!tinyMCEKey && React__default.createElement(tinymceReact.Editor, {
+      apiKey: tinyMCEKey,
       initialValue: questionDetail.text,
       init: marioCore.editorConfig.question,
       onEditorChange: function onEditorChange(content) {
@@ -69901,7 +69949,7 @@ var useHeaderSideBar = function useHeaderSideBar(_navigations) {
 
   var openProfile = function openProfile() {
     handleClose();
-    var url = "/my-profile";
+    var url = "/admin/user/" + userId;
     history.push(url);
   };