fix: show email and avatar for pending members
This commit is contained in:
@@ -27,7 +27,7 @@ const Avatar = ({
|
||||
}) => {
|
||||
const initials = name
|
||||
? getInitialsFromName(name)
|
||||
: inferInitialsFromEmail(email ?? "");
|
||||
: inferInitialsFromEmail(email);
|
||||
|
||||
return (
|
||||
<>
|
||||
|
||||
@@ -12,6 +12,7 @@ const Card = ({
|
||||
labels: { name: string; colourCode: string | null }[];
|
||||
members: {
|
||||
publicId: string;
|
||||
email: string;
|
||||
user: { name: string | null; email: string; image: string | null } | null;
|
||||
}[];
|
||||
}) => {
|
||||
@@ -29,17 +30,15 @@ const Card = ({
|
||||
))}
|
||||
</div>
|
||||
<div className="isolate flex justify-end -space-x-1 overflow-hidden">
|
||||
{members.map(({ user }) => {
|
||||
if (!user) return null;
|
||||
|
||||
const avatarUrl = user.image
|
||||
{members.map(({ user, email }) => {
|
||||
const avatarUrl = user?.image
|
||||
? getAvatarUrl(user.image)
|
||||
: undefined;
|
||||
|
||||
return (
|
||||
<Avatar
|
||||
name={user.name ?? ""}
|
||||
email={user.email}
|
||||
name={user?.name ?? ""}
|
||||
email={user?.email ?? email}
|
||||
imageUrl={avatarUrl}
|
||||
size="sm"
|
||||
/>
|
||||
|
||||
@@ -149,7 +149,7 @@ export function NewCardForm({
|
||||
key: member.publicId,
|
||||
value: formatMemberDisplayName(
|
||||
member.user?.name ?? null,
|
||||
member.user?.email ?? null,
|
||||
member.user?.email ?? member.email,
|
||||
),
|
||||
leftIcon: (
|
||||
<Avatar
|
||||
@@ -158,7 +158,7 @@ export function NewCardForm({
|
||||
imageUrl={
|
||||
member.user?.image ? getAvatarUrl(member.user.image) : undefined
|
||||
}
|
||||
email={member.user?.email ?? ""}
|
||||
email={member.user?.email ?? member.email}
|
||||
/>
|
||||
),
|
||||
})) ?? [];
|
||||
|
||||
@@ -89,7 +89,7 @@ export default function CardPage() {
|
||||
key: member.publicId,
|
||||
value: formatMemberDisplayName(
|
||||
member.user?.name ?? null,
|
||||
member.user?.email ?? null,
|
||||
member.user?.email ?? member.email,
|
||||
),
|
||||
imageUrl: member.user?.image
|
||||
? getAvatarUrl(member.user.image)
|
||||
@@ -102,7 +102,7 @@ export default function CardPage() {
|
||||
imageUrl={
|
||||
member.user?.image ? getAvatarUrl(member.user.image) : undefined
|
||||
}
|
||||
email={member.user?.email ?? ""}
|
||||
email={member.user?.email ?? member.email}
|
||||
/>
|
||||
),
|
||||
};
|
||||
|
||||
@@ -93,6 +93,7 @@ export const getByPublicId = async (
|
||||
members: {
|
||||
columns: {
|
||||
publicId: true,
|
||||
email: true,
|
||||
},
|
||||
with: {
|
||||
user: {
|
||||
@@ -148,6 +149,7 @@ export const getByPublicId = async (
|
||||
member: {
|
||||
columns: {
|
||||
publicId: true,
|
||||
email: true,
|
||||
deletedAt: true,
|
||||
},
|
||||
with: {
|
||||
|
||||
@@ -336,6 +336,7 @@ export const getWithListAndMembersByPublicId = async (
|
||||
members: {
|
||||
columns: {
|
||||
publicId: true,
|
||||
email: true,
|
||||
},
|
||||
with: {
|
||||
user: {
|
||||
@@ -362,6 +363,7 @@ export const getWithListAndMembersByPublicId = async (
|
||||
member: {
|
||||
columns: {
|
||||
publicId: true,
|
||||
email: true,
|
||||
},
|
||||
with: {
|
||||
user: {
|
||||
|
||||
Reference in New Issue
Block a user