diff --git a/src/Context/Users/state.tsx b/src/Context/Users/state.tsx index 46f1a4d..ce071b1 100644 --- a/src/Context/Users/state.tsx +++ b/src/Context/Users/state.tsx @@ -30,9 +30,9 @@ export const UsersState = () => { project: GetId(data.project), sex: data.sex, color_race: data.color_race, - birthday: data.birthday, + birthday: converterData(data.birthday), email: data.email, - initial_date: data.initial_date, + initial_date: converterData(data.initial_date), phone: data.phone, }; props.requestUserMutation.mutate(body); diff --git a/src/Context/Users/type.tsx b/src/Context/Users/type.tsx index ba71a0c..513cf23 100644 --- a/src/Context/Users/type.tsx +++ b/src/Context/Users/type.tsx @@ -15,7 +15,7 @@ export interface CreateUser { username: string; password?: string; project: number[]; - role?: { name: string, id: string } + role?:string, email?: string, phone?: string, sex: number, diff --git a/src/Pages/Users/CreateUser/index.tsx b/src/Pages/Users/CreateUser/index.tsx index 52aa4d5..717a9fa 100644 --- a/src/Pages/Users/CreateUser/index.tsx +++ b/src/Pages/Users/CreateUser/index.tsx @@ -25,7 +25,7 @@ const CreateUserPage = () => { name: Yup.string().required("Campo Obrigatório").min(8, "Nome deve ter pelo menos 8 caracteres"), username: Yup.string().required("Campo Obrigatório").min(8, "Nome do usuário deve ter pelo menos 8 caracteres"), password: Yup.string().required("Campo Obrigatório").min(8, "Senha deve ter pelo menos 8 caracteres"), - role: Yup.object().required("Campo Obrigatório"), + role: Yup.string().required("Campo Obrigatório"), project: Yup.array().required("Campo Obrigatório"), initial_date: Yup.string().required("Campo Obrigatório"), birthday: Yup.string().required("Campo Obrigatório"), diff --git a/src/Pages/Users/EditUser/index.tsx b/src/Pages/Users/EditUser/index.tsx index fa27cbe..e421887 100644 --- a/src/Pages/Users/EditUser/index.tsx +++ b/src/Pages/Users/EditUser/index.tsx @@ -80,12 +80,12 @@ const EditUserPage = () => { username: project?.username ?? "", role: project?.role ?? "", project: selectTs(project.user_social_technology), - initial_date: formatarData(project?.reapplicators[0]?.initial_date) ?? "", + initial_date: project?.reapplicators[0]?.initial_date ? formatarData(project?.reapplicators[0]?.initial_date) : "", phone: project?.reapplicators[0]?.phone ?? "", email: project?.reapplicators[0]?.email ?? "", color_race: project?.reapplicators[0]?.color_race ?? "", sex: project?.reapplicators[0]?.sex ?? "", - birthday: formatarData(project?.reapplicators[0]?.birthday) ?? "", + birthday: project?.reapplicators[0]?.birthday ? formatarData(project?.reapplicators[0]?.birthday) : "", }} onSubmit={(values) => { props.UpdateUser(values, parseInt(id!)); diff --git a/src/Services/Users/request.tsx b/src/Services/Users/request.tsx index 37a9a99..fcb61f6 100644 --- a/src/Services/Users/request.tsx +++ b/src/Services/Users/request.tsx @@ -56,8 +56,9 @@ export const requestUsersChart = (id?: string) => { export const requestCreateUsers = (data: CreateUser) => { let path = "/user-bff"; + console.log(data) return http - .post(path, { ...data, role: data.role?.id }) + .post(path, { ...data, role: data.role }) .then((response) => response.data) .catch((err) => { if (err.response.status === 401) {