mario-core 2.9.200-release → 2.9.202-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.
@@ -1,4 +1,5 @@
1
1
  /// <reference types="react" />
2
+ import { IOptions } from "../constants/types";
2
3
  declare type UserDetail = {
3
4
  id?: string;
4
5
  firstName: string;
@@ -9,6 +10,7 @@ declare type UserDetail = {
9
10
  isActive: boolean;
10
11
  profileImageFileName: string;
11
12
  sourcedId?: string;
13
+ teacherUserId?: string;
12
14
  };
13
15
  declare const useUserDetail: (id?: string | undefined) => {
14
16
  userDetail: UserDetail;
@@ -24,5 +26,8 @@ declare const useUserDetail: (id?: string | undefined) => {
24
26
  currentRoles: string[];
25
27
  handleDisableRoles: (currentRoles: string) => boolean;
26
28
  handleResetPassword: (userId: string) => Promise<void>;
29
+ teacherOptions: IOptions[];
30
+ openModel: boolean;
31
+ handleToggleModel: () => void;
27
32
  };
28
33
  export default useUserDetail;
package/dist/index.js CHANGED
@@ -29152,7 +29152,8 @@ var initValue$3 = {
29152
29152
  dateOfBirth: "",
29153
29153
  roles: [],
29154
29154
  isActive: true,
29155
- profileImageFileName: ""
29155
+ profileImageFileName: "",
29156
+ teacherUserId: ""
29156
29157
  };
29157
29158
  var USER_LIST_URL = "/admin/users/user-list";
29158
29159
  var TITLE$9 = "User detail";
@@ -29165,13 +29166,21 @@ var useUserDetail = function useUserDetail(id) {
29165
29166
  userDetail = _useState[0],
29166
29167
  setUserDetail = _useState[1];
29167
29168
 
29168
- var _useState2 = React.useState(null),
29169
- file = _useState2[0],
29170
- setFile = _useState2[1];
29169
+ var _useState2 = React.useState(false),
29170
+ openModel = _useState2[0],
29171
+ setOpenModel = _useState2[1];
29171
29172
 
29172
- var _useState3 = React.useState(false),
29173
- edited = _useState3[0],
29174
- setEdited = _useState3[1];
29173
+ var _useState3 = React.useState([]),
29174
+ teacherOptions = _useState3[0],
29175
+ setTeacherOptions = _useState3[1];
29176
+
29177
+ var _useState4 = React.useState(null),
29178
+ file = _useState4[0],
29179
+ setFile = _useState4[1];
29180
+
29181
+ var _useState5 = React.useState(false),
29182
+ edited = _useState5[0],
29183
+ setEdited = _useState5[1];
29175
29184
 
29176
29185
  var setEditedTrue = function setEditedTrue() {
29177
29186
  try {
@@ -29183,9 +29192,13 @@ var useUserDetail = function useUserDetail(id) {
29183
29192
  }
29184
29193
  };
29185
29194
 
29186
- var _useState4 = React.useState([]),
29187
- currentRoles = _useState4[0],
29188
- setCurrentRoles = _useState4[1];
29195
+ var _useState6 = React.useState([]),
29196
+ currentRoles = _useState6[0],
29197
+ setCurrentRoles = _useState6[1];
29198
+
29199
+ var handleToggleModel = function handleToggleModel() {
29200
+ setOpenModel(!openModel);
29201
+ };
29189
29202
 
29190
29203
  React.useEffect(function () {
29191
29204
  document.title = TITLE$9;
@@ -29194,6 +29207,7 @@ var useUserDetail = function useUserDetail(id) {
29194
29207
  }, []);
29195
29208
  React.useEffect(function () {
29196
29209
  !!id && getData();
29210
+ !id && getDataTeachers();
29197
29211
  }, [id]);
29198
29212
  var getData = React.useCallback(function () {
29199
29213
  try {
@@ -29228,19 +29242,50 @@ var useUserDetail = function useUserDetail(id) {
29228
29242
  return Promise.reject(e);
29229
29243
  }
29230
29244
  }, [id]);
29245
+
29246
+ var getDataTeachers = function getDataTeachers() {
29247
+ try {
29248
+ var _temp6 = _catch(function () {
29249
+ return Promise.resolve(getTeachers({
29250
+ sortBy: "Email"
29251
+ })).then(function (res) {
29252
+ var _res$data$map, _res$data3;
29253
+
29254
+ res.data && setTeacherOptions(((_res$data$map = (_res$data3 = res.data).map) === null || _res$data$map === void 0 ? void 0 : _res$data$map.call(_res$data3, function (record) {
29255
+ return {
29256
+ label: record.email,
29257
+ value: record.id
29258
+ };
29259
+ })) || []);
29260
+ });
29261
+ }, function (err) {
29262
+ var _err$response2, _err$response2$data;
29263
+
29264
+ dispatch(setAlert({
29265
+ type: "danger",
29266
+ 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
29267
+ }));
29268
+ });
29269
+
29270
+ return Promise.resolve(_temp6 && _temp6.then ? _temp6.then(function () {}) : void 0);
29271
+ } catch (e) {
29272
+ return Promise.reject(e);
29273
+ }
29274
+ };
29275
+
29231
29276
  var backToList = React.useCallback(function (user) {
29232
29277
  !!user && typeof user === "string" ? history.push(USER_LIST_URL + ("?query=" + user)) : history.push(USER_LIST_URL);
29233
29278
  }, []);
29234
29279
  var confirmData = React.useCallback(function (data) {
29235
29280
  try {
29236
- var _temp9 = function _temp9() {
29281
+ var _temp11 = function _temp11() {
29237
29282
  dispatch(setLoading(false));
29238
29283
  };
29239
29284
 
29240
29285
  dispatch(setLoading(true));
29241
29286
 
29242
- var _temp10 = _catch(function () {
29243
- function _temp6() {
29287
+ var _temp12 = _catch(function () {
29288
+ function _temp8() {
29244
29289
  var next = !!id ? update$6 : create$6;
29245
29290
  !id && delete data.id;
29246
29291
  return Promise.resolve(next(data)).then(function (result) {
@@ -29261,31 +29306,31 @@ var useUserDetail = function useUserDetail(id) {
29261
29306
  });
29262
29307
  }
29263
29308
 
29264
- var _temp5 = function () {
29309
+ var _temp7 = function () {
29265
29310
  if (!!file) {
29266
29311
  var formData = new FormData();
29267
29312
  var name = file.name;
29268
29313
  formData.append("file", file, name);
29269
29314
  return Promise.resolve(systemProfileUpload(formData)).then(function (res) {
29270
- var _res$data3;
29315
+ var _res$data4;
29271
29316
 
29272
- var imageUrl = res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.key;
29317
+ var imageUrl = res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.key;
29273
29318
  data.profileImageFileName = imageUrl;
29274
29319
  });
29275
29320
  }
29276
29321
  }();
29277
29322
 
29278
- return _temp5 && _temp5.then ? _temp5.then(_temp6) : _temp6(_temp5);
29323
+ return _temp7 && _temp7.then ? _temp7.then(_temp8) : _temp8(_temp7);
29279
29324
  }, function (err) {
29280
- var _err$response2, _err$response2$data;
29325
+ var _err$response3, _err$response3$data;
29281
29326
 
29282
29327
  dispatch(setAlert({
29283
29328
  type: "danger",
29284
- 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
29329
+ 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
29285
29330
  }));
29286
29331
  });
29287
29332
 
29288
- return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(_temp9) : _temp9(_temp10));
29333
+ return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(_temp11) : _temp11(_temp12));
29289
29334
  } catch (e) {
29290
29335
  return Promise.reject(e);
29291
29336
  }
@@ -29297,13 +29342,13 @@ var useUserDetail = function useUserDetail(id) {
29297
29342
 
29298
29343
  var confirmChangePassword = function confirmChangePassword(data) {
29299
29344
  try {
29300
- var _temp13 = function _temp13() {
29345
+ var _temp15 = function _temp15() {
29301
29346
  dispatch(setLoading(false));
29302
29347
  };
29303
29348
 
29304
29349
  dispatch(setLoading(true));
29305
29350
 
29306
- var _temp14 = _catch(function () {
29351
+ var _temp16 = _catch(function () {
29307
29352
  return Promise.resolve(changePassword(data)).then(function () {
29308
29353
  dispatch(setAlert({
29309
29354
  type: "success",
@@ -29319,7 +29364,7 @@ var useUserDetail = function useUserDetail(id) {
29319
29364
  }));
29320
29365
  });
29321
29366
 
29322
- return Promise.resolve(_temp14 && _temp14.then ? _temp14.then(_temp13) : _temp13(_temp14));
29367
+ return Promise.resolve(_temp16 && _temp16.then ? _temp16.then(_temp15) : _temp15(_temp16));
29323
29368
  } catch (e) {
29324
29369
  return Promise.reject(e);
29325
29370
  }
@@ -29327,13 +29372,13 @@ var useUserDetail = function useUserDetail(id) {
29327
29372
 
29328
29373
  var forgotPasswordRequest = React.useCallback(function (data) {
29329
29374
  try {
29330
- var _temp17 = function _temp17() {
29375
+ var _temp19 = function _temp19() {
29331
29376
  dispatch(setLoading(false));
29332
29377
  };
29333
29378
 
29334
29379
  dispatch(setLoading(true));
29335
29380
 
29336
- var _temp18 = _catch(function () {
29381
+ var _temp20 = _catch(function () {
29337
29382
  return Promise.resolve(forgotChangePassword(data)).then(function () {
29338
29383
  dispatch(setAlert({
29339
29384
  type: "success",
@@ -29341,28 +29386,28 @@ var useUserDetail = function useUserDetail(id) {
29341
29386
  }));
29342
29387
  });
29343
29388
  }, function (err) {
29344
- var _err$response3, _err$response3$data;
29389
+ var _err$response4, _err$response4$data;
29345
29390
 
29346
29391
  dispatch(setAlert({
29347
29392
  type: "danger",
29348
- 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 || "Error occured"
29393
+ 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 || "Error occured"
29349
29394
  }));
29350
29395
  });
29351
29396
 
29352
- return Promise.resolve(_temp18 && _temp18.then ? _temp18.then(_temp17) : _temp17(_temp18));
29397
+ return Promise.resolve(_temp20 && _temp20.then ? _temp20.then(_temp19) : _temp19(_temp20));
29353
29398
  } catch (e) {
29354
29399
  return Promise.reject(e);
29355
29400
  }
29356
29401
  }, []);
29357
29402
  var handleResetPassword = React.useCallback(function (userId) {
29358
29403
  try {
29359
- var _temp21 = function _temp21() {
29404
+ var _temp23 = function _temp23() {
29360
29405
  dispatch(setLoading(false));
29361
29406
  };
29362
29407
 
29363
29408
  dispatch(setLoading(true));
29364
29409
 
29365
- var _temp22 = _catch(function () {
29410
+ var _temp24 = _catch(function () {
29366
29411
  var form = {
29367
29412
  userId: userId
29368
29413
  };
@@ -29377,15 +29422,15 @@ var useUserDetail = function useUserDetail(id) {
29377
29422
  }
29378
29423
  });
29379
29424
  }, function (err) {
29380
- var _err$response4, _err$response4$data;
29425
+ var _err$response5, _err$response5$data;
29381
29426
 
29382
29427
  dispatch(setAlert({
29383
29428
  type: "danger",
29384
- 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
29429
+ 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
29385
29430
  }));
29386
29431
  });
29387
29432
 
29388
- return Promise.resolve(_temp22 && _temp22.then ? _temp22.then(_temp21) : _temp21(_temp22));
29433
+ return Promise.resolve(_temp24 && _temp24.then ? _temp24.then(_temp23) : _temp23(_temp24));
29389
29434
  } catch (e) {
29390
29435
  return Promise.reject(e);
29391
29436
  }
@@ -29403,7 +29448,10 @@ var useUserDetail = function useUserDetail(id) {
29403
29448
  forgotPasswordRequest: forgotPasswordRequest,
29404
29449
  currentRoles: currentRoles,
29405
29450
  handleDisableRoles: handleDisableRoles,
29406
- handleResetPassword: handleResetPassword
29451
+ handleResetPassword: handleResetPassword,
29452
+ teacherOptions: teacherOptions,
29453
+ openModel: openModel,
29454
+ handleToggleModel: handleToggleModel
29407
29455
  };
29408
29456
  };
29409
29457
 
@@ -29614,7 +29662,10 @@ var UserDetail = function UserDetail() {
29614
29662
  forgotPasswordRequest = _useUserDetail.forgotPasswordRequest,
29615
29663
  currentRoles = _useUserDetail.currentRoles,
29616
29664
  handleDisableRoles = _useUserDetail.handleDisableRoles,
29617
- handleResetPassword = _useUserDetail.handleResetPassword;
29665
+ handleResetPassword = _useUserDetail.handleResetPassword,
29666
+ teacherOptions = _useUserDetail.teacherOptions,
29667
+ openModel = _useUserDetail.openModel,
29668
+ handleToggleModel = _useUserDetail.handleToggleModel;
29618
29669
 
29619
29670
  var initialValueForm = {
29620
29671
  oldPassword: "",
@@ -29681,7 +29732,7 @@ var UserDetail = function UserDetail() {
29681
29732
  return;
29682
29733
  }
29683
29734
 
29684
- if (values.roles.includes(ROLES.EDUTEACHER) && ROLES.EDUTEACHER != role) {
29735
+ if (values.roles.includes(ROLES.EDUTEACHER) && ROLES.EDUTEACHER != role || values.roles.includes(ROLES.STUDENT) && ROLES.STUDENT != role) {
29685
29736
  setFieldValue("roles", [role]);
29686
29737
  return;
29687
29738
  }
@@ -29774,7 +29825,7 @@ var UserDetail = function UserDetail() {
29774
29825
  toggleRoles(role);
29775
29826
  setEditedTrue();
29776
29827
  },
29777
- disabled: !!id ? currentRoles.concat(["Student", "Parent", "General ED teacher"]).includes(role) || currentRoles.every(handleDisableRoles) : ["Student", "Parent"].includes(role)
29828
+ disabled: !!id ? currentRoles.concat(["Student", "Parent", "General ED teacher"]).includes(role) || currentRoles.every(handleDisableRoles) : ["Parent"].includes(role)
29778
29829
  }));
29779
29830
  }))), touched.roles && errors.roles && React__default.createElement(ErrorHandler, {
29780
29831
  text: errors.roles
@@ -29944,9 +29995,37 @@ var UserDetail = function UserDetail() {
29944
29995
  }, t("save"))));
29945
29996
  })) : null, React__default.createElement(DetailActionButtons, {
29946
29997
  confirmText: confirmText,
29947
- onConfirm: handleSubmit,
29998
+ onConfirm: !values.roles.includes(ROLES.STUDENT) ? handleSubmit : handleToggleModel,
29948
29999
  onCancel: backToList
29949
- }));
30000
+ }), React__default.createElement(reactstrap.Modal, {
30001
+ centered: true,
30002
+ isOpen: openModel,
30003
+ toggle: function toggle() {
30004
+ return handleToggleModel();
30005
+ }
30006
+ }, React__default.createElement(reactstrap.ModalHeader, null, "Assign Teacher"), React__default.createElement(reactstrap.ModalBody, null, React__default.createElement(TeacherSelector, {
30007
+ value: teacherOptions.find(function (r) {
30008
+ return r.value == values.teacherUserId;
30009
+ }) || null,
30010
+ options: teacherOptions,
30011
+ onChange: function onChange(e) {
30012
+ return setFieldValue("teacherUserId", e.value);
30013
+ },
30014
+ placeholder: t("select_teacher"),
30015
+ className: "flex-grow-1 mb-3"
30016
+ })), React__default.createElement(reactstrap.ModalFooter, {
30017
+ className: "text-right"
30018
+ }, React__default.createElement(reactstrap.Button, {
30019
+ onClick: function onClick() {
30020
+ return handleToggleModel();
30021
+ }
30022
+ }, "Cancel"), React__default.createElement(reactstrap.Button, {
30023
+ disabled: !values.teacherUserId,
30024
+ color: "primary",
30025
+ onClick: function onClick() {
30026
+ return handleSubmit();
30027
+ }
30028
+ }, "Assign"))));
29950
30029
  });
29951
30030
  };
29952
30031