mario-core 2.9.205-release → 2.9.207-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.
@@ -1540,7 +1540,9 @@ var lang_us = {
1540
1540
  include_section_you_want_to_appear: include_section_you_want_to_appear,
1541
1541
  time_of_day: time_of_day,
1542
1542
  last_1_1_conversation: last_1_1_conversation,
1543
- leave_page: leave_page
1543
+ leave_page: leave_page,
1544
+ "you_can_start_a_1-1_conversation_after_the_results_of_the_student's_check-in._If_the_check-in_is_24_hours_older,_you_can_request_the_new_check-in_or_start_the_conversation_by_viewing_the_results": "You can start a 1-1 conversation after the results of the student's check-in. If the check-in is 24 hours older, you can request the new check-in or start the conversation by viewing the results",
1545
+ "select_a_student_and_start_a_1-1_conversation_from_a_check-in_or_ask_the_student_to_check-in_before": "Select a student and start a 1-1 conversation from a check-in or ask the student to check-in before"
1544
1546
  };
1545
1547
 
1546
1548
  var dashboard$1 = "Dashboard";
@@ -3048,7 +3050,9 @@ var lang_uk = {
3048
3050
  include_section_you_want_to_appear: include_section_you_want_to_appear$1,
3049
3051
  time_of_day: time_of_day$1,
3050
3052
  last_1_1_conversation: last_1_1_conversation$1,
3051
- leave_page: leave_page$1
3053
+ leave_page: leave_page$1,
3054
+ "you_can_start_a_1-1_conversation_after_the_results_of_the_student's_check-in._If_the_check-in_is_24_hours_older,_you_can_request_the_new_check-in_or_start_the_conversation_by_viewing_the_results": "You can start a 1-1 conversation after the results of the student's check-in. If the check-in is 24 hours older, you can request the new check-in or start the conversation by viewing the results",
3055
+ "select_a_student_and_start_a_1-1_conversation_from_a_check-in_or_ask_the_student_to_check-in_before": "Select a student and start a 1-1 conversation from a check-in or ask the student to check-in before"
3052
3056
  };
3053
3057
 
3054
3058
  var dashboard$2 = "لوحة المعلومات";
@@ -4519,7 +4523,9 @@ var lang_ar = {
4519
4523
  still_in_control_but_starting_to_feel_the_pressure: still_in_control_but_starting_to_feel_the_pressure$2,
4520
4524
  too_much_pressure_and_really_struggling_to_manage_my_workload: too_much_pressure_and_really_struggling_to_manage_my_workload$2,
4521
4525
  last_1_1_conversation: last_1_1_conversation$2,
4522
- leave_page: leave_page$2
4526
+ leave_page: leave_page$2,
4527
+ "you_can_start_a_1-1_conversation_after_the_results_of_the_student's_check-in._If_the_check-in_is_24_hours_older,_you_can_request_the_new_check-in_or_start_the_conversation_by_viewing_the_results": "You can start a 1-1 conversation after the results of the student's check-in. If the check-in is 24 hours older, you can request the new check-in or start the conversation by viewing the results",
4528
+ "select_a_student_and_start_a_1-1_conversation_from_a_check-in_or_ask_the_student_to_check-in_before": "Select a student and start a 1-1 conversation from a check-in or ask the student to check-in before"
4523
4529
  };
4524
4530
 
4525
4531
  var TINY_MCE_API_KEY = "htqausuofrnali3nh9ivmlpq6v415o0tv2qikpg39bqf4pnk";
@@ -22180,6 +22186,9 @@ var apiUpload = axios.create({
22180
22186
  var ACCOUNT_URL = BASE_URL + "/api/account";
22181
22187
  var USER_URL = BASE_URL + "/api/user";
22182
22188
  var TEACHER_URL = BASE_URL + "/api/teacher";
22189
+ var apiInforUserClassLink = function apiInforUserClassLink(data) {
22190
+ return api.post(BASE_URL + "/api/User/infor-user-classlink", data);
22191
+ };
22183
22192
  var logIn = function logIn(data) {
22184
22193
  return api.post(ACCOUNT_URL + "/login", data);
22185
22194
  };
@@ -22271,6 +22280,9 @@ var useLogin = function useLogin() {
22271
22280
  infoUser = _useState5[0],
22272
22281
  setInfoUser = _useState5[1];
22273
22282
 
22283
+ var params = new URLSearchParams(location.search);
22284
+ var loginClassLink = params.get("type") === "classlink";
22285
+ var tokenClassLink = params.get("token");
22274
22286
  var toggle = useCallback(function () {
22275
22287
  setOpenLogin(!openLogin);
22276
22288
  }, [openLogin]);
@@ -22285,8 +22297,13 @@ var useLogin = function useLogin() {
22285
22297
  if (!!token) history.push("/");
22286
22298
  getInfoGoogle();
22287
22299
  }, []);
22288
- var isDistrict = window.location.host.includes("-district");
22289
- var userLogin = useCallback(function (data) {
22300
+ useEffect(function () {
22301
+ if (loginClassLink && tokenClassLink != "") {
22302
+ loginAccountClassLink();
22303
+ }
22304
+ }, []);
22305
+
22306
+ var loginAccountClassLink = function loginAccountClassLink() {
22290
22307
  try {
22291
22308
  var _temp3 = function _temp3() {
22292
22309
  dispatch(setLoading(false));
@@ -22295,21 +22312,61 @@ var useLogin = function useLogin() {
22295
22312
  dispatch(setLoading(true));
22296
22313
 
22297
22314
  var _temp4 = _catch(function () {
22315
+ var data = {
22316
+ tokenClassLink: tokenClassLink
22317
+ };
22318
+ return Promise.resolve(apiInforUserClassLink(data)).then(function (res) {
22319
+ var _res$data = res.data,
22320
+ email = _res$data.email,
22321
+ token = _res$data.token;
22322
+ var dataUser = {
22323
+ email: email,
22324
+ rememberMe: false,
22325
+ password: "default",
22326
+ accessToken: token
22327
+ };
22328
+ return Promise.resolve(userLogin(dataUser)).then(function () {});
22329
+ });
22330
+ }, function (err) {
22331
+ var _err$response, _err$response$data;
22332
+
22333
+ dispatch(setAlert({
22334
+ type: "danger",
22335
+ 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
22336
+ }));
22337
+ });
22338
+
22339
+ return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp3) : _temp3(_temp4));
22340
+ } catch (e) {
22341
+ return Promise.reject(e);
22342
+ }
22343
+ };
22344
+
22345
+ var isDistrict = window.location.host.includes("-district");
22346
+ var userLogin = useCallback(function (data) {
22347
+ try {
22348
+ var _temp7 = function _temp7() {
22349
+ dispatch(setLoading(false));
22350
+ };
22351
+
22352
+ dispatch(setLoading(true));
22353
+
22354
+ var _temp8 = _catch(function () {
22298
22355
  var _data$email, _data$password;
22299
22356
 
22300
22357
  return Promise.resolve(logIn(_extends({}, data, {
22301
22358
  email: data === null || data === void 0 ? void 0 : (_data$email = data.email) === null || _data$email === void 0 ? void 0 : _data$email.trim(),
22302
22359
  password: data === null || data === void 0 ? void 0 : (_data$password = data.password) === null || _data$password === void 0 ? void 0 : _data$password.trim()
22303
22360
  }))).then(function (res) {
22304
- var _res$data = res.data,
22305
- token = _res$data.token,
22306
- id = _res$data.id,
22307
- firstName = _res$data.firstName,
22308
- lastName = _res$data.lastName,
22309
- roles = _res$data.roles,
22310
- email = _res$data.email,
22311
- profileImageFileName = _res$data.profileImageFileName,
22312
- isLoginFirst = _res$data.isLoginFirst;
22361
+ var _res$data2 = res.data,
22362
+ token = _res$data2.token,
22363
+ id = _res$data2.id,
22364
+ firstName = _res$data2.firstName,
22365
+ lastName = _res$data2.lastName,
22366
+ roles = _res$data2.roles,
22367
+ email = _res$data2.email,
22368
+ profileImageFileName = _res$data2.profileImageFileName,
22369
+ isLoginFirst = _res$data2.isLoginFirst;
22313
22370
  localStorage.setItem(ACCESS_TOKEN, token);
22314
22371
  localStorage.removeItem(NOTIFICATION_ALERT_KEY);
22315
22372
  dispatch(setUser({
@@ -22367,16 +22424,16 @@ var useLogin = function useLogin() {
22367
22424
  }
22368
22425
  });
22369
22426
  }, function (err) {
22370
- var _err$response, _err$response$data;
22427
+ var _err$response2, _err$response2$data;
22371
22428
 
22372
22429
  dispatch(setAlert({
22373
22430
  type: "danger",
22374
- 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 || "Login failed"
22431
+ 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 || "Login failed"
22375
22432
  }));
22376
22433
  localStorage.removeItem(ACCESS_TOKEN);
22377
22434
  });
22378
22435
 
22379
- return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(_temp3) : _temp3(_temp4));
22436
+ return Promise.resolve(_temp8 && _temp8.then ? _temp8.then(_temp7) : _temp7(_temp8));
22380
22437
  } catch (e) {
22381
22438
  return Promise.reject(e);
22382
22439
  }
@@ -22384,21 +22441,21 @@ var useLogin = function useLogin() {
22384
22441
 
22385
22442
  var getInfoGoogle = function getInfoGoogle() {
22386
22443
  try {
22387
- var _temp6 = _catch(function () {
22444
+ var _temp10 = _catch(function () {
22388
22445
  return Promise.resolve(getGoogleClientId()).then(function (res) {
22389
22446
  setGoogleClientId(res.data.googleClientId);
22390
22447
  setGoogleRecaptchaId(res.data.googleCaptchaId);
22391
22448
  });
22392
22449
  }, function (err) {
22393
- var _err$response2, _err$response2$data;
22450
+ var _err$response3, _err$response3$data;
22394
22451
 
22395
22452
  dispatch(setAlert({
22396
22453
  type: "danger",
22397
- 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 || "Login failed"
22454
+ 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 || "Login failed"
22398
22455
  }));
22399
22456
  });
22400
22457
 
22401
- return Promise.resolve(_temp6 && _temp6.then ? _temp6.then(function () {}) : void 0);
22458
+ return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(function () {}) : void 0);
22402
22459
  } catch (e) {
22403
22460
  return Promise.reject(e);
22404
22461
  }
@@ -22406,17 +22463,17 @@ var useLogin = function useLogin() {
22406
22463
 
22407
22464
  var fnIsCheckLogin = useCallback(function (data, token, clickHandler) {
22408
22465
  try {
22409
- var _temp10 = function _temp10() {
22466
+ var _temp14 = function _temp14() {
22410
22467
  dispatch(setLoading(false));
22411
22468
  };
22412
22469
 
22413
22470
  dispatch(setLoading(true));
22414
22471
 
22415
- var _temp11 = _catch(function () {
22472
+ var _temp15 = _catch(function () {
22416
22473
  return Promise.resolve(checkUserGoogle(data)).then(function (res) {
22417
22474
  var checkUser = res.data;
22418
22475
 
22419
- var _temp7 = function () {
22476
+ var _temp11 = function () {
22420
22477
  if (checkUser) {
22421
22478
  return Promise.resolve(clickHandler()).then(function (clickHandlerRes) {
22422
22479
  var dataUser = {
@@ -22436,18 +22493,18 @@ var useLogin = function useLogin() {
22436
22493
  }
22437
22494
  }();
22438
22495
 
22439
- if (_temp7 && _temp7.then) return _temp7.then(function () {});
22496
+ if (_temp11 && _temp11.then) return _temp11.then(function () {});
22440
22497
  });
22441
22498
  }, function (err) {
22442
- var _err$response3, _err$response3$data;
22499
+ var _err$response4, _err$response4$data;
22443
22500
 
22444
22501
  dispatch(setAlert({
22445
22502
  type: "danger",
22446
- 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 || "Login failed"
22503
+ message: ((_err$response4 = err.response) === null || _err$response4 === void 0 ? void 0 : (_err$response4$data = _err$response4.data) === null || _err$response4$data === void 0 ? void 0 : _err$response4$data.title) || err.message || "Login failed"
22447
22504
  }));
22448
22505
  });
22449
22506
 
22450
- return Promise.resolve(_temp11 && _temp11.then ? _temp11.then(_temp10) : _temp10(_temp11));
22507
+ return Promise.resolve(_temp15 && _temp15.then ? _temp15.then(_temp14) : _temp14(_temp15));
22451
22508
  } catch (e) {
22452
22509
  return Promise.reject(e);
22453
22510
  }
@@ -22455,14 +22512,14 @@ var useLogin = function useLogin() {
22455
22512
 
22456
22513
  var submitLogin = function submitLogin(teacherId, clickHandler) {
22457
22514
  try {
22458
- var _temp15 = function _temp15() {
22515
+ var _temp19 = function _temp19() {
22459
22516
  setIsLoginGoogle(false);
22460
22517
  dispatch(setLoading(false));
22461
22518
  };
22462
22519
 
22463
22520
  dispatch(setLoading(true));
22464
22521
 
22465
- var _temp16 = _catch(function () {
22522
+ var _temp20 = _catch(function () {
22466
22523
  var data = {
22467
22524
  firstName: infoUser.firstName,
22468
22525
  lastName: infoUser.lastName,
@@ -22473,7 +22530,7 @@ var useLogin = function useLogin() {
22473
22530
  teacherId: teacherId
22474
22531
  };
22475
22532
  return Promise.resolve(registerUserStudent(data)).then(function (res) {
22476
- var _temp12 = function () {
22533
+ var _temp16 = function () {
22477
22534
  if (res.data) {
22478
22535
  return Promise.resolve(clickHandler()).then(function (clickHandlerRes) {
22479
22536
  var dataLogin = {
@@ -22492,18 +22549,18 @@ var useLogin = function useLogin() {
22492
22549
  }
22493
22550
  }();
22494
22551
 
22495
- if (_temp12 && _temp12.then) return _temp12.then(function () {});
22552
+ if (_temp16 && _temp16.then) return _temp16.then(function () {});
22496
22553
  });
22497
22554
  }, function (err) {
22498
- var _err$response4, _err$response4$data;
22555
+ var _err$response5, _err$response5$data;
22499
22556
 
22500
22557
  dispatch(setAlert({
22501
22558
  type: "danger",
22502
- message: ((_err$response4 = err.response) === null || _err$response4 === void 0 ? void 0 : (_err$response4$data = _err$response4.data) === null || _err$response4$data === void 0 ? void 0 : _err$response4$data.title) || err.message || "Login failed"
22559
+ message: ((_err$response5 = err.response) === null || _err$response5 === void 0 ? void 0 : (_err$response5$data = _err$response5.data) === null || _err$response5$data === void 0 ? void 0 : _err$response5$data.title) || err.message || "Login failed"
22503
22560
  }));
22504
22561
  });
22505
22562
 
22506
- return Promise.resolve(_temp16 && _temp16.then ? _temp16.then(_temp15) : _temp15(_temp16));
22563
+ return Promise.resolve(_temp20 && _temp20.then ? _temp20.then(_temp19) : _temp19(_temp20));
22507
22564
  } catch (e) {
22508
22565
  return Promise.reject(e);
22509
22566
  }
@@ -22511,7 +22568,7 @@ var useLogin = function useLogin() {
22511
22568
 
22512
22569
  var getInformationSetting = function getInformationSetting() {
22513
22570
  try {
22514
- var _temp18 = _catch(function () {
22571
+ var _temp22 = _catch(function () {
22515
22572
  return Promise.resolve(getSchoolSettings()).then(function (res) {
22516
22573
  dispatch(setSandboxMode(res.data.isSandboxMode));
22517
22574
  });
@@ -22519,7 +22576,7 @@ var useLogin = function useLogin() {
22519
22576
  console.error(err);
22520
22577
  });
22521
22578
 
22522
- return Promise.resolve(_temp18 && _temp18.then ? _temp18.then(function () {}) : void 0);
22579
+ return Promise.resolve(_temp22 && _temp22.then ? _temp22.then(function () {}) : void 0);
22523
22580
  } catch (e) {
22524
22581
  return Promise.reject(e);
22525
22582
  }
@@ -30413,7 +30470,7 @@ var useCategorySelector = function useCategorySelector() {
30413
30470
  label: c.name,
30414
30471
  value: c.id,
30415
30472
  level: 0,
30416
- isDisabled: childrenOfCategory.length > 0
30473
+ isDisabled: false
30417
30474
  });
30418
30475
 
30419
30476
  result = result.concat(convertOptions(categories, category, childrenOfCategory));
@@ -30431,7 +30488,7 @@ var useCategorySelector = function useCategorySelector() {
30431
30488
  label: c.name,
30432
30489
  value: c.id,
30433
30490
  level: parent.level ? parent.level + 1 : 1,
30434
- isDisabled: childrenOfCategory.length > 0
30491
+ isDisabled: false
30435
30492
  });
30436
30493
 
30437
30494
  result = result.concat(convertOptions(categories, category, childrenOfCategory));