mario-core 2.10.6-release → 2.10.7-release

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -22207,93 +22207,6 @@ const _iteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.it
22207
22207
 
22208
22208
  const _asyncIteratorSymbol = /*#__PURE__*/ typeof Symbol !== "undefined" ? (Symbol.asyncIterator || (Symbol.asyncIterator = Symbol("Symbol.asyncIterator"))) : "@@asyncIterator";
22209
22209
 
22210
- // Asynchronously implement a generic for loop
22211
- function _for(test, update, body) {
22212
- var stage;
22213
- for (;;) {
22214
- var shouldContinue = test();
22215
- if (_isSettledPact(shouldContinue)) {
22216
- shouldContinue = shouldContinue.v;
22217
- }
22218
- if (!shouldContinue) {
22219
- return result;
22220
- }
22221
- if (shouldContinue.then) {
22222
- stage = 0;
22223
- break;
22224
- }
22225
- var result = body();
22226
- if (result && result.then) {
22227
- if (_isSettledPact(result)) {
22228
- result = result.s;
22229
- } else {
22230
- stage = 1;
22231
- break;
22232
- }
22233
- }
22234
- if (update) {
22235
- var updateValue = update();
22236
- if (updateValue && updateValue.then && !_isSettledPact(updateValue)) {
22237
- stage = 2;
22238
- break;
22239
- }
22240
- }
22241
- }
22242
- var pact = new _Pact();
22243
- var reject = _settle.bind(null, pact, 2);
22244
- (stage === 0 ? shouldContinue.then(_resumeAfterTest) : stage === 1 ? result.then(_resumeAfterBody) : updateValue.then(_resumeAfterUpdate)).then(void 0, reject);
22245
- return pact;
22246
- function _resumeAfterBody(value) {
22247
- result = value;
22248
- do {
22249
- if (update) {
22250
- updateValue = update();
22251
- if (updateValue && updateValue.then && !_isSettledPact(updateValue)) {
22252
- updateValue.then(_resumeAfterUpdate).then(void 0, reject);
22253
- return;
22254
- }
22255
- }
22256
- shouldContinue = test();
22257
- if (!shouldContinue || (_isSettledPact(shouldContinue) && !shouldContinue.v)) {
22258
- _settle(pact, 1, result);
22259
- return;
22260
- }
22261
- if (shouldContinue.then) {
22262
- shouldContinue.then(_resumeAfterTest).then(void 0, reject);
22263
- return;
22264
- }
22265
- result = body();
22266
- if (_isSettledPact(result)) {
22267
- result = result.v;
22268
- }
22269
- } while (!result || !result.then);
22270
- result.then(_resumeAfterBody).then(void 0, reject);
22271
- }
22272
- function _resumeAfterTest(shouldContinue) {
22273
- if (shouldContinue) {
22274
- result = body();
22275
- if (result && result.then) {
22276
- result.then(_resumeAfterBody).then(void 0, reject);
22277
- } else {
22278
- _resumeAfterBody(result);
22279
- }
22280
- } else {
22281
- _settle(pact, 1, result);
22282
- }
22283
- }
22284
- function _resumeAfterUpdate() {
22285
- if (shouldContinue = test()) {
22286
- if (shouldContinue.then) {
22287
- shouldContinue.then(_resumeAfterTest).then(void 0, reject);
22288
- } else {
22289
- _resumeAfterTest(shouldContinue);
22290
- }
22291
- } else {
22292
- _settle(pact, 1, result);
22293
- }
22294
- }
22295
- }
22296
-
22297
22210
  // Asynchronously call a function and send errors to recovery continuation
22298
22211
  function _catch(body, recover) {
22299
22212
  try {
@@ -49670,8 +49583,8 @@ var importClassReflectionCSV$1 = function importClassReflectionCSV(formData) {
49670
49583
  var importStudentByTeacher$1 = function importStudentByTeacher(teacherId, formData) {
49671
49584
  return apiUpload.post(CSV_FILE_TEACHER$1 + "/adminImportStudentByTeacherId/" + teacherId, formData);
49672
49585
  };
49673
- var importUsersCSV$1 = function importUsersCSV(formData) {
49674
- return apiUpload.post(CSV_FILE_TEACHER$1 + "/adminImport", formData);
49586
+ var importChunkFileUsers = function importChunkFileUsers(data) {
49587
+ return api.post(CSV_FILE_TEACHER$1 + "/adminImportChunkUser", data);
49675
49588
  };
49676
49589
  var downloadTemplateFileUser$1 = function downloadTemplateFileUser() {
49677
49590
  return api.get(CSV_FILE_TEACHER$1 + "/download-template-file-user");
@@ -49694,11 +49607,6 @@ var isbButtons = [{
49694
49607
  backgroundColor: "#0abde3",
49695
49608
  type: CSVType$1.AllUser
49696
49609
  }];
49697
- var othersButtons = [{
49698
- text: "import_class_reflection",
49699
- backgroundColor: "#e74c3c",
49700
- type: CSVType$1.ClassReflection
49701
- }];
49702
49610
  var title$5 = "CSV Import";
49703
49611
  var id$1 = "csvupload";
49704
49612
  var initClassReflect$1 = {
@@ -49734,8 +49642,7 @@ var useCSVImportTab = function useCSVImportTab() {
49734
49642
  studentDataFile = _useState5[0],
49735
49643
  setStudentDataFile = _useState5[1];
49736
49644
 
49737
- var domainName = window.location.hostname;
49738
- var isCheckDomainIBS = domainName.includes('isb') || domainName.includes('stage');
49645
+ var isCheckDomainIBS = true;
49739
49646
 
49740
49647
  var _useState6 = useState(0),
49741
49648
  defaultTeacher = _useState6[0],
@@ -49748,7 +49655,7 @@ var useCSVImportTab = function useCSVImportTab() {
49748
49655
  useEffect(function () {
49749
49656
  document.title = title$5;
49750
49657
  }, []);
49751
- var buttons = isCheckDomainIBS ? isbButtons : othersButtons;
49658
+ var buttons = isbButtons ;
49752
49659
 
49753
49660
  var downloadTemplateUser = function downloadTemplateUser() {
49754
49661
  try {
@@ -49786,56 +49693,12 @@ var useCSVImportTab = function useCSVImportTab() {
49786
49693
  }
49787
49694
  };
49788
49695
 
49789
- var safeImport = function safeImport(importUsersCSV, formData, chunkIndex) {
49790
- try {
49791
- var _exit3 = false;
49792
- var _retry = 0;
49793
- return Promise.resolve(_for(function () {
49794
- return !_exit3 && _retry < 2;
49795
- }, function () {
49796
- return _retry++;
49797
- }, function () {
49798
- return _catch(function () {
49799
- _exit3 = true;
49800
- return Promise.resolve(importUsersCSV(formData));
49801
- }, function (err) {
49802
- var _exit2 = false;
49803
-
49804
- function _temp6(_result) {
49805
- if (_exit2) return _result;
49806
- throw err;
49807
- }
49808
-
49809
- if (err.response) {
49810
- throw err;
49811
- }
49812
-
49813
- console.warn("\u26A0\uFE0F Chunk " + chunkIndex + " network error, retry " + (_retry + 1) + "/2...");
49814
-
49815
- var _temp5 = function () {
49816
- if (_retry < 1) {
49817
- return Promise.resolve(new Promise(function (res) {
49818
- return setTimeout(res, 500);
49819
- })).then(function () {});
49820
- } else {
49821
- throw err;
49822
- }
49823
- }();
49824
-
49825
- return _temp5 && _temp5.then ? _temp5.then(_temp6) : _temp6(_temp5);
49826
- });
49827
- }));
49828
- } catch (e) {
49829
- return Promise.reject(e);
49830
- }
49831
- };
49832
-
49833
49696
  var upload = useCallback(function (file) {
49834
49697
  try {
49835
- var _exit5 = false;
49698
+ var _exit2 = false;
49836
49699
 
49837
- var _temp14 = function _temp14(_result4) {
49838
- if (_exit5) return _result4;
49700
+ var _temp12 = function _temp12(_result2) {
49701
+ if (_exit2) return _result2;
49839
49702
  dispatch(setLoading(false));
49840
49703
  var inputId = document.getElementById(id$1);
49841
49704
  var input = document.getElementById('import-student');
@@ -49848,9 +49711,9 @@ var useCSVImportTab = function useCSVImportTab() {
49848
49711
  if (!type || !file) return Promise.resolve();
49849
49712
  dispatch(setLoading(true));
49850
49713
 
49851
- var _temp15 = _catch(function () {
49852
- function _temp11(_result3) {
49853
- if (_exit5) return _result3;
49714
+ var _temp13 = _catch(function () {
49715
+ function _temp9(_result) {
49716
+ if (_exit2) return _result;
49854
49717
  dispatch(setAlert({
49855
49718
  type: "success",
49856
49719
  message: "Import CSV successfully"
@@ -49860,7 +49723,7 @@ var useCSVImportTab = function useCSVImportTab() {
49860
49723
  var formData = new FormData();
49861
49724
  formData.append("file", file, file.name);
49862
49725
 
49863
- var _temp10 = function () {
49726
+ var _temp8 = function () {
49864
49727
  if (type == CSVType$1.AllUser) {
49865
49728
  return Promise.resolve(file.text()).then(function (fileTextRaw) {
49866
49729
  var fileText = fileTextRaw.trim();
@@ -49887,48 +49750,67 @@ var useCSVImportTab = function useCSVImportTab() {
49887
49750
 
49888
49751
  for (var _i = 0; _i < dataRows.length; _i += chunkSize) {
49889
49752
  var chunkData = dataRows.slice(_i, _i + chunkSize);
49890
- var csvChunk = Papa.unparse({
49891
- fields: header != null ? header : [],
49892
- data: chunkData
49753
+ var valuesOnly = chunkData.map(function (row) {
49754
+ return Object.values(row).map(function (v) {
49755
+ return (v != null ? v : "").toString().trim();
49756
+ });
49757
+ });
49758
+ console.log({
49759
+ valuesOnly: valuesOnly
49760
+ });
49761
+ console.log({
49762
+ chunkData: chunkData
49893
49763
  });
49894
- chunks.push(csvChunk);
49895
- }
49896
49764
 
49897
- var _temp7 = _forTo(chunks, function (i) {
49898
- var blob = new Blob([chunks[i]], {
49899
- type: "text/csv"
49765
+ if (header) {
49766
+ valuesOnly.unshift(header);
49767
+ }
49768
+
49769
+ console.log({
49770
+ valuesOnly: valuesOnly
49900
49771
  });
49901
- var formData = new FormData();
49902
- formData.append("file", blob, "students_chunk" + (i + 1) + ".csv");
49903
- return Promise.resolve(safeImport(importUsersCSV$1, formData, i + 1)).then(function () {
49772
+ chunks.push(valuesOnly);
49773
+ }
49774
+
49775
+ console.log({
49776
+ chunks: chunks
49777
+ });
49778
+ console.log({
49779
+ header: header
49780
+ });
49781
+
49782
+ var _temp5 = _forTo(chunks, function (i) {
49783
+ return Promise.resolve(importChunkFileUsers({
49784
+ chunks: chunks[i]
49785
+ })).then(function () {
49904
49786
  return Promise.resolve(new Promise(function (res) {
49905
49787
  return setTimeout(res, 500);
49906
49788
  })).then(function () {});
49907
49789
  });
49908
49790
  });
49909
49791
 
49910
- if (_temp7 && _temp7.then) return _temp7.then(function () {});
49792
+ if (_temp5 && _temp5.then) return _temp5.then(function () {});
49911
49793
  });
49912
49794
  } else {
49913
- var _temp16 = function () {
49795
+ var _temp14 = function () {
49914
49796
  if (isCheckDomainIBS) {
49915
- var _temp17 = function () {
49797
+ var _temp15 = function () {
49916
49798
  if (type == CSVType$1.ClassReflection) {
49917
49799
  return Promise.resolve(importClassReflectionCSV$1(formData)).then(function () {});
49918
49800
  }
49919
49801
  }();
49920
49802
 
49921
- if (_temp17 && _temp17.then) return _temp17.then(function () {});
49803
+ if (_temp15 && _temp15.then) return _temp15.then(function () {});
49922
49804
  } else {
49923
49805
  return Promise.resolve(importCSV$1(formData, type.toString())).then(function () {});
49924
49806
  }
49925
49807
  }();
49926
49808
 
49927
- if (_temp16 && _temp16.then) return _temp16.then(function () {});
49809
+ if (_temp14 && _temp14.then) return _temp14.then(function () {});
49928
49810
  }
49929
49811
  }();
49930
49812
 
49931
- return _temp10 && _temp10.then ? _temp10.then(_temp11) : _temp11(_temp10);
49813
+ return _temp8 && _temp8.then ? _temp8.then(_temp9) : _temp9(_temp8);
49932
49814
  }, function (err) {
49933
49815
  var _err$response, _err$response$data;
49934
49816
 
@@ -49939,7 +49821,7 @@ var useCSVImportTab = function useCSVImportTab() {
49939
49821
  }));
49940
49822
  });
49941
49823
 
49942
- return Promise.resolve(_temp15 && _temp15.then ? _temp15.then(_temp14) : _temp14(_temp15));
49824
+ return Promise.resolve(_temp13 && _temp13.then ? _temp13.then(_temp12) : _temp12(_temp13));
49943
49825
  } catch (e) {
49944
49826
  return Promise.reject(e);
49945
49827
  }
@@ -49947,7 +49829,7 @@ var useCSVImportTab = function useCSVImportTab() {
49947
49829
 
49948
49830
  var uploadByTeacherId = function uploadByTeacherId(file) {
49949
49831
  try {
49950
- var _temp20 = function _temp20() {
49832
+ var _temp18 = function _temp18() {
49951
49833
  dispatch(setLoading(false));
49952
49834
  var input = document.getElementById('teacherSelector');
49953
49835
  input && (input.value = "");
@@ -49964,7 +49846,7 @@ var useCSVImportTab = function useCSVImportTab() {
49964
49846
  if (!type || !file) return Promise.resolve();
49965
49847
  dispatch(setLoading(true));
49966
49848
 
49967
- var _temp21 = _catch(function () {
49849
+ var _temp19 = _catch(function () {
49968
49850
  var formData = new FormData();
49969
49851
  formData.append("file", file, file.name);
49970
49852
  return Promise.resolve(importStudentByTeacher$1(defaultTeacher, formData)).then(function () {
@@ -49982,7 +49864,7 @@ var useCSVImportTab = function useCSVImportTab() {
49982
49864
  }));
49983
49865
  });
49984
49866
 
49985
- return Promise.resolve(_temp21 && _temp21.then ? _temp21.then(_temp20) : _temp20(_temp21));
49867
+ return Promise.resolve(_temp19 && _temp19.then ? _temp19.then(_temp18) : _temp18(_temp19));
49986
49868
  } catch (e) {
49987
49869
  return Promise.reject(e);
49988
49870
  }
@@ -49990,7 +49872,7 @@ var useCSVImportTab = function useCSVImportTab() {
49990
49872
 
49991
49873
  var onConfirm = function onConfirm(values) {
49992
49874
  try {
49993
- var _temp24 = function _temp24() {
49875
+ var _temp22 = function _temp22() {
49994
49876
  dispatch(setLoading(false));
49995
49877
  var input = document.getElementById(id$1);
49996
49878
  input && (input.value = "");
@@ -49999,7 +49881,7 @@ var useCSVImportTab = function useCSVImportTab() {
49999
49881
  if (!dataFile || !dataFile) return Promise.resolve();
50000
49882
  dispatch(setLoading(true));
50001
49883
 
50002
- var _temp25 = _catch(function () {
49884
+ var _temp23 = _catch(function () {
50003
49885
  var formData = new FormData();
50004
49886
  formData.append("file", dataFile, dataFile.name);
50005
49887
  formData.append("teacherName", values.teacherName);
@@ -50023,7 +49905,7 @@ var useCSVImportTab = function useCSVImportTab() {
50023
49905
  }));
50024
49906
  });
50025
49907
 
50026
- return Promise.resolve(_temp25 && _temp25.then ? _temp25.then(_temp24) : _temp24(_temp25));
49908
+ return Promise.resolve(_temp23 && _temp23.then ? _temp23.then(_temp22) : _temp22(_temp23));
50027
49909
  } catch (e) {
50028
49910
  return Promise.reject(e);
50029
49911
  }
@@ -50110,7 +49992,6 @@ var CSVImport = function CSVImport() {
50110
49992
  setArrStudent = _useCSVImportTab.setArrStudent,
50111
49993
  buttons = _useCSVImportTab.buttons,
50112
49994
  upload = _useCSVImportTab.upload,
50113
- isCheckDomainIBS = _useCSVImportTab.isCheckDomainIBS,
50114
49995
  downloadTemplateUser = _useCSVImportTab.downloadTemplateUser;
50115
49996
 
50116
49997
  var _useTranslation = useTranslation(),
@@ -50118,7 +49999,7 @@ var CSVImport = function CSVImport() {
50118
49999
 
50119
50000
  return React.createElement("div", {
50120
50001
  className: "animated fadeIn pt-3"
50121
- }, isCheckDomainIBS ? React.createElement(React.Fragment, null, React.createElement(Input, {
50002
+ }, React.createElement(React.Fragment, null, React.createElement(Input, {
50122
50003
  className: "d-none",
50123
50004
  type: "file",
50124
50005
  id: "import-user",
@@ -50226,67 +50107,7 @@ var CSVImport = function CSVImport() {
50226
50107
  }
50227
50108
  });
50228
50109
  })))));
50229
- }))) : React.createElement(React.Fragment, null, React.createElement(Row, null, React.createElement(Col, {
50230
- md: 12,
50231
- className: "mt-2 mb-2 text-left"
50232
- }, React.createElement(Button, {
50233
- role: "button",
50234
- color: "primary",
50235
- onClick: function onClick() {
50236
- return downloadTemplateUser();
50237
- }
50238
- }, React.createElement("p", {
50239
- className: "d-flex align-items-center mb-0"
50240
- }, t("download_template"), " ", React.createElement(AiOutlineDownload, {
50241
- size: 20,
50242
- className: "ml-2"
50243
- })))), React.createElement(Col, {
50244
- md: 6,
50245
- className: "mb-3"
50246
- }, React.createElement(Input, {
50247
- id: "import-user",
50248
- className: "d-none",
50249
- type: "file",
50250
- onChange: function onChange(e) {
50251
- return upload(e.target.files[0]);
50252
- },
50253
- accept: "text/csv"
50254
- }), React.createElement(RequiredLabel$1, {
50255
- text: t("import_users")
50256
- }), React.createElement(UploadCSVButton, {
50257
- key: "import-users",
50258
- htmlFor: 'import-user',
50259
- text: t("import_users"),
50260
- isDisabled: isLoading,
50261
- backgroundColor: "#0abde3",
50262
- onClick: function onClick() {
50263
- setType(CSVType.AllUser);
50264
- }
50265
- })), React.createElement(Col, {
50266
- md: 6,
50267
- className: "mb-3"
50268
- }, React.createElement(Input, {
50269
- className: "d-none",
50270
- type: "file",
50271
- id: id,
50272
- onChange: function onChange(e) {
50273
- return upload(e.target.files[0]);
50274
- },
50275
- accept: "text/csv"
50276
- }), buttons.map(function (button) {
50277
- return React.createElement(React.Fragment, null, React.createElement(RequiredLabel$1, {
50278
- text: t(button.text)
50279
- }), React.createElement(UploadCSVButton, {
50280
- key: button.text,
50281
- htmlFor: id,
50282
- text: t(button.text),
50283
- isDisabled: isLoading,
50284
- backgroundColor: button.backgroundColor,
50285
- onClick: function onClick() {
50286
- return setType(button.type);
50287
- }
50288
- }));
50289
- })))));
50110
+ }))) );
50290
50111
  };
50291
50112
 
50292
50113
  var tabs = [{