mario-core 2.7.7 → 2.8.0

package/dist/containers/User/configs/changePasswordSchema.d.ts

@@ -0,0 +1,10 @@
+declare const changePasswordSchema: import("yup/lib/object").OptionalObjectSchema<{
+    oldPassword: import("yup/lib/string").RequiredStringSchema<string | undefined, Record<string, any>>;
+    newPassword: import("yup/lib/string").RequiredStringSchema<string | undefined, Record<string, any>>;
+    confirmedNewPassword: import("yup/lib/string").RequiredStringSchema<string | undefined, Record<string, any>>;
+}, Record<string, any>, import("yup/lib/object").TypeOfShape<{
+    oldPassword: import("yup/lib/string").RequiredStringSchema<string | undefined, Record<string, any>>;
+    newPassword: import("yup/lib/string").RequiredStringSchema<string | undefined, Record<string, any>>;
+    confirmedNewPassword: import("yup/lib/string").RequiredStringSchema<string | undefined, Record<string, any>>;
+}>>;
+export default changePasswordSchema;

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

@@ -18,5 +18,6 @@ declare const useUserDetail: (id?: string | undefined) => {
     edited: boolean;
     setEdited: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     setEditedTrue: () => Promise<void>;
+    confirmChangePassword: (data: any) => Promise<void>;
 };
 export default useUserDetail;

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

@@ -2,8 +2,8 @@ declare const useUserList: () => {
     userList: any;
     totalItems: any;
     filters: import("../../..").Filter;
-    fullName: string | null;
-    getData: () => Promise<void>;
+    queryName: string | null;
+    getData: (fullName?: string | undefined) => Promise<void>;
     removeData: (id: string) => void;
     changeFilters: (updatedFilters: any) => void;
     reDirectDetailPage: (id?: number | undefined) => void;

package/dist/index.js

@@ -1588,7 +1588,14 @@ var TheHeader = function TheHeader() {
     className: styles["header-logo"]
   })), React__default.createElement(react.CHeaderNav, {
     className: "pr-3"
-  }, !isDistrict && React__default.createElement(NotificationButton, null), React__default.createElement(TheHeaderDropdown, null)));
+  }, React__default.createElement("a", {
+    className: "mr-3",
+    style: {
+      color: '#000'
+    },
+    href: 'https://marioframework.com/mario-for-me-privacy-policy/',
+    target: "blank"
+  }, "Privacy Policy"), !isDistrict && React__default.createElement(NotificationButton, null), React__default.createElement(TheHeaderDropdown, null)));
 };
 
 var TITLE$3 = "Not found";
@@ -2418,6 +2425,7 @@ var config = {
   force_br_newlines: true,
   force_p_newlines: false,
   branding: false,
+  convert_urls: false,
   plugins: "advlist autolink lists link image charmap print preview anchor\n        searchreplace visualblocks code fullscreen\n        insertdatetime media table paste code help wordcount media",
   toolbar: "undo redo | formatselect | bold italic backcolor |         alignleft aligncenter alignright alignjustify |         bullist numlist outdent indent | removeformat | image",
   paste_data_images: true
@@ -4056,6 +4064,7 @@ var setUserList = toolkit.createAction("users/setUserList");
 var setStudentList = toolkit.createAction("users/setStudentList");
 
 var USER_URL = BASE_URL + "/api/user";
+var CHANGE_PASSWORD = BASE_URL + "/api/Account/changePassword";
 var get$5 = function get(filter) {
   return api.get("" + USER_URL, {
     params: filter
@@ -4073,6 +4082,9 @@ var update$3 = function update(data) {
 var remove$3 = function remove(id) {
   return api["delete"](USER_URL + "/" + id);
 };
+var changePassword = function changePassword(formData) {
+  return api.post(CHANGE_PASSWORD, formData);
+};
 
 var USER_URL$1 = "/admin/user";
 var CREATE_USER_URL = "/admin/create-user";
@@ -4081,7 +4093,7 @@ var TITLE$8 = "User list";
 var useUserList = function useUserList() {
   var history = reactRouterDom.useHistory();
   var query = new URLSearchParams(location.search);
-  var fullName = query.get("query");
+  var queryName = query.get("query");
   var userList = reactRedux.useSelector(function (state) {
     return state.users.userList;
   });
@@ -4093,8 +4105,12 @@ var useUserList = function useUserList() {
       filters = _useFilters.filters,
       changeFilters = _useFilters.changeFilters;
 
+  var _useState = React.useState(!!queryName ? queryName : ""),
+      fullName = _useState[0],
+      setFullName = _useState[1];
+
   var dispatch = reactRedux.useDispatch();
-  var getData = React.useCallback(function () {
+  var getData = React.useCallback(function (fullName) {
     try {
       var _temp3 = function _temp3() {
         dispatch(setLoading(false));
@@ -4103,7 +4119,9 @@ var useUserList = function useUserList() {
       dispatch(setLoading(true));
 
       var _temp4 = _catch(function () {
-        return Promise.resolve(get$5(filters)).then(function (res) {
+        return Promise.resolve(fullName ? get$5(_extends({}, filters, {
+          searchString: fullName
+        })) : get$5(filters)).then(function (res) {
           var _res$data = res.data,
               items = _res$data.items,
               totalItems = _res$data.totalItems;
@@ -4130,13 +4148,13 @@ var useUserList = function useUserList() {
     document.title = TITLE$8;
   }, []);
   React.useEffect(function () {
-    getData();
+    if (!!fullName) {
+      getData(fullName);
+      setFullName(null);
+    } else {
+      getData();
+    }
   }, [filters]);
-  React.useEffect(function () {
-    changeFilters({
-      searchString: fullName
-    });
-  }, [fullName]);
   var removeData = React.useCallback(function (id) {
     dispatch(setLoading(true));
 
@@ -4182,7 +4200,7 @@ var useUserList = function useUserList() {
     userList: userList,
     totalItems: totalItems,
     filters: filters,
-    fullName: fullName,
+    queryName: queryName,
     getData: getData,
     removeData: removeData,
     changeFilters: changeFilters,
@@ -4259,7 +4277,7 @@ var header$2 = "User";
 
 var UserList = function UserList() {
   var _useUserList = useUserList(),
-      fullName = _useUserList.fullName,
+      queryName = _useUserList.queryName,
       userList = _useUserList.userList,
       totalItems = _useUserList.totalItems,
       filters = _useUserList.filters,
@@ -4280,7 +4298,7 @@ var UserList = function UserList() {
     onClick: function onClick() {
       return reDirectDetailPage();
     },
-    initValue: !!fullName ? fullName : '',
+    initValue: !!queryName ? queryName : "",
     onSearch: function onSearch(searchString) {
       return changeFilters({
         searchString: searchString
@@ -4520,7 +4538,7 @@ var useUserDetail = function useUserDetail(id) {
     }
   }, [id]);
   var backToList = React.useCallback(function (user) {
-    !!user ? history.push(USER_LIST_URL + ("?query=" + user)) : history.push(USER_LIST_URL);
+    !!user && typeof user === "string" ? history.push(USER_LIST_URL + ("?query=" + user)) : history.push(USER_LIST_URL);
   }, []);
   var confirmData = React.useCallback(function (data) {
     try {
@@ -4577,6 +4595,37 @@ var useUserDetail = function useUserDetail(id) {
       return Promise.reject(e);
     }
   }, [id, file]);
+
+  var confirmChangePassword = function confirmChangePassword(data) {
+    try {
+      var _temp13 = function _temp13() {
+        dispatch(setLoading(false));
+      };
+
+      dispatch(setLoading(true));
+
+      var _temp14 = _catch(function () {
+        return Promise.resolve(changePassword(data)).then(function () {
+          dispatch(setAlert({
+            type: "success",
+            message: "Change password successfully"
+          }));
+        });
+      }, function (e) {
+        var _e$response, _e$response$data;
+
+        dispatch(setAlert({
+          type: "danger",
+          message: ((_e$response = e.response) === null || _e$response === void 0 ? void 0 : (_e$response$data = _e$response.data) === null || _e$response$data === void 0 ? void 0 : _e$response$data.title) || e.message
+        }));
+      });
+
+      return Promise.resolve(_temp14 && _temp14.then ? _temp14.then(_temp13) : _temp13(_temp14));
+    } catch (e) {
+      return Promise.reject(e);
+    }
+  };
+
   return {
     userDetail: userDetail,
     backToList: backToList,
@@ -4585,7 +4634,8 @@ var useUserDetail = function useUserDetail(id) {
     setFile: setFile,
     edited: edited,
     setEdited: setEdited,
-    setEditedTrue: setEditedTrue
+    setEditedTrue: setEditedTrue,
+    confirmChangePassword: confirmChangePassword
   };
 };
 
@@ -4597,8 +4647,15 @@ var userSchema = yup.object({
   roles: yup.array().of(yup.string()).min(1, "Role is required")
 });
 
+var changePasswordSchema = yup.object({
+  oldPassword: yup.string().required("Current password is required"),
+  newPassword: yup.string().required("New password is required"),
+  confirmedNewPassword: yup.string().required("Confirm password is required")
+});
+
 var CREATE_USER = "Create user";
 var EDIT_USER_HEADER = "Edit user";
+var CHANGE_PASSWORD$1 = "Change password";
 var ROLES = {
   ADMIN: "Admin",
   TEACHER: "Teacher",
@@ -4611,6 +4668,10 @@ var UserDetail = function UserDetail() {
   var _useParams = reactRouterDom.useParams(),
       id = _useParams.id;
 
+  var user = reactRedux.useSelector(function (state) {
+    return state.common.user;
+  });
+
   var _useUserDetail = useUserDetail(id),
       userDetail = _useUserDetail.userDetail,
       backToList = _useUserDetail.backToList,
@@ -4619,8 +4680,14 @@ var UserDetail = function UserDetail() {
       setFile = _useUserDetail.setFile,
       edited = _useUserDetail.edited,
       setEdited = _useUserDetail.setEdited,
-      setEditedTrue = _useUserDetail.setEditedTrue;
+      setEditedTrue = _useUserDetail.setEditedTrue,
+      confirmChangePassword = _useUserDetail.confirmChangePassword;
 
+  var initialValueForm = {
+    oldPassword: "",
+    newPassword: "",
+    confirmedNewPassword: ""
+  };
   var header = !!id ? EDIT_USER_HEADER : CREATE_USER;
   var confirmText = !!id ? "Update" : "Create";
 
@@ -4826,7 +4893,82 @@ var UserDetail = function UserDetail() {
       style: {
         maxWidth: "100%"
       }
-    }))))), React__default.createElement(DetailActionButtons, {
+    }))))), user.id === id ? React__default.createElement("div", null, React__default.createElement("h5", {
+      className: "mt-3"
+    }, CHANGE_PASSWORD$1), React__default.createElement(formik.Formik, {
+      initialValues: initialValueForm,
+      enableReinitialize: true,
+      validationSchema: changePasswordSchema,
+      onSubmit: function onSubmit(values) {
+        confirmChangePassword(values);
+      }
+    }, function (formProps) {
+      var values = formProps.values,
+          touched = formProps.touched,
+          errors = formProps.errors,
+          handleChange = formProps.handleChange,
+          handleSubmit = formProps.handleSubmit;
+      return React__default.createElement(reactstrap.Row, {
+        className: "pt-2 pb-5"
+      }, React__default.createElement(reactstrap.Col, {
+        md: 7
+      }, React__default.createElement(reactstrap.FormGroup, null, React__default.createElement(RequiredLabel$1, {
+        text: "Current password"
+      }), React__default.createElement(reactstrap.Input, {
+        name: "oldPassword",
+        type: "password",
+        value: values.oldPassword,
+        onChange: function onChange(e) {
+          handleChange(e);
+          setEditedTrue();
+        },
+        onBlur: handleBlur("subject"),
+        placeholder: "Current password"
+      }), touched.oldPassword && errors.oldPassword && React__default.createElement(ErrorHandler, {
+        text: errors.oldPassword
+      }))), React__default.createElement(reactstrap.Col, {
+        md: 7
+      }, React__default.createElement(reactstrap.FormGroup, null, React__default.createElement(RequiredLabel$1, {
+        text: "New password"
+      }), React__default.createElement(reactstrap.Input, {
+        name: "newPassword",
+        type: "password",
+        value: values.newPassword,
+        onChange: function onChange(e) {
+          handleChange(e);
+          setEditedTrue();
+        },
+        onBlur: handleBlur("subject"),
+        placeholder: "New password"
+      }), touched.newPassword && errors.newPassword && React__default.createElement(ErrorHandler, {
+        text: errors.newPassword
+      }))), React__default.createElement(reactstrap.Col, {
+        md: 7
+      }, React__default.createElement(reactstrap.FormGroup, null, React__default.createElement(RequiredLabel$1, {
+        text: "Confirm password"
+      }), React__default.createElement(reactstrap.Input, {
+        name: "confirmedNewPassword",
+        type: "password",
+        value: values.confirmedNewPassword,
+        onChange: function onChange(e) {
+          handleChange(e);
+          setEditedTrue();
+        },
+        onBlur: handleBlur("subject"),
+        placeholder: "Confirm password"
+      }), touched.confirmedNewPassword && errors.confirmedNewPassword && React__default.createElement(ErrorHandler, {
+        text: errors.confirmedNewPassword
+      }))), React__default.createElement(reactstrap.Col, {
+        md: 12
+      }, React__default.createElement(reactstrap.Button, {
+        color: "primary",
+        size: "sm",
+        className: "px-4 pl-1 mr-2 ml-3",
+        onClick: function onClick() {
+          return handleSubmit();
+        }
+      }, "Save")));
+    })) : null, React__default.createElement(DetailActionButtons, {
       confirmText: confirmText,
       onConfirm: handleSubmit,
       onCancel: backToList