Skip to content
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

Jump to bottom

fix: Files menu ignores new server address #29620

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

fix: Files menu ignores new server address #29620

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
42d9d34
fixed issue#29516
Rottenblasters Jun 22, 2023
ff70072
Merge branch 'develop' into issue_29516_Files_menu_ignores_new_server…
Rottenblasters Jun 27, 2023
91f39e0
Merge branch 'develop' into issue_29516_Files_menu_ignores_new_server…
Rottenblasters Jun 27, 2023
efbae6b
Merge branch 'develop' into issue_29516_Files_menu_ignores_new_server…
Rottenblasters Jun 27, 2023
33c73b4
Merge branch 'develop' into issue_29516_Files_menu_ignores_new_server…
Rottenblasters Jun 28, 2023
668057d
Merge branch 'develop' into issue_29516_Files_menu_ignores_new_server…
Rottenblasters Jul 2, 2023
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
8 changes: 4 additions & 4 deletions apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const hoverClass = css`
const FileItem = ({ fileData, isDeletionAllowed, onClickDelete }) => {
const format = useFormatDateAndTime();

const { _id, name, url, uploadedAt, ts, type, typeGroup, style, className, user } = fileData;
const { _id, name, path, uploadedAt, ts, type, typeGroup, style, className, user } = fileData;

return (
<Box display='flex' p='x12' borderRadius='x4' style={style} className={[className, hoverClass]}>
Expand All @@ -31,9 +31,9 @@ const FileItem = ({ fileData, isDeletionAllowed, onClickDelete }) => {
display='flex'
flexGrow={1}
flexShrink={1}
href={url}
href={path}
>
{typeGroup === 'image' ? <Avatar size='x48' url={url} /> : <FileItemIcon type={type} />}
{typeGroup === 'image' ? <Avatar size='x48' url={path} /> : <FileItemIcon type={type} />}
<Box mis='x8' flexShrink={1} overflow='hidden'>
<Box withTruncatedText color='default' fontScale='p2m'>
{name}
Expand All @@ -50,7 +50,7 @@ const FileItem = ({ fileData, isDeletionAllowed, onClickDelete }) => {
<MenuItem
_id={_id}
name={name}
url={url}
url={path}
onClickDelete={isDeletionAllowed && isDeletionAllowed({ uid: user?._id, ts }) && onClickDelete}
/>
</Box>
Expand Down
Loading