fixup! fix(shares): allow to retry failed uploads

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>

src/components/MessagesList/MessagesGroup/Message/Message.vue

@@ -814,7 +814,6 @@ export default {
 				if (this.sendingFailure === 'failed-upload') {
 					const caption = this.renderedMessage !== this.message ? this.message : undefined
 					this.$store.dispatch('retryUploadFiles', { uploadId: this.messageObject.uploadId, caption })
-					this.$store.dispatch('removeTemporaryMessageFromStore', this.messageObject)
 				} else {
 					EventBus.$emit('retry-message', this.id)
 					EventBus.$emit('focus-chat-input')

src/store/fileUploadStore.js

@@ -72,6 +72,11 @@ const getters = {
 			.filter(([_index, uploadedFile]) => uploadedFile.status === 'failedUpload')
 	},
 
+	getUploadingFiles: (state, getters) => (uploadId) => {
+		return getters.getUploadsArray(uploadId)
+			.filter(([_index, uploadedFile]) => uploadedFile.status === 'uploading')
+	},
+
 	// Returns all the files that have been successfully uploaded provided an
 	// upload id
 	getShareableFiles: (state, getters) => (uploadId) => {
@@ -306,8 +311,8 @@ const actions = {
 
 		// Tag previously indexed files and add temporary messages to the MessagesList
 		// If caption is provided, attach to the last temporary message
-		const lastIndex = getters.getUploadsArray(uploadId).at(-1).at(0)
-		for (const [index, uploadedFile] of getters.getUploadsArray(uploadId)) {
+		const lastIndex = getters.getInitialisedUploads(uploadId).at(-1).at(0)
+		for (const [index, uploadedFile] of getters.getInitialisedUploads(uploadId)) {
 			// mark all files as uploading
 			commit('markFileAsUploading', { uploadId, index })
 			// Store the previously created temporary message
@@ -406,7 +411,7 @@ const actions = {
 		const client = getDavClient()
 		const userRoot = '/files/' + getters.getUserId()
 
-		const uploads = getters.getUploadsArray(uploadId)
+		const uploads = getters.getUploadingFiles(uploadId)
 		// Check for duplicate names in the uploads array
 		if (hasDuplicateUploadNames(uploads)) {
 			const { uniques, duplicates } = separateDuplicateUploads(uploads)
@@ -449,7 +454,8 @@ const actions = {
 	 * @param {string} [data.caption] the message caption;
 	 */
 	retryUploadFiles(context, { uploadId, caption }) {
-		context.getters.getFailedUploads(uploadId).forEach(([index, _uploadedFile]) => {
+		context.getters.getFailedUploads(uploadId).forEach(([index, file]) => {
+			context.dispatch('removeTemporaryMessageFromStore', file.temporaryMessage)
 			context.commit('markFileAsInitializedUpload', { uploadId, index })
 		})