Merge pull request #3617 from nextcloud/backport/3600/stable27

[stable27] refactor: move to office.vue component

cypress/e2e/open.spec.js

@@ -56,7 +56,7 @@ describe('Open existing office files', function() {
 			// Share action
 			cy.get('@loleafletframe').within(() => {
 				cy.get('#main-menu #menu-file > a').click()
-				cy.get('#main-menu #menu-shareas > a').click()
+				cy.get('#main-menu #menu-shareas > a').click({ force: true })
 			})
 
 			cy.get('#app-sidebar-vue')

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/components/AdminSettings.vue

@@ -502,7 +502,7 @@ export default {
 		},
 		fontHint() {
 			return t('richdocuments', 'Make sure to set this URL: {url} in the coolwsd.xml file of your Collabora Online server to ensure the added fonts get loaded automatically.',
-				{ url: this.fontHintUrl }
+				{ url: this.fontHintUrl },
 			)
 		},
 		fontXmlHint() {
@@ -658,7 +658,7 @@ export default {
 			try {
 				const result = await axios.post(
 					generateFilePath('richdocuments', 'ajax', 'admin.php'),
-					data
+					data,
 				)
 
 				this.updating = false

src/components/SettingsSelectGroup.vue

@@ -112,7 +112,7 @@ export default {
 						}
 					}
 					return this.groups[id]
-				}
+				},
 			)
 		},
 		update() {

src/components/SettingsSelectTag.vue

@@ -188,7 +188,7 @@ export default {
 		},
 		getValueObject() {
 			return this.value.filter((tag) => tag !== '').map(
-				(id) => this.tags.find((tag) => tag.id === id)
+				(id) => this.tags.find((tag) => tag.id === id),
 			)
 		},
 		update() {

src/document.js

@@ -392,7 +392,7 @@ const documentsMain = {
 									title += `_${version}`
 								}
 								documentsMain.UI.showViewer(
-									fileId, title
+									fileId, title,
 								)
 							}
 							break
@@ -463,7 +463,7 @@ const documentsMain = {
 					case 'rev-history':
 						documentsMain.UI.loadRevViewerContainer()
 						documentsMain.UI.showViewer(
-							documentsMain.fileId, documentsMain.title
+							documentsMain.fileId, documentsMain.title,
 						)
 						break
 					case 'RD_Version_Restored':
@@ -516,7 +516,7 @@ const documentsMain = {
 							},
 							true,
 							t('richdocuments', 'New filename'),
-							false
+							false,
 						).then(function() {
 							const $dialog = $('.oc-dialog:visible')
 							const $buttons = $dialog.find('.oc-dialog-buttonrow button')
@@ -575,7 +575,7 @@ const documentsMain = {
 					}
 					documentsMain.openingLocally = true
 					PostMessages.sendWOPIPostMessage('loolframe', 'Get_Views')
-				}
+				},
 			)
 		},
 
@@ -606,7 +606,7 @@ const documentsMain = {
 
 			axios.post(
 				OC.linkToOCS('apps/files/api/v1', 2) + 'openlocaleditor?format=json',
-				{ path: documentsMain.fullPath }
+				{ path: documentsMain.fullPath },
 			).then((result) => {
 				const url = 'nc://open/'
 					+ Config.get('userId') + '@' + getNextcloudUrl()
@@ -633,7 +633,7 @@ const documentsMain = {
 					_window.location = url
 					this.showOpenLocalConfirmation(url, _window)
 				}
-			}
+			},
 		)
 	},
 

src/files.js

@@ -60,7 +60,7 @@ const odfViewer = {
 							timeout: 0,
 						})
 					}
-				}
+				},
 			)
 			return
 		}
@@ -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
@@ -293,7 +291,7 @@ addEventListener('DOMContentLoaded', () => {
 				})
 				odfViewer.onClose()
 				OC.Notification.showTemporary(t('richdocuments', 'Failed to connect to {productName}. Please try again later or contact your server administrator.',
-					{ productName: OC.getCapabilities().richdocuments.productName }
+					{ productName: OC.getCapabilities().richdocuments.productName },
 				))
 			}
 			break

src/helpers/isDocument.js

@@ -0,0 +1,18 @@
+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,13 @@
+/**
+ * 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/helpers/types.js

@@ -1,4 +1,3 @@
-
 /*
  * @copyright Copyright (c) 2019 Julius Härtl <[email protected]>
  *

src/helpers/url.js

@@ -76,7 +76,7 @@ const getDocumentUrlFromTemplate = (templateId, fileName, fileDir, fillWithTempl
 			fileName,
 			dir: fileDir,
 			requesttoken: OC.requestToken,
-		}
+		},
 	)
 }
 
@@ -88,7 +88,7 @@ const getDocumentUrlForPublicFile = (fileName, fileId) => {
 			fileName,
 			fileId,
 			requesttoken: OC.requestToken,
-		}
+		},
 	)
 }
 

src/mixins/saveAs.js

@@ -33,7 +33,7 @@ export default {
 				},
 				true,
 				t('richdocuments', 'New filename'),
-				false
+				false,
 			).then(() => {
 				const $dialog = $('.oc-dialog:visible')
 				const $buttons = $dialog.find('.oc-dialog-buttonrow button')

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/FilesAppIntegration.js

@@ -482,7 +482,7 @@ export default {
 			},
 			true,
 			t('richdocuments', 'New filename'),
-			false
+			false,
 		).then(function() {
 			const $dialog = parent.$('.oc-dialog:visible')
 			const $buttons = $dialog.find('button')

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$/