[stable25] Reset file list on upload in FilesPicker

cypress/e2e/shared_albums.cy.js

@@ -145,8 +145,7 @@ describe('Manage shared albums', () => {
     })
 
     it('Remove collaborator from an album', () => {
-      cy.get('ul.collections__list li')
-        .should('contain', `shared_album_test4 (${alice})`)
+      cy.get(`[data-test="shared_album_test4 (${alice})"]`).should('have.length', 1)
 
       cy.logout()
       cy.login(alice, 'password', '/apps/photos')
@@ -178,10 +177,8 @@ describe('Manage shared albums', () => {
 
 
     it('It should display two shared albums', () => {
-      cy.get('ul.collections__list li')
-        .contains(`shared_album_test5 (${alice})`)
-      cy.get('ul.collections__list li')
-        .contains(`shared_album_test5 (${charlie})`)
+      cy.get(`[data-test="shared_album_test5 (${alice})"]`).should('have.length', 1)
+      cy.get(`[data-test="shared_album_test5 (${charlie})"]`).should('have.length', 1)
     })
   })
 })

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)
 		},

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 []
 			}