[FIX] Attachments not rendered if deployed on subfolder (#22290)

Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>
pull/22432/head
gabriellsh 5 years ago committed by Diego Sampaio
parent 958cc35658
commit 8e9dc8cc5c
No known key found for this signature in database
GPG Key ID: E060152B30502562
  1. 2
      app/utils/lib/getURL.js
  2. 2
      client/components/Message/Attachments/Files/ImageAttachment.tsx
  3. 3
      client/providers/AvatarUrlProvider.tsx

@ -54,7 +54,7 @@ export const _getURL = (path, { cdn, full, cloud, cloud_route, cloud_params, _cd
}
if (full) {
return siteUrl + url;
return s.rtrim(siteUrl, pathPrefix) + url;
}
return url;

@ -51,7 +51,7 @@ export const ImageAttachment: FC<ImageAttachmentProps> = ({
{...imageDimensions}
loadImage={loadImage}
setLoadImage={setLoadImage}
src={url}
src={getURL(url)}
previewUrl={`data:image/png;base64,${imagePreview}`}
/>
</Attachment.Content>

@ -1,6 +1,7 @@
import React, { useMemo, FC } from 'react';
import { roomTypes } from '../../app/utils/client';
import { getURL } from '../../app/utils/lib/getURL';
import { AvatarUrlContext } from '../contexts/AvatarUrlContext';
import { useSetting } from '../contexts/SettingsContext';
@ -19,7 +20,7 @@ const AvatarUrlProvider: FC = ({ children }) => {
`${cdnAvatarUrl}/avatar/${uid}${etag ? `?etag=${etag}` : ''}`;
}
return (uid: string, etag?: string): string =>
`/avatar/${uid}${etag ? `?etag=${etag}` : ''}`;
getURL(`/avatar/${uid}${etag ? `?etag=${etag}` : ''}`);
})(),
getRoomPathAvatar: ({ type, ...room }: any): string =>
roomTypes.getConfig(type || room.t).getAvatarPath({ username: room._id, ...room }),

Loading…
Cancel
Save