Merge branch 'stable29' into automated/noid/stable29-update-nextcloud-ocp

Author: elzody

cypress/e2e/open.spec.js

@@ -56,10 +56,8 @@ describe('Open existing office files', function() {
 			// Share action
 			cy.wait(2000)
 			cy.get('@loleafletframe').within(() => {
-				cy.get('#main-menu #menu-file > a').click()
-				cy.get('#main-menu #menu-shareas > a').should('be.visible').click()
+				cy.verifyOpen(filename)
 			})
-			cy.verifyOpen(filename)
 
 			// FIXME: wait for sidebar tab content
 			// FIXME: validate sharing tab
@@ -84,9 +82,8 @@ describe('Open existing office files', function() {
 
 			cy.screenshot('open-file_' + filename)
 			cy.get('@loleafletframe').within(() => {
-				cy.get('button.icon-nextcloud-sidebar').click()
+				cy.verifyOpen(filename)
 			})
-			cy.verifyOpen(filename)
 			// FIXME: wait for sidebar tab content
 			// FIXME: validate sharing tab
 			cy.screenshot('share-sidebar_' + filename)
@@ -148,9 +145,8 @@ describe('Open PDF with richdocuments', () => {
 
 		// Verify that the correct file is open
 		cy.get('@loleafletframe').within(() => {
-			cy.get('button.icon-nextcloud-sidebar').click()
+			cy.verifyOpen('document.pdf')
 		})
-		cy.verifyOpen('document.pdf')
 
 		// Make sure we can close the document
 		cy.closeDocument()

cypress/support/commands.js

@@ -307,11 +307,9 @@ Cypress.Commands.add('closeDocument', () => {
 })
 
 Cypress.Commands.add('verifyOpen', (filename) => {
-	cy.get('#app-sidebar-vue')
-		.should('be.visible')
-	cy.get('.app-sidebar-header__mainname')
-		.should('be.visible')
-		.should('contain.text', filename)
+	cy.get('input#document-name-input').should(($docName) => {
+		expect($docName.val()).to.equal(filename)
+	})
 })
 
 Cypress.Commands.add('uploadSystemTemplate', () => {

lib/Controller/WopiController.php

@@ -606,8 +606,7 @@ public function postFile(string $fileId, string $access_token): JSONResponse {
 				$suggested = $this->request->getHeader('X-WOPI-RequestedName');
 				$suggested = mb_convert_encoding($suggested, 'utf-8', 'utf-7') . '.' . $file->getExtension();
 
-				$parent = $isPublic ? dirname($file->getPath()) : $userFolder->getPath();
-				$path = $this->normalizePath($suggested, $parent);
+				$path = $this->normalizePath($suggested, dirname($file->getPath()));
 
 				if ($path === '') {
 					return new JSONResponse([