From: Ferdinand Thiessen <opensource@fthiessen.de>
Date: Thu, 23 Nov 2023 13:58:43 +0000 (+0100)
Subject: fix(files): Show error message if drag-and-drop upload fails
X-Git-Tag: v29.0.0beta1~780^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c91cdb263150efacd3a2fa4f9b2585656cd40b6a;p=nextcloud-server.git

fix(files): Show error message if drag-and-drop upload fails

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
---

diff --git a/apps/files/src/components/DragAndDropNotice.vue b/apps/files/src/components/DragAndDropNotice.vue
index 1e53556e1f5..d18f82978a4 100644
--- a/apps/files/src/components/DragAndDropNotice.vue
+++ b/apps/files/src/components/DragAndDropNotice.vue
@@ -34,7 +34,7 @@
 
 <script lang="ts">
 import type { Upload } from '@nextcloud/upload'
-import { showSuccess } from '@nextcloud/dialogs'
+import { showError, showSuccess } from '@nextcloud/dialogs'
 import { translate as t } from '@nextcloud/l10n'
 import { getUploader } from '@nextcloud/upload'
 import { defineComponent } from 'vue'
@@ -105,8 +105,13 @@ export default defineComponent({
 
 				// Start upload
 				logger.debug(`Uploading files to ${this.currentFolder.path}`)
-				const promises = [...event.dataTransfer.files].map((file: File) => {
-					return uploader.upload(file.name, file) as Promise<Upload>
+				const promises = [...event.dataTransfer.files].map(async (file: File) => {
+					try {
+						return await uploader.upload(file.name, file)
+					} catch (e) {
+						showError(t('files', 'Uploading "{filename}" failed', { filename: file.name }))
+						throw e
+					}
 				})
 
 				// Process finished uploads
diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue
index d4c3e0b4d4c..07366f351a5 100644
--- a/apps/files/src/views/FilesList.vue
+++ b/apps/files/src/views/FilesList.vue
@@ -425,7 +425,7 @@ export default Vue.extend({
 
 				// Define current directory children
 				// TODO: make it more official
-				Vue.set(folder, '_children', contents.map(node => node.fileid))
+				this.$set(folder, '_children', contents.map(node => node.fileid))
 
 				// If we're in the root dir, define the root
 				if (dir === '/') {