diff --git a/src/app/modules/employers/employers-list/users-list/core/_requests.ts b/src/app/modules/employers/employers-list/users-list/core/_requests.ts index 5e26c09..acfa89c 100644 --- a/src/app/modules/employers/employers-list/users-list/core/_requests.ts +++ b/src/app/modules/employers/employers-list/users-list/core/_requests.ts @@ -19,6 +19,20 @@ const getEmployersList = (query: string): Promise => { // FU .then((d: AxiosResponse) => d.data); }; +// const createUser = (user: User): Promise => { // FUNCTION TO ADD/CREATE NEW USER +// return axios +// .post(`${NEW_USER_ENDPOINT}/employers`, user) +// .then((response: AxiosResponse>) => response.data) +// .then((response: Response) => response.data); +// }; + +const createUser = (user: User): Promise => { // FUNCTION TO ADD/CREATE NEW USER + return axios + .post(`${NEW_USER_ENDPOINT}/employers`, user) + .then((response: AxiosResponse) => response.data) + // .then((response: Response) => response.data); +}; + const getUserById = (id: ID): Promise => { return axios .get(`${USER_URL}/${id}`) @@ -26,13 +40,6 @@ const getUserById = (id: ID): Promise => { .then((response: Response) => response.data); }; -const createUser = (user: User): Promise => { - return axios - .put(USER_URL, user) - .then((response: AxiosResponse>) => response.data) - .then((response: Response) => response.data); -}; - const updateUser = (user: User): Promise => { return axios .post(`${USER_URL}/${user.id}`, user) @@ -51,9 +58,9 @@ const deleteSelectedUsers = (userIds: Array): Promise => { export { getEmployersList, + createUser, deleteUser, deleteSelectedUsers, getUserById, - createUser, updateUser, }; diff --git a/src/app/modules/employers/employers-list/users-list/user-edit-modal/UserEditModalForm.tsx b/src/app/modules/employers/employers-list/users-list/user-edit-modal/UserEditModalForm.tsx index c06679c..95b7782 100644 --- a/src/app/modules/employers/employers-list/users-list/user-edit-modal/UserEditModalForm.tsx +++ b/src/app/modules/employers/employers-list/users-list/user-edit-modal/UserEditModalForm.tsx @@ -24,29 +24,31 @@ const editUserSchema = Yup.object().shape({ .min(3, "Minimum 3 symbols") .max(50, "Maximum 50 symbols") .required("required"), - percent_interest: Yup.string() - .min(3, "Minimum 3 symbols") - .max(50, "Maximum 50 symbols") + percent_interest: Yup.number() + .typeError("Invalid number") + .min(1, "must be greater than 0") + // .test("no-e", "Invalid number", (value) => { + // if (value && /\d+e/.test(value)) { + // return false; + // } + // return true; + // }) .required("required"), - max_loan: Yup.string() - .min(3, "Minimum 3 symbols") - .max(50, "Maximum 50 symbols") + max_loan: Yup.number() + .typeError("Invalid number") + .min(1, "must be greater than 0") .required("required"), - tenor: Yup.string() - .min(3, "Minimum 3 symbols") - .max(50, "Maximum 50 symbols") + tenor: Yup.number() + .typeError("Invalid number") + .min(1, "must be greater than 0") .required("required"), - retirement_age: Yup.string() - .min(3, "Minimum 3 symbols") - .max(50, "Maximum 50 symbols") + retirement_age: Yup.number() + .typeError("Invalid number") + .min(1, "must be greater than 0") .required("is required"), sector: Yup.string() - .min(3, "Minimum 3 symbols") - .max(50, "Maximum 50 symbols") .required("required"), salary_source: Yup.string() - .min(3, "Minimum 3 symbols") - .max(50, "Maximum 50 symbols") .required("required"), });