amy/donetick-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix optional chaining for userProfile in chore filters and adjust data destructuring in MyChores component

Browse source
This commit is contained in:
Mo Tarbin 2025-03-05 22:04:28 -05:00
parent de08c6c5b1
commit 08de84a889
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/utils/Chores.jsx
View file

@ -179,9 +179,9 @@ export const notInCompletionWindow = chore => {
export const ChoreFilters = userProfile => ({ export const ChoreFilters = userProfile => ({
anyone: () => true, anyone: () => true,
assigned_to_me: chore => { assigned_to_me: chore => {
return chore.assignedTo && chore.assignedTo === userProfile.id return chore.assignedTo && chore.assignedTo === userProfile?.id
}, },
assigned_to_others: chore => { assigned_to_others: chore => {
return chore.assignedTo && chore.assignedTo !== userProfile.id return chore.assignedTo && chore.assignedTo !== userProfile?.id
}, },
}) })

5
src/views/Chores/MyChores.jsx
View file

@ -98,13 +98,12 @@ const MyChores = () => {
throw new Error(userProfileResponse.statusText) throw new Error(userProfileResponse.statusText)
} }
Promise.all([ Promise.all([
userProfileResponse.json(),
choresResponse.json(), choresResponse.json(),
usersResponse.json(), usersResponse.json(),
userProfileResponse.json(),
]).then(data => { ]).then(data => {
const [choresData, usersData, userProfileData] = data const [userProfileData, choresData, usersData] = data
setUserProfile(userProfileData.res) setUserProfile(userProfileData.res)
choresData.res.sort(ChoreSorter)
setChores(choresData.res) setChores(choresData.res)
setFilteredChores(choresData.res) setFilteredChores(choresData.res)
setPerformers(usersData.res) setPerformers(usersData.res)