Browse Source

🛠️ Minor changes in frontend (#715)

pull/13907/head
Alejandra 1 year ago
committed by GitHub
parent
commit
21232c0f9f
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      frontend/src/components/Admin/AddUser.tsx
  2. 4
      frontend/src/components/Admin/EditUser.tsx
  3. 2
      frontend/src/components/Common/ActionsMenu.tsx
  4. 2
      frontend/src/components/Items/AddItem.tsx
  5. 2
      frontend/src/components/Items/EditItem.tsx
  6. 2
      frontend/src/components/UserSettings/ChangePassword.tsx
  7. 2
      frontend/src/components/UserSettings/DeleteConfirmation.tsx
  8. 4
      frontend/src/components/UserSettings/UserInformation.tsx
  9. 5
      frontend/src/routes/reset-password.tsx

2
frontend/src/components/Admin/AddUser.tsx

@ -64,7 +64,7 @@ const AddUser: React.FC<AddUserProps> = ({ isOpen, onClose }) => {
onClose() onClose()
}, },
onError: (err: ApiError) => { onError: (err: ApiError) => {
const errDetail = err.body.detail const errDetail = err.body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast('Something went wrong.', `${errDetail}`, 'error')
}, },
onSettled: () => { onSettled: () => {

4
frontend/src/components/Admin/EditUser.tsx

@ -57,7 +57,7 @@ const EditUser: React.FC<EditUserProps> = ({ user, isOpen, onClose }) => {
onClose() onClose()
}, },
onError: (err: ApiError) => { onError: (err: ApiError) => {
const errDetail = err.body.detail const errDetail = err.body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast('Something went wrong.', `${errDetail}`, 'error')
}, },
onSettled: () => { onSettled: () => {
@ -67,7 +67,7 @@ const EditUser: React.FC<EditUserProps> = ({ user, isOpen, onClose }) => {
const onSubmit: SubmitHandler<UserUpdateForm> = async (data) => { const onSubmit: SubmitHandler<UserUpdateForm> = async (data) => {
if (data.password === '') { if (data.password === '') {
delete data.password data.password = undefined
} }
mutation.mutate(data) mutation.mutate(data)
} }

2
frontend/src/components/Common/ActionsMenu.tsx

@ -33,7 +33,7 @@ const ActionsMenu: React.FC<ActionsMenuProps> = ({ type, value, disabled }) => {
as={Button} as={Button}
rightIcon={<BsThreeDotsVertical />} rightIcon={<BsThreeDotsVertical />}
variant="unstyled" variant="unstyled"
></MenuButton> />
<MenuList> <MenuList>
<MenuItem <MenuItem
onClick={editUserModal.onOpen} onClick={editUserModal.onOpen}

2
frontend/src/components/Items/AddItem.tsx

@ -52,7 +52,7 @@ const AddItem: React.FC<AddItemProps> = ({ isOpen, onClose }) => {
onClose() onClose()
}, },
onError: (err: ApiError) => { onError: (err: ApiError) => {
const errDetail = err.body.detail const errDetail = err.body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast('Something went wrong.', `${errDetail}`, 'error')
}, },
onSettled: () => { onSettled: () => {

2
frontend/src/components/Items/EditItem.tsx

@ -49,7 +49,7 @@ const EditItem: React.FC<EditItemProps> = ({ item, isOpen, onClose }) => {
onClose() onClose()
}, },
onError: (err: ApiError) => { onError: (err: ApiError) => {
const errDetail = err.body.detail const errDetail = err.body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast('Something went wrong.', `${errDetail}`, 'error')
}, },
onSettled: () => { onSettled: () => {

2
frontend/src/components/UserSettings/ChangePassword.tsx

@ -44,7 +44,7 @@ const ChangePassword: React.FC = () => {
reset() reset()
}, },
onError: (err: ApiError) => { onError: (err: ApiError) => {
const errDetail = err.body.detail const errDetail = err.body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast('Something went wrong.', `${errDetail}`, 'error')
}, },
}) })

2
frontend/src/components/UserSettings/DeleteConfirmation.tsx

@ -46,7 +46,7 @@ const DeleteConfirmation: React.FC<DeleteProps> = ({ isOpen, onClose }) => {
onClose() onClose()
}, },
onError: (err: ApiError) => { onError: (err: ApiError) => {
const errDetail = err.body.detail const errDetail = err.body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast('Something went wrong.', `${errDetail}`, 'error')
}, },
onSettled: () => { onSettled: () => {

4
frontend/src/components/UserSettings/UserInformation.tsx

@ -53,7 +53,7 @@ const UserInformation: React.FC = () => {
showToast('Success!', 'User updated successfully.', 'success') showToast('Success!', 'User updated successfully.', 'success')
}, },
onError: (err: ApiError) => { onError: (err: ApiError) => {
const errDetail = err.body.detail const errDetail = err.body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast('Something went wrong.', `${errDetail}`, 'error')
}, },
onSettled: () => { onSettled: () => {
@ -118,7 +118,7 @@ const UserInformation: React.FC = () => {
/> />
) : ( ) : (
<Text size="md" py={2}> <Text size="md" py={2}>
{currentUser!.email} {currentUser?.email}
</Text> </Text>
)} )}
{errors.email && ( {errors.email && (

5
frontend/src/routes/reset-password.tsx

@ -50,8 +50,9 @@ function ResetPassword() {
const resetPassword = async (data: NewPassword) => { const resetPassword = async (data: NewPassword) => {
const token = new URLSearchParams(window.location.search).get('token') const token = new URLSearchParams(window.location.search).get('token')
if (!token) return
await LoginService.resetPassword({ 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' }) navigate({ to: '/login' })
}, },
onError: (err: ApiError) => { onError: (err: ApiError) => {
const errDetail = err.body.detail const errDetail = err.body?.detail
showToast('Something went wrong.', `${errDetail}`, 'error') showToast('Something went wrong.', `${errDetail}`, 'error')
}, },
}) })

Loading…
Cancel
Save