mario-education 2.4.514-feedback → 2.4.514-release

package/dist/containers/MarioAi/cofigs/type.d.ts

@@ -31,6 +31,7 @@ export interface IChat {
     text?: string;
     time: string;
     isUser: boolean;
+    isSystem?: boolean;
     options?: string[];
 }
 export interface IPrompt {

package/dist/index.js

@@ -10,6 +10,7 @@ var formik = require('formik');
 var yup = require('yup');
 var reactRouterDom = require('react-router-dom');
 var ai = require('react-icons/ai');
+var Papa = _interopDefault(require('papaparse'));
 var DatePicker = _interopDefault(require('react-datepicker'));
 var format = _interopDefault(require('date-fns/format'));
 var react = require('@ag-grid-community/react');
@@ -6018,9 +6019,7 @@ var importStudentByTeacher = function importStudentByTeacher(teacherId, formData
   return marioCore.apiUpload.post(CSV_FILE_TEACHER + "/adminImportStudentByTeacherId/" + teacherId, formData);
 };
 var importUsersCSV = function importUsersCSV(formData) {
-  return marioCore.apiUpload.post(CSV_FILE_TEACHER + "/adminImport", formData, {
-    timeout: 400000
-  });
+  return marioCore.apiUpload.post(CSV_FILE_TEACHER + "/adminImport", formData);
 };
 var downloadTemplateFileUser = function downloadTemplateFileUser() {
   return marioCore.api.get(CSV_FILE_TEACHER + "/download-template-file-user");
@@ -6137,7 +6136,10 @@ var useCSVImport = function useCSVImport() {
 
   var upload = React.useCallback(function (file) {
     try {
-      var _temp11 = function _temp11() {
+      var _exit2 = false;
+
+      var _temp12 = function _temp12(_result2) {
+        if (_exit2) return _result2;
         dispatch(marioCore.setLoading(false));
         var inputId = document.getElementById(id);
         var input = document.getElementById('import-student');
@@ -6150,8 +6152,9 @@ var useCSVImport = function useCSVImport() {
       if (!type || !file) return Promise.resolve();
       dispatch(marioCore.setLoading(true));
 
-      var _temp12 = _catch(function () {
-        function _temp8() {
+      var _temp13 = _catch(function () {
+        function _temp9(_result) {
+          if (_exit2) return _result;
           dispatch(marioCore.setAlert({
             type: "success",
             message: "Import CSV successfully"
@@ -6161,29 +6164,71 @@ var useCSVImport = function useCSVImport() {
         var formData = new FormData();
         formData.append("file", file, file.name);
 
-        var _temp7 = function () {
+        var _temp8 = function () {
           if (type == CSVType.AllUser) {
-            return Promise.resolve(importUsersCSV(formData)).then(function () {});
+            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("FirstName");
+              });
+
+              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;
+              var chunkSize = 20;
+              var chunks = [];
+
+              for (var _i = 0; _i < dataRows.length; _i += chunkSize) {
+                var chunkData = dataRows.slice(_i, _i + chunkSize);
+                var csvChunk = Papa.unparse({
+                  fields: header,
+                  data: chunkData
+                });
+                chunks.push(csvChunk);
+              }
+
+              var _temp5 = _forTo(chunks, function (i) {
+                var blob = new Blob([chunks[i]], {
+                  type: "text/csv"
+                });
+                var formData = new FormData();
+                formData.append("file", blob, "students_chunk" + (i + 1) + ".csv");
+                return Promise.resolve(importUsersCSV(formData)).then(function () {});
+              });
+
+              if (_temp5 && _temp5.then) return _temp5.then(function () {});
+            });
           } else {
-            var _temp13 = function () {
+            var _temp14 = function () {
               if (isCheckDomainIBS) {
-                var _temp14 = function () {
+                var _temp15 = function () {
                   if (type == CSVType.ClassReflection) {
                     return Promise.resolve(importClassReflectionCSV(formData)).then(function () {});
                   }
                 }();
 
-                if (_temp14 && _temp14.then) return _temp14.then(function () {});
+                if (_temp15 && _temp15.then) return _temp15.then(function () {});
               } else {
                 return Promise.resolve(importCSV(formData, type.toString())).then(function () {});
               }
             }();
 
-            if (_temp13 && _temp13.then) return _temp13.then(function () {});
+            if (_temp14 && _temp14.then) return _temp14.then(function () {});
           }
         }();
 
-        return _temp7 && _temp7.then ? _temp7.then(_temp8) : _temp8(_temp7);
+        return _temp8 && _temp8.then ? _temp8.then(_temp9) : _temp9(_temp8);
       }, function (err) {
         var _err$response, _err$response$data;
 
@@ -6193,7 +6238,7 @@ var useCSVImport = function useCSVImport() {
         }));
       });
 
-      return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(_temp11) : _temp11(_temp12));
+      return Promise.resolve(_temp13 && _temp13.then ? _temp13.then(_temp12) : _temp12(_temp13));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -6201,7 +6246,7 @@ var useCSVImport = function useCSVImport() {
 
   var uploadByTeacherId = function uploadByTeacherId(file) {
     try {
-      var _temp17 = function _temp17() {
+      var _temp18 = function _temp18() {
         dispatch(marioCore.setLoading(false));
         var input = document.getElementById('teacherSelector');
         input && (input.value = "");
@@ -6218,7 +6263,7 @@ var useCSVImport = function useCSVImport() {
       if (!type || !file) return Promise.resolve();
       dispatch(marioCore.setLoading(true));
 
-      var _temp18 = _catch(function () {
+      var _temp19 = _catch(function () {
         var formData = new FormData();
         formData.append("file", file, file.name);
         return Promise.resolve(importStudentByTeacher(defaultTeacher, formData)).then(function () {
@@ -6236,7 +6281,7 @@ var useCSVImport = function useCSVImport() {
         }));
       });
 
-      return Promise.resolve(_temp18 && _temp18.then ? _temp18.then(_temp17) : _temp17(_temp18));
+      return Promise.resolve(_temp19 && _temp19.then ? _temp19.then(_temp18) : _temp18(_temp19));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -6244,7 +6289,7 @@ var useCSVImport = function useCSVImport() {
 
   var onConfirm = function onConfirm(values) {
     try {
-      var _temp21 = function _temp21() {
+      var _temp22 = function _temp22() {
         dispatch(marioCore.setLoading(false));
         var input = document.getElementById(id);
         input && (input.value = "");
@@ -6253,7 +6298,7 @@ var useCSVImport = function useCSVImport() {
       if (!dataFile || !dataFile) return Promise.resolve();
       dispatch(marioCore.setLoading(true));
 
-      var _temp22 = _catch(function () {
+      var _temp23 = _catch(function () {
         var formData = new FormData();
         formData.append("file", dataFile, dataFile.name);
         formData.append("teacherName", values.teacherName);
@@ -6277,7 +6322,7 @@ var useCSVImport = function useCSVImport() {
         }));
       });
 
-      return Promise.resolve(_temp22 && _temp22.then ? _temp22.then(_temp21) : _temp21(_temp22));
+      return Promise.resolve(_temp23 && _temp23.then ? _temp23.then(_temp22) : _temp22(_temp23));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -78643,6 +78688,7 @@ var useAIChat = function useAIChat() {
                 text: r.message.replace(/\$\{\{/g, ""),
                 time: "",
                 isUser: ((_r$role = r.role) === null || _r$role === void 0 ? void 0 : _r$role.toString()) == "User",
+                isSystem: false,
                 options: (_r$message = r.message) === null || _r$message === void 0 ? void 0 : (_r$message$match = _r$message.match(regex)) === null || _r$message$match === void 0 ? void 0 : (_r$message$match$ = _r$message$match[1]) === null || _r$message$match$ === void 0 ? void 0 : (_r$message$match$$spl = _r$message$match$.split(" || ")) === null || _r$message$match$$spl === void 0 ? void 0 : (_r$message$match$$spl2 = _r$message$match$$spl[1]) === null || _r$message$match$$spl2 === void 0 ? void 0 : _r$message$match$$spl2.split("/")
               };
             })) || []);
@@ -78666,11 +78712,13 @@ var useAIChat = function useAIChat() {
       var responses = chats.concat([{
         isUser: true,
         message: option,
-        time: ""
+        time: "",
+        isSystem: false
       }, {
         time: "",
         isUser: false,
-        message: ""
+        message: "",
+        isSystem: false
       }]);
       setChats(responses);
       var startDate;
@@ -78881,21 +78929,31 @@ var useAIChat = function useAIChat() {
                 isUser: false,
                 message: messageText,
                 time: "",
-                text: ""
+                text: "",
+                isSystem: false
               }], match ? [{
                 isUser: false,
                 message: match[1],
                 time: "",
                 text: "",
-                options: (_match$1$split$ = match[1].split(" || ")[1]) === null || _match$1$split$ === void 0 ? void 0 : _match$1$split$.split("/")
+                options: (_match$1$split$ = match[1].split(" || ")[1]) === null || _match$1$split$ === void 0 ? void 0 : _match$1$split$.split("/"),
+                isSystem: false
               }] : []).filter(function (r) {
                 return r.message;
               });
               aiChats = updatedChats;
               return updatedChats;
             });
+            var formattedSystemMessages = systemMessages.map(function (msg) {
+              return {
+                message: msg.text,
+                time: "",
+                isUser: false,
+                isSystem: true
+              };
+            });
             saveHistoryPrompt(_extends({}, prompt, {
-              messages: aiChats,
+              messages: aiChats.concat(formattedSystemMessages),
               output: "",
               promptId: prompt.id,
               grade: "",