admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix avatar placeholder not displayed (#2611)

Browse Source
This commit is contained in:
Charles Bochet
2023-11-21 12:39:40 +01:00
committed by GitHub
parent b13d84fcda
commit d25f00e04f
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
front/src/modules/ui/object/field/meta-types/hooks/useRelationField.ts
View File

@ -39,7 +39,7 @@ export const useRelationField = () => {
if (fieldPathParts.length === 1) { if (fieldPathParts.length === 1) {
name += record[fieldPathParts[0]]; name += record[fieldPathParts[0]];
} else if (fieldPathParts.length === 2) { } else if (fieldPathParts.length === 2) {
name += record[fieldPathParts[0]][fieldPathParts[1]]; name += record[fieldPathParts[0]][fieldPathParts[1]] + ' ';
} else { } else {
throw new Error( throw new Error(
`Invalid field path ${fieldPath}. Relation picker only supports field paths with 1 or 2 parts.`, `Invalid field path ${fieldPath}. Relation picker only supports field paths with 1 or 2 parts.`,
@ -47,12 +47,14 @@ export const useRelationField = () => {
} }
} }
const avatarUrl = record[fieldDefinition.metadata.imageIdentifierUrlField];
return { return {
id: record.id, id: record.id,
name: record[name], name: name.trimEnd(),
avatarUrl: avatarUrl: avatarUrl
fieldDefinition.metadata.imageIdentifierUrlPrefix + ? fieldDefinition.metadata.imageIdentifierUrlPrefix +
record[fieldDefinition.metadata.imageIdentifierUrlField], record[fieldDefinition.metadata.imageIdentifierUrlField]
: '',
avatarType: fieldDefinition.metadata.imageIdentifierFormat, avatarType: fieldDefinition.metadata.imageIdentifierFormat,
record: record, record: record,
}; };

1
front/src/modules/users/components/Avatar.tsx
View File

@ -98,7 +98,6 @@ export const Avatar = ({
}: AvatarProps) => { }: AvatarProps) => {
const noAvatarUrl = !isNonEmptyString(avatarUrl); const noAvatarUrl = !isNonEmptyString(avatarUrl);
const [isInvalidAvatarUrl, setIsInvalidAvatarUrl] = useState(false); const [isInvalidAvatarUrl, setIsInvalidAvatarUrl] = useState(false);
useEffect(() => { useEffect(() => {
if (avatarUrl) { if (avatarUrl) {
new Promise((resolve) => { new Promise((resolve) => {