fixup! chore: update @nextcloud/files to 4.0.0

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

Author: skjnldsv

apps/files/src/components/FileEntry/FileEntryActions.vue

@@ -11,8 +11,8 @@
 			v-for="action in enabledRenderActions"
 			:key="action.id"
 			:class="'files-list__row-action-' + action.id"
-			:active-folder="activeFolder"
-			:active-view="activeView"
+			:active-folder="activeStore.activeFolder"
+			:active-view="activeStore.activeView"
 			:render="action.renderInline"
 			:source="source"
 			class="files-list__row-action--inline" />
@@ -121,7 +121,7 @@
 </template>
 
 <script lang="ts">
-import type { FileAction, Node } from '@nextcloud/files'
+import type { ActionContextSingle, FileAction, Node } from '@nextcloud/files'
 import type { PropType } from 'vue'
 
 import { DefaultType, NodeStatus } from '@nextcloud/files'
@@ -175,13 +175,11 @@ export default defineComponent({
 
 	setup() {
 		// The file list is guaranteed to be  shown with active view - thus we can set the `loaded` flag
-		const { activeNode, activeFolder, activeView } = useActiveStore()
+		const activeStore = useActiveStore()
 		const filesListWidth = useFileListWidth()
 		const enabledFileActions = inject<FileAction[]>('enabledFileActions', [])
 		return {
-			activeFolder,
-			activeNode,
-			activeView,
+			activeStore,
 			enabledFileActions,
 			filesListWidth,
 			t,
@@ -190,18 +188,18 @@ export default defineComponent({
 
 	computed: {
 		isActive() {
-			return this.activeNode?.source === this.source.source
+			return this.activeStore.activeNode?.source === this.source.source
 		},
 
 		isLoading() {
 			return this.source.status === NodeStatus.LOADING
 		},
 
-		actionContext() {
+		actionContext(): ActionContextSingle {
 			return {
 				nodes: [this.source],
-				view: this.activeView,
-				folder: this.activeFolder!,
+				view: this.activeStore.activeView!,
+				folder: this.activeStore.activeFolder!,
 				contents: [],
 			}
 		},
@@ -307,22 +305,12 @@ export default defineComponent({
 				if ((this.gridMode || (this.filesListWidth < 768 && action.inline)) && typeof action.title === 'function') {
 					// if an inline action is rendered in the menu for
 					// lack of space we use the title first if defined
-					const title = action.title({
-						nodes: [this.source],
-						view: this.activeView,
-						folder: this.activeFolder!,
-						contents: [],
-					})
+					const title = action.title(this.actionContext)
 					if (title) {
 						return title
 					}
 				}
-				return action.displayName({
-					nodes: [this.source],
-					view: this.activeView,
-					folder: this.activeFolder!,
-					contents: [],
-				})
+				return action.displayName(this.actionContext)
 			} catch (error) {
 				logger.error('Error while getting action display name', { action, error })
 				// Not ideal, but better than nothing
@@ -334,7 +322,7 @@ export default defineComponent({
 			if (!this.isActive) {
 				return false
 			}
-			return this.activeStore?.activeAction?.id === action.id
+			return this.activeStore.activeAction?.id === action.id
 		},
 
 		async onActionClick(action) {

apps/files/src/components/FilesListVirtual.vue

@@ -456,6 +456,7 @@ export default defineComponent({
 		},
 
 		onKeyDown(event: KeyboardEvent) {
+			console.debug('FilesListVirtual: onKeyDown', { key: event.key })
 			// Up and down arrow keys
 			if (event.key === 'ArrowUp' || event.key === 'ArrowDown') {
 				const columnCount = this.$refs.table?.columnCount ?? 1
@@ -469,6 +470,7 @@ export default defineComponent({
 
 				if (nextNode && nextNode?.fileid) {
 					this.setActiveNode(nextNode)
+					return
 				}
 			}
 
@@ -484,6 +486,7 @@ export default defineComponent({
 
 				if (nextNode && nextNode?.fileid) {
 					this.setActiveNode(nextNode)
+					return
 				}
 			}
 		},

apps/files/src/utils/actionUtils.ts

@@ -2,32 +2,28 @@
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import type { FileAction } from '@nextcloud/files'
+import type { ActionContextSingle, FileAction } from '@nextcloud/files'
 
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { NodeStatus } from '@nextcloud/files'
 import { t } from '@nextcloud/l10n'
 import Vue from 'vue'
 import logger from '../logger.ts'
 import { useActiveStore } from '../store/active.ts'
-import { getPinia } from '../store/index.ts'
 
 /**
  * Execute an action on the current active node
  *
  * @param action The action to execute
  */
 export async function executeAction(action: FileAction) {
-	const activeStore = useActiveStore(getPinia())
-	const currentFolder = activeStore.activeFolder!
-	const currentNode = activeStore.activeNode!
-	const currentView = activeStore.activeView!
+	const activeStore = useActiveStore()
+	const currentFolder = activeStore.activeFolder
+	const currentNode = activeStore.activeNode
+	const currentView = activeStore.activeView
 
-	// @ts-expect-error _children is private
-	const contents = currentFolder?._children || []
-
-	if (!currentNode || !currentView) {
-		logger.error('No active node or view', { node: currentNode, view: currentView })
+	if (!currentFolder || !currentNode || !currentView) {
+		logger.error('No active folder, node or view', { folder: currentFolder, node: currentNode, view: currentView })
 		return
 	}
 
@@ -36,24 +32,23 @@ export async function executeAction(action: FileAction) {
 		return
 	}
 
-	if (!action.enabled!({
+	// @ts-expect-error _children is private
+	const contents = currentFolder?._children || []
+	const context = {
 		nodes: [currentNode],
 		view: currentView,
 		folder: currentFolder,
 		contents,
-	})) {
+	} as ActionContextSingle
+
+	if (!action.enabled!(context)) {
 		logger.debug('Action is not not available for the current context', { action, node: currentNode, view: currentView })
 		return
 	}
 
 	let displayName = action.id
 	try {
-		displayName = action.displayName({
-			nodes: [currentNode],
-			view: currentView,
-			folder: currentFolder,
-			contents,
-		})
+		displayName = action.displayName(context)
 	} catch (error) {
 		logger.error('Error while getting action display name', { action, error })
 	}
@@ -63,12 +58,7 @@ export async function executeAction(action: FileAction) {
 		Vue.set(currentNode, 'status', NodeStatus.LOADING)
 		activeStore.activeAction = action
 
-		const success = await action.exec({
-			nodes: [currentNode],
-			view: currentView,
-			folder: currentFolder!,
-			contents,
-		})
+		const success = await action.exec(context)
 
 		// If the action returns null, we stay silent
 		if (success === null || success === undefined) {