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

feat: add delete option to file menu #936

Merged
merged 2 commits into from
Mar 18, 2022
Merged

feat: add delete option to file menu #936

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73a1ace
feat: add delete option to file menu
amanharwara Mar 18, 2022
3fca2c8
feat: filter files based on file.deleted
amanharwara Mar 18, 2022
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
2 changes: 1 addition & 1 deletion app/assets/javascripts/components/AttachedFilesPopover/AttachedFilesButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export const AttachedFilesButton: FunctionComponent<Props> = observer(
type: ToastType.Loading,
message: `Deleting file "${file.name}"...`,
});
await application.deleteItem(file);
await application.files.deleteFile(file);
addToast({
type: ToastType.Success,
message: `Deleted file "${file.name}"`,
Expand Down
26 changes: 14 additions & 12 deletions app/assets/javascripts/components/AttachedFilesPopover/AttachedFilesPopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,18 +169,20 @@ export const AttachedFilesPopover: FunctionComponent<Props> = observer(
</div>
) : null}
{filteredList.length > 0 ? (
filteredList.map((file: SNFile) => {
return (
<PopoverFileItem
key={file.uuid}
file={file}
isAttachedToNote={attachedFiles.includes(file)}
handleFileAction={handleFileAction}
getIconType={application.iconsController.getIconForFileType}
closeOnBlur={closeOnBlur}
/>
);
})
filteredList
.filter((file) => file.name && file.size)
.map((file: SNFile) => {
return (
<PopoverFileItem
key={file.uuid}
file={file}
isAttachedToNote={attachedFiles.includes(file)}
handleFileAction={handleFileAction}
getIconType={application.iconsController.getIconForFileType}
closeOnBlur={closeOnBlur}
/>
);
})
) : (
<div className="flex flex-col items-center justify-center w-full py-8">
<div className="w-18 h-18 mb-2">
Expand Down
14 changes: 14 additions & 0 deletions app/assets/javascripts/components/AttachedFilesPopover/PopoverFileSubmenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,20 @@ export const PopoverFileSubmenu: FunctionComponent<Props> = ({
<Icon type="pencil" className="mr-2 color-neutral" />
Rename
</button>
<button
onBlur={closeOnBlur}
className="sn-dropdown-item focus:bg-info-backdrop"
onClick={() => {
handleFileAction({
type: PopoverFileItemActionType.DeleteFile,
payload: file,
});
closeMenu();
}}
>
<Icon type="trash" className="mr-2 color-danger" />
<span className="color-danger">Delete permanently</span>
</button>
</>
)}
</DisclosurePanel>
Expand Down