Merge pull request #49693 from nextcloud/fix/files-rename-esc

nextcloud · Dec 10, 2024 · 70346e0 · 70346e0
2 parents 4da101e + 1ccce41
commit 70346e0
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 3 deletions.
diff --git a/apps/files/src/components/FileEntry/FileEntryName.vue b/apps/files/src/components/FileEntry/FileEntryName.vue
@@ -241,6 +241,10 @@ export default defineComponent({
 			}
 
 			const oldName = this.source.basename
+			if (newName === oldName) {
+				this.stopRenaming()
+				return
+			}
 
 			try {
 				const status = await this.renamingStore.rename()

diff --git a/cypress/e2e/files/files-renaming.cy.ts b/cypress/e2e/files/files-renaming.cy.ts
@@ -143,4 +143,43 @@ describe('files: Rename nodes', { testIsolation: true }, () => {
 			.findByRole('textbox', { name: 'Filename' })
 			.should('not.exist')
 	})
+
+	it('cancel renaming on esc press', () => {
+		// All are visible by default
+		getRowForFile('file.txt').should('be.visible')
+
+		triggerActionForFile('file.txt', 'rename')
+
+		getRowForFile('file.txt')
+			.findByRole('textbox', { name: 'Filename' })
+			.should('be.visible')
+			.type('{selectAll}other.txt')
+			.should(haveValidity(''))
+			.type('{esc}')
+
+		// See it is not renamed
+		getRowForFile('other.txt').should('not.exist')
+		getRowForFile('file.txt')
+			.should('be.visible')
+			.find('input[type="text"]')
+			.should('not.exist')
+	})
+
+	it('cancel on enter if no new name is entered', () => {
+		// All are visible by default
+		getRowForFile('file.txt').should('be.visible')
+
+		triggerActionForFile('file.txt', 'rename')
+
+		getRowForFile('file.txt')
+			.findByRole('textbox', { name: 'Filename' })
+			.should('be.visible')
+			.type('{enter}')
+
+		// See it is not renamed
+		getRowForFile('file.txt')
+			.should('be.visible')
+			.find('input[type="text"]')
+			.should('not.exist')
+	})
 })
diff --git a/dist/files-main.js b/dist/files-main.js
diff --git a/dist/files-main.js.map b/dist/files-main.js.map