feat(overview): use dav search

DAV search finds documents that are not only in the root folder but also recursively in subdirectories. It was specified that it should be used in the feature spec anyway.

Signed-off-by: Elizabeth Danzberger <elizabeth@elzody.dev>

Author: elzody

cypress/e2e/overview.spec.js

@@ -70,9 +70,16 @@ describe('Office overview page', function() {
 			cy.createRandomUser().then(user => {
 				randUser = user
 				cy.login(user)
+
 				CATEGORY_FILES.forEach(({ fixture, mimeType }) => {
 					cy.uploadFile(user, fixture, mimeType, `/${fixture}`)
 				})
+
+				cy.createFolder(user, 'subfolder').then(() => {
+					CATEGORY_FILES.forEach(({ fixture, mimeType }) => {
+						cy.uploadFile(user, fixture, mimeType, `/subfolder/${fixture}`)
+					})
+				})
 			})
 		})
 
@@ -110,6 +117,13 @@ describe('Office overview page', function() {
 			})
 		})
 
+		it('Shows file cards for files in subdirectories', function() {
+			CATEGORY_FILES.forEach(({ category }) => {
+				cy.contains('.app-navigation-entry', category).click()
+				cy.get('.file-card').should('have.length.at.least', 2)
+			})
+		})
+
 		it('Filters file cards by search query', function() {
 			const { category, fixture } = CATEGORY_FILES[0]
 			const stem = fixture.split('.')[0]

src/services/officeFiles.js

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import { getClient, getDefaultPropfind, getRootPath, resultToNode } from '@nextcloud/files/dav'
+import { getClient, getDavNameSpaces, getDavProperties, getRootPath, resultToNode } from '@nextcloud/files/dav'
 
 export const OFFICE_MIME_FILTERS = {
 	documents: [
@@ -38,12 +38,48 @@ export const OFFICE_MIME_FILTERS = {
 
 const ALL_OFFICE_MIMES = Object.values(OFFICE_MIME_FILTERS).flat()
 
+// Pre-computed at module load time — ALL_OFFICE_MIMES is static so this never changes.
+const OFFICE_MIME_CONDITIONS = ALL_OFFICE_MIMES
+	.map(mime => `\t\t\t\t<d:eq><d:prop><d:getcontenttype/></d:prop><d:literal>${mime}</d:literal></d:eq>`)
+	.join('\n')
+
+/**
+ * Build a DAV SEARCH request body that matches files of any office MIME type
+ * across all subdirectories (depth: infinity).
+ *
+ * @return {string} XML string for the SEARCH request body
+ */
+function getOfficeMimeSearch() {
+	return `<?xml version="1.0" encoding="UTF-8"?>
+<d:searchrequest ${getDavNameSpaces()}>
+	<d:basicsearch>
+		<d:select>
+			<d:prop>
+				${getDavProperties()}
+			</d:prop>
+		</d:select>
+		<d:from>
+			<d:scope>
+				<d:href>${getRootPath()}/</d:href>
+				<d:depth>infinity</d:depth>
+			</d:scope>
+		</d:from>
+		<d:where>
+			<d:or>
+${OFFICE_MIME_CONDITIONS}
+			</d:or>
+		</d:where>
+	</d:basicsearch>
+</d:searchrequest>`
+}
+
 /** @type {import('@nextcloud/files').Node[]|null} */
 let cachedNodes = null
 
 /**
  * Fetch all office files once and cache the result.
  * Subsequent calls return the cached array.
+ * Uses DAV SEARCH to recursively find office files across all subdirectories.
  *
  * @return {Promise<import('@nextcloud/files').Node[]>}
  */
@@ -53,16 +89,15 @@ export async function getAllOfficeFiles() {
 	}
 
 	const client = getClient()
-	const propfindPayload = getDefaultPropfind()
 
-	const response = await client.getDirectoryContents(getRootPath(), {
+	const response = await client.search('/', {
 		details: true,
-		data: propfindPayload,
+		data: getOfficeMimeSearch(),
 	})
 
-	cachedNodes = response.data
+	cachedNodes = response.data.results
 		.map(item => resultToNode(item))
-		.filter(node => node.type === 'file' && ALL_OFFICE_MIMES.includes(node.mime))
+		.filter(node => node.type === 'file')
 
 	return cachedNodes
 }