mario-core 2.9.161-level → 2.9.162-level

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

@@ -12,9 +12,9 @@ export declare type User = {
     profileImageFileName: string;
     fullName: string;
     sourcedId: string;
-    rosterUser: RosterStudent;
+    rosterUser: RosterUser;
 };
-export declare type RosterStudent = {
+export declare type RosterUser = {
     sourcedId: string;
     username: string;
     status: string;

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

@@ -0,0 +1,8 @@
+import { Option } from "../constants/types";
+declare const useRosterUserSelector: (roles: string[], value?: string | undefined) => {
+    users: Option[];
+    isLoading: boolean;
+    user: Option | undefined;
+    handleInputChange: (value: string) => void;
+};
+export default useRosterUserSelector;

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

@@ -9,7 +9,7 @@ declare const useUserList: () => {
     changeFilters: (updatedFilters: any) => void;
     reDirectDetailPage: (id?: number | undefined) => void;
     swicthUser: (id: string) => Promise<void>;
-    handleSyncRosterStudents: () => Promise<void>;
+    handleSyncRosterUsers: () => Promise<void>;
     rosterUserInfo: (record: any) => string;
 };
 export default useUserList;

package/dist/containers/User/views/RosterUserSelector.d.ts

@@ -0,0 +1,8 @@
+import { FC } from "react";
+interface Props {
+    onChange: (e: any) => void;
+    value?: string;
+    roles: string[];
+}
+declare const RosterUserSelector: FC<Props>;
+export default RosterUserSelector;

package/dist/index.js

@@ -7296,7 +7296,6 @@ var setUserList = toolkit.createAction("users/setUserList");
 var setStudentList = toolkit.createAction("users/setStudentList");
 
 var USER_URL$1 = BASE_URL + "/api/user";
-var STUDENT_URL = BASE_URL + "/api/student";
 var CHANGE_PASSWORD = BASE_URL + "/api/Account/changePassword";
 var ACCOUNT_URL$1 = BASE_URL + "/api/account";
 var EDU_USER_URL = BASE_URL + "/api/User";
@@ -7338,16 +7337,16 @@ var forgotChangePassword = function forgotChangePassword(data) {
 var switchAccountUser = function switchAccountUser(id) {
   return api.post(EDU_USER_URL + "/switch-user/" + id);
 };
-var getRosterStudentsApi = function getRosterStudentsApi(filter) {
+var getRosterUsersApi = function getRosterUsersApi(filter) {
   return api.get("" + ONE_ROSTER_USER_URL, {
     params: filter
   });
 };
-var getRosterStudentBySourcedIdApi = function getRosterStudentBySourcedIdApi(sourcedId) {
+var getRosterUserBySourcedIdApi = function getRosterUserBySourcedIdApi(sourcedId) {
   return api.get(ONE_ROSTER_USER_URL + "/" + sourcedId);
 };
-var syncRosterStudentsApi = function syncRosterStudentsApi() {
-  return api.put(STUDENT_URL + "/sync-students");
+var syncRosterUsersApi = function syncRosterUsersApi() {
+  return api.put(EDU_USER_URL + "/sync-roster-user");
 };
 
 var UserOrder;
@@ -7558,7 +7557,7 @@ var useUserList = function useUserList() {
     }
   }, [dispatch, filters]);
 
-  var handleSyncRosterStudents = function handleSyncRosterStudents() {
+  var handleSyncRosterUsers = function handleSyncRosterUsers() {
     try {
       var _temp7 = function _temp7() {
         dispatch(setLoading(false));
@@ -7567,17 +7566,17 @@ var useUserList = function useUserList() {
       dispatch(setLoading(true));
 
       var _temp8 = _catch(function () {
-        return Promise.resolve(syncRosterStudentsApi()).then(function (res) {
+        return Promise.resolve(syncRosterUsersApi()).then(function (res) {
           if (res.data) {
             dispatch(setAlert({
               type: "success",
-              message: res.data + " student" + (res.data > 1 ? "s have" : " has") + " been synchronized"
+              message: res.data + " user" + (res.data > 1 ? "s have" : " has") + " been synchronized"
             }));
             getData();
           } else {
             dispatch(setAlert({
               type: "success",
-              message: "Every student synchronized"
+              message: "Users synchronized"
             }));
           }
         });
@@ -7777,7 +7776,7 @@ var useUserList = function useUserList() {
     changeFilters: changeFilters,
     reDirectDetailPage: reDirectDetailPage,
     swicthUser: swicthUser,
-    handleSyncRosterStudents: handleSyncRosterStudents,
+    handleSyncRosterUsers: handleSyncRosterUsers,
     rosterUserInfo: rosterUserInfo
   };
 };
@@ -8359,7 +8358,7 @@ var useExportUsersCsv = function useExportUsersCsv() {
       var _user$rosterUser, _user$rosterUser2, _user$rosterUser3, _user$rosterUser4, _user$rosterUser5, _user$rosterUser6, _user$rosterUser7;
 
       var age = user.dateOfBirth !== DATE_MIN_VALUE ? dateFns.differenceInCalendarYears(moment().toDate(), moment.utc(user.dateOfBirth).local().toDate()) : "";
-      return escapeCell(user.firstName) + "," + escapeCell(user.lastName) + "," + escapeCell(user.email) + "," + escapeCell(user.phoneNumber) + "," + age + "," + escapeCell(user.roles.join(", ")) + "," + (user.isActive ? "Active" : "Inactive") + "," + utcToLocalTime(user === null || user === void 0 ? void 0 : user.createTime, "yyyy-MM-DD HH:mm") + "," + escapeCell(user.sourcedId) + "," + escapeCell((_user$rosterUser = user.rosterUser) === null || _user$rosterUser === void 0 ? void 0 : _user$rosterUser.status) + "," + escapeCell((_user$rosterUser2 = user.rosterUser) === null || _user$rosterUser2 === void 0 ? void 0 : _user$rosterUser2.familyName) + "," + escapeCell((_user$rosterUser3 = user.rosterUser) === null || _user$rosterUser3 === void 0 ? void 0 : _user$rosterUser3.middleName) + "," + escapeCell((_user$rosterUser4 = user.rosterUser) === null || _user$rosterUser4 === void 0 ? void 0 : _user$rosterUser4.givenName) + "," + escapeCell((_user$rosterUser5 = user.rosterUser) === null || _user$rosterUser5 === void 0 ? void 0 : _user$rosterUser5.email) + "," + escapeCell((_user$rosterUser6 = user.rosterUser) === null || _user$rosterUser6 === void 0 ? void 0 : _user$rosterUser6.role) + "," + escapeCell((_user$rosterUser7 = user.rosterUser) === null || _user$rosterUser7 === void 0 ? void 0 : _user$rosterUser7.grades);
+      return escapeCell(user.firstName) + "," + escapeCell(user.lastName) + "," + escapeCell(user.email) + "," + escapeCell(user.phoneNumber) + "," + age + "," + escapeCell(user.roles.join(", ").replace("SecondaryTeacher", "SupportTeacher")) + "," + (user.isActive ? "Active" : "Inactive") + "," + utcToLocalTime(user === null || user === void 0 ? void 0 : user.createTime, "yyyy-MM-DD HH:mm") + "," + escapeCell(user.sourcedId) + "," + escapeCell((_user$rosterUser = user.rosterUser) === null || _user$rosterUser === void 0 ? void 0 : _user$rosterUser.status) + "," + escapeCell((_user$rosterUser2 = user.rosterUser) === null || _user$rosterUser2 === void 0 ? void 0 : _user$rosterUser2.familyName) + "," + escapeCell((_user$rosterUser3 = user.rosterUser) === null || _user$rosterUser3 === void 0 ? void 0 : _user$rosterUser3.middleName) + "," + escapeCell((_user$rosterUser4 = user.rosterUser) === null || _user$rosterUser4 === void 0 ? void 0 : _user$rosterUser4.givenName) + "," + escapeCell((_user$rosterUser5 = user.rosterUser) === null || _user$rosterUser5 === void 0 ? void 0 : _user$rosterUser5.email) + "," + escapeCell((_user$rosterUser6 = user.rosterUser) === null || _user$rosterUser6 === void 0 ? void 0 : _user$rosterUser6.role) + "," + escapeCell((_user$rosterUser7 = user.rosterUser) === null || _user$rosterUser7 === void 0 ? void 0 : _user$rosterUser7.grades);
     }).join('\n');
     return "" + CSV_PREFIX + headers + encodeURIComponent(content);
   };
@@ -8393,7 +8392,7 @@ var UserList = function UserList() {
       changeFilters = _useUserList.changeFilters,
       reDirectDetailPage = _useUserList.reDirectDetailPage,
       swicthUser = _useUserList.swicthUser,
-      handleSyncRosterStudents = _useUserList.handleSyncRosterStudents,
+      handleSyncRosterUsers = _useUserList.handleSyncRosterUsers,
       rosterUserInfo = _useUserList.rosterUserInfo;
 
   var _useExportUsersCsv = useExportUsersCsv(),
@@ -8433,8 +8432,8 @@ var UserList = function UserList() {
     md: 12,
     className: "d-flex justify-content-end my-2"
   }, React__default.createElement(SyncButtonIcon, {
-    text: "Sync Roster students",
-    onClick: handleSyncRosterStudents
+    text: "Sync Roster users",
+    onClick: handleSyncRosterUsers
   }), React__default.createElement("button", {
     className: "btn btn-success d-flex align-items-center border-0 p-0 ml-2",
     style: buttonStyle$2,
@@ -8850,14 +8849,13 @@ var changePasswordSchema = yup.object({
 
 var defaultFilter = {
   currentPage: 1,
-  pageSize: 100,
-  role: "student"
+  pageSize: 100
 };
 
-var useStudentSelector = function useStudentSelector(value) {
+var useRosterUserSelector = function useRosterUserSelector(roles, value) {
   var _useState = React.useState([]),
-      students = _useState[0],
-      setStudents = _useState[1];
+      users = _useState[0],
+      setUsers = _useState[1];
 
   var _useState2 = React.useState(false),
       isLoading = _useState2[0],
@@ -8868,11 +8866,11 @@ var useStudentSelector = function useStudentSelector(value) {
       setFilter = _useState3[1];
 
   var _useState4 = React.useState(),
-      student = _useState4[0],
-      setStudent = _useState4[1];
+      user = _useState4[0],
+      setUser = _useState4[1];
 
   var dispatch = reactRedux.useDispatch();
-  var getRosterStudents = React.useCallback(function () {
+  var getRosterUsers = React.useCallback(function () {
     try {
       var _temp3 = function _temp3() {
         setLoading(false);
@@ -8881,17 +8879,17 @@ var useStudentSelector = function useStudentSelector(value) {
       setLoading(true);
 
       var _temp4 = _catch(function () {
-        return Promise.resolve(getRosterStudentsApi(filter)).then(function (res) {
+        return Promise.resolve(getRosterUsersApi(filter)).then(function (res) {
           var _res$data;
 
-          var students = ((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.items) || [];
-          setStudents(mapStudentsToOptions(students));
+          var users = ((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.items) || [];
+          setUsers(mapUsersToOptions(users));
         });
       }, function (err) {
         console.log("err:", err);
         dispatch(setAlert({
           type: "error",
-          message: "Cannot get roster students"
+          message: "Cannot get roster users"
         }));
       });
 
@@ -8900,30 +8898,30 @@ var useStudentSelector = function useStudentSelector(value) {
       return Promise.reject(e);
     }
   }, [JSON.stringify(filter)]);
-  var getStudentBySourcedId = React.useCallback(function () {
+  var getUserBySourcedId = React.useCallback(function () {
     try {
       var _temp7 = function _temp7() {
         setLoading(false);
       };
 
       if (!value) return Promise.resolve();
-      var v = students.find(function (i) {
+      var v = users.find(function (i) {
         return i.value === value;
       });
 
       if (v) {
-        setStudent(v);
+        setUser(v);
         return Promise.resolve();
       }
 
       setLoading(true);
 
       var _temp8 = _catch(function () {
-        return Promise.resolve(getRosterStudentBySourcedIdApi(value)).then(function (res) {
-          var student = res.data;
-          setStudent({
-            label: student.sourcedId + " - " + student.givenName + " - " + student.email,
-            value: student.sourcedId
+        return Promise.resolve(getRosterUserBySourcedIdApi(value)).then(function (res) {
+          var user = res.data;
+          setUser({
+            label: rosterUserInfo(user),
+            value: user.sourcedId
           });
         });
       }, function (err) {
@@ -8936,8 +8934,8 @@ var useStudentSelector = function useStudentSelector(value) {
     }
   }, [value]);
 
-  var mapStudentsToOptions = function mapStudentsToOptions(students) {
-    return students.map(function (i) {
+  var mapUsersToOptions = function mapUsersToOptions(users) {
+    return users.map(function (i) {
       return {
         label: rosterUserInfo(i),
         value: i.sourcedId
@@ -8950,14 +8948,15 @@ var useStudentSelector = function useStudentSelector(value) {
     var givenName = rosterUser.givenName,
         middleName = rosterUser.middleName,
         familyName = rosterUser.familyName,
-        email = rosterUser.email;
+        email = rosterUser.email,
+        role = rosterUser.role;
     var names = [];
     !!givenName && names.push(givenName);
     !!middleName && names.push(middleName);
     !!familyName && names.push(familyName);
     !!names.length && result.push(names.join(" "));
     !!email && result.push(email);
-    return result.join(" - ");
+    return "" + result.join(" - ") + (role ? " (" + role + ")" : '');
   };
 
   var handleInputChange = function handleInputChange(value) {
@@ -8968,37 +8967,45 @@ var useStudentSelector = function useStudentSelector(value) {
     });
   };
 
+  var handleChangeFilter = React.useCallback(function (newFilter) {
+    setFilter(_extends({}, filter, newFilter));
+  }, [JSON.stringify(filter)]);
   React.useEffect(function () {
-    getRosterStudents();
+    var _filter$roles;
+
+    !!((_filter$roles = filter.roles) !== null && _filter$roles !== void 0 && _filter$roles.length) && getRosterUsers();
   }, [JSON.stringify(filter)]);
   React.useEffect(function () {
-    getStudentBySourcedId();
+    handleChangeFilter({
+      roles: roles
+    });
+  }, [JSON.stringify(roles)]);
+  React.useEffect(function () {
+    getUserBySourcedId();
   }, [value]);
   return {
-    students: students,
+    users: users,
     isLoading: isLoading,
-    student: student,
+    user: user,
     handleInputChange: handleInputChange
   };
 };
 
-var RosterStudentSelector = function RosterStudentSelector(_ref) {
+var RosterUserSelector = function RosterUserSelector(_ref) {
   var value = _ref.value,
+      roles = _ref.roles,
       onChange = _ref.onChange;
 
-  var _useTranslation = reactI18next.useTranslation(),
-      t = _useTranslation.t;
-
-  var _useStudentSelector = useStudentSelector(value),
-      students = _useStudentSelector.students,
-      isLoading = _useStudentSelector.isLoading,
-      student = _useStudentSelector.student,
-      handleInputChange = _useStudentSelector.handleInputChange;
+  var _useRosterUserSelecto = useRosterUserSelector(roles, value),
+      users = _useRosterUserSelecto.users,
+      isLoading = _useRosterUserSelecto.isLoading,
+      user = _useRosterUserSelecto.user,
+      handleInputChange = _useRosterUserSelecto.handleInputChange;
 
   return React__default.createElement(CustomSelector, {
-    options: students,
-    value: student,
-    placeholder: t("Select student"),
+    options: users,
+    value: user,
+    placeholder: "Select user",
     onChange: onChange,
     isLoading: isLoading,
     onInputChange: handleInputChange
@@ -9232,7 +9239,8 @@ var UserDetail = function UserDetail() {
       }
     })))))), !!id && React__default.createElement(reactstrap.Row, null, React__default.createElement(reactstrap.Col, {
       md: 6
-    }, values.roles.includes("Student") && React__default.createElement(reactstrap.FormGroup, null, React__default.createElement(reactstrap.Label, null, "Map student from Roster"), React__default.createElement(RosterStudentSelector, {
+    }, (!values.roles.includes("Admin") || values.roles.length > 1) && !!values.roles.length && React__default.createElement(reactstrap.FormGroup, null, React__default.createElement(reactstrap.Label, null, "Map from Roster"), React__default.createElement(RosterUserSelector, {
+      roles: values.roles,
       value: values.sourcedId,
       onChange: function onChange(e) {
         return setFieldValue("sourcedId", e.value);