Merge pull request #3904 from nextcloud/backport/3870/stable26

nextcloud · Mar 6, 2023 · 9ee25d0 · 9ee25d0
2 parents 327869b + 092a05d
commit 9ee25d0
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 21 deletions.
diff --git a/cypress/e2e/nodes/Links.spec.js b/cypress/e2e/nodes/Links.spec.js
@@ -44,12 +44,12 @@ describe('test link marks', function() {
 	})
 
 	describe('autolink', function() {
-		it('with protocol', () => {
+		it('with protocol to files app and fileId', () => {
 			cy.getFile(fileName)
 				.then($el => {
 					const id = $el.data('id')
 
-					const link = `${Cypress.env('baseUrl')}/file-name?fileId=${id}`
+					const link = `${Cypress.env('baseUrl')}/apps/files/file-name?fileId=${id}`
 					cy.clearContent()
 						.type(`${link}{enter}`)
 
@@ -63,6 +63,25 @@ describe('test link marks', function() {
 				})
 		})
 
+		it('with protocol and fileId', () => {
+			cy.getFile(fileName)
+				.then($el => {
+					const id = $el.data('id')
+
+					const link = `${Cypress.env('baseUrl')}/file-name?fileId=${id}`
+					cy.clearContent()
+						.type(`${link}{enter}`)
+
+					cy.getContent()
+						.find(`a[href*="${Cypress.env('baseUrl')}"]`)
+						.click({ force: true })
+
+					cy.get('@winOpen')
+						.should('have.been.calledOnce')
+						.should('have.been.calledWithMatch', new RegExp(`${Cypress.env('baseUrl')}/file-name\\?fileId=${id}$`))
+				})
+		})
+
 		it('without protocol', () => {
 			cy.clearContent()
 				.type('google.com{enter}')

diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/text-editors.js b/js/text-editors.js
diff --git a/js/text-editors.js.map b/js/text-editors.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/helpers/links.js b/src/helpers/links.js
@@ -111,7 +111,7 @@ const openLink = function(event, _attrs) {
 		OCA.Viewer.open({ path })
 		return
 	}
-	if (query?.fileId) {
+	if (htmlHref.match(/apps\/files\//) && query?.fileId) {
 		// open the direct file link
 		window.open(generateUrl(`/f/${query.fileId}`), '_self')
 		return