mario-core 2.9.418-feedback → 2.9.418-release

package/dist/containers/User/hooks/useCSVImportTab.d.ts

@@ -40,7 +40,5 @@ declare const useCSVImportTab: () => {
     fileName: string;
     onStudentSubmit: () => void;
     downloadTemplateUser: () => Promise<void>;
-    errorsValidate: string[];
-    setErrorsValidate: import("react").Dispatch<import("react").SetStateAction<string[]>>;
 };
 export default useCSVImportTab;

package/dist/index.js

@@ -2190,7 +2190,6 @@ var save_new_password = "Save new password";
 var teacher_code = "Teacher code";
 var number_of_conversations = "Number of conversations";
 var number_of_expected_conversations_based_on_the_goal = "Number of expected conversations based on the goal";
-var check_in = "Check-in";
 var lang_us = {
 	dashboard: dashboard,
 	user: user,
@@ -4396,8 +4395,7 @@ var lang_us = {
 	save_new_password: save_new_password,
 	teacher_code: teacher_code,
 	number_of_conversations: number_of_conversations,
-	number_of_expected_conversations_based_on_the_goal: number_of_expected_conversations_based_on_the_goal,
-	check_in: check_in
+	number_of_expected_conversations_based_on_the_goal: number_of_expected_conversations_based_on_the_goal
 };
 
 var dashboard$1 = "Dashboard";
@@ -4415,7 +4413,7 @@ var cancel$1 = "Cancel";
 var hey$1 = "Hey";
 var readiness_to_learn$1 = "Readiness to Learn";
 var high_impact_learning_strategies$1 = "High Impact Learning Strategies";
-var check_in$1 = "Check In";
+var check_in = "Check In";
 var check_ins$1 = "Check Ins";
 var reflection$1 = "Reflection";
 var conferences$1 = "Conferences";
@@ -6568,7 +6566,7 @@ var lang_uk = {
 	readiness_to_learn: readiness_to_learn$1,
 	high_impact_learning_strategies: high_impact_learning_strategies$1,
 	"1_to_1": "1 to 1",
-	check_in: check_in$1,
+	check_in: check_in,
 	check_ins: check_ins$1,
 	reflection: reflection$1,
 	conferences: conferences$1,
@@ -8772,7 +8770,7 @@ var cancel$2 = "إلغاء";
 var hey$2 = "مرحبًا";
 var readiness_to_learn$2 = "الاستعداد للتعلم";
 var high_impact_learning_strategies$2 = "استراتيجيات التعلم عالية التأثير";
-var check_in$2 = "تسجيل الحضور";
+var check_in$1 = "تسجيل الحضور";
 var check_ins$2 = "عمليات تسجيل الحضور";
 var reflection$2 = "التفكير";
 var conferences$2 = "اللقاءات";
@@ -10955,7 +10953,7 @@ var lang_ar = {
 	readiness_to_learn: readiness_to_learn$2,
 	high_impact_learning_strategies: high_impact_learning_strategies$2,
 	"1_to_1": "1 إلى 1",
-	check_in: check_in$2,
+	check_in: check_in$1,
 	check_ins: check_ins$2,
 	reflection: reflection$2,
 	conferences: conferences$2,
@@ -13191,7 +13189,7 @@ var cancel$3 = "Cancelar";
 var hey$3 = "Hola";
 var readiness_to_learn$3 = "Preparación para el aprendizaje";
 var high_impact_learning_strategies$3 = "Estrategias de aprendizaje de alto impacto";
-var check_in$3 = "Registro";
+var check_in$2 = "Registro";
 var check_ins$3 = "Registro de entrada";
 var reflection$3 = "Reflexión";
 var conferences$3 = "Conferencias";
@@ -15374,7 +15372,7 @@ var lang_es = {
 	readiness_to_learn: readiness_to_learn$3,
 	high_impact_learning_strategies: high_impact_learning_strategies$3,
 	"1_to_1": "1 a 1",
-	check_in: check_in$3,
+	check_in: check_in$2,
 	check_ins: check_ins$3,
 	reflection: reflection$3,
 	conferences: conferences$3,
@@ -17610,7 +17608,7 @@ var cancel$4 = "取消";
 var hey$4 = "您好";
 var readiness_to_learn$4 = "准备学习";
 var high_impact_learning_strategies$4 = "高效学习策略";
-var check_in$4 = "签到";
+var check_in$3 = "签到";
 var check_ins$4 = "签到";
 var reflection$4 = "反思";
 var conferences$4 = "讨论会";
@@ -19793,7 +19791,7 @@ var lang_zh = {
 	readiness_to_learn: readiness_to_learn$4,
 	high_impact_learning_strategies: high_impact_learning_strategies$4,
 	"1_to_1": "一对一",
-	check_in: check_in$4,
+	check_in: check_in$3,
 	check_ins: check_ins$4,
 	reflection: reflection$4,
 	conferences: conferences$4,
@@ -22178,7 +22176,9 @@ var CsvImportType;
 
 var domainName = window.location.hostname;
 var listCheckMalvernCollege = ['malverncollege', 'stage', 'localhost'];
-var isMalvernCollege = listCheckMalvernCollege.includes(domainName);
+var isMalvernCollege = listCheckMalvernCollege.some(function (e) {
+  return domainName.includes(e);
+});
 
 var resources$5 = {
   "en-US": {
@@ -39663,7 +39663,7 @@ var BlockLogin = function BlockLogin(_ref) {
 
   var onSuccessGoogle = function onSuccessGoogle(res) {
     if (!!(res !== null && res !== void 0 && res.accessToken)) {
-      var _hostName$split, _email$split;
+      var _hostName$split, _email$split, _extensionEmail$split, _extensionEmail$split2;
 
       var _res$profileObj = res.profileObj,
           email = _res$profileObj.email,
@@ -39676,8 +39676,15 @@ var BlockLogin = function BlockLogin(_ref) {
       var hostName = window.location.hostname;
       var subDomain = (_hostName$split = hostName.split(".marioforme.com")) === null || _hostName$split === void 0 ? void 0 : _hostName$split[0];
       var emailDomain = (_email$split = email.split("@")) === null || _email$split === void 0 ? void 0 : _email$split[1];
+      var matchExtension = extensionEmail === null || extensionEmail === void 0 ? void 0 : (_extensionEmail$split = extensionEmail.split(",")) === null || _extensionEmail$split === void 0 ? void 0 : (_extensionEmail$split2 = _extensionEmail$split.map(function (x) {
+        return x.trim();
+      })) === null || _extensionEmail$split2 === void 0 ? void 0 : _extensionEmail$split2.filter(function (x) {
+        return x;
+      }).some(function (ext) {
+        return emailDomain.includes(ext);
+      });
 
-      if (!emailDomain.includes(subDomain) && !emailDomain.includes(extensionEmail)) {
+      if (!emailDomain.includes(subDomain) && !matchExtension) {
         alert("The email address you used does not match the login information in the database.  Please check that you are using your school assigned email address to log into MARIO for Me.  If you have further trouble please notify your school site administrator");
         return;
       }
@@ -41320,14 +41327,7 @@ var BlockCreatePassword = function BlockCreatePassword() {
       className: "" + styles["img-login-rectangle"]
     }), React__default.createElement("p", {
       className: "" + styles["title-login"]
-    }, "You cannot regenerate the password")))), React__default.createElement(reactstrap.Col, {
-      lg: 4,
-      md: 4,
-      className: "" + styles["img-box"]
-    }, React__default.createElement("img", {
-      src: "/images/img-login.png",
-      className: "" + styles["img-login"]
-    })));
+    }, "You cannot regenerate the password")))));
   });
 };
 
@@ -46317,9 +46317,6 @@ var importUsersCSV = function importUsersCSV(formData) {
 var downloadTemplateFileUser = function downloadTemplateFileUser() {
   return api.get(CSV_FILE_TEACHER + "/download-template-file-user");
 };
-var validateCsvApi = function validateCsvApi(formData, type) {
-  return api.post(CSV_FILE_TEACHER + "/validate-csv-template-student/" + type, formData);
-};
 
 var CSVType;
 
@@ -50116,7 +50113,7 @@ var style$2 = {
   color: "#fff",
   fontWeight: 500,
   fontSize: "14px",
-  height: "56px",
+  height: "100%",
   justifyContent: "center"
 };
 
@@ -50215,19 +50212,15 @@ var useCSVImportTab = function useCSVImportTab() {
       studentDataFile = _useState5[0],
       setStudentDataFile = _useState5[1];
 
-  var _useState6 = React.useState([]),
-      errorsValidate = _useState6[0],
-      setErrorsValidate = _useState6[1];
-
   var isCheckDomainIBS = true;
 
-  var _useState7 = React.useState(0),
-      defaultTeacher = _useState7[0],
-      setDefaultTeacher = _useState7[1];
+  var _useState6 = React.useState(0),
+      defaultTeacher = _useState6[0],
+      setDefaultTeacher = _useState6[1];
 
-  var _useState8 = React.useState(""),
-      fileName = _useState8[0],
-      setFileName = _useState8[1];
+  var _useState7 = React.useState(""),
+      fileName = _useState7[0],
+      setFileName = _useState7[1];
 
   React.useEffect(function () {
     document.title = title$5;
@@ -50272,10 +50265,10 @@ var useCSVImportTab = function useCSVImportTab() {
 
   var upload = React.useCallback(function (file) {
     try {
-      var _exit3 = false;
+      var _exit2 = false;
 
-      var _temp12 = function _temp12(_result) {
-        if (_exit3) return _result;
+      var _temp12 = function _temp12(_result2) {
+        if (_exit2) return _result2;
         dispatch(setLoading(false));
         var inputId = document.getElementById(id$1);
         var input = document.getElementById('import-student');
@@ -50289,114 +50282,103 @@ var useCSVImportTab = function useCSVImportTab() {
       dispatch(setLoading(true));
 
       var _temp13 = _catch(function () {
+        function _temp9(_result) {
+          if (_exit2) return _result;
+          dispatch(setAlert({
+            type: "success",
+            message: "Import CSV successfully"
+          }));
+        }
+
         var formData = new FormData();
         formData.append("file", file, file.name);
-        var typeOfCsv = type === CSVType$1.AllUser ? CsvImportType.Admin : CsvImportType.Teacher;
-        return Promise.resolve(validateCsvApi(formData, typeOfCsv)).then(function (res) {
-          var _exit2 = false;
-
-          function _temp9(_result2) {
-            if (_exit2) return _result2;
-            dispatch(setAlert({
-              type: "success",
-              message: "Import CSV successfully"
-            }));
-          }
 
-          if (res.data && res.data.length > 0) {
-            setErrorsValidate(res.data);
-            dispatch(setLoading(false));
-            _exit3 = true;
-            return;
-          }
-
-          var _temp8 = function () {
-            if (type == CSVType$1.AllUser) {
-              return Promise.resolve(file.text()).then(function (fileTextRaw) {
-                var fileText = fileTextRaw.trim();
-                var rows = fileText.split("\n").map(function (row) {
-                  return row.trim();
-                });
-                var headerIndex = rows.findIndex(function (row) {
-                  return row.split(",").includes("First Name");
-                });
+        var _temp8 = function () {
+          if (type == CSVType$1.AllUser) {
+            return Promise.resolve(file.text()).then(function (fileTextRaw) {
+              var fileText = fileTextRaw.trim();
+              var rows = fileText.split("\n").map(function (row) {
+                return row.trim();
+              });
+              var headerIndex = rows.findIndex(function (row) {
+                return row.split(",").includes("First Name");
+              });
 
-                if (headerIndex === 0) {
-                  throw new Error("Invalid CSV: Missing header row.");
-                }
+              if (headerIndex === 0) {
+                throw new Error("Invalid CSV: Missing header row.");
+              }
 
-                fileText = rows.slice(headerIndex).join("\n");
-                var parsedData = Papa.parse(fileText, {
-                  header: true,
-                  skipEmptyLines: true
-                });
-                var header = parsedData.meta.fields;
-                var dataRows = parsedData.data;
+              fileText = rows.slice(headerIndex).join("\n");
+              var parsedData = Papa.parse(fileText, {
+                header: true,
+                skipEmptyLines: true
+              });
+              var header = parsedData.meta.fields;
+              var dataRows = parsedData.data;
 
-                if (!!!dataRows.length) {
-                  dispatch(setLoading(false));
-                  dispatch(setAlert({
-                    type: "danger",
-                    message: 'The file has no data or some column names are misformed.'
-                  }));
-                  _exit3 = true;
-                  return;
-                }
+              if (!!!dataRows.length) {
+                dispatch(setLoading(false));
+                dispatch(setAlert({
+                  type: "danger",
+                  message: 'The file has no data or some column names are misformed.'
+                }));
+                _exit2 = true;
+                return;
+              }
 
-                var chunkSize = 10;
-                var chunks = [];
+              var chunkSize = 10;
+              var chunks = [];
 
-                for (var _i = 0; _i < dataRows.length; _i += chunkSize) {
-                  var chunkData = dataRows.slice(_i, _i + chunkSize);
-                  var valuesOnly = chunkData.map(function (row) {
-                    return Object.values(row).map(function (v) {
-                      return (v != null ? v : "").toString().trim();
-                    });
+              for (var _i = 0; _i < dataRows.length; _i += chunkSize) {
+                var chunkData = dataRows.slice(_i, _i + chunkSize);
+                var valuesOnly = chunkData.map(function (row) {
+                  return Object.values(row).map(function (v) {
+                    return (v != null ? v : "").toString().trim();
                   });
+                });
 
-                  if (header) {
-                    valuesOnly.unshift(header);
-                  }
-
-                  console.log({
-                    valuesOnly: valuesOnly
-                  });
-                  chunks.push(valuesOnly);
+                if (header) {
+                  valuesOnly.unshift(header);
                 }
 
-                var _temp5 = _forTo(chunks, function (i) {
-                  return Promise.resolve(importChunkFileUsers({
-                    chunks: chunks[i]
-                  })).then(function () {
-                    return Promise.resolve(new Promise(function (res) {
-                      return setTimeout(res, 500);
-                    })).then(function () {});
-                  });
+                console.log({
+                  valuesOnly: valuesOnly
                 });
+                chunks.push(valuesOnly);
+              }
 
-                if (_temp5 && _temp5.then) return _temp5.then(function () {});
+              var _temp5 = _forTo(chunks, function (i) {
+                return Promise.resolve(importChunkFileUsers({
+                  chunks: chunks[i]
+                })).then(function () {
+                  return Promise.resolve(new Promise(function (res) {
+                    return setTimeout(res, 500);
+                  })).then(function () {});
+                });
               });
-            } else {
-              var _temp14 = function () {
-                if (isCheckDomainIBS) {
-                  var _temp15 = function () {
-                    if (type == CSVType$1.ClassReflection) {
-                      return Promise.resolve(importClassReflectionCSV$1(formData)).then(function () {});
-                    }
-                  }();
-
-                  if (_temp15 && _temp15.then) return _temp15.then(function () {});
-                } else {
-                  return Promise.resolve(importCSV$1(formData, type.toString())).then(function () {});
-                }
-              }();
 
-              if (_temp14 && _temp14.then) return _temp14.then(function () {});
-            }
-          }();
+              if (_temp5 && _temp5.then) return _temp5.then(function () {});
+            });
+          } else {
+            var _temp14 = function () {
+              if (isCheckDomainIBS) {
+                var _temp15 = function () {
+                  if (type == CSVType$1.ClassReflection) {
+                    return Promise.resolve(importClassReflectionCSV$1(formData)).then(function () {});
+                  }
+                }();
 
-          return _temp8 && _temp8.then ? _temp8.then(_temp9) : _temp9(_temp8);
-        });
+                if (_temp15 && _temp15.then) return _temp15.then(function () {});
+              } else {
+                return Promise.resolve(importCSV$1(formData, type.toString())).then(function () {});
+              }
+            }();
+
+            if (_temp14 && _temp14.then) return _temp14.then(function () {});
+          }
+        }();
+
+        return _temp8 && _temp8.then ? _temp8.then(_temp9) : _temp9(_temp8);
       }, function (err) {
         var _err$response, _err$response$data;
 
@@ -50551,9 +50533,7 @@ var useCSVImportTab = function useCSVImportTab() {
     defaultTeacher: defaultTeacher,
     fileName: fileName,
     onStudentSubmit: onStudentSubmit,
-    downloadTemplateUser: downloadTemplateUser,
-    errorsValidate: errorsValidate,
-    setErrorsValidate: setErrorsValidate
+    downloadTemplateUser: downloadTemplateUser
   };
 };
 
@@ -50580,8 +50560,7 @@ var CSVImport = function CSVImport() {
       setArrStudent = _useCSVImportTab.setArrStudent,
       buttons = _useCSVImportTab.buttons,
       upload = _useCSVImportTab.upload,
-      downloadTemplateUser = _useCSVImportTab.downloadTemplateUser,
-      errorsValidate = _useCSVImportTab.errorsValidate;
+      downloadTemplateUser = _useCSVImportTab.downloadTemplateUser;
 
   var _useTranslation = reactI18next.useTranslation(),
       t = _useTranslation.t;
@@ -50634,9 +50613,9 @@ var CSVImport = function CSVImport() {
       accept: "text/csv"
     }), React__default.createElement(reactstrap.Col, {
       md: 6,
-      className: "mb-2 d-flex mt-5"
+      className: "mb-2 d-flex align-items-end"
     }, React__default.createElement(reactstrap.Row, {
-      className: "w-100 flex-column"
+      className: "w-100"
     }, React__default.createElement(reactstrap.Col, {
       md: 12,
       className: ""
@@ -50665,9 +50644,7 @@ var CSVImport = function CSVImport() {
     })))), React__default.createElement(reactstrap.Col, {
       md: 6,
       className: "mb-2"
-    }, React__default.createElement(reactstrap.Row, {
-      className: "flex-column"
-    }, React__default.createElement(reactstrap.Col, {
+    }, React__default.createElement(reactstrap.Row, null, React__default.createElement(reactstrap.Col, {
       md: 12,
       className: "mb-2 text-right"
     }, React__default.createElement(reactstrap.Button, {
@@ -50697,12 +50674,7 @@ var CSVImport = function CSVImport() {
           return setType(button.type);
         }
       });
-    })), (errorsValidate === null || errorsValidate === void 0 ? void 0 : errorsValidate.length) > 0 && errorsValidate.map(function (error, index) {
-      return React__default.createElement(ErrorHandler, {
-        key: index,
-        text: error
-      });
-    }))));
+    })))));
   }))) );
 };