From 2e30e08e22d34a4f5eae7d9417630e9ed87106d2 Mon Sep 17 00:00:00 2001
From: Faisal Alghamdi <falghamdi125@gmail.com>
Date: Mon, 6 Jan 2025 12:58:45 -0500
Subject: [PATCH] fix(files_sharing): Fix file request dialog keeps asking for
 upload destination if ignored the first time.

Signed-off-by: Faisal Alghamdi <falghamdi125@gmail.com>
---
 .../src/components/NewFileRequestDialog.vue            | 10 +---------
 .../NewFileRequestDialog/NewFileRequestDialogIntro.vue |  4 ++++
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/apps/files_sharing/src/components/NewFileRequestDialog.vue b/apps/files_sharing/src/components/NewFileRequestDialog.vue
index f482500450815..95404e1e16160 100644
--- a/apps/files_sharing/src/components/NewFileRequestDialog.vue
+++ b/apps/files_sharing/src/components/NewFileRequestDialog.vue
@@ -88,7 +88,7 @@
 			<!-- Next -->
 			<NcButton v-if="currentStep !== STEP.LAST"
 				:aria-label="t('files_sharing', 'Continue')"
-				:disabled="loading"
+				:disabled="loading || (destination === '/' || destination === '')"
 				data-cy-file-request-dialog-controls="next"
 				@click="onPageNext">
 				<template #icon>
@@ -223,14 +223,6 @@ export default defineComponent({
 				return
 			}
 
-			// custom destination validation
-			// cannot share root
-			if (this.destination === '/' || this.destination === '') {
-				const destinationInput = form.querySelector('input[name="destination"]') as HTMLInputElement
-				destinationInput?.setCustomValidity(t('files_sharing', 'Please select a folder, you cannot share the root directory.'))
-				form.reportValidity()
-				return
-			}
 
 			if (this.currentStep === STEP.FIRST) {
 				this.currentStep = STEP.SECOND
diff --git a/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogIntro.vue b/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogIntro.vue
index 805b13fdf95ac..4fe8026460fac 100644
--- a/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogIntro.vue
+++ b/apps/files_sharing/src/components/NewFileRequestDialog/NewFileRequestDialogIntro.vue
@@ -34,6 +34,10 @@
 				:show-trailing-button="destination !== context.path"
 				:trailing-button-icon="'undo'"
 				:trailing-button-label="t('files_sharing', 'Revert to default')"
+				:error="(destination === '/' || destination === '')"
+				:helper-text="(destination === '/' || destination === '') ? 
+				t('files_sharing', 'Please select a folder, you cannot share the root directory.'):
+				''"
 				name="destination"
 				@click="onPickDestination"
 				@keypress.prevent.stop="/* prevent typing in the input, we use the picker */"