Merge pull request #1792 from nextcloud/backport/stable26/artonge/fix…

…/refresh_file_list_on_upload [stable26] Reset file list on upload in FilesPicker
nextcloud · May 16, 2023 · 6553c1b · 6553c1b
2 parents fbd60d0 + 18e5fa5
commit 6553c1b
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 18 deletions.
diff --git a/js/photos-main.js b/js/photos-main.js
diff --git a/js/photos-main.js.map b/js/photos-main.js.map
diff --git a/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-36962a.js b/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-36962a.js
diff --git a/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-36962a.js.map b/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-36962a.js.map
diff --git a/js/photos-public.js b/js/photos-public.js
diff --git a/js/photos-public.js.map b/js/photos-public.js.map
diff --git a/js/photos-src_mixins_FetchFilesMixin_js.js b/js/photos-src_mixins_FetchFilesMixin_js.js
diff --git a/js/photos-src_mixins_FetchFilesMixin_js.js.map b/js/photos-src_mixins_FetchFilesMixin_js.js.map
diff --git a/js/photos-src_views_AlbumContent_vue.js b/js/photos-src_views_AlbumContent_vue.js
diff --git a/js/photos-src_views_AlbumContent_vue.js.map b/js/photos-src_views_AlbumContent_vue.js.map
diff --git a/src/components/FilesPicker.vue b/src/components/FilesPicker.vue
@@ -67,7 +67,7 @@
 				:context="uploadContext"
 				:destination="photosLocation"
 				:multiple="true"
-				@uploaded="getFiles" />
+				@uploaded="refreshFiles" />
 			<NcButton type="primary" :disabled="loading || selectedFileIds.length === 0" @click="emitPickedEvent">
 				<template #icon>
 					<ImagePlus v-if="!loading" />
@@ -172,6 +172,10 @@ export default {
 			this.fetchFiles('', {}, this.blacklistIds)
 		},
 
+		refreshFiles() {
+			this.fetchFiles('', { firstResult: 0 }, [...this.blacklistIds, ...this.fetchedFileIds], true)
+		},
+
 		emitPickedEvent() {
 			this.$emit('files-picked', this.selectedFileIds)
 		},

diff --git a/src/mixins/FetchFilesMixin.js b/src/mixins/FetchFilesMixin.js
@@ -55,10 +55,11 @@ export default {
 		 * @param {string} path - Path to pass to getPhotos.
 		 * @param {object} options - Options to pass to getPhotos.
 		 * @param {string[]} [blacklist=[]] - Array of ids to filter out.
+		 * @param {boolean} [force=false] - Force fetching even if doneFetchingFiles is true
 		 * @return {Promise<string[]>} - The next batch of data depending on global offset.
 		 */
-		async fetchFiles(path = '', options = {}, blacklist = []) {
-			if (this.doneFetchingFiles || this.loadingFiles) {
+		async fetchFiles(path = '', options = {}, blacklist = [], force = false) {
+			if ((this.doneFetchingFiles && !force) || this.loadingFiles) {
 				return []
 			}