Skip to content

Allow to delete files without trashbin + add unit tests + some refactoring #51394

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
susnux merged 6 commits into from
Mar 11, 2025
Merged

Allow to delete files without trashbin + add unit tests + some refactoring #51394

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c7014a7
fix(files_trashbin): correctly sort custom columns in trashbin view
susnux Mar 11, 2025
aac5859
fix(files_trashbin): return correct type in empty trash action
susnux Mar 11, 2025
a60a24e
refactor(files_trashbin): restore action refactoring
susnux Mar 11, 2025
f4d0478
test(files_trashbin): add test coverage also for utils like the logger
susnux Mar 11, 2025
7b5cd60
fix(files): also enable delete action if trashbin is disabled
susnux Mar 11, 2025
07535e7
chore: compile assets
susnux Mar 11, 2025
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
Prev Previous commit
Next Next commit
fix(files): also enable delete action if trashbin is disabled 
Signed-off-by: Ferdinand Thiessen <[email protected]>
  • Loading branch information
@susnux
susnux committed Mar 11, 2025
commit 7b5cd6061488f5219c1f612c92470f1339cdcb8e
19 changes: 10 additions & 9 deletions apps/files/src/actions/deleteAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@
* SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
import type { FilesTrashbinConfigState } from '../../../files_trashbin/src/fileListActions/emptyTrashAction.ts'

import { loadState } from '@nextcloud/initial-state'
import { Permission, Node, View, FileAction } from '@nextcloud/files'
import { showInfo } from '@nextcloud/dialogs'
import { Permission, Node, View, FileAction } from '@nextcloud/files'
import { loadState } from '@nextcloud/initial-state'
import { translate as t } from '@nextcloud/l10n'
import PQueue from 'p-queue'

import CloseSvg from '@mdi/svg/svg/close.svg?raw'
import NetworkOffSvg from '@mdi/svg/svg/network-off.svg?raw'
import TrashCanSvg from '@mdi/svg/svg/trash-can.svg?raw'

import { TRASHBIN_VIEW_ID } from '../../../files_trashbin/src/files_views/trashbinView.ts'
import { askConfirmation, canDisconnectOnly, canUnshareOnly, deleteNode, displayName, isTrashbinEnabled } from './deleteUtils.ts'
import logger from '../logger.ts'
import { askConfirmation, canDisconnectOnly, canUnshareOnly, deleteNode, displayName, isTrashbinEnabled } from './deleteUtils'

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

Expand All @@ -36,10 +35,12 @@ export const action = new FileAction({
return TrashCanSvg
},

enabled(nodes: Node[]) {
const config = loadState<FilesTrashbinConfigState>('files_trashbin', 'config')
if (!config.allow_delete) {
return false
enabled(nodes: Node[], view: View): boolean {
if (view.id === TRASHBIN_VIEW_ID) {
const config = loadState('files_trashbin', 'config', { allow_delete: true })
if (config.allow_delete === false) {
return false
}
}

return nodes.length > 0 && nodes
Expand Down