nextcloud · susnux · Jun 24, 2024 · Jun 22, 2024 · Jun 22, 2024 · artonge
diff --git a/__mocks__/@nextcloud/axios.ts b/__mocks__/@nextcloud/axios.ts
@@ -3,6 +3,14 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 export default {
+	interceptors: {
+		response: {
+			use: () => {},
+		},
+		request: {
+			use: () => {},
+		},
+	},
 	get: async () => ({ status: 200, data: {} }),
 	delete: async () => ({ status: 200, data: {} }),
 	post: async () => ({ status: 200, data: {} }),

@@ -37,10 +37,12 @@
 
 					<!-- Uploader -->
 					<UploadPicker v-else-if="currentFolder"
-						:content="dirContents"
-						:destination="currentFolder"
-						:multiple="true"
+						allow-folders
 						class="files-list__header-upload-button"
+						:content="getContent"
+						:destination="currentFolder"
+						:forbidden-characters="forbiddenCharacters"
+						multiple
 						@failed="onUploadFail"
 						@uploaded="onUpload" />
 				</template>
@@ -79,9 +81,11 @@
 			<template v-if="dir !== '/'" #action>
 				<!-- Uploader -->
 				<UploadPicker v-if="currentFolder && canUpload && !isQuotaExceeded"
-					:content="dirContents"
-					:destination="currentFolder"
+					allow-folders
 					class="files-list__header-upload-button"
+					:content="getContent"
+					:destination="currentFolder"
+					:forbidden-characters="forbiddenCharacters"
 					multiple
 					@failed="onUploadFail"
 					@uploaded="onUpload" />
@@ -118,10 +122,10 @@ import { getCapabilities } from '@nextcloud/capabilities'
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { Folder, Node, Permission } from '@nextcloud/files'
 import { translate as t } from '@nextcloud/l10n'
-import { join, dirname } from 'path'
-import { showError } from '@nextcloud/dialogs'
+import { join, dirname, normalize } from 'path'
+import { showError, showWarning } from '@nextcloud/dialogs'
 import { Type } from '@nextcloud/sharing'
-import { UploadPicker } from '@nextcloud/upload'
+import { UploadPicker, UploadStatus } from '@nextcloud/upload'
 import { loadState } from '@nextcloud/initial-state'
 import { defineComponent } from 'vue'
 
@@ -190,6 +194,7 @@ export default defineComponent({
 		const { currentView } = useNavigation()
 
 		const enableGridView = (loadState('core', 'config', [])['enable_non-accessible_features'] ?? true)
+		const forbiddenCharacters = loadState<string[]>('files', 'forbiddenCharacters', [])
 
 		return {
 			currentView,
@@ -200,9 +205,10 @@ export default defineComponent({
 			uploaderStore,
 			userConfigStore,
 			viewConfigStore,
-			enableGridView,
 
 			// non reactive data
+			enableGridView,
+			forbiddenCharacters,
 			Type,
 		}
 	},
@@ -228,6 +234,19 @@ export default defineComponent({
 			}, 500)
 		},
 
+		/**
+		 * Get a callback function for the uploader to fetch directory contents for conflict resolution
+		 */
+		getContent() {
+			const view = this.currentView
+			return async (path?: string) => {
+				// as the path is allowed to be undefined we need to normalize the path ('//' to '/')
+				const normalizedPath = normalize(`${this.currentFolder?.path ?? ''}/${path ?? ''}`)
+				// use the current view to fetch the content for the requested path
+				return (await view.getContents(normalizedPath)).contents
+			}
+		},
+
 		userConfig(): UserConfig {
 			return this.userConfigStore.userConfig
 		},
@@ -590,8 +609,7 @@ export default defineComponent({
 		onUpload(upload: Upload) {
 			// Let's only refresh the current Folder
 			// Navigating to a different folder will refresh it anyway
-			const destinationSource = dirname(upload.source)
-			const needsRefresh = destinationSource === this.currentFolder?.source
+			const needsRefresh = dirname(upload.source) === this.currentFolder!.source
 
 			// TODO: fetch uploaded files data only
 			// Use parseInt(upload.response?.headers?.['oc-fileid']) to get the fileid
@@ -604,6 +622,11 @@ export default defineComponent({
 		async onUploadFail(upload: Upload) {
 			const status = upload.response?.status || 0
 
+			if (upload.status === UploadStatus.CANCELLED) {
+				showWarning(t('files', 'Upload was cancelled by user'))
+				return
+			}
+
 			// Check known status codes
 			if (status === 507) {
 				showError(t('files', 'Not enough free space'))

diff --git a/dist/1521-1521.js.license b/dist/1521-1521.js.license
@@ -42,10 +42,10 @@ This file is generated from multiple sources. Included packages:
 	- version: 8.11.2
 	- license: AGPL-3.0-or-later
 - @vueuse/core
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - @vueuse/shared
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - assert
 	- version: 2.1.0

diff --git a/dist/1642-1642.js.license b/dist/1642-1642.js.license
@@ -69,10 +69,10 @@ This file is generated from multiple sources. Included packages:
 	- version: 8.11.2
 	- license: AGPL-3.0-or-later
 - @vueuse/core
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - @vueuse/shared
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - assert
 	- version: 2.1.0
@@ -81,7 +81,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 1.0.7
 	- license: MIT
 - axios
-	- version: 1.6.8
+	- version: 1.7.2
 	- license: MIT
 - base64-js
 	- version: 1.5.1

diff --git a/dist/2452-2452.js.license b/dist/2452-2452.js.license
@@ -56,10 +56,10 @@ This file is generated from multiple sources. Included packages:
 	- version: 8.11.2
 	- license: AGPL-3.0-or-later
 - @vueuse/core
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - @vueuse/shared
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - assert
 	- version: 2.1.0
@@ -68,7 +68,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 1.0.7
 	- license: MIT
 - axios
-	- version: 1.6.8
+	- version: 1.7.2
 	- license: MIT
 - base64-js
 	- version: 1.5.1

diff --git a/dist/3920-3920.js.license b/dist/3920-3920.js.license
@@ -100,13 +100,13 @@ This file is generated from multiple sources. Included packages:
 	- version: 8.11.2
 	- license: AGPL-3.0-or-later
 - @vueuse/components
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - @vueuse/core
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - @vueuse/shared
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - assert
 	- version: 2.1.0
@@ -115,7 +115,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 1.0.7
 	- license: MIT
 - axios
-	- version: 1.6.8
+	- version: 1.7.2
 	- license: MIT
 - balanced-match
 	- version: 1.0.2

diff --git a/dist/5390-5390.js.license b/dist/5390-5390.js.license
@@ -42,10 +42,10 @@ This file is generated from multiple sources. Included packages:
 	- version: 8.11.2
 	- license: AGPL-3.0-or-later
 - @vueuse/core
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - @vueuse/shared
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - assert
 	- version: 2.1.0

diff --git a/dist/5455-5455.js b/dist/5455-5455.js
diff --git a/dist/5455-5455.js.license b/dist/5455-5455.js.license
@@ -156,13 +156,13 @@ This file is generated from multiple sources. Included packages:
 	- version: 1.2.0
 	- license: ISC
 - @vueuse/components
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - @vueuse/core
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - @vueuse/shared
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - assert
 	- version: 2.1.0
@@ -171,7 +171,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 1.0.7
 	- license: MIT
 - axios
-	- version: 1.6.8
+	- version: 1.7.2
 	- license: MIT
 - bail
 	- version: 2.0.2

diff --git a/dist/5455-5455.js.map b/dist/5455-5455.js.map
diff --git a/dist/5528-5528.js.license b/dist/5528-5528.js.license
@@ -113,13 +113,13 @@ This file is generated from multiple sources. Included packages:
 	- version: 1.2.0
 	- license: ISC
 - @vueuse/components
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - @vueuse/core
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - @vueuse/shared
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - assert
 	- version: 2.1.0
@@ -128,7 +128,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 1.0.7
 	- license: MIT
 - axios
-	- version: 1.6.8
+	- version: 1.7.2
 	- license: MIT
 - bail
 	- version: 2.0.2

diff --git a/dist/5733-5733.js.license b/dist/5733-5733.js.license
@@ -121,13 +121,13 @@ This file is generated from multiple sources. Included packages:
 	- version: 8.11.2
 	- license: AGPL-3.0-or-later
 - @vueuse/components
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - @vueuse/core
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - @vueuse/shared
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - assert
 	- version: 2.1.0
@@ -136,7 +136,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 1.0.7
 	- license: MIT
 - axios
-	- version: 1.6.8
+	- version: 1.7.2
 	- license: MIT
 - base64-js
 	- version: 1.5.1

diff --git a/dist/6075-6075.js b/dist/6075-6075.js
diff --git a/dist/6075-6075.js.map b/dist/6075-6075.js.map
diff --git a/dist/6075-6075.js.map.license b/dist/6075-6075.js.map.license
diff --git a/dist/6778-6778.js b/dist/6778-6778.js
diff --git a/dist/6075-6075.js.license → dist/6778-6778.js.license b/dist/6075-6075.js.license → dist/6778-6778.js.license
@@ -11,6 +11,7 @@ SPDX-FileCopyrightText: Varun A P
 SPDX-FileCopyrightText: Tobias Koppers @sokra
 SPDX-FileCopyrightText: T. Jameson Little <t.jameson.little@gmail.com>
 SPDX-FileCopyrightText: Stefan-Gabriel Muscalu <stefan.gabriel.muscalu@gmail.com>
+SPDX-FileCopyrightText: Sindre Sorhus
 SPDX-FileCopyrightText: Roman Shtylman <shtylman@gmail.com>
 SPDX-FileCopyrightText: Raynos <raynos2@gmail.com>
 SPDX-FileCopyrightText: Perry Mitchell <perry@perrymitchell.net>
@@ -81,23 +82,20 @@ This file is generated from multiple sources. Included packages:
 - @nextcloud/router
 	- version: 3.0.1
 	- license: GPL-3.0-or-later
-- @nextcloud/logger
-	- version: 2.7.0
-	- license: GPL-3.0-or-later
 - eventemitter3
 	- version: 5.0.1
 	- license: MIT
 - @nextcloud/upload
-	- version: 1.1.1
+	- version: 1.4.1
 	- license: AGPL-3.0-or-later
 - @nextcloud/vue
 	- version: 8.11.2
 	- license: AGPL-3.0-or-later
 - @vueuse/core
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - @vueuse/shared
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - assert
 	- version: 2.1.0
@@ -106,7 +104,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 1.0.7
 	- license: MIT
 - axios
-	- version: 1.6.8
+	- version: 1.7.2
 	- license: MIT
 - base64-js
 	- version: 1.5.1
@@ -198,6 +196,9 @@ This file is generated from multiple sources. Included packages:
 - is-nan
 	- version: 1.3.2
 	- license: MIT
+- is-retry-allowed
+	- version: 2.2.0
+	- license: MIT
 - is-typed-array
 	- version: 1.1.13
 	- license: MIT

diff --git a/dist/6778-6778.js.map b/dist/6778-6778.js.map
diff --git a/dist/6778-6778.js.map.license b/dist/6778-6778.js.map.license
@@ -0,0 +1 @@
+6778-6778.js.license
diff --git a/dist/7462-7462.js.license b/dist/7462-7462.js.license
@@ -100,13 +100,13 @@ This file is generated from multiple sources. Included packages:
 	- version: 8.11.2
 	- license: AGPL-3.0-or-later
 - @vueuse/components
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - @vueuse/core
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - @vueuse/shared
-	- version: 10.9.0
+	- version: 10.11.0
 	- license: MIT
 - assert
 	- version: 2.1.0
@@ -115,7 +115,7 @@ This file is generated from multiple sources. Included packages:
 	- version: 1.0.7
 	- license: MIT
 - axios
-	- version: 1.6.8
+	- version: 1.7.2
 	- license: MIT
 - balanced-match
 	- version: 1.0.2