Office Overview Part 1/5 - DAV search service, templates API and category providers

CHANGELOG.md

@@ -4,6 +4,15 @@
 -->
 # Changelog
 
+## 11.0.0-beta.1
+
+### Fixed
+- Make preview timeout an info log instead of error by @CarlSchwan in [#5613](https://github.com/nextcloud/richdocuments/pull/5613)
+
+### Other
+- Temporarily revert pdf viewer assertion by @elzody in [#5578](https://github.com/nextcloud/richdocuments/pull/5578)
+- Enhance direct editing test with postMessage handling by @elzody in [#5555](https://github.com/nextcloud/richdocuments/pull/5555)
+
 ## 10.0.0-beta.1
 
 ### Added

appinfo/info.xml

@@ -11,7 +11,7 @@
 	<description><![CDATA[This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.
 
 You can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.]]></description>
-	<version>11.0.0-dev.0</version>
+	<version>12.0.0-dev.0</version>
 	<licence>agpl</licence>
 	<author>Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk</author>
 	<types>
@@ -32,7 +32,7 @@ You can also edit your documents off-line with the Collabora Office app from the
 	<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-spreadsheet.png</screenshot>
 	<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-presentation.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="34" max-version="34"/>
+		<nextcloud min-version="35" max-version="35"/>
 	</dependencies>
 	<background-jobs>
 		<job>OCA\Richdocuments\Backgroundjobs\ObtainCapabilities</job>
@@ -55,4 +55,12 @@ You can also edit your documents off-line with the Collabora Office app from the
 		<personal>OCA\Richdocuments\Settings\Personal</personal>
 		<personal-section>OCA\Richdocuments\Settings\Section</personal-section>
 	</settings>
+	<navigations>
+		<navigation>
+			<name>Office</name>
+			<route>richdocuments.overview.index</route>
+			<icon>app.svg</icon>
+			<order>10</order>
+		</navigation>
+	</navigations>
 </info>

appinfo/routes.php

@@ -24,6 +24,9 @@
 		// external api access
 		['name' => 'document#extAppGetData', 'url' => '/ajax/extapp/data/{fileId}', 'verb' => 'POST'],
 
+		// Office overview page
+		['name' => 'overview#index', 'url' => '/overview', 'verb' => 'GET'],
+
 		// Settings
 		['name' => 'settings#setPersonalSettings', 'url' => 'ajax/personal.php', 'verb' => 'POST'],
 		['name' => 'settings#setSettings', 'url' => 'ajax/admin.php', 'verb' => 'POST'],

cypress/e2e/open.spec.js

@@ -122,9 +122,7 @@ describe('Open PDF with richdocuments', () => {
 			.its('body').should('not.be.empty')
 			.as('pdfViewer')
 
-		// TODO: Once fixed upstream, this will start failing again and can be reverted
-		// https://github.com/nextcloud/files_pdfviewer/pull/1422
-		cy.get('@pdfViewer').find('.pdfViewer').should('not.exist')
+		cy.get('@pdfViewer').find('.pdfViewer').should('exist')
 	})
 
 	// Verify that using the file action 'Edit with Nextcloud Office'

cypress/e2e/overview.spec.js

@@ -0,0 +1,158 @@
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+const CATEGORY_FILES = [
+	{
+		category: 'Documents',
+		emptyMessage: 'No documents found',
+		fixture: 'document.odt',
+		mimeType: 'application/vnd.oasis.opendocument.text',
+	},
+	{
+		category: 'Presentations',
+		emptyMessage: 'No presentations found',
+		fixture: 'presentation.odp',
+		mimeType: 'application/vnd.oasis.opendocument.presentation',
+	},
+	{
+		category: 'Spreadsheets',
+		emptyMessage: 'No spreadsheets found',
+		fixture: 'spreadsheet.ods',
+		mimeType: 'application/vnd.oasis.opendocument.spreadsheet',
+	},
+	{
+		category: 'Diagrams',
+		emptyMessage: 'No diagrams found',
+		fixture: 'drawing.odg',
+		mimeType: 'application/vnd.oasis.opendocument.graphics',
+	},
+]
+
+describe('Office overview page', function() {
+	describe('without files', function() {
+		let randUser
+
+		before(function() {
+			cy.createRandomUser().then(user => {
+				randUser = user
+			})
+		})
+
+		beforeEach(function() {
+			cy.login(randUser)
+			cy.visit('/apps/richdocuments/overview')
+		})
+
+		it('Shows the navigation sidebar with appropriate entries', function() {
+			CATEGORY_FILES.forEach(({ category }) => {
+				cy.contains('.app-navigation-entry', category).should('exist')
+			})
+		})
+
+		it('Highlights the active navigation item and shows empty state on click', function() {
+			CATEGORY_FILES.forEach(({ category, emptyMessage }) => {
+				cy.contains('.app-navigation-entry', category).click()
+				cy.contains('.app-navigation-entry', category)
+					.should('have.class', 'active')
+				cy.get('.empty-content')
+					.should('be.visible')
+					.and('contain', emptyMessage)
+			})
+		})
+	})
+
+	describe('with files', function() {
+		let randUser
+
+		before(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}`)
+					})
+				})
+			})
+		})
+
+		beforeEach(function() {
+			cy.login(randUser)
+			cy.visit('/apps/richdocuments/overview', {
+				onBeforeLoad(win) {
+					cy.spy(win, 'postMessage').as('postMessage')
+				},
+			})
+		})
+
+		CATEGORY_FILES.forEach(({ category, fixture }) => {
+			it(`Shows ${category} file cards in the correct category`, function() {
+				cy.contains('.app-navigation-entry', category).click()
+
+				cy.contains('.file-card__name', fixture)
+					.should('be.visible')
+
+				cy.get('.file-card__preview img')
+					.should('exist')
+
+				cy.get('.input-field__label')
+					.should('contain', `Search ${category.toLowerCase()}`)
+			})
+
+			it(`Opens the viewer when clicking a ${category} file card`, function() {
+				cy.contains('.app-navigation-entry', category).click()
+				cy.contains('.file-card', fixture).click()
+
+				cy.waitForViewer()
+				cy.waitForCollabora()
+
+				cy.closeDocument()
+			})
+		})
+
+		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]
+
+			cy.contains('.app-navigation-entry', category).click()
+
+			cy.get('.office-overview__search [type="search"]').type(stem)
+			cy.contains('.file-card__name', fixture).should('be.visible')
+		})
+
+		it('Shows empty state when search matches nothing', function() {
+			const { category } = CATEGORY_FILES[0]
+
+			cy.contains('.app-navigation-entry', category).click()
+
+			cy.get('.office-overview__search [type="search"]').type('xyz123noresults')
+			cy.get('.empty-content').should('be.visible')
+		})
+
+		it('Resets search when switching categories', function() {
+			const [first, second] = CATEGORY_FILES
+
+			cy.contains('.app-navigation-entry', first.category).click()
+			cy.get('.office-overview__search [type="search"]').type('xyz123noresults')
+
+			cy.contains('.app-navigation-entry', second.category).click()
+
+			cy.get('.office-overview__search [type="search"]').should('have.value', '')
+			cy.contains('.file-card__name', second.fixture).should('be.visible')
+		})
+	})
+})

cypress/e2e/settings.spec.js

@@ -20,10 +20,10 @@ describe('Office admin settings', function() {
 	})
 
 	it('Error for invalid url', function() {
-		cy.get('#app-content')
+		cy.get('#app-content-vue')
 			.scrollTo('topLeft')
 
-		cy.get('#app-content')
+		cy.get('#app-content-vue')
 			.scrollIntoView()
 			.should('be.visible')
 		cy.screenshot()
@@ -40,10 +40,10 @@ describe('Office admin settings', function() {
 	})
 
 	it('Opens settings and configure a valid url', function() {
-		cy.get('#app-content')
+		cy.get('#app-content-vue')
 			.scrollTo('topLeft')
 
-		cy.get('#app-content')
+		cy.get('#app-content-vue')
 			.scrollIntoView()
 			.should('be.visible')
 		cy.screenshot()

cypress/e2e/templates.spec.js

@@ -52,7 +52,7 @@ describe('Global templates', function() {
 			.scrollIntoView()
 
 		cy.intercept('DELETE', '**/richdocuments/template/*').as('templateDeleteRequest')
-		cy.get('.template-btn[data-cy-template-btn-name="systemtemplate"]').click()
+		cy.get('.file-card[data-cy-template-btn-name="systemtemplate"]').click()
 
 		cy.wait('@templateDeleteRequest').then(({ response }) => {
 			expect(response.statusCode).to.equal(204)

l10n/de.json

@@ -81,7 +81,7 @@
     "Empty" : "Leer",
     "Anonymous guest" : "Anonymer Gast",
     "%s (Guest)" : "%s (Gast)",
-    "Edit office documents directly in your browser." : "Bearbeite Office-Dokumente direkt in deinem Browser",
+    "Edit office documents directly in your browser." : "Office-Dokumente direkt im Browser bearbeiten.",
     "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store." : "Diese App kann sich mit einem Collabora Online (oder anderem) Server (als WOPI-ähnlicher Client) verbinden. Nextcloud ist der WOPI-Host. Weitere Einzelheiten hierzu sind in der Dokumentation zu finden.\n\nDokumente können auch offline mit der Collabora Office App aus dem **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** und **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** Store bearbeitet werden.",
     "Instance-wide templates that should be available to all users." : "Instanzweite Vorlagen, die allen Benutzern zur Verfügung stehen sollten.",
     "Uploaded template \"{name}\"" : "Hochgeladene Vorlage \"{name}\"",

l10n/de_DE.json

@@ -81,7 +81,7 @@
     "Empty" : "Leer",
     "Anonymous guest" : "Anonymer Gast",
     "%s (Guest)" : "%s (Gast)",
-    "Edit office documents directly in your browser." : "Bearbeiten Sie Office-Dokumente direkt in Ihrem Browser.",
+    "Edit office documents directly in your browser." : "Office-Dokumente direkt im Browser bearbeiten.",
     "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store." : "Diese App kann sich mit einem Collabora Online (oder anderem) Server (als WOPI-ähnlicher Client) verbinden. Nextcloud ist der WOPI-Host. Weitere Einzelheiten hierzu sind in der Dokumentation zu finden.\n\nDokumente können auch offline mit der Collabora Office App aus dem  **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** und **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** Store bearbeitet werden.",
     "Instance-wide templates that should be available to all users." : "Instanzweite Vorlagen, die allen Benutzern zur Verfügung stehen sollten.",
     "Uploaded template \"{name}\"" : "Hochgeladene Vorlage \"{name}\"",