Alejandra
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with
13 additions and
12 deletions
-
frontend/src/components/Admin/AddUser.tsx
-
frontend/src/components/Admin/EditUser.tsx
-
frontend/src/components/Common/ActionsMenu.tsx
-
frontend/src/components/Items/AddItem.tsx
-
frontend/src/components/Items/EditItem.tsx
-
frontend/src/components/UserSettings/ChangePassword.tsx
-
frontend/src/components/UserSettings/DeleteConfirmation.tsx
-
frontend/src/components/UserSettings/UserInformation.tsx
-
frontend/src/routes/reset-password.tsx
|
|
@ -64,7 +64,7 @@ const AddUser: React.FC<AddUserProps> = ({ isOpen, onClose }) => { |
|
|
|
onClose() |
|
|
|
}, |
|
|
|
onError: (err: ApiError) => { |
|
|
|
const errDetail = err.body.detail |
|
|
|
const errDetail = err.body?.detail |
|
|
|
showToast('Something went wrong.', `${errDetail}`, 'error') |
|
|
|
}, |
|
|
|
onSettled: () => { |
|
|
|
|
|
@ -57,7 +57,7 @@ const EditUser: React.FC<EditUserProps> = ({ user, isOpen, onClose }) => { |
|
|
|
onClose() |
|
|
|
}, |
|
|
|
onError: (err: ApiError) => { |
|
|
|
const errDetail = err.body.detail |
|
|
|
const errDetail = err.body?.detail |
|
|
|
showToast('Something went wrong.', `${errDetail}`, 'error') |
|
|
|
}, |
|
|
|
onSettled: () => { |
|
|
@ -67,7 +67,7 @@ const EditUser: React.FC<EditUserProps> = ({ user, isOpen, onClose }) => { |
|
|
|
|
|
|
|
const onSubmit: SubmitHandler<UserUpdateForm> = async (data) => { |
|
|
|
if (data.password === '') { |
|
|
|
delete data.password |
|
|
|
data.password = undefined |
|
|
|
} |
|
|
|
mutation.mutate(data) |
|
|
|
} |
|
|
|
|
|
@ -33,7 +33,7 @@ const ActionsMenu: React.FC<ActionsMenuProps> = ({ type, value, disabled }) => { |
|
|
|
as={Button} |
|
|
|
rightIcon={<BsThreeDotsVertical />} |
|
|
|
variant="unstyled" |
|
|
|
></MenuButton> |
|
|
|
/> |
|
|
|
<MenuList> |
|
|
|
<MenuItem |
|
|
|
onClick={editUserModal.onOpen} |
|
|
|
|
|
@ -52,7 +52,7 @@ const AddItem: React.FC<AddItemProps> = ({ isOpen, onClose }) => { |
|
|
|
onClose() |
|
|
|
}, |
|
|
|
onError: (err: ApiError) => { |
|
|
|
const errDetail = err.body.detail |
|
|
|
const errDetail = err.body?.detail |
|
|
|
showToast('Something went wrong.', `${errDetail}`, 'error') |
|
|
|
}, |
|
|
|
onSettled: () => { |
|
|
|
|
|
@ -49,7 +49,7 @@ const EditItem: React.FC<EditItemProps> = ({ item, isOpen, onClose }) => { |
|
|
|
onClose() |
|
|
|
}, |
|
|
|
onError: (err: ApiError) => { |
|
|
|
const errDetail = err.body.detail |
|
|
|
const errDetail = err.body?.detail |
|
|
|
showToast('Something went wrong.', `${errDetail}`, 'error') |
|
|
|
}, |
|
|
|
onSettled: () => { |
|
|
|
|
|
@ -44,7 +44,7 @@ const ChangePassword: React.FC = () => { |
|
|
|
reset() |
|
|
|
}, |
|
|
|
onError: (err: ApiError) => { |
|
|
|
const errDetail = err.body.detail |
|
|
|
const errDetail = err.body?.detail |
|
|
|
showToast('Something went wrong.', `${errDetail}`, 'error') |
|
|
|
}, |
|
|
|
}) |
|
|
|
|
|
@ -46,7 +46,7 @@ const DeleteConfirmation: React.FC<DeleteProps> = ({ isOpen, onClose }) => { |
|
|
|
onClose() |
|
|
|
}, |
|
|
|
onError: (err: ApiError) => { |
|
|
|
const errDetail = err.body.detail |
|
|
|
const errDetail = err.body?.detail |
|
|
|
showToast('Something went wrong.', `${errDetail}`, 'error') |
|
|
|
}, |
|
|
|
onSettled: () => { |
|
|
|
|
|
@ -53,7 +53,7 @@ const UserInformation: React.FC = () => { |
|
|
|
showToast('Success!', 'User updated successfully.', 'success') |
|
|
|
}, |
|
|
|
onError: (err: ApiError) => { |
|
|
|
const errDetail = err.body.detail |
|
|
|
const errDetail = err.body?.detail |
|
|
|
showToast('Something went wrong.', `${errDetail}`, 'error') |
|
|
|
}, |
|
|
|
onSettled: () => { |
|
|
@ -118,7 +118,7 @@ const UserInformation: React.FC = () => { |
|
|
|
/> |
|
|
|
) : ( |
|
|
|
<Text size="md" py={2}> |
|
|
|
{currentUser!.email} |
|
|
|
{currentUser?.email} |
|
|
|
</Text> |
|
|
|
)} |
|
|
|
{errors.email && ( |
|
|
|
|
|
@ -50,8 +50,9 @@ function ResetPassword() { |
|
|
|
|
|
|
|
const resetPassword = async (data: NewPassword) => { |
|
|
|
const token = new URLSearchParams(window.location.search).get('token') |
|
|
|
if (!token) return |
|
|
|
await LoginService.resetPassword({ |
|
|
|
requestBody: { new_password: data.new_password, token: token! }, |
|
|
|
requestBody: { new_password: data.new_password, token: token }, |
|
|
|
}) |
|
|
|
} |
|
|
|
|
|
|
@ -62,7 +63,7 @@ function ResetPassword() { |
|
|
|
navigate({ to: '/login' }) |
|
|
|
}, |
|
|
|
onError: (err: ApiError) => { |
|
|
|
const errDetail = err.body.detail |
|
|
|
const errDetail = err.body?.detail |
|
|
|
showToast('Something went wrong.', `${errDetail}`, 'error') |
|
|
|
}, |
|
|
|
}) |
|
|
|