mario-core 2.9.199-release → 2.9.201-release

package/dist/containers/User/components/HeaderCell.d.ts

@@ -12,6 +12,7 @@ interface Props {
     onOpenFilter?: (id: string, searchBy?: SearchBy, searchStringBy?: string, sortBy?: UserOrder) => void;
     onClose?: () => void;
     onChangeFilters?: (filter: UserFilter) => void;
+    isCenter?: boolean;
 }
 declare const HeaderCell: FC<Props>;
 export default HeaderCell;

package/dist/containers/User/constants/types.d.ts

@@ -56,6 +56,7 @@ export declare type UserFilterField = {
     isStudentFilter?: boolean;
 };
 export declare type UserColumn = {
+    isCenter?: boolean;
     name: string;
     sortBy?: UserOrder;
     className?: string;

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

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { IOptions } from "../constants/types";
 declare type UserDetail = {
     id?: string;
     firstName: string;
@@ -9,6 +10,7 @@ declare type UserDetail = {
     isActive: boolean;
     profileImageFileName: string;
     sourcedId?: string;
+    teacherUserId?: string;
 };
 declare const useUserDetail: (id?: string | undefined) => {
     userDetail: UserDetail;
@@ -24,5 +26,8 @@ declare const useUserDetail: (id?: string | undefined) => {
     currentRoles: string[];
     handleDisableRoles: (currentRoles: string) => boolean;
     handleResetPassword: (userId: string) => Promise<void>;
+    teacherOptions: IOptions[];
+    openModel: boolean;
+    handleToggleModel: () => void;
 };
 export default useUserDetail;

package/dist/index.js

@@ -26804,6 +26804,7 @@ var _userOrders;
 var userOrders = (_userOrders = {}, _userOrders[UserOrder.Id] = "filter-id", _userOrders[UserOrder.Name] = "filter-name", _userOrders[UserOrder.Email] = "filter-email", _userOrders[UserOrder.Age] = "filter-age", _userOrders[UserOrder.Role] = "filter-role", _userOrders[UserOrder.Status] = "filter-status", _userOrders[UserOrder.CreatedAt] = "filter-createdAt", _userOrders[UserOrder.RosterUser] = "filter-roster", _userOrders);
 var UserColumns = [{
   name: "name",
+  isCenter: true,
   sortBy: UserOrder.Name,
   searchBy: SearchBy.Name,
   className: "align-top",
@@ -26815,6 +26816,7 @@ var UserColumns = [{
   }
 }, {
   name: "email",
+  isCenter: true,
   sortBy: UserOrder.Email,
   searchBy: SearchBy.Email,
   className: "align-top",
@@ -26826,10 +26828,12 @@ var UserColumns = [{
   }
 }, {
   name: "age",
+  isCenter: true,
   sortBy: UserOrder.Age,
   className: "align-top"
 }, {
   name: "role",
+  isCenter: true,
   sortBy: UserOrder.Role,
   searchBy: SearchBy.Role,
   className: "align-top",
@@ -26843,6 +26847,7 @@ var UserColumns = [{
   }
 }, {
   name: "active_status",
+  isCenter: true,
   sortBy: UserOrder.Status,
   searchBy: SearchBy.Status,
   className: "align-top",
@@ -26855,10 +26860,12 @@ var UserColumns = [{
   }]
 }, {
   name: "created_time",
+  isCenter: true,
   sortBy: UserOrder.CreatedAt,
   className: "align-top"
 }, {
   name: "Information Roster (Sourced Id / Full name / Email)",
+  isCenter: true,
   sortBy: UserOrder.RosterUser,
   searchBy: SearchBy.RosterUser,
   className: "align-top",
@@ -26870,9 +26877,11 @@ var UserColumns = [{
   }
 }, {
   name: "Impersonate",
+  isCenter: true,
   className: "align-top"
 }, {
   name: "Delete",
+  isCenter: true,
   className: "align-top"
 }];
 var DEFAULT_PAGE_SIZE$1 = {
@@ -27586,7 +27595,8 @@ var HeaderCell = function HeaderCell(_ref) {
       onSearch = _ref.onSearch,
       onChangeFilters = _ref.onChangeFilters,
       onOpenFilter = _ref.onOpenFilter,
-      onClose = _ref.onClose;
+      onClose = _ref.onClose,
+      isCenter = _ref.isCenter;
 
   var _useTranslation = reactI18next.useTranslation(),
       t = _useTranslation.t;
@@ -27613,7 +27623,7 @@ var HeaderCell = function HeaderCell(_ref) {
   return React__default.createElement("th", {
     className: data.className
   }, !!id && data.sortBy !== undefined ? React__default.createElement("div", {
-    className: "w-100 d-flex justify-content-between align-items-center " + styles["table-filter-icon"]
+    className: "w-100 d-flex " + (!isCenter ? "justify-content-between" : "justify-content-center") + " align-items-center " + styles["table-filter-icon"]
   }, t(data.name), React__default.createElement("div", {
     className: "ml-2 p-1",
     id: id,
@@ -27751,6 +27761,7 @@ var TableHeader = function TableHeader(_ref) {
       users: users,
       data: header,
       key: header.name,
+      isCenter: header.isCenter,
       filters: filters,
       popoverId: popoverId,
       selectedOptions: filters.searchByStrings,
@@ -28756,11 +28767,13 @@ var AssignStudentList = function AssignStudentList() {
 
   var AssignStudentColumns = [{
     name: "",
+    isCenter: true,
     onSelectAll: handleSelectAll,
     isCheckAll: isCheckAll,
     className: "text-center"
   }, {
     name: "Student Name",
+    isCenter: true,
     sortBy: UserOrder.Name,
     searchBy: SearchBy.Name,
     className: "align-top",
@@ -28772,6 +28785,7 @@ var AssignStudentList = function AssignStudentList() {
     }
   }, {
     name: "Student Email",
+    isCenter: true,
     sortBy: UserOrder.Email,
     searchBy: SearchBy.Email,
     className: "align-top",
@@ -28783,19 +28797,19 @@ var AssignStudentList = function AssignStudentList() {
     }
   }, {
     name: "Teacher Email",
-    className: "align-top"
+    className: "align-top text-center"
   }, {
     name: "Assistant Email",
-    className: "align-top"
+    className: "align-top text-center"
   }, {
     name: "Counselor Email",
-    className: "align-top"
+    className: "align-top text-center"
   }, {
     name: "Support Teacher Email",
-    className: "align-top"
+    className: "align-top text-center"
   }, {
     name: "action",
-    className: "text-center"
+    className: "text-center text-center"
   }];
   return React__default.createElement("div", {
     className: "fadeIn animated"
@@ -29138,7 +29152,8 @@ var initValue$3 = {
   dateOfBirth: "",
   roles: [],
   isActive: true,
-  profileImageFileName: ""
+  profileImageFileName: "",
+  teacherUserId: ""
 };
 var USER_LIST_URL = "/admin/users/user-list";
 var TITLE$9 = "User detail";
@@ -29151,13 +29166,21 @@ var useUserDetail = function useUserDetail(id) {
       userDetail = _useState[0],
       setUserDetail = _useState[1];
 
-  var _useState2 = React.useState(null),
-      file = _useState2[0],
-      setFile = _useState2[1];
+  var _useState2 = React.useState(false),
+      openModel = _useState2[0],
+      setOpenModel = _useState2[1];
 
-  var _useState3 = React.useState(false),
-      edited = _useState3[0],
-      setEdited = _useState3[1];
+  var _useState3 = React.useState([]),
+      teacherOptions = _useState3[0],
+      setTeacherOptions = _useState3[1];
+
+  var _useState4 = React.useState(null),
+      file = _useState4[0],
+      setFile = _useState4[1];
+
+  var _useState5 = React.useState(false),
+      edited = _useState5[0],
+      setEdited = _useState5[1];
 
   var setEditedTrue = function setEditedTrue() {
     try {
@@ -29169,9 +29192,13 @@ var useUserDetail = function useUserDetail(id) {
     }
   };
 
-  var _useState4 = React.useState([]),
-      currentRoles = _useState4[0],
-      setCurrentRoles = _useState4[1];
+  var _useState6 = React.useState([]),
+      currentRoles = _useState6[0],
+      setCurrentRoles = _useState6[1];
+
+  var handleToggleModel = function handleToggleModel() {
+    setOpenModel(!openModel);
+  };
 
   React.useEffect(function () {
     document.title = TITLE$9;
@@ -29180,6 +29207,7 @@ var useUserDetail = function useUserDetail(id) {
   }, []);
   React.useEffect(function () {
     !!id && getData();
+    !id && getDataTeachers();
   }, [id]);
   var getData = React.useCallback(function () {
     try {
@@ -29214,19 +29242,50 @@ var useUserDetail = function useUserDetail(id) {
       return Promise.reject(e);
     }
   }, [id]);
+
+  var getDataTeachers = function getDataTeachers() {
+    try {
+      var _temp6 = _catch(function () {
+        return Promise.resolve(getTeachers({
+          sortBy: "Email"
+        })).then(function (res) {
+          var _res$data$map, _res$data3;
+
+          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) {
+            return {
+              label: record.email,
+              value: record.id
+            };
+          })) || []);
+        });
+      }, function (err) {
+        var _err$response2, _err$response2$data;
+
+        dispatch(setAlert({
+          type: "danger",
+          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
+        }));
+      });
+
+      return Promise.resolve(_temp6 && _temp6.then ? _temp6.then(function () {}) : void 0);
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+
   var backToList = React.useCallback(function (user) {
     !!user && typeof user === "string" ? history.push(USER_LIST_URL + ("?query=" + user)) : history.push(USER_LIST_URL);
   }, []);
   var confirmData = React.useCallback(function (data) {
     try {
-      var _temp9 = function _temp9() {
+      var _temp11 = function _temp11() {
         dispatch(setLoading(false));
       };
 
       dispatch(setLoading(true));
 
-      var _temp10 = _catch(function () {
-        function _temp6() {
+      var _temp12 = _catch(function () {
+        function _temp8() {
           var next = !!id ? update$6 : create$6;
           !id && delete data.id;
           return Promise.resolve(next(data)).then(function (result) {
@@ -29247,31 +29306,31 @@ var useUserDetail = function useUserDetail(id) {
           });
         }
 
-        var _temp5 = function () {
+        var _temp7 = function () {
           if (!!file) {
             var formData = new FormData();
             var name = file.name;
             formData.append("file", file, name);
             return Promise.resolve(systemProfileUpload(formData)).then(function (res) {
-              var _res$data3;
+              var _res$data4;
 
-              var imageUrl = res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.key;
+              var imageUrl = res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.key;
               data.profileImageFileName = imageUrl;
             });
           }
         }();
 
-        return _temp5 && _temp5.then ? _temp5.then(_temp6) : _temp6(_temp5);
+        return _temp7 && _temp7.then ? _temp7.then(_temp8) : _temp8(_temp7);
       }, function (err) {
-        var _err$response2, _err$response2$data;
+        var _err$response3, _err$response3$data;
 
         dispatch(setAlert({
           type: "danger",
-          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
+          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
         }));
       });
 
-      return Promise.resolve(_temp10 && _temp10.then ? _temp10.then(_temp9) : _temp9(_temp10));
+      return Promise.resolve(_temp12 && _temp12.then ? _temp12.then(_temp11) : _temp11(_temp12));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -29283,13 +29342,13 @@ var useUserDetail = function useUserDetail(id) {
 
   var confirmChangePassword = function confirmChangePassword(data) {
     try {
-      var _temp13 = function _temp13() {
+      var _temp15 = function _temp15() {
         dispatch(setLoading(false));
       };
 
       dispatch(setLoading(true));
 
-      var _temp14 = _catch(function () {
+      var _temp16 = _catch(function () {
         return Promise.resolve(changePassword(data)).then(function () {
           dispatch(setAlert({
             type: "success",
@@ -29305,7 +29364,7 @@ var useUserDetail = function useUserDetail(id) {
         }));
       });
 
-      return Promise.resolve(_temp14 && _temp14.then ? _temp14.then(_temp13) : _temp13(_temp14));
+      return Promise.resolve(_temp16 && _temp16.then ? _temp16.then(_temp15) : _temp15(_temp16));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -29313,13 +29372,13 @@ var useUserDetail = function useUserDetail(id) {
 
   var forgotPasswordRequest = React.useCallback(function (data) {
     try {
-      var _temp17 = function _temp17() {
+      var _temp19 = function _temp19() {
         dispatch(setLoading(false));
       };
 
       dispatch(setLoading(true));
 
-      var _temp18 = _catch(function () {
+      var _temp20 = _catch(function () {
         return Promise.resolve(forgotChangePassword(data)).then(function () {
           dispatch(setAlert({
             type: "success",
@@ -29327,28 +29386,28 @@ var useUserDetail = function useUserDetail(id) {
           }));
         });
       }, function (err) {
-        var _err$response3, _err$response3$data;
+        var _err$response4, _err$response4$data;
 
         dispatch(setAlert({
           type: "danger",
-          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"
+          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"
         }));
       });
 
-      return Promise.resolve(_temp18 && _temp18.then ? _temp18.then(_temp17) : _temp17(_temp18));
+      return Promise.resolve(_temp20 && _temp20.then ? _temp20.then(_temp19) : _temp19(_temp20));
     } catch (e) {
       return Promise.reject(e);
     }
   }, []);
   var handleResetPassword = React.useCallback(function (userId) {
     try {
-      var _temp21 = function _temp21() {
+      var _temp23 = function _temp23() {
         dispatch(setLoading(false));
       };
 
       dispatch(setLoading(true));
 
-      var _temp22 = _catch(function () {
+      var _temp24 = _catch(function () {
         var form = {
           userId: userId
         };
@@ -29363,15 +29422,15 @@ var useUserDetail = function useUserDetail(id) {
           }
         });
       }, function (err) {
-        var _err$response4, _err$response4$data;
+        var _err$response5, _err$response5$data;
 
         dispatch(setAlert({
           type: "danger",
-          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
+          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
         }));
       });
 
-      return Promise.resolve(_temp22 && _temp22.then ? _temp22.then(_temp21) : _temp21(_temp22));
+      return Promise.resolve(_temp24 && _temp24.then ? _temp24.then(_temp23) : _temp23(_temp24));
     } catch (e) {
       return Promise.reject(e);
     }
@@ -29389,7 +29448,10 @@ var useUserDetail = function useUserDetail(id) {
     forgotPasswordRequest: forgotPasswordRequest,
     currentRoles: currentRoles,
     handleDisableRoles: handleDisableRoles,
-    handleResetPassword: handleResetPassword
+    handleResetPassword: handleResetPassword,
+    teacherOptions: teacherOptions,
+    openModel: openModel,
+    handleToggleModel: handleToggleModel
   };
 };
 
@@ -29600,7 +29662,10 @@ var UserDetail = function UserDetail() {
       forgotPasswordRequest = _useUserDetail.forgotPasswordRequest,
       currentRoles = _useUserDetail.currentRoles,
       handleDisableRoles = _useUserDetail.handleDisableRoles,
-      handleResetPassword = _useUserDetail.handleResetPassword;
+      handleResetPassword = _useUserDetail.handleResetPassword,
+      teacherOptions = _useUserDetail.teacherOptions,
+      openModel = _useUserDetail.openModel,
+      handleToggleModel = _useUserDetail.handleToggleModel;
 
   var initialValueForm = {
     oldPassword: "",
@@ -29667,7 +29732,7 @@ var UserDetail = function UserDetail() {
         return;
       }
 
-      if (values.roles.includes(ROLES.EDUTEACHER) && ROLES.EDUTEACHER != role) {
+      if (values.roles.includes(ROLES.EDUTEACHER) && ROLES.EDUTEACHER != role || values.roles.includes(ROLES.STUDENT) && ROLES.STUDENT != role) {
         setFieldValue("roles", [role]);
         return;
       }
@@ -29760,7 +29825,7 @@ var UserDetail = function UserDetail() {
           toggleRoles(role);
           setEditedTrue();
         },
-        disabled: !!id ? currentRoles.concat(["Student", "Parent", "General ED teacher"]).includes(role) || currentRoles.every(handleDisableRoles) : ["Student", "Parent"].includes(role)
+        disabled: !!id ? currentRoles.concat(["Student", "Parent", "General ED teacher"]).includes(role) || currentRoles.every(handleDisableRoles) : ["Parent"].includes(role)
       }));
     }))), touched.roles && errors.roles && React__default.createElement(ErrorHandler, {
       text: errors.roles
@@ -29930,9 +29995,37 @@ var UserDetail = function UserDetail() {
       }, t("save"))));
     })) : null, React__default.createElement(DetailActionButtons, {
       confirmText: confirmText,
-      onConfirm: handleSubmit,
+      onConfirm: !values.roles.includes(ROLES.STUDENT) ? handleSubmit : handleToggleModel,
       onCancel: backToList
-    }));
+    }), React__default.createElement(reactstrap.Modal, {
+      centered: true,
+      isOpen: openModel,
+      toggle: function toggle() {
+        return handleToggleModel();
+      }
+    }, React__default.createElement(reactstrap.ModalHeader, null, "Assign Teacher"), React__default.createElement(reactstrap.ModalBody, null, React__default.createElement(TeacherSelector, {
+      value: teacherOptions.find(function (r) {
+        return r.value == values.teacherUserId;
+      }) || null,
+      options: teacherOptions,
+      onChange: function onChange(e) {
+        return setFieldValue("teacherUserId", e.value);
+      },
+      placeholder: t("select_teacher"),
+      className: "flex-grow-1 mb-3"
+    })), React__default.createElement(reactstrap.ModalFooter, {
+      className: "text-right"
+    }, React__default.createElement(reactstrap.Button, {
+      onClick: function onClick() {
+        return handleToggleModel();
+      }
+    }, "Cancel"), React__default.createElement(reactstrap.Button, {
+      disabled: !values.teacherUserId,
+      color: "primary",
+      onClick: function onClick() {
+        return handleSubmit();
+      }
+    }, "Assign"))));
   });
 };