fixup! fixup! fixup! fixup! chore: update @nextcloud/files to 4.0.0

Signed-off-by: skjnldsv <[email protected]>

Author: skjnldsv

apps/files/src/actions/deleteAction.spec.ts

@@ -87,18 +87,38 @@ describe('Delete action conditions tests', () => {
 	test('Default values', () => {
 		expect(action).toBeInstanceOf(FileAction)
 		expect(action.id).toBe('delete')
-		expect(action.displayName([file], view)).toBe('Delete file')
-		expect(action.iconSvgInline([], view)).toMatch(/<svg.+<\/svg>/)
+		expect(action.displayName({
+			nodes: [file],
+			view,
+			folder: {} as Folder,
+			contents: [],
+		})).toBe('Delete file')
+		expect(action.iconSvgInline({
+			nodes: [file],
+			view,
+			folder: {} as Folder,
+			contents: [],
+		})).toMatch(/<svg.+<\/svg>/)
 		expect(action.default).toBeUndefined()
 		expect(action.order).toBe(100)
 	})
 
 	test('Default folder displayName', () => {
-		expect(action.displayName([folder], view)).toBe('Delete folder')
+		expect(action.displayName({
+			nodes: [folder],
+			view,
+			folder: {} as Folder,
+			contents: [],
+		})).toBe('Delete folder')
 	})
 
 	test('Default trashbin view displayName', () => {
-		expect(action.displayName([file], trashbinView)).toBe('Delete permanently')
+		expect(action.displayName({
+			nodes: [file],
+			view: trashbinView,
+			folder: {} as Folder,
+			contents: [],
+		})).toBe('Delete permanently')
 	})
 
 	test('Trashbin disabled displayName', () => {
@@ -107,23 +127,58 @@ describe('Delete action conditions tests', () => {
 				files: {},
 			}
 		})
-		expect(action.displayName([file], view)).toBe('Delete permanently')
+		expect(action.displayName({
+			nodes: [file],
+			view,
+			folder: {} as Folder,
+			contents: [],
+		})).toBe('Delete permanently')
 		expect(capabilities.getCapabilities).toBeCalledTimes(1)
 	})
 
 	test('Shared root node displayName', () => {
-		expect(action.displayName([file2], view)).toBe('Leave this share')
-		expect(action.displayName([folder2], view)).toBe('Leave this share')
-		expect(action.displayName([file2, folder2], view)).toBe('Leave these shares')
+		expect(action.displayName({
+			nodes: [file2],
+			view,
+			folder: {} as Folder,
+			contents: [],
+		})).toBe('Leave this share')
+		expect(action.displayName({
+			nodes: [folder2],
+			view,
+			folder: {} as Folder,
+			contents: [],
+		})).toBe('Leave this share')
+		expect(action.displayName({
+			nodes: [file2, folder2],
+			view,
+			folder: {} as Folder,
+			contents: [],
+		})).toBe('Leave these shares')
 	})
 
 	test('External storage root node displayName', () => {
-		expect(action.displayName([folder3], view)).toBe('Disconnect storage')
-		expect(action.displayName([folder3, folder3], view)).toBe('Disconnect storages')
+		expect(action.displayName({
+			nodes: [folder3],
+			view,
+			folder: {} as Folder,
+			contents: [],
+		})).toBe('Disconnect storage')
+		expect(action.displayName({
+			nodes: [folder3, folder3],
+			view,
+			folder: {} as Folder,
+			contents: [],
+		})).toBe('Disconnect storages')
 	})
 
 	test('Shared and owned nodes displayName', () => {
-		expect(action.displayName([file, file2], view)).toBe('Delete and unshare')
+		expect(action.displayName({
+			nodes: [file, file2],
+			view,
+			folder: {} as Folder,
+			contents: [],
+		})).toBe('Delete and unshare')
 	})
 })
 
@@ -154,7 +209,12 @@ describe('Delete action enabled tests', () => {
 		})
 
 		expect(action.enabled).toBeDefined()
-		expect(action.enabled!([file], view)).toBe(true)
+		expect(action.enabled!({
+			nodes: [file],
+			view,
+			folder: {} as Folder,
+			contents: [],
+		})).toBe(true)
 	})
 
 	test('Disabled without DELETE permissions', () => {
@@ -167,12 +227,22 @@ describe('Delete action enabled tests', () => {
 		})
 
 		expect(action.enabled).toBeDefined()
-		expect(action.enabled!([file], view)).toBe(false)
+		expect(action.enabled!({
+			nodes: [file],
+			view,
+			folder: {} as Folder,
+			contents: [],
+		})).toBe(false)
 	})
 
 	test('Disabled without nodes', () => {
 		expect(action.enabled).toBeDefined()
-		expect(action.enabled!([], view)).toBe(false)
+		expect(action.enabled!({
+			nodes: [],
+			view,
+			folder: {} as Folder,
+			contents: [],
+		})).toBe(false)
 	})
 
 	test('Disabled if not all nodes can be deleted', () => {
@@ -190,9 +260,24 @@ describe('Delete action enabled tests', () => {
 		})
 
 		expect(action.enabled).toBeDefined()
-		expect(action.enabled!([folder1], view)).toBe(true)
-		expect(action.enabled!([folder2], view)).toBe(false)
-		expect(action.enabled!([folder1, folder2], view)).toBe(false)
+		expect(action.enabled!({
+			nodes: [folder1],
+			view,
+			folder: {} as Folder,
+			contents: [],
+		})).toBe(true)
+		expect(action.enabled!({
+			nodes: [folder2],
+			view,
+			folder: {} as Folder,
+			contents: [],
+		})).toBe(false)
+		expect(action.enabled!({
+			nodes: [folder1, folder2],
+			view,
+			folder: {} as Folder,
+			contents: [],
+		})).toBe(false)
 	})
 
 	test('Disabled if not allowed', () => {
@@ -201,7 +286,12 @@ describe('Delete action enabled tests', () => {
 		})))
 
 		expect(action.enabled).toBeDefined()
-		expect(action.enabled!([], view)).toBe(false)
+		expect(action.enabled!({
+			nodes: [],
+			view,
+			folder: {} as Folder,
+			contents: [],
+		})).toBe(false)
 	})
 })
 

apps/files/src/actions/deleteAction.ts

@@ -2,9 +2,6 @@
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-
-import type { Node, View } from '@nextcloud/files'
-
 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-outline.svg?raw'
@@ -26,7 +23,7 @@ export const ACTION_DELETE = 'delete'
 export const action = new FileAction({
 	id: ACTION_DELETE,
 	displayName,
-	enabled({ nodes }) => {
+	iconSvgInline: ({ nodes }) => {
 		if (canUnshareOnly(nodes)) {
 			return CloseSvg
 		}
@@ -38,7 +35,7 @@ export const action = new FileAction({
 		return TrashCanSvg
 	},
 
-	enabled(nodes: Node[], view: View): boolean {
+	enabled({ nodes, view }) {
 		if (view.id === TRASHBIN_VIEW_ID) {
 			const config = loadState('files_trashbin', 'config', { allow_delete: true })
 			if (config.allow_delete === false) {
@@ -51,7 +48,7 @@ export const action = new FileAction({
 			.every((permission) => (permission & Permission.DELETE) !== 0)
 	},
 
-	async exec({ nodes, view }): Promise<boolean | null> {
+	async exec({ nodes, view }) {
 		try {
 			let confirm = true
 
@@ -74,12 +71,12 @@ export const action = new FileAction({
 
 			return true
 		} catch (error) {
-			logger.error('Error while deleting a file', { error, source: node.source, node })
+			logger.error('Error while deleting a file', { error, source: nodes[0].source, node: nodes[0] })
 			return false
 		}
 	},
 
-	async execBatch({ nodes, view }): Promise<(boolean | null)[]> {
+	async execBatch({ nodes, view }) {
 		let confirm = true
 
 		if (shouldAskForConfirmation()) {

apps/files/src/actions/deleteUtils.ts

@@ -16,28 +16,16 @@ import { useUserConfigStore } from '../store/userconfig.ts'
 
 export const isTrashbinEnabled = () => (getCapabilities() as Capabilities)?.files?.undelete === true
 
-/**
- *
- * @param nodes
- */
 export function canUnshareOnly(nodes: Node[]) {
 	return nodes.every((node) => node.attributes['is-mount-root'] === true
 		&& node.attributes['mount-type'] === 'shared')
 }
 
-/**
- *
- * @param nodes
- */
 export function canDisconnectOnly(nodes: Node[]) {
 	return nodes.every((node) => node.attributes['is-mount-root'] === true
 		&& node.attributes['mount-type'] === 'external')
 }
 
-/**
- *
- * @param nodes
- */
 export function isMixedUnshareAndDelete(nodes: Node[]) {
 	if (nodes.length === 1) {
 		return false
@@ -48,28 +36,15 @@ export function isMixedUnshareAndDelete(nodes: Node[]) {
 	return hasSharedItems && hasDeleteItems
 }
 
-/**
- *
- * @param nodes
- */
 export function isAllFiles(nodes: Node[]) {
 	return !nodes.some((node) => node.type !== FileType.File)
 }
 
-/**
- *
- * @param nodes
- */
 export function isAllFolders(nodes: Node[]) {
 	return !nodes.some((node) => node.type !== FileType.Folder)
 }
 
-/**
- *
- * @param nodes
- * @param view
- */
-export function displayName(nodes: Node[], view: View) {
+export function displayName({ nodes, view }: { nodes: Node[], view: View }) {
 	/**
 	 * If those nodes are all the root node of a
 	 * share, we can only unshare them.
@@ -129,19 +104,11 @@ export function displayName(nodes: Node[], view: View) {
 	return t('files', 'Delete')
 }
 
-/**
- *
- */
 export function shouldAskForConfirmation() {
 	const userConfig = useUserConfigStore(getPinia())
 	return userConfig.userConfig.show_dialog_deletion !== false
 }
 
-/**
- *
- * @param nodes
- * @param view
- */
 export async function askConfirmation(nodes: Node[], view: View) {
 	const message = view.id === 'trashbin' || !isTrashbinEnabled()
 		? n('files', 'You are about to permanently delete {count} item', 'You are about to permanently delete {count} items', nodes.length, { count: nodes.length })
@@ -154,7 +121,7 @@ export async function askConfirmation(nodes: Node[], view: View) {
 			t('files', 'Confirm deletion'),
 			{
 				type: window.OC.dialogs.YES_NO_BUTTONS,
-				confirm: displayName(nodes, view),
+				confirm: displayName({ nodes, view }),
 				confirmClasses: 'error',
 				cancel: t('files', 'Cancel'),
 			},
@@ -165,10 +132,6 @@ export async function askConfirmation(nodes: Node[], view: View) {
 	})
 }
 
-/**
- *
- * @param node
- */
 export async function deleteNode(node: Node) {
 	await axios.delete(node.encodedSource)