From 4eda604add41299895315f77eec36ac3de36894b Mon Sep 17 00:00:00 2001
From: Louis Chmn <louis@chmn.me>
Date: Thu, 16 Oct 2025 15:09:34 +0200
Subject: [PATCH 1/5] feat(FilePicker): Set cursor as pointer on file rows

Signed-off-by: Louis Chmn <louis@chmn.me>
---
 lib/components/FilePicker/FileListRow.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/components/FilePicker/FileListRow.vue b/lib/components/FilePicker/FileListRow.vue
index 58ec1d6a6..38088fa84 100644
--- a/lib/components/FilePicker/FileListRow.vue
+++ b/lib/components/FilePicker/FileListRow.vue
@@ -132,6 +132,10 @@ function handleKeyDown(event: KeyboardEvent) {
 
 .file-picker {
 	&__row {
+		* {
+			cursor: pointer;
+		}
+
 		&--selected {
 			background-color: var(--color-background-dark);
 		}

From 7442fac8c30ccf113cf57c431635a322d4f23b89 Mon Sep 17 00:00:00 2001
From: Louis Chmn <louis@chmn.me>
Date: Fri, 17 Oct 2025 11:23:50 +0200
Subject: [PATCH 2/5] feat(FilePicker): Expose `canPick` option

This will inhibit selection of nodes

Signed-off-by: Louis Chmn <louis@chmn.me>
---
 lib/components/FilePicker/FileList.vue    |  7 ++++++-
 lib/components/FilePicker/FileListRow.vue | 13 +++++++++++++
 lib/components/FilePicker/FilePicker.vue  |  9 ++++++++-
 lib/components/types.ts                   |  7 ++++++-
 lib/filepicker-builder.ts                 | 18 +++++++++++++++++-
 lib/index.ts                              |  1 +
 6 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/lib/components/FilePicker/FileList.vue b/lib/components/FilePicker/FileList.vue
index 2bb90394f..59285bb79 100644
--- a/lib/components/FilePicker/FileList.vue
+++ b/lib/components/FilePicker/FileList.vue
@@ -67,7 +67,7 @@
 						:key="file.fileid || file.path"
 						:allow-pick-directory="allowPickDirectory"
 						:show-checkbox="multiselect"
-						:can-pick="multiselect || selectedFiles.length === 0 || selectedFiles.includes(file)"
+						:can-pick="(multiselect || selectedFiles.length === 0 || selectedFiles.includes(file)) && (canPick === undefined || canPick(file))"
 						:selected="selectedFiles.includes(file)"
 						:node="file"
 						:crop-image-previews="cropImagePreviews"
@@ -82,6 +82,7 @@
 <script setup lang="ts">
 import type { FilesSortingMode, INode } from '@nextcloud/files'
 import type { FileListViews } from '../../composables/filesSettings.ts'
+import type { IFilePickerCanPick } from '../types.ts'
 
 import { FileType, sortNodes } from '@nextcloud/files'
 import { computed, nextTick, onMounted, onUnmounted, ref } from 'vue'
@@ -125,6 +126,10 @@ const props = defineProps<{
 	 * Files to show
 	 */
 	files: INode[]
+	/**
+	 * Custom function to decide if a node can be picked
+	 */
+	canPick?: IFilePickerCanPick
 }>()
 
 /// sorting related stuff
diff --git a/lib/components/FilePicker/FileListRow.vue b/lib/components/FilePicker/FileListRow.vue
index 38088fa84..513c86d00 100644
--- a/lib/components/FilePicker/FileListRow.vue
+++ b/lib/components/FilePicker/FileListRow.vue
@@ -10,6 +10,7 @@
 		:class="[
 			{
 				'file-picker__row--selected': selected && !showCheckbox,
+				'file-picker__row--not-pickable': !isPickable,
 			},
 		]"
 		:data-filename="node.basename"
@@ -101,6 +102,10 @@ const isPickable = computed(() => props.canPick && (props.allowPickDirectory ||
  * Toggle the selection state
  */
 function toggleSelected() {
+	if (!isPickable.value) {
+		return
+	}
+
 	emit('update:selected', !props.selected)
 }
 
@@ -139,6 +144,14 @@ function handleKeyDown(event: KeyboardEvent) {
 		&--selected {
 			background-color: var(--color-background-dark);
 		}
+
+		&--not-pickable {
+
+			* {
+				cursor: default !important;
+			}
+		}
+
 		&:hover {
 			background-color: var(--color-background-hover);
 		}
diff --git a/lib/components/FilePicker/FilePicker.vue b/lib/components/FilePicker/FilePicker.vue
index 542c4bc3a..ad6facf50 100644
--- a/lib/components/FilePicker/FilePicker.vue
+++ b/lib/components/FilePicker/FilePicker.vue
@@ -43,6 +43,7 @@
 				:multiselect="multiselect"
 				:loading="isLoading"
 				:name="viewHeadline"
+				:can-pick="canPickFn"
 				@update:path="currentView = 'files'" />
 			<NcEmptyContent
 				v-else-if="filterString"
@@ -67,7 +68,7 @@
 <script setup lang="ts">
 import type { Node } from '@nextcloud/files'
 import type { IFilesViewId } from '../../composables/views.ts'
-import type { IDialogButton, IFilePickerButton, IFilePickerButtonFactory, IFilePickerFilter } from '../types.ts'
+import type { IDialogButton, IFilePickerButton, IFilePickerButtonFactory, IFilePickerCanPick, IFilePickerFilter } from '../types.ts'
 
 import { emit as emitOnEventBus } from '@nextcloud/event-bus'
 import { computed, onMounted, ref, shallowRef, toRef, watch } from 'vue'
@@ -108,6 +109,11 @@ const props = withDefaults(defineProps<{
 	 */
 	filterFn?: IFilePickerFilter
 
+	/**
+	 * Custom function to decide if a node can be picked
+	 */
+	canPickFn?: IFilePickerCanPick
+
 	/**
 	 * List of allowed mime types
 	 * You can use placeholders for e.g. allowing all subtypes of images `['image/*']`.
@@ -132,6 +138,7 @@ const props = withDefaults(defineProps<{
 	allowPickDirectory: false,
 	disabledNavigation: false,
 	filterFn: undefined,
+	canPickFn: undefined,
 	mimetypeFilter: () => [],
 	multiselect: false,
 	path: undefined,
diff --git a/lib/components/types.ts b/lib/components/types.ts
index ce557d0f8..b78635bd9 100644
--- a/lib/components/types.ts
+++ b/lib/components/types.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import type { Node } from '@nextcloud/files'
+import type { INode, Node } from '@nextcloud/files'
 
 export type IDialogSeverity = 'info' | 'warning' | 'error'
 
@@ -58,3 +58,8 @@ export type IFilePickerButtonFactory = (selectedNodes: Node[], currentPath: stri
  * Type of filter functions to filter the FilePicker's file list
  */
 export type IFilePickerFilter = (node: Node) => boolean
+
+/**
+ * Type of functions to allow or not picking a node
+ */
+export type IFilePickerCanPick = (node: INode) => boolean
diff --git a/lib/filepicker-builder.ts b/lib/filepicker-builder.ts
index a7bac675a..1c618b56f 100644
--- a/lib/filepicker-builder.ts
+++ b/lib/filepicker-builder.ts
@@ -4,7 +4,7 @@
  */
 
 import type { Node } from '@nextcloud/files'
-import type { IFilePickerButton, IFilePickerButtonFactory, IFilePickerFilter } from './components/types.ts'
+import type { IFilePickerButton, IFilePickerButtonFactory, IFilePickerCanPick, IFilePickerFilter } from './components/types.ts'
 
 import IconMove from '@mdi/svg/svg/folder-move.svg?raw'
 import IconCopy from '@mdi/svg/svg/folder-multiple.svg?raw'
@@ -37,6 +37,7 @@ export class FilePicker<IsMultiSelect extends boolean> {
 	private buttons: IFilePickerButton[] | IFilePickerButtonFactory
 	private path?: string
 	private filter?: IFilePickerFilter
+	private canPick?: IFilePickerCanPick
 	private container?: string
 	private disabledNavigation: boolean
 
@@ -48,6 +49,7 @@ export class FilePicker<IsMultiSelect extends boolean> {
 		buttons: IFilePickerButton[] | IFilePickerButtonFactory,
 		path?: string,
 		filter?: IFilePickerFilter,
+		canPick?: IFilePickerCanPick,
 		container?: string,
 		disabledNavigation = false,
 	) {
@@ -57,6 +59,7 @@ export class FilePicker<IsMultiSelect extends boolean> {
 		this.directoriesAllowed = directoriesAllowed
 		this.path = path
 		this.filter = filter
+		this.canPick = canPick
 		this.buttons = buttons
 		this.container = container
 		this.disabledNavigation = disabledNavigation
@@ -78,6 +81,7 @@ export class FilePicker<IsMultiSelect extends boolean> {
 			mimetypeFilter: this.mimeTypeFilter,
 			multiselect: this.multiSelect,
 			filterFn: this.filter,
+			canPickFn: this.canPick,
 			disabledNavigation: this.disabledNavigation,
 		}, {
 			container: this.container,
@@ -112,6 +116,7 @@ export class FilePickerBuilder<IsMultiSelect extends boolean> {
 	private directoriesAllowed = false
 	private path?: string
 	private filter?: IFilePickerFilter
+	private canPick?: IFilePickerCanPick
 	private buttons: IFilePickerButton[] | IFilePickerButtonFactory = []
 	private container?: string
 	private disabledNavigation = false
@@ -269,6 +274,16 @@ export class FilePickerBuilder<IsMultiSelect extends boolean> {
 		return this
 	}
 
+	/**
+	 * Add function to allow or not picking a node
+	 *
+	 * @param canPick Function to decide if a node can be picked
+	 */
+	public setCanPick(canPick: IFilePickerCanPick) {
+		this.canPick = canPick
+		return this
+	}
+
 	/**
 	 * Disable navigation (view selection)
 	 */
@@ -289,6 +304,7 @@ export class FilePickerBuilder<IsMultiSelect extends boolean> {
 			this.buttons,
 			this.path,
 			this.filter,
+			this.canPick,
 			this.container,
 			this.disabledNavigation,
 		)
diff --git a/lib/index.ts b/lib/index.ts
index c425f8c2f..62b86d585 100644
--- a/lib/index.ts
+++ b/lib/index.ts
@@ -57,5 +57,6 @@ export type {
 	IDialogButton,
 	IDialogSeverity,
 	IFilePickerButton,
+	IFilePickerCanPick,
 	IFilePickerFilter,
 } from './components/types.ts'

From 9895f855f3b21edccb04a5a918181b18312d9e37 Mon Sep 17 00:00:00 2001
From: Louis Chmn <louis@chmn.me>
Date: Fri, 17 Oct 2025 11:24:52 +0200
Subject: [PATCH 3/5] feat(FilePicker): Prevent navigation to non readable
 nodes

Signed-off-by: Louis Chmn <louis@chmn.me>
---
 lib/components/FilePicker/FileListRow.vue | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/components/FilePicker/FileListRow.vue b/lib/components/FilePicker/FileListRow.vue
index 513c86d00..4424d4c19 100644
--- a/lib/components/FilePicker/FileListRow.vue
+++ b/lib/components/FilePicker/FileListRow.vue
@@ -10,6 +10,7 @@
 		:class="[
 			{
 				'file-picker__row--selected': selected && !showCheckbox,
+				'file-picker__row--not-navigatable': isDirectory && !isNavigatable,
 				'file-picker__row--not-pickable': !isPickable,
 			},
 		]"
@@ -47,7 +48,7 @@
 <script setup lang="ts">
 import type { INode } from '@nextcloud/files'
 
-import { FileType, formatFileSize } from '@nextcloud/files'
+import { FileType, formatFileSize, Permission } from '@nextcloud/files'
 import { computed } from 'vue'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
 import NcDateTime from '@nextcloud/vue/components/NcDateTime'
@@ -98,6 +99,11 @@ const isDirectory = computed(() => props.node.type === FileType.Folder)
  */
 const isPickable = computed(() => props.canPick && (props.allowPickDirectory || !isDirectory.value))
 
+/**
+ * If this node is not readable, then we cannot navigate to it.
+ */
+const isNavigatable = computed(() => (props.node.permissions & Permission.READ) === Permission.READ)
+
 /**
  * Toggle the selection state
  */
@@ -114,7 +120,9 @@ function toggleSelected() {
  */
 function handleClick() {
 	if (isDirectory.value) {
-		emit('enterDirectory', props.node)
+		if (isNavigatable.value) {
+			emit('enterDirectory', props.node)
+		}
 	} else {
 		toggleSelected()
 	}
@@ -145,6 +153,12 @@ function handleKeyDown(event: KeyboardEvent) {
 			background-color: var(--color-background-dark);
 		}
 
+		&--not-navigatable {
+			filter: saturate(0.7);
+			opacity: 0.7;
+		}
+
+		&--not-navigatable,
 		&--not-pickable {
 
 			* {

From 25e2d91c9d5dbf4a11a627be3482df6f0c265c85 Mon Sep 17 00:00:00 2001
From: Louis Chmn <louis@chmn.me>
Date: Fri, 17 Oct 2025 12:33:11 +0200
Subject: [PATCH 4/5] test(FilePicker): Add more use cases

Signed-off-by: Louis Chmn <louis@chmn.me>
---
 lib/components/FilePicker/FileListRow.spec.ts | 230 ++++++++++++------
 1 file changed, 154 insertions(+), 76 deletions(-)

diff --git a/lib/components/FilePicker/FileListRow.spec.ts b/lib/components/FilePicker/FileListRow.spec.ts
index 6bd097ae5..07a2cdfb1 100644
--- a/lib/components/FilePicker/FileListRow.spec.ts
+++ b/lib/components/FilePicker/FileListRow.spec.ts
@@ -3,22 +3,109 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { File } from '@nextcloud/files'
+import type { VueWrapper } from '@vue/test-utils'
+import type { ComponentProps } from 'vue-component-type-helpers'
+
+import { File, Folder, Permission } from '@nextcloud/files'
 import { shallowMount } from '@vue/test-utils'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { nextTick } from 'vue'
 import FileListRow from './FileListRow.vue'
 
-describe('FilePicker: FileListRow', () => {
-	const node = new File({
-		owner: null,
-		mtime: new Date(),
-		mime: 'text/plain',
-		source: 'https://example.com/dav/a.txt',
-		root: '/',
-		attributes: { displayName: 'test' },
+type SubmitAction = (wrapper: VueWrapper<any>) => Promise<void>
+type ElementEvent = { 'update:selected': boolean | undefined, enterDirectory: Folder | undefined }
+
+async function clickCheckboxAction(wrapper: VueWrapper<any>) {
+	wrapper.find('input[type="checkbox"]').trigger('click')
+}
+
+async function clickElementAction(wrapper: VueWrapper<any>) {
+	wrapper.find('[data-testid="row-name"]').trigger('click')
+}
+
+async function pressEnterAction(wrapper: VueWrapper<any>) {
+	wrapper.element.dispatchEvent(new KeyboardEvent('keydown', { bubbles: true, key: 'Enter' }))
+	await nextTick()
+}
+
+function testSubmitNode(name: string, props: ComponentProps<typeof FileListRow>, eventPayload: ElementEvent, actionCallback: SubmitAction) {
+	it(name, async () => {
+		const wrapper = shallowMount(FileListRow, {
+			props,
+			global: {
+				stubs: {
+					NcCheckboxRadioSwitch: {
+						template: '<label><input type="checkbox" @click="$emit(\'update:model-value\', true)" ></label>',
+					},
+				},
+			},
+		})
+
+		await actionCallback(wrapper)
+
+		for (const [event, payload] of Object.entries(eventPayload)) {
+			if (payload === undefined) {
+				expect(wrapper.emitted(event)).toBeUndefined()
+			} else {
+				expect(wrapper.emitted(event)).toEqual([[payload]])
+			}
+		}
 	})
+}
+
+const node = new File({
+	owner: 'alice',
+	mtime: new Date(),
+	mime: 'text/plain',
+	source: 'https://example.com/remote.php/dav/alice/a.txt',
+	root: '/',
+	attributes: { displayName: 'test' },
+})
 
+const folder = new Folder({
+	owner: 'alice',
+	mtime: new Date(),
+	mime: 'httpd/unix-directory',
+	source: 'https://example.com/remote.php/dav/alice/b',
+	root: '/',
+	permissions: Permission.ALL,
+	attributes: { displayName: 'test folder' },
+})
+
+const folderNonReadable = new Folder({
+	owner: 'alice',
+	mtime: new Date(),
+	mime: 'httpd/unix-directory',
+	source: 'https://example.com/remote.php/dav/alice/b',
+	root: '/',
+	permissions: Permission.ALL & ~Permission.READ,
+	attributes: { displayName: 'test folder' },
+})
+
+const defaultOptions = {
+	selected: false,
+	cropImagePreviews: true,
+	canPick: true,
+	showCheckbox: true,
+	allowPickDirectory: true,
+}
+
+const noEmits = {
+	'update:selected': undefined,
+	enterDirectory: undefined,
+}
+
+const selectNode = {
+	'update:selected': true,
+	enterDirectory: undefined,
+}
+
+const navigateToFolder = {
+	'update:selected': undefined,
+	enterDirectory: folder,
+}
+
+describe('FilePicker: FileListRow', () => {
 	afterEach(() => {
 		vi.restoreAllMocks()
 	})
@@ -64,82 +151,73 @@ describe('FilePicker: FileListRow', () => {
 		expect(wrapper.find('[data-testid="row-checkbox"]').exists()).toBe(false)
 	})
 
-	it('Click checkbox triggers select', async () => {
-		const wrapper = shallowMount(FileListRow, {
-			props: {
-				allowPickDirectory: false,
-				selected: false,
-				showCheckbox: true,
-				canPick: true,
-				node,
-				cropImagePreviews: true,
-			},
-			global: {
-				stubs: {
-					NcCheckboxRadioSwitch: {
-						template: '<label><input type="checkbox" @click="$emit(\'update:model-value\', true)" ></label>',
-					},
-				},
-			},
+	describe('when node is a file', () => {
+		const fileOptions = {
+			...defaultOptions,
+			node,
+		}
+
+		testSubmitNode('Click checkbox triggers select', { ...fileOptions }, selectNode, clickCheckboxAction)
+		testSubmitNode('Click element triggers select', { ...fileOptions }, selectNode, clickElementAction)
+		testSubmitNode('Click element without checkbox triggers select', { ...fileOptions, showCheckbox: false }, selectNode, clickElementAction)
+		testSubmitNode('Enter triggers select', { ...fileOptions, showCheckbox: false }, selectNode, pressEnterAction)
+
+		describe('canPick: false', () => {
+			const options = {
+				...fileOptions,
+				canPick: false,
+			}
+
+			testSubmitNode('Click checkbox does not triggers select', options, noEmits, clickCheckboxAction)
+			testSubmitNode('Click element does not triggers select', options, noEmits, clickElementAction)
+			testSubmitNode('Click element without checkbox does not triggers select', { ...options, showCheckbox: false }, noEmits, clickElementAction)
+			testSubmitNode('Enter does not triggers select', { ...options, showCheckbox: false }, noEmits, pressEnterAction)
 		})
-
-		await wrapper.find('input[type="checkbox"]').trigger('click')
-
-		// one event with payload `true` is expected
-		expect(wrapper.emitted('update:selected')).toEqual([[true]])
 	})
 
-	it('Click element triggers select', async () => {
-		const wrapper = shallowMount(FileListRow, {
-			props: {
-				allowPickDirectory: false,
-				selected: false,
-				showCheckbox: true,
-				canPick: true,
-				node,
-				cropImagePreviews: true,
-			},
+	describe('when node is a folder', () => {
+		const folderOptions = {
+			...defaultOptions,
+			node: folder,
+		}
+
+		testSubmitNode('Click checkbox triggers select', folderOptions, selectNode, clickCheckboxAction)
+		testSubmitNode('Click element navigates to it', folderOptions, navigateToFolder, clickElementAction)
+		testSubmitNode('Click element without checkbox navigates to it', { ...folderOptions, showCheckbox: false }, navigateToFolder, clickElementAction)
+		testSubmitNode('Enter navigates to it', { ...folderOptions, showCheckbox: false }, navigateToFolder, pressEnterAction)
+
+		describe('canPick: false', () => {
+			const options = {
+				...folderOptions,
+				canPick: false,
+			}
+
+			testSubmitNode('Click checkbox does not triggers select', options, noEmits, clickCheckboxAction)
+			testSubmitNode('Click element navigates to it', options, navigateToFolder, clickElementAction)
+			testSubmitNode('Click element without checkbox navigates to it', { ...options, showCheckbox: false }, navigateToFolder, clickElementAction)
+			testSubmitNode('Enter navigates to it', { ...options, showCheckbox: false }, navigateToFolder, pressEnterAction)
 		})
 
-		await wrapper.find('[data-testid="row-name"]').trigger('click')
+		describe('without READ permissions', () => {
+			const options = {
+				...folderOptions,
+				node: folderNonReadable,
+			}
 
-		// one event with payload `true` is expected
-		expect(wrapper.emitted('update:selected')).toEqual([[true]])
-	})
-
-	it('Click element without checkbox triggers select', async () => {
-		const wrapper = shallowMount(FileListRow, {
-			props: {
-				allowPickDirectory: false,
-				selected: false,
-				showCheckbox: false,
-				canPick: true,
-				node,
-				cropImagePreviews: true,
-			},
+			testSubmitNode('Click checkbox triggers select', options, selectNode, clickCheckboxAction)
+			testSubmitNode('Click element does not navigates to it', options, noEmits, clickElementAction)
+			testSubmitNode('Click element without checkbox does not navigates to it', { ...options, showCheckbox: false }, noEmits, clickElementAction)
+			testSubmitNode('Enter does not navigates to it', { ...options, showCheckbox: false }, noEmits, pressEnterAction)
 		})
 
-		await wrapper.find('[data-testid="row-name"]').trigger('click')
-
-		// one event with payload `true` is expected
-		expect(wrapper.emitted('update:selected')).toEqual([[true]])
-	})
-
-	it('Enter triggers select', async () => {
-		const wrapper = shallowMount(FileListRow, {
-			props: {
+		describe('allowPickDirectory: false', () => {
+			const options = {
+				...folderOptions,
+				node: folderNonReadable,
 				allowPickDirectory: false,
-				selected: false,
-				showCheckbox: false,
-				canPick: true,
-				node,
-				cropImagePreviews: true,
-			},
-		})
+			}
 
-		wrapper.element.dispatchEvent(new KeyboardEvent('keydown', { bubbles: true, key: 'Enter' }))
-		await nextTick()
-
-		expect(wrapper.emitted('update:selected')).toEqual([[true]])
+			testSubmitNode('Click checkbox does not triggers select', options, noEmits, clickCheckboxAction)
+		})
 	})
 })

From c6dd72cff045eff3e26c491ca1771632c54a3e71 Mon Sep 17 00:00:00 2001
From: Louis Chmn <louis@chmn.me>
Date: Fri, 17 Oct 2025 12:33:28 +0200
Subject: [PATCH 5/5] test(FilePicker): Minor fixes

Signed-off-by: Louis Chmn <louis@chmn.me>
---
 lib/composables/dav.spec.ts | 8 ++++----
 lib/dialogs.spec.ts         | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/composables/dav.spec.ts b/lib/composables/dav.spec.ts
index 3d5f9c7da..72c74e500 100644
--- a/lib/composables/dav.spec.ts
+++ b/lib/composables/dav.spec.ts
@@ -64,7 +64,7 @@ describe('dav composable', () => {
 		vi.resetAllMocks()
 	})
 
-	it('Sets the inital state correctly', () => {
+	it('Sets the initial state correctly', () => {
 		const client = {
 			getDirectoryContents: vi.fn(() => ({ data: [] })),
 		}
@@ -128,13 +128,13 @@ describe('dav composable', () => {
 		await waitLoaded(vue.vm)
 
 		expect(client.getDirectoryContents).toBeCalledTimes(1)
-		expect(client.getDirectoryContents.mock.calls[0][0]).toBe(`${nextcloudFiles.davRootPath}/`)
+		expect(client.getDirectoryContents.mock.calls[0]![0]).toBe(`${nextcloudFiles.davRootPath}/`)
 
 		vue.setProps({ currentPath: '/other' })
 		await waitLoaded(vue.vm)
 
 		expect(client.getDirectoryContents).toBeCalledTimes(2)
-		expect(client.getDirectoryContents.mock.calls[1][0]).toBe(`${nextcloudFiles.davRootPath}/other`)
+		expect(client.getDirectoryContents.mock.calls[1]![0]).toBe(`${nextcloudFiles.davRootPath}/other`)
 	})
 
 	it('reloads on view change', async () => {
@@ -158,7 +158,7 @@ describe('dav composable', () => {
 
 		expect(client.search).not.toBeCalled()
 		expect(client.getDirectoryContents).toBeCalledTimes(1)
-		expect(client.getDirectoryContents.mock.calls[0][0]).toBe(`${nextcloudFiles.davRootPath}/`)
+		expect(client.getDirectoryContents.mock.calls[0]![0]).toBe(`${nextcloudFiles.davRootPath}/`)
 
 		vue.setProps({ currentView: 'recent' })
 		await waitLoaded(vue.vm)
diff --git a/lib/dialogs.spec.ts b/lib/dialogs.spec.ts
index dd603ca60..bd07123da 100644
--- a/lib/dialogs.spec.ts
+++ b/lib/dialogs.spec.ts
@@ -26,7 +26,7 @@ test('Show confirmation dialog', async () => {
 	const confirm = getByRole(dialog, 'button', { name: 'Confirm' })
 	expect(confirm).toBeInstanceOf(HTMLElement)
 	await fireEvent(confirm, new MouseEvent('click', { bubbles: true }))
-	expect(promise).resolves.toBe(true)
+	await expect(promise).resolves.toBe(true)
 })
 
 test('show confirmation dialog with reject', async () => {
@@ -43,7 +43,7 @@ test('show confirmation dialog with reject', async () => {
 	expect(confirm).toBeInstanceOf(HTMLElement)
 	expect(reject).toBeInstanceOf(HTMLElement)
 	await fireEvent(reject, new MouseEvent('click', { bubbles: true }))
-	expect(promise).resolves.toBe(false)
+	await expect(promise).resolves.toBe(false)
 })
 
 test('show confirmation dialog and close', async () => {
@@ -56,5 +56,5 @@ test('show confirmation dialog and close', async () => {
 	const close = getByRole(dialog, 'button', { name: 'Close' })
 	expect(close).toBeInstanceOf(HTMLElement)
 	await fireEvent(close, new MouseEvent('click', { bubbles: true }))
-	expect(promise).rejects.toThrowError('Dialog closed')
+	await expect(promise).rejects.toThrowError('Dialog closed')
 })