mario-education 2.3.3 → 2.3.4

package/dist/index.js

@@ -5269,24 +5269,45 @@ var useCSVImport = function useCSVImport() {
   }, []);
   var upload = React.useCallback(function (file) {
     try {
-      var _temp3 = function _temp3() {
+      var _temp7 = function _temp7() {
         dispatch(marioCore.setLoading(false));
         var input = document.getElementById('import-student');
+        var importClass = document.getElementById('import-classReflection');
         input && (input.value = "");
+        importClass && (importClass.value = "");
       };
 
       if (!type || !file) return Promise.resolve();
       dispatch(marioCore.setLoading(true));
 
-      var _temp4 = _catch(function () {
+      var _temp8 = _catch(function () {
+        function _temp4() {
+          function _temp2() {
+            dispatch(marioCore.setAlert({
+              type: "success",
+              message: "Import CSV successfully"
+            }));
+          }
+
+          var _temp = function () {
+            if (type == CSVType.ClassReflection) {
+              return Promise.resolve(importClassReflectionCSV(formData)).then(function () {});
+            }
+          }();
+
+          return _temp && _temp.then ? _temp.then(_temp2) : _temp2(_temp);
+        }
+
         var formData = new FormData();
         formData.append("file", file, file.name);
-        return Promise.resolve(importStudentCSV(formData)).then(function () {
-          dispatch(marioCore.setAlert({
-            type: "success",
-            message: "Import CSV successfully"
-          }));
-        });
+
+        var _temp3 = function () {
+          if (type == CSVType.Students) {
+            return Promise.resolve(importStudentCSV(formData)).then(function () {});
+          }
+        }();
+
+        return _temp3 && _temp3.then ? _temp3.then(_temp4) : _temp4(_temp3);
       }, function (err) {
         var _err$response, _err$response$data;
 
@@ -5296,7 +5317,7 @@ var useCSVImport = function useCSVImport() {
         }));
       });
 
-      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);
     }
@@ -5304,7 +5325,7 @@ var useCSVImport = function useCSVImport() {
 
   var onConfirm = function onConfirm(values) {
     try {
-      var _temp7 = function _temp7() {
+      var _temp11 = function _temp11() {
         dispatch(marioCore.setLoading(false));
         var input = document.getElementById(id);
         input && (input.value = "");
@@ -5313,7 +5334,7 @@ var useCSVImport = function useCSVImport() {
       if (!dataFile || !dataFile) return Promise.resolve();
       dispatch(marioCore.setLoading(true));
 
-      var _temp8 = _catch(function () {
+      var _temp12 = _catch(function () {
         var formData = new FormData();
         formData.append("file", dataFile, dataFile.name);
         formData.append("teacherName", values.teacherName);
@@ -5337,7 +5358,7 @@ var useCSVImport = function useCSVImport() {
         }));
       });
 
-      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);
     }
@@ -5360,13 +5381,14 @@ var useCSVImport = function useCSVImport() {
   };
 };
 
+var _yup$string, _yup$string2, _yup$string3;
 var schema$4 = yup.object({
-  teacherName: yup.string().required(),
-  teacherEmail: yup.string().email('Invalid email').required(),
+  teacherName: (_yup$string = yup.string()) === null || _yup$string === void 0 ? void 0 : _yup$string.trim().required(),
+  teacherEmail: (_yup$string2 = yup.string()) === null || _yup$string2 === void 0 ? void 0 : _yup$string2.trim().email('Invalid email').required(),
   studentIds: yup.array().required().test("test students", "Please choose student", function () {
     return !!this.parent.studentIds && !!this.parent.studentIds.length;
   }),
-  file: yup.string().required()
+  file: (_yup$string3 = yup.string()) === null || _yup$string3 === void 0 ? void 0 : _yup$string3.trim().required()
 });
 
 var CSVImport = function CSVImport() {
@@ -5380,7 +5402,6 @@ var CSVImport = function CSVImport() {
       dataFile = _useCSVImport.dataFile,
       setDataFile = _useCSVImport.setDataFile,
       setArrStudent = _useCSVImport.setArrStudent,
-      arrStudent = _useCSVImport.arrStudent,
       buttons = _useCSVImport.buttons,
       upload = _useCSVImport.upload;
 
@@ -5394,6 +5415,14 @@ var CSVImport = function CSVImport() {
       return upload(e.target.files[0]);
     },
     accept: "text/csv"
+  }), React__default.createElement(reactstrap.Input, {
+    className: "d-none",
+    type: "file",
+    id: "import-classReflection",
+    onChange: function onChange(e) {
+      return upload(e.target.files[0]);
+    },
+    accept: "text/csv"
   }), React__default.createElement("div", {
     className: "class-reflection"
   }, React__default.createElement(formik.Formik, {
@@ -5407,11 +5436,8 @@ var CSVImport = function CSVImport() {
       actions.resetForm();
     }
   }, function (formProps) {
-    var values = formProps.values,
-        touched = formProps.touched,
-        errors = formProps.errors,
-        handleSubmit = formProps.handleSubmit,
-        handleChange = formProps.handleChange;
+    var touched = formProps.touched,
+        errors = formProps.errors;
     return React__default.createElement(reactstrap.Row, {
       className: "mb-2"
     }, React__default.createElement(reactstrap.Input, {
@@ -5432,56 +5458,11 @@ var CSVImport = function CSVImport() {
       md: 12,
       className: "mb-2"
     }, React__default.createElement(marioCore.RequiredLabel, {
-      text: "Class Teacher Name"
-    }), React__default.createElement(reactstrap.Input, {
-      name: "teacherName",
-      value: values.teacherName,
-      type: "text",
-      onChange: function onChange(e) {
-        handleChange(e);
-      }
-    }), touched.teacherName && errors.teacherName && React__default.createElement(marioCore.ErrorHandler, {
-      text: errors.teacherName
-    })), React__default.createElement(reactstrap.Col, {
-      md: 12,
-      className: "mb-2"
-    }, React__default.createElement(marioCore.RequiredLabel, {
-      text: "Class Teacher Email"
-    }), React__default.createElement(reactstrap.Input, {
-      name: "teacherEmail",
-      value: values.teacherEmail,
-      type: "text",
-      onChange: function onChange(e) {
-        handleChange(e);
-      }
-    }), touched.teacherEmail && errors.teacherEmail && React__default.createElement(marioCore.ErrorHandler, {
-      text: errors.teacherEmail
-    })), React__default.createElement(reactstrap.Col, {
-      md: 12,
-      className: "mb-2"
-    }, React__default.createElement(reactstrap.Label, null, "Students"), React__default.createElement(StudentSelector, {
-      onChange: function onChange(e) {
-        setArrStudent(e);
-        formProps.setFieldValue("studentIds", e.map(function (i) {
-          return i.value;
-        }) || []);
-      },
-      value: arrStudent
-    })), React__default.createElement(reactstrap.Col, {
-      md: 12,
-      className: "mb-2"
-    }, touched.studentIds && errors.studentIds && React__default.createElement(marioCore.ErrorHandler, {
-      text: errors.studentIds
-    })), React__default.createElement(reactstrap.Col, {
-      md: 12,
-      className: "mb-2"
-    }, React__default.createElement(marioCore.RequiredLabel, {
-      text: "Upload File Class Reflection"
+      text: "Import Class Reflection"
     }), React__default.createElement(UploadCSVButton, {
       key: "Import class reflections",
-      isClassReflection: true,
-      htmlFor: id,
-      text: "Upload File",
+      htmlFor: "import-classReflection",
+      text: "Import Class Reflection",
       isDisabled: isLoading,
       backgroundColor: "#e74c3c",
       onClick: function onClick() {
@@ -5498,15 +5479,7 @@ var CSVImport = function CSVImport() {
       className: "mb-2"
     }, touched.file && errors.file && React__default.createElement(marioCore.ErrorHandler, {
       text: errors.file
-    })), React__default.createElement(reactstrap.Col, {
-      md: 12
-    }, React__default.createElement(reactstrap.Button, {
-      color: "primary",
-      className: "float-right",
-      onClick: function onClick() {
-        return handleSubmit();
-      }
-    }, "Import"), ' '))), React__default.createElement(reactstrap.Col, {
+    })))), React__default.createElement(reactstrap.Col, {
       md: 6,
       className: "mb-2"
     }, React__default.createElement(reactstrap.Row, null, React__default.createElement(reactstrap.Col, {