chore: support new spawnDialog format

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>

Author: susnux

lib/components/FilePicker/FileList.spec.ts

@@ -158,12 +158,12 @@ describe('FilePicker FileList', () => {
 			// all nodes are shown
 			expect(rows.length).toBe(nodes.length)
 			// by default favorites are sorted before other files
-			expect(rows.at(0).attributes('data-filename')).toBe('favorite.txt')
+			expect(rows.at(0)!.attributes('data-filename')).toBe('favorite.txt')
 			// folder are sorted first
-			expect(rows.at(1).attributes('data-filename')).toBe('directory')
+			expect(rows.at(1)!.attributes('data-filename')).toBe('directory')
 			// other files are ascending
-			expect(rows.at(2).attributes('data-filename')).toBe('a-file.txt')
-			expect(rows.at(3).attributes('data-filename')).toBe('b-file.txt')
+			expect(rows.at(2)!.attributes('data-filename')).toBe('a-file.txt')
+			expect(rows.at(3)!.attributes('data-filename')).toBe('b-file.txt')
 		})
 
 		it('can sort descending by name', async () => {
@@ -193,12 +193,12 @@ describe('FilePicker FileList', () => {
 			// all nodes are shown
 			expect(rows.length).toBe(nodes.length)
 			// by default favorites are sorted before other files
-			expect(rows.at(0).attributes('data-filename')).toBe('favorite.txt')
+			expect(rows.at(0)!.attributes('data-filename')).toBe('favorite.txt')
 			// folder are sorted first
-			expect(rows.at(1).attributes('data-filename')).toBe('directory')
+			expect(rows.at(1)!.attributes('data-filename')).toBe('directory')
 			// other files are descending
-			expect(rows.at(2).attributes('data-filename')).toBe('b-file.txt')
-			expect(rows.at(3).attributes('data-filename')).toBe('a-file.txt')
+			expect(rows.at(2)!.attributes('data-filename')).toBe('b-file.txt')
+			expect(rows.at(3)!.attributes('data-filename')).toBe('a-file.txt')
 		})
 	})
 })

lib/components/FilePicker/FilePicker.vue

@@ -4,7 +4,6 @@
 -->
 <template>
 	<NcDialog v-model:open="isOpen"
-		:container="container"
 		:buttons="dialogButtons"
 		:name="name"
 		size="large"
@@ -95,13 +94,7 @@ const props = withDefaults(defineProps<{
 	/**
 	 * Is the navigation disabled
 	 */
-	 disabledNavigation?: boolean
-
-	/**
-	 * Where to mount the dialog
-	 * @default 'body'
-	 */
-	container?: string
+	disabledNavigation?: boolean
 
 	/**
 	 * Custom filter function used to filter pickable files
@@ -130,7 +123,6 @@ const props = withDefaults(defineProps<{
 }>(), {
 	allowPickDirectory: false,
 	disabledNavigation: false,
-	container: 'body',
 	filterFn: undefined,
 	mimetypeFilter: () => [],
 	multiselect: true,
@@ -175,7 +167,7 @@ const dialogButtons = computed(() => {
 let isHandlingCallback = false
 
 const handleButtonClick = async (callback: IFilePickerButton['callback'], nodes: Node[]) => {
-	callback(nodes)
+	await callback(nodes)
 	emit('close', nodes)
 	// Unlock close
 	isHandlingCallback = false

lib/components/types.ts

@@ -47,7 +47,7 @@ export interface IFilePickerButton extends Omit<IDialogButton, 'callback'> {
 	 *
 	 * @param nodes Array of `@nextcloud/files` Nodes that were selected
 	 */
-	callback: (nodes: Node[]) => void
+	callback: (nodes: Node[]) => void | Promise<void>
 }
 
 export type IFilePickerButtonFactory = (selectedNodes: Node[], currentPath: string, currentView: string) => IFilePickerButton[]

lib/composables/dav.spec.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import type { Ref } from 'vue'
+import type { ComponentPublicInstance, Ref } from 'vue'
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { shallowMount } from '@vue/test-utils'
 import { defineComponent, ref, toRef, nextTick, h } from 'vue'
@@ -20,9 +20,10 @@ const nextcloudFiles = vi.hoisted(() => ({
 }))
 vi.mock('@nextcloud/files', () => nextcloudFiles)
 
-const waitLoaded = (vue: ReturnType<typeof shallowMount>) => new Promise((resolve) => {
+// eslint-disable-next-line @typescript-eslint/ban-types
+const waitLoaded = (vm: ComponentPublicInstance<{}, { isLoading: boolean }>) => new Promise((resolve) => {
 	const w = () => {
-		if (vue.vm.isLoading) window.setTimeout(w, 50)
+		if (vm.isLoading) window.setTimeout(w, 50)
 		else resolve(true)
 	}
 	w()
@@ -90,14 +91,15 @@ describe('dav composable', () => {
 		})
 
 		// wait until files are loaded
-		await waitLoaded(vue)
+		await waitLoaded(vue.vm)
 
 		expect(vue.vm.files).toEqual(['node 1', 'node 2'])
 	})
 
 	it('reloads on path change', async () => {
 		const client = {
-			getDirectoryContents: vi.fn(() => ({ data: [] })),
+			// eslint-disable-next-line @typescript-eslint/no-unused-vars
+			getDirectoryContents: vi.fn((_path: string) => ({ data: [] })),
 		}
 		nextcloudFiles.davGetClient.mockImplementationOnce(() => client)
 
@@ -110,21 +112,22 @@ describe('dav composable', () => {
 		})
 
 		// wait until files are loaded
-		await waitLoaded(vue)
+		await waitLoaded(vue.vm)
 
 		expect(client.getDirectoryContents).toBeCalledTimes(1)
 		expect(client.getDirectoryContents.mock.calls[0][0]).toBe(`${nextcloudFiles.davRootPath}/`)
 
 		vue.setProps({ currentPath: '/other' })
-		await waitLoaded(vue)
+		await waitLoaded(vue.vm)
 
 		expect(client.getDirectoryContents).toBeCalledTimes(2)
 		expect(client.getDirectoryContents.mock.calls[1][0]).toBe(`${nextcloudFiles.davRootPath}/other`)
 	})
 
 	it('reloads on view change', async () => {
 		const client = {
-			getDirectoryContents: vi.fn(() => ({ data: [] })),
+			// eslint-disable-next-line @typescript-eslint/no-unused-vars
+			getDirectoryContents: vi.fn((_path: string) => ({ data: [] })),
 			search: vi.fn(() => ({ data: { results: [], truncated: false } })),
 		}
 		nextcloudFiles.davGetClient.mockImplementationOnce(() => client)
@@ -138,14 +141,14 @@ describe('dav composable', () => {
 		})
 
 		// wait until files are loaded
-		await waitLoaded(vue)
+		await waitLoaded(vue.vm)
 
 		expect(client.search).not.toBeCalled()
 		expect(client.getDirectoryContents).toBeCalledTimes(1)
 		expect(client.getDirectoryContents.mock.calls[0][0]).toBe(`${nextcloudFiles.davRootPath}/`)
 
 		vue.setProps({ currentView: 'recent' })
-		await waitLoaded(vue)
+		await waitLoaded(vue.vm)
 
 		// Uses search instead of getDirectoryContents
 		expect(client.getDirectoryContents).toBeCalledTimes(1)

lib/vue-icons.d.ts

@@ -0,0 +1,17 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+declare module 'vue-material-design-icons/*.vue' {
+	import type { DefineComponent } from 'vue'
+
+	const IconVue: DefineComponent<{
+		/// `size` defaults to 24
+		size?: number;
+		/// `fillColor` defaults to 'currentColor'
+		fillColor?: string;
+		title?: string;
+	}>
+
+	export default IconVue
+}