[stable30] fix(SaveAs): improve filename validation, fix cant-empty-field bug, prefill path where available

cypress/e2e/direct.spec.js

@@ -183,7 +183,7 @@ describe('Direct editing (legacy)', function() {
 					.should('be.visible')
 				cy.get('.saveas-dialog input[type=text]')
 					.should('be.visible')
-					.should('have.value', 'document.rtf')
+					.should('have.value', '/document.rtf')
 
 				cy.get('.saveas-dialog button.button-vue--vue-primary').click()
 

src/components/Modal/SaveAs.vue

@@ -19,6 +19,7 @@
 					{{ t('richdocuments', 'Cancel') }}
 				</NcButton>
 				<NcButton type="primary"
+					:disabled="!isValidName"
 					@click="close">
 					{{ t('richdocuments', 'Save') }}
 				</NcButton>
@@ -66,13 +67,13 @@ export default {
 	emits: ['close'],
 	data() {
 		return {
-			selectedPath: '',
+			selectedPath: null,
 		}
 	},
 	computed: {
 		newFileName: {
 			get() {
-				if (this.selectedPath !== '') {
+				if (this.selectedPath !== null) {
 					return this.selectedPath
 				}
 				const filename = this.path
@@ -84,6 +85,20 @@ export default {
 				this.selectedPath = value
 			},
 		},
+		isValidName() {
+			const value = this.newFileName.trim()
+			if (value === '') {
+				return false
+			}
+			const base = value.split('/').pop()
+			const parts = base.split('.')
+			let valid = true
+			// filename is non-empty
+			valid &&= base !== ''
+			// filename has both a name part and an extension
+			valid &&= parts.length >= 2 && parts.at(-2).length > 0 && parts.at(-1).length > 0
+			return valid
+		},
 	},
 	mounted() {
 		// prepare filename for having a separate picker for the path (.split('/').pop())

src/document.js

@@ -37,7 +37,7 @@
 const checkProxyStatus = () => {
 	checkingProxyStatus = true
 	const url = Config.get('urlsrc').slice(0, Config.get('urlsrc').indexOf('proxy.php') + 'proxy.php'.length)
 	$.get(url + '?status').done(function(val) {
 		if (val && val.status && val.status !== 'OK') {
 			if (val.status === 'starting' || val.status === 'stopped') {
 				document.getElementById('proxyLoadingIcon').classList.add('icon-loading-small')
@@ -150,8 +150,8 @@
 		showViewer(fileId, title) {
 			// remove previous viewer, if open, and set a new one
 			if (documentsMain.isViewerMode) {
 				$('#revViewer').remove()
 				$('#revViewerContainer').prepend($('<div id="revViewer">'))
 			}
 
 			const urlsrc = getWopiUrl({ fileId, title, readOnly: true, closeButton: !documentsMain.hideCloseButton })
@@ -176,15 +176,15 @@
 			// iframe that contains the Collabora Online Viewer
 			const frame = '<iframe data-cy="coolframe" id="loleafletframe" name="loleafletframe_viewer" allowfullscreen allow="clipboard-read *; clipboard-write *" nonce="' + btoa(getRequestToken()) + '" style="width:100%;height:100%;position:absolute;" title="' + getCapabilities().productName + '"/>'
 
 			$('#revViewer').append(form)
 			$('#revViewer').append(frame)
 			$('#loleafletframe_viewer').focus()
 
 			// submit that
 			$('#loleafletform_viewer').submit()
 			documentsMain.isViewerMode = true
 			// for closing revision mode
 			$('#revViewerContainer .closeButton').click(function(e) {
 				e.preventDefault()
 				documentsMain.onCloseViewer()
 			})
@@ -470,10 +470,14 @@
 					}
 
 					if (msgId === 'UI_SaveAs') {
+						let docPath = documentsMain.fileName
+						if (documentsMain.fullPath && documentsMain.fullPath !== '/') {
+							docPath = documentsMain.fullPath
+						}
 						spawnDialog(
 							SaveAs,
 							{
-								path: documentsMain.fileName,
+								path: docPath,
 								format: args.format,
 							},
 							(value) => value && PostMessages.sendWOPIPostMessage('loolframe', 'Action_SaveAs', { Filename: value, Notify: true }),