fix: use office.vue for public shares

Signed-off-by: Elizabeth Danzberger <[email protected]>

cypress/e2e/share-link.js

@@ -51,7 +51,18 @@ describe('Public sharing of office documents', function() {
 							cy.spy(win, 'postMessage').as('postMessage')
 						},
 					})
-					cy.waitForCollabora(true)
+
+					cy.waitForCollabora()
+					cy.get('@postMessage', { timeout: 20000 }).should(spy => {
+						const calls = spy.getCalls()
+						const findMatchingCall = calls.find(call => call.args[0].indexOf('"MessageId":"App_LoadingStatus"') !== -1)
+						if (!findMatchingCall) {
+							return expect(findMatchingCall).to.not.be.undefined
+						}
+						const object = JSON.parse(findMatchingCall.args[0])
+						expect(object.Values).to.have.property('Status', 'Initialized')
+					})
+
 					cy.get('@loleafletframe').within(() => {
 						cy.get('#closebutton').click()
 					})

lib/Listener/ShareLinkListener.php

@@ -61,6 +61,7 @@ public function handle(Event $event): void {
 			$this->initialStateService->provideCapabilities();
 			Util::addScript('richdocuments', 'richdocuments-files');
 			Util::addScript('richdocuments', 'richdocuments-viewer', 'viewer');
+			Util::addScript('richdocuments', 'richdocuments-public');
 		}
 	}
 }

src/files.js

@@ -258,8 +258,6 @@ addEventListener('DOMContentLoaded', () => {
 		return
 	}
 
-	odfViewer.onEdit(document.getElementById('filename').value)
-
 	PostMessages.registerPostMessageHandler(({ parsed }) => {
 		console.debug('[viewer] Received post message', parsed)
 		const { msgId, args, deprecated } = parsed

src/helpers/isDocument.js

@@ -0,0 +1,17 @@
+import { getCapabilities } from '@nextcloud/capabilities'
+
+/** @type Array.<String> */
+const mimetypes = getCapabilities().richdocuments.mimetypes
+
+/**
+ * Determines if the mimetype of the resource is supported by richdocuments
+ * @return {boolean}
+ */
+function isDocument() {
+	/** @type HTMLInputElement */
+	const mimetypeElement = document.getElementById('mimetype')
+
+	return Boolean(mimetypeElement) && mimetypes.includes(mimetypeElement.value)
+}
+
+export default isDocument

src/helpers/isPublicPage.js

@@ -0,0 +1,12 @@
+/**
+ * Determines if the resource is a public share
+ * @return {boolean}
+ */
+function isPublic() {
+	/** @type HTMLInputElement */
+	const publicElement = document.getElementById('isPublic')
+
+	return Boolean(publicElement) && publicElement.value === '1'
+}
+
+export default isPublic

src/public.js

@@ -0,0 +1,17 @@
+import isPublic from './helpers/isPublicPage.js'
+import isDocument from './helpers/isDocument.js'
+
+document.addEventListener('DOMContentLoaded', () => {
+
+	// Public share, but not a supported mimetype - do nothing
+	if (isPublic() && !isDocument()) {
+		return
+	}
+
+	// Public share, and is a supported mimetype - open viewer
+	if (isPublic() && isDocument()) {
+		if (OCA.Viewer) {
+			OCA.Viewer.open({ path: '/' })
+		}
+	}
+})

src/view/Office.vue

@@ -259,7 +259,7 @@ export default {
 		}
 		this.postMessage.registerPostMessageHandler(this.postMessageHandler)
 
-		this.load()
+		await this.load()
 	},
 	beforeDestroy() {
 		this.postMessage.unregisterPostMessageHandler(this.postMessageHandler)

webpack.js

@@ -11,6 +11,7 @@ webpackConfig.entry = {
 	admin: path.join(__dirname, 'src', 'admin.js'),
 	personal: path.join(__dirname, 'src', 'personal.js'),
 	reference: path.join(__dirname, 'src', 'reference.js'),
+	public: path.join(__dirname, 'src', 'public.js'),
 }
 
 webpackRules.RULE_JS.test = /\.m?js$/