mario-education 2.4.256-release → 2.4.258-release

package/dist/MarioFramework.Education/ClientApp/src/containers/QuestionCategory/hooks/useQuestionCateDetail.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 declare type questionCateDetail = {
     name: string;
-    parentCategoryId: number | null;
+    parentCategoryId: Array<number> | null;
 };
 declare const useQuestionCateDetail: () => {
     id: number;

package/dist/MarioFramework.Education/ClientApp/src/services/questionCategoryService.d.ts

@@ -1,5 +1,6 @@
 import { Filter } from "mario-core";
 export declare const get: (filter?: Filter | undefined) => Promise<import("axios").AxiosResponse<any>>;
+export declare const getParentLevel0: (level?: string | undefined) => Promise<import("axios").AxiosResponse<any>>;
 export declare const getById: (id: number) => Promise<import("axios").AxiosResponse<any>>;
 export declare const create: (data: any) => Promise<import("axios").AxiosResponse<any>>;
 export declare const update: (data: any) => Promise<import("axios").AxiosResponse<any>>;

package/dist/index.js

@@ -14800,6 +14800,13 @@ var get$i = function get(filter) {
     params: filter
   });
 };
+var getParentLevel0 = function getParentLevel0(level) {
+  return marioCore.api.get(QUESTION_CATE_URL, {
+    params: {
+      level: level
+    }
+  });
+};
 var getById$e = function getById(id) {
   return marioCore.api.get(QUESTION_CATE_URL + "/" + id);
 };
@@ -16883,6 +16890,60 @@ var QuestionBankContainer = function QuestionBankContainer() {
   });
 };
 
+var QuestionCateSelector = function QuestionCateSelector(_ref) {
+  var isDisabled = _ref.isDisabled,
+      value = _ref.value,
+      onChange = _ref.onChange,
+      rest = _objectWithoutPropertiesLoose(_ref, ["id", "isDisabled", "value", "onChange", "title", "isRequired"]);
+
+  var dispatch = reactRedux.useDispatch();
+
+  var _useState = React.useState([]),
+      questionCategory = _useState[0],
+      setQuestionCategory = _useState[1];
+
+  var getData = React.useCallback(function () {
+    try {
+      var _temp2 = _catch(function () {
+        return Promise.resolve(getParentLevel0("0")).then(function (res) {
+          setQuestionCategory(res.data.items);
+        });
+      }, 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) || err.message
+        }));
+      });
+
+      return Promise.resolve(_temp2 && _temp2.then ? _temp2.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  }, []);
+  React.useEffect(function () {
+    getData();
+  }, []);
+  var options = questionCategory.length > 0 ? questionCategory.map(function (item) {
+    return {
+      id: item.id,
+      label: "" + item.name,
+      value: item.id
+    };
+  }) : [];
+  var initValue = !!value && value.length > 0 ? options.filter(function (item) {
+    return value.includes(item.value);
+  }) : [];
+  return React__default.createElement(marioCore.CustomSelector, Object.assign({
+    options: options,
+    placeholder: "Select category",
+    value: initValue,
+    onChange: onChange,
+    isDisabled: isDisabled
+  }, rest));
+};
+
 var schema$d = yup.object({
   name: yup.string().required("Name is required")
 });
@@ -16947,14 +17008,15 @@ var QuestionCateModal = function QuestionCateModal(props, ref) {
     })), React__default.createElement(reactstrap.Col, {
       md: 12,
       className: "mb-2"
-    }, React__default.createElement(reactstrap.Label, null, t("parent_category")), React__default.createElement(marioCore.QuestionCategorySelector, {
-      isDisabled: !!values.id,
+    }, React__default.createElement(reactstrap.Label, null, t("parent_category")), React__default.createElement(QuestionCateSelector, {
       onChange: function onChange(e) {
-        formikProps.setFieldValue("parentCategoryId", e.value);
+        formikProps.setFieldValue("parentCategoryId", e.map(function (i) {
+          return i.value;
+        }));
         setEditedTrue();
       },
-      id: values.parentCategoryId,
-      isMulti: false
+      value: values.parentCategoryId,
+      isMulti: true
     }))));
   });
 };
@@ -17155,11 +17217,13 @@ var useQuestionCateList = function useQuestionCateList() {
 
     if (!parent) {
       newQuestionCategories = questionCategories.filter(function (q) {
-        return !q.parentCategoryId;
+        return !(q !== null && q !== void 0 && q.parentCategoryId);
       });
     } else {
       newQuestionCategories = questionCategories.filter(function (q) {
-        return q.parentCategoryId === parent.id;
+        var _q$parentCategoryId;
+
+        return q === null || q === void 0 ? void 0 : (_q$parentCategoryId = q.parentCategoryId) === null || _q$parentCategoryId === void 0 ? void 0 : _q$parentCategoryId.includes(parent.id);
       });
     }
 
@@ -17167,7 +17231,9 @@ var useQuestionCateList = function useQuestionCateList() {
       return _extends({}, q, {
         level: Number.isInteger(parent === null || parent === void 0 ? void 0 : parent.level) ? parent.level + 1 : 0,
         hasChildren: questionCategories.findIndex(function (qc) {
-          return qc.parentCategoryId === q.id;
+          var _qc$parentCategoryId;
+
+          return qc === null || qc === void 0 ? void 0 : (_qc$parentCategoryId = qc.parentCategoryId) === null || _qc$parentCategoryId === void 0 ? void 0 : _qc$parentCategoryId.includes(q.id);
         }) >= 0
       });
     });
@@ -17178,22 +17244,32 @@ var useQuestionCateList = function useQuestionCateList() {
       return c.id === parent.id;
     });
     if (indexOfParent < 0) return;
+    var newCategories = categories;
 
     if (categories[indexOfParent].show) {
-      var newCategories = hideChildren(categories[indexOfParent]);
-      setCategories([].concat(newCategories));
+      newCategories = hideChildren(categories[indexOfParent]);
     } else {
       var children = getCategoriesByParent(questionCateList, categories[indexOfParent]);
 
       if (children.length > 0) {
-        var _newCategories = categories;
+        newCategories.splice.apply(newCategories, [indexOfParent + 1, 0].concat(children));
+        newCategories[indexOfParent].show = true;
+      }
+    }
 
-        _newCategories.splice.apply(_newCategories, [indexOfParent + 1, 0].concat(children));
+    var indexOpenOthder = categories.findIndex(function (c) {
+      return c.id != parent.id && c.show;
+    });
 
-        _newCategories[indexOfParent].show = true;
-        setCategories([].concat(_newCategories));
-      }
+    if (indexOpenOthder >= 0) {
+      var indexLevel0 = categories.findIndex(function (c, idx) {
+        return c.level == 0 && idx > indexOpenOthder;
+      });
+      newCategories.splice(indexOpenOthder + 1, indexLevel0 - indexOpenOthder - 1);
+      newCategories[indexOpenOthder].show = false;
     }
+
+    setCategories([].concat(newCategories));
   };
 
   var hideChildren = function hideChildren(parent) {
@@ -17203,22 +17279,19 @@ var useQuestionCateList = function useQuestionCateList() {
     if (indexOfParent < 0) return;
     var newCategories = categories;
     categories.forEach(function (c) {
-      if (c.parentCategoryId === parent.id) newCategories = hideChildren(c);
+      var _c$parentCategoryId;
+
+      if (c !== null && c !== void 0 && (_c$parentCategoryId = c.parentCategoryId) !== null && _c$parentCategoryId !== void 0 && _c$parentCategoryId.includes(parent.id)) newCategories = hideChildren(c);
     });
     newCategories = newCategories.filter(function (c) {
-      return c.parentCategoryId !== parent.id;
+      var _c$parentCategoryId2;
+
+      return !(c !== null && c !== void 0 && (_c$parentCategoryId2 = c.parentCategoryId) !== null && _c$parentCategoryId2 !== void 0 && _c$parentCategoryId2.includes(parent.id));
     });
     newCategories[indexOfParent].show = false;
     return newCategories;
   };
 
-  var removeCatecory = function removeCatecory(categoryId) {
-    var newCategories = categories.filter(function (c) {
-      return c.id !== categoryId;
-    });
-    setCategories([].concat(newCategories));
-  };
-
   var removeData = function removeData(id) {
     dispatch(marioCore.setLoading(true));
 
@@ -17229,24 +17302,35 @@ var useQuestionCateList = function useQuestionCateList() {
         message: "Do you want to remove this category?",
         onConfirm: function () {
           try {
-            return Promise.resolve(remove$e(id)).then(function () {
+            var _temp6 = _catch(function () {
+              return Promise.resolve(remove$e(id)).then(function () {
+                dispatch(marioCore.setAlert({
+                  type: "success",
+                  message: "Remove category successfully"
+                }));
+                getData();
+              });
+            }, function (err) {
+              var _err$response2, _err$response2$data;
+
               dispatch(marioCore.setAlert({
-                type: "success",
-                message: "Remove category successfully"
+                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) || err.message
               }));
-              removeCatecory(id);
             });
+
+            return Promise.resolve(_temp6 && _temp6.then ? _temp6.then(function () {}) : void 0);
           } catch (e) {
             return Promise.reject(e);
           }
         }
       }));
     } catch (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) || err.message
+        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
       }));
     }