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.

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(trashbin): Allow emptying trash #49171

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions apps/files/src/components/BreadCrumbs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ export default defineComponent({
margin-block: 0;
margin-inline: 10px;
min-width: 0;
gap: var(--default-grid-baseline);

:deep() {
a {
Expand Down
70 changes: 70 additions & 0 deletions apps/files_trashbin/src/fileListActions/emptyTrashAction.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
/**
* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

import PQueue from 'p-queue'
import { FileListAction } from '@nextcloud/files'
import { DialogSeverity, getDialogBuilder, showSuccess } from '@nextcloud/dialogs'

import TrashCanSvg from '@mdi/svg/svg/trash-can.svg?raw'

import { deleteNode } from '../../../files/src/actions/deleteUtils.ts'
import { logger } from '../logger.ts'

const queue = new PQueue({ concurrency: 5 })

export const emptyTrashAction = new FileListAction({
id: 'empty-trash',

displayName: () => t('files_trashbin', 'Empty deleted files'),
iconSvgInline: () => TrashCanSvg,
order: 0,

enabled: (view, nodes, { folder }) => {
if (view.id !== 'trashbin') {
return false
}

return nodes.length > 0 && folder.path === '/'
},

exec: async (view, nodes) => {
const dialog = getDialogBuilder(t('files_trashbin', 'Confirm permanent deletion'))
.setSeverity(DialogSeverity.Warning)
// TODO Add note for groupfolders
.setText(t('files_trashbin', "Are you sure you want to permanently delete the items in deleted files? You can't undo this action."))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The phrasing looks odd to me :)

Maybe something like:

Permanently delete all files and folders in the trash? This cannot be undone.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the UI we call it "Deleted files" so this would be inconsistent, maybe we should change it to "Trash" or "Trash bin" everywhere @marcoambrosini?

.setButtons([
{
label: t('files_trashbin', 'Cancel'),
type: 'secondary',
callback: () => {},
},
{
label: t('files_trashbin', 'Empty deleted files'),
type: 'error',
callback: async () => {
for (const node of nodes) {
queue.add(async () => {
try {
await deleteNode(node)
} catch (error) {
logger.error('Failed to delete node', { error, node })
}
})
}
queue.once('empty', () => {
showSuccess(t('files_trashbin', 'Permanently deleted items in deleted files'))
})
},
},
])
.build()

try {
await dialog.show()
} catch (error) {
// Allow throw on dialog close
}
},
})
6 changes: 5 additions & 1 deletion apps/files_trashbin/src/files-init.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@
import './trashbin.scss'

import { translate as t } from '@nextcloud/l10n'
import { View, getNavigation, registerFileListAction } from '@nextcloud/files'
import DeleteSvg from '@mdi/svg/svg/delete.svg?raw'

import { getContents } from './services/trashbin'
import { columns } from './columns.ts'

// Register restore action
import './actions/restoreAction'
import { View, getNavigation } from '@nextcloud/files'

import { emptyTrashAction } from './fileListActions/emptyTrashAction.ts'

const Navigation = getNavigation()
Navigation.register(new View({
Expand All @@ -34,3 +36,5 @@ Navigation.register(new View({

getContents,
}))

registerFileListAction(emptyTrashAction)
11 changes: 11 additions & 0 deletions apps/files_trashbin/src/logger.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/**
* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

import { getLoggerBuilder } from '@nextcloud/logger'

export const logger = getLoggerBuilder()
.setApp('files_trashbin')
.detectUser()
.build()
Loading