From 21232c0f9f94d9b374df1f759111a6ea0eb9ccfc Mon Sep 17 00:00:00 2001
From: Alejandra <90076947+alejsdev@users.noreply.github.com>
Date: Wed, 13 Mar 2024 22:59:28 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=EF=B8=8F=20Minor=20changes=20in=20?=
 =?UTF-8?q?frontend=20(#715)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Admin/AddUser.tsx                   | 2 +-
 frontend/src/components/Admin/EditUser.tsx                  | 4 ++--
 frontend/src/components/Common/ActionsMenu.tsx              | 2 +-
 frontend/src/components/Items/AddItem.tsx                   | 2 +-
 frontend/src/components/Items/EditItem.tsx                  | 2 +-
 frontend/src/components/UserSettings/ChangePassword.tsx     | 2 +-
 frontend/src/components/UserSettings/DeleteConfirmation.tsx | 2 +-
 frontend/src/components/UserSettings/UserInformation.tsx    | 4 ++--
 frontend/src/routes/reset-password.tsx                      | 5 +++--
 9 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/Admin/AddUser.tsx b/frontend/src/components/Admin/AddUser.tsx
index 541a234..207dc5e 100644
--- a/frontend/src/components/Admin/AddUser.tsx
+++ b/frontend/src/components/Admin/AddUser.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: () => {
diff --git a/frontend/src/components/Admin/EditUser.tsx b/frontend/src/components/Admin/EditUser.tsx
index c9459b1..dd52241 100644
--- a/frontend/src/components/Admin/EditUser.tsx
+++ b/frontend/src/components/Admin/EditUser.tsx
@@ -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)
   }
diff --git a/frontend/src/components/Common/ActionsMenu.tsx b/frontend/src/components/Common/ActionsMenu.tsx
index 2994dc6..94ec8c1 100644
--- a/frontend/src/components/Common/ActionsMenu.tsx
+++ b/frontend/src/components/Common/ActionsMenu.tsx
@@ -33,7 +33,7 @@ const ActionsMenu: React.FC<ActionsMenuProps> = ({ type, value, disabled }) => {
           as={Button}
           rightIcon={<BsThreeDotsVertical />}
           variant="unstyled"
-        ></MenuButton>
+        />
         <MenuList>
           <MenuItem
             onClick={editUserModal.onOpen}
diff --git a/frontend/src/components/Items/AddItem.tsx b/frontend/src/components/Items/AddItem.tsx
index 27c6d24..8b7e805 100644
--- a/frontend/src/components/Items/AddItem.tsx
+++ b/frontend/src/components/Items/AddItem.tsx
@@ -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: () => {
diff --git a/frontend/src/components/Items/EditItem.tsx b/frontend/src/components/Items/EditItem.tsx
index bb1e786..03a0b7b 100644
--- a/frontend/src/components/Items/EditItem.tsx
+++ b/frontend/src/components/Items/EditItem.tsx
@@ -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: () => {
diff --git a/frontend/src/components/UserSettings/ChangePassword.tsx b/frontend/src/components/UserSettings/ChangePassword.tsx
index bd1be20..8fc9613 100644
--- a/frontend/src/components/UserSettings/ChangePassword.tsx
+++ b/frontend/src/components/UserSettings/ChangePassword.tsx
@@ -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')
     },
   })
diff --git a/frontend/src/components/UserSettings/DeleteConfirmation.tsx b/frontend/src/components/UserSettings/DeleteConfirmation.tsx
index 3c5cf0b..ab401a3 100644
--- a/frontend/src/components/UserSettings/DeleteConfirmation.tsx
+++ b/frontend/src/components/UserSettings/DeleteConfirmation.tsx
@@ -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: () => {
diff --git a/frontend/src/components/UserSettings/UserInformation.tsx b/frontend/src/components/UserSettings/UserInformation.tsx
index 964131b..af30ba6 100644
--- a/frontend/src/components/UserSettings/UserInformation.tsx
+++ b/frontend/src/components/UserSettings/UserInformation.tsx
@@ -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 && (
diff --git a/frontend/src/routes/reset-password.tsx b/frontend/src/routes/reset-password.tsx
index 5f20b14..55f4d49 100644
--- a/frontend/src/routes/reset-password.tsx
+++ b/frontend/src/routes/reset-password.tsx
@@ -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')
     },
   })