Skip to content

fix: show users correctly using userId instead of id from user profiles. #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abhirajshourya wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −8
Open

fix: show users correctly using userId instead of id from user profiles. #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/views/ChoreEdit/ChoreView.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ const ChoreView = () => {
icon: <PeopleAlt />,
title: 'Assignment',
text: `Assigned: ${
performers.find(p => p.id === chore.assignedTo)?.displayName || 'N/A'
performers.find(p => p.userId === chore.assignedTo)?.displayName || 'N/A'
}`,
subtext: ` Last: ${
chore.lastCompletedDate
? performers.find(p => p.id === chore.lastCompletedBy)?.displayName
? performers.find(p => p.userId === chore.lastCompletedBy)?.displayName
: '--'
}`,
},
Expand Down Expand Up @@ -150,7 +150,7 @@ const ChoreView = () => {
icon: <Person />,
title: 'Details',
subtext: `Created By: ${
performers.find(p => p.id === chore.createdBy)?.displayName || 'N/A'
performers.find(p => p.userId === chore.createdBy)?.displayName || 'N/A'
}`,
},
]
Expand Down
2 changes: 1 addition & 1 deletion src/views/Chores/ChoreCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ const ChoreCard = ({
</Avatar>
<Box display='flex' flexDirection='column'>
<Typography level='title-md'>{getName(chore.name)}</Typography>
{userProfile && chore.assignedTo !== userProfile.id && (
{userProfile && chore.assignedTo !== userProfile.userId && (
<Box display='flex' alignItems='center' gap={0.5}>
<Typography level='body-md' color='text.disabled'>
Assigned to
Expand Down
2 changes: 1 addition & 1 deletion src/views/Chores/CompactChoreCard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ const CompactChoreCard = ({
// Assignee (if not current user)
if (userProfile && chore.assignedTo !== userProfile.id) {
const assignee = performers.find(
p => p.id === chore.assignedTo,
p => p.userId === chore.assignedTo,
)?.displayName
if (assignee) parts.push(assignee)
}
Expand Down
6 changes: 3 additions & 3 deletions src/views/ChoresOverview.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ const ChoresOverview = () => {
{chore.assignedTo > 0 ? (
<Tooltip
title={
performers.find(p => p.id === chore.assignedTo)
performers.find(p => p.userId === chore.assignedTo)
?.displayName
}
size='sm'
Expand All @@ -214,13 +214,13 @@ const ChoresOverview = () => {
startDecorator={
<Avatar color='primary'>
{
performers.find(p => p.id === chore.assignedTo)
performers.find(p => p.userId === chore.assignedTo)
?.displayName[0]
}
</Avatar>
}
>
{performers.find(p => p.id === chore.assignedTo)?.name}
{performers.find(p => p.userId === chore.assignedTo)?.name}
</Chip>
</Tooltip>
) : (
Expand Down