Skip to content

[FIX] Can't delete file from Room's file list #22191

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

Merged
dougfabris merged 4 commits into from
Jun 11, 2021
Merged

[FIX] Can't delete file from Room's file list #22191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef69368
fix onclick
gabriellsh May 28, 2021
2538531
Merge branch 'develop' into fix/delete_file
Jun 10, 2021
e12ac0a
Merge branch 'develop' into fix/delete_file
Jun 10, 2021
2d62564
Merge branch 'develop' into fix/delete_file
Jun 11, 2021
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
11 changes: 1 addition & 10 deletions client/views/room/contextualBar/RoomFiles/Row.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,13 @@ import React, { memo } from 'react';
import FileItem from './components/FileItem';

const Row = ({ item, data, index }) => {
const { userId, onClickDelete, isDeletionAllowed } = data;
const { onClickDelete, isDeletionAllowed } = data;

return (
item && (
<FileItem
index={index}
_id={item._id}
name={item.name}
url={item.url}
uploadedAt={item.uploadedAt}
user={item.user}
ts={item.ts}
type={item.type}
typeGroup={item.typeGroup}
fileData={item}
userId={userId}
onClickDelete={onClickDelete}
isDeletionAllowed={isDeletionAllowed}
/>
Expand Down
18 changes: 3 additions & 15 deletions 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 @@ -14,23 +14,10 @@ const hoverClass = css`
}
`;

const FileItem = ({ fileData }) => {
const FileItem = ({ fileData, isDeletionAllowed, onClickDelete, index }) => {
const format = useFormatDateAndTime();

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

return (
<Box display='flex' p='x12' style={style} className={[className, hoverClass]}>
Expand All @@ -46,6 +33,7 @@ const FileItem = ({ fileData }) => {
flexGrow={1}
flexShrink={1}
href={url}
key={index}
>
{typeGroup === 'image' ? <Avatar size='x48' url={url} /> : <FileItemIcon type={type} />}
<Box mis='x8' flexShrink={1} overflow='hidden'>
Expand Down