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

Fix broken image urls in Settings > Profile and Invite To Workspace Email (#8942)

Browse Source 
Fixes #8601

We had 3 implementations of getImageAbsoluteURI: in twenty-front, in
twenty-ui and in twenty-emails. I was able to remove the one in
twenty-front but I could not remove it from twenty-emails as this is a
standalone for now. The vision is to introduce shared utils in a
twenty-shared package
This commit is contained in:
Charles Bochet
2024-12-07 14:57:32 +01:00
committed by GitHub
parent ab8ad46685
commit 99f53a5030
17 changed files with 72 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/twenty-emails/src/emails/send-invite-link.email.tsx
View File

@ -20,7 +20,7 @@ type SendInviteLinkEmailProps = {
firstName: string;
lastName: string;
};
serverUrl?: string;
serverUrl: string;
};
export const SendInviteLinkEmail = ({
@ -29,7 +29,9 @@ export const SendInviteLinkEmail = ({
sender,
serverUrl,
}: SendInviteLinkEmailProps) => {
const workspaceLogo = getImageAbsoluteURI(workspace.logo, serverUrl);
const workspaceLogo = workspace.logo
? getImageAbsoluteURI(workspace.logo, serverUrl)
: null;
return (
<BaseEmail width={333}>

15
packages/twenty-emails/src/utils/getImageAbsoluteURI.ts
View File

@ -1,16 +1,9 @@
export const getImageAbsoluteURI = (
imageUrl?: string | null,
serverUrl?: string,
) => {
if (!imageUrl) {
return null;
}
if (imageUrl?.startsWith('https:')) {
export const getImageAbsoluteURI = (imageUrl: string, serverUrl: string) => {
if (imageUrl.startsWith('https:') || imageUrl.startsWith('http:')) {
return imageUrl;
}
return serverUrl?.endsWith('/')
return serverUrl.endsWith('/')
? `${serverUrl.substring(0, serverUrl.length - 1)}/files/${imageUrl}`
: `${serverUrl || ''}/files/${imageUrl}`;
: `${serverUrl}/files/${imageUrl}`;
};