Merge pull request #2759 from nextcloud/fix/noid/nc25-sharing-changes

Nextcloud 25 - Share changes

cypress/e2e/files.spec.js

@@ -20,16 +20,24 @@
  *
  */
 
-describe('Files default view', function() {
-	beforeEach(function() {
-		cy.login('admin', 'admin')
+import { randHash } from '../utils/index.js'
+
+const randUser = randHash()
+
+describe('Files default view', () => {
+	before(() => {
+		cy.nextcloudCreateUser(randUser, randUser)
+	})
+
+	beforeEach(() => {
+		cy.login(randUser, randUser)
 	})
 
-	it('See the default files list', function() {
-		cy.get('.files-fileList tr').should('contain', 'welcome.txt')
+	it('See the default files list', () => {
+		cy.get('#app-content-files table tr').should('contain', 'welcome.txt')
 	})
 
-	it('Take screenshot', function() {
+	it('Take screenshot', () => {
 		cy.screenshot()
 	})
 })

cypress/e2e/share.spec.js

@@ -54,15 +54,12 @@ describe('Open test.md in viewer', function() {
 		cy.get('#app-sidebar-vue button.new-share-link').trigger('click')
 		cy.get('#app-sidebar-vue a.sharing-entry__copy')
 			.should('have.attr', 'href').and('include', '/s/')
-			.then((href) => {
-				cy.visit(href)
-				cy.window().then(win => {
-					win.OC.appswebroots.files_texteditor = true
-					cy.getEditor().should('be.visible')
-					cy.getContent()
-						.should('contain', 'Hello world')
-						.find('h2').should('contain', 'Hello world')
-				})
+			.then((href) => cy.visit(href))
+			.then(() => {
+				cy.getEditor().should('be.visible')
+				cy.getContent()
+					.should('contain', 'Hello world')
+					.find('h2').should('contain', 'Hello world')
 			})
 	})
 
@@ -80,20 +77,17 @@ describe('Open test.md in viewer', function() {
 		cy.get(checkboxAllowEditing).first().should('be.checked')
 		cy.get('#app-sidebar-vue a.sharing-entry__copy')
 			.should('have.attr', 'href').and('include', '/s/')
-			.then((href) => {
-				cy.visit(href)
-				cy.window().then(win => {
-					win.OC.appswebroots.files_texteditor = true
-					cy.getEditor().should('be.visible')
-					cy.getContent()
-						.should('contain', 'Hello world')
-						.find('h2').should('contain', 'Hello world')
+			.then((href) => cy.visit(href))
+			.then(() => {
+				cy.getEditor().should('be.visible')
+				cy.getContent()
+					.should('contain', 'Hello world')
+					.find('h2').should('contain', 'Hello world')
 
-					cy.getMenu().should('be.visible')
-					cy.getActionEntry('undo').should('be.visible')
-					cy.getActionEntry('redo').should('be.visible')
-					cy.getActionEntry('bold').should('be.visible')
-				})
+				cy.getMenu().should('be.visible')
+				cy.getActionEntry('undo').should('be.visible')
+				cy.getActionEntry('redo').should('be.visible')
+				cy.getActionEntry('bold').should('be.visible')
 			})
 	})
 
@@ -107,22 +101,19 @@ describe('Open test.md in viewer', function() {
 		cy.get('#app-sidebar-vue a.sharing-entry__copy')
 			.should('have.attr', 'href').and('include', '/s/')
 			.then((href) => {
-				cy.logout()
-				cy.visit(href)
-				cy.window().then(win => {
-					win.OC.appswebroots.files_texteditor = true
-					// eslint-disable-next-line cypress/no-unnecessary-waiting
-					cy.wait(1000)
-					cy.getEditor().should('be.visible')
-					cy.getContent()
-						.should('contain', 'Hello world')
-						.find('h2').should('contain', 'Hello world')
+				return cy.logout()
+					.then(() => cy.visit(href))
+			})
+			.then(() => {
+				cy.getEditor().should('be.visible')
+				cy.getContent()
+					.should('contain', 'Hello world')
+					.find('h2').should('contain', 'Hello world')
 
-					cy.getMenu().should('be.visible')
-					cy.getActionEntry('undo').should('be.visible')
-					cy.getActionEntry('redo').should('be.visible')
-					cy.getActionEntry('bold').should('be.visible')
-				})
+				cy.getMenu().should('be.visible')
+				cy.getActionEntry('undo').should('be.visible')
+				cy.getActionEntry('redo').should('be.visible')
+				cy.getActionEntry('bold').should('be.visible')
 			})
 	})
 
@@ -136,18 +127,15 @@ describe('Open test.md in viewer', function() {
 		cy.get('#app-sidebar-vue button.new-share-link').trigger('click')
 		cy.get('#app-sidebar-vue a.sharing-entry__copy')
 			.should('have.attr', 'href').and('include', '/s/')
-			.then((href) => {
-				cy.visit(href)
-				cy.window().then(win => {
-					win.OC.appswebroots.files_texteditor = true
-					cy.get('#rich-workspace').should('contain', 'Hello world')
-					cy.openFile('test.md')
-					cy.get('#editor-container').should('be.visible')
-					cy.get('#editor .ProseMirror').should('contain', 'Hello world')
-					cy.get('#editor .ProseMirror h2').should('contain', 'Hello world')
-					cy.get('.modal-header button.header-close').click()
-					cy.get('.modal-mask').should('not.exist')
-				})
+			.then((href) => cy.visit(href))
+			.then(() => {
+				cy.get('#rich-workspace').should('contain', 'Hello world')
+				cy.openFile('test.md')
+				cy.get('#editor-container').should('be.visible')
+				cy.get('#editor .ProseMirror').should('contain', 'Hello world')
+				cy.get('#editor .ProseMirror h2').should('contain', 'Hello world')
+				cy.get('.modal-header button.header-close').click()
+				cy.get('.modal-mask').should('not.exist')
 			})
 	})
 

src/helpers/files.js

@@ -78,9 +78,9 @@ const registerFileCreate = () => {
 
 const registerFileActionFallback = () => {
 	const sharingToken = document.getElementById('sharingToken') ? document.getElementById('sharingToken').value : null
-	const dir = document.getElementById('dir').value
+	const filesTable = document.querySelector('#preview table.files-filestable')
 
-	if (!sharingToken || dir !== '') {
+	if (!sharingToken || !filesTable) {
 		const ViewerRoot = document.createElement('div')
 		ViewerRoot.id = 'text-viewer-fallback'
 		document.body.appendChild(ViewerRoot)

src/public.js

@@ -11,48 +11,61 @@ import store from './store.js'
 __webpack_nonce__ = btoa(OC.requestToken) // eslint-disable-line
 __webpack_public_path__ = OC.linkTo('text', 'js/') // eslint-disable-line
 
+const loadEditor = ({ sharingToken, mimetype, $el }) => {
+	const container = document.createElement('div')
+	container.id = 'texteditor'
+
+	document.getElementById('app-content').appendChild(container)
+
+	Promise.all([
+		import(/* webpackChunkName: "vendor" */'vue'),
+		import(/* webpackChunkName: "editor" */'./components/EditorWrapper.vue'),
+	])
+		.then(([vue, editor]) => ({
+			Vue: vue.default,
+			Editor: editor.default,
+		}))
+		.then(({ Vue, Editor }) => {
+			Vue.prototype.t = window.t
+			Vue.prototype.OCA = window.OCA
+
+			new Vue({
+				render: h => h(Editor, {
+					props: {
+						active: true,
+						shareToken: sharingToken,
+						mime: mimetype,
+					},
+				}),
+				store,
+			})
+				.$mount($el)
+
+		})
+		.catch(console.error)
+}
+
 documentReady(() => {
-	const dir = document.getElementById('dir').value
 	const mimetype = document.getElementById('mimetype').value
 	const sharingToken = document.getElementById('sharingToken') ? document.getElementById('sharingToken').value : null
 
 	if (!sharingToken) {
 		return
 	}
 
-	if (dir !== '') {
+	const filesTable = document.querySelector('#preview table.files-filestable')
+
+	// list of files - dir sharing
+	if (filesTable) {
 		OC.Plugins.register('OCA.Files.FileList', FilesWorkspacePlugin)
 		registerFileActionFallback()
 		registerFileCreate()
-	} else {
-		// single file share
-		const container = document.createElement('div')
-		container.id = 'texteditor'
-		const body = document.getElementById('app-content')
-		body.appendChild(container)
-
-		if (openMimetypes.indexOf(mimetype) !== -1) {
-			Promise.all([
-				import(/* webpackChunkName: "vendor" */'vue'),
-				import(/* webpackChunkName: "editor" */'./components/EditorWrapper.vue'),
-			]).then((imports) => {
-				const Vue = imports[0].default
-				Vue.prototype.t = window.t
-				Vue.prototype.OCA = window.OCA
-				const Editor = imports[1].default
-				const vm = new Vue({
-					render: h => h(Editor, {
-						props: {
-							active: true,
-							shareToken: sharingToken,
-							mime: mimetype,
-						},
-					}),
-					store,
-				})
-				vm.$mount(document.getElementById('preview'))
-			})
-		}
+		return
+	}
+
+	// single file share
+	if (openMimetypes.indexOf(mimetype) !== -1) {
+		loadEditor({ mimetype, sharingToken, $el: document.getElementById('preview') })
 	}
 })