From b9632cf7a380e5d86391b780bcfb89f11f8ff51e Mon Sep 17 00:00:00 2001
From: Vincent Petry <vincent@nextcloud.com>
Date: Wed, 28 Apr 2021 18:02:14 +0200
Subject: Decuple fileUpload service from the global store

Moved the logic of "processFiles" into the existing "initialiseUpload"
action of the fileUploadStore

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
---
 src/components/ChatView.vue                      | 3 +--
 src/components/NewMessageForm/NewMessageForm.vue | 3 +--
 src/components/UploadEditor.vue                  | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/components')

diff --git a/src/components/ChatView.vue b/src/components/ChatView.vue
index 105fafa88..2a76975db 100644
--- a/src/components/ChatView.vue
+++ b/src/components/ChatView.vue
@@ -59,7 +59,6 @@
 <script>
 import MessagesList from './MessagesList/MessagesList'
 import NewMessageForm from './NewMessageForm/NewMessageForm'
-import { processFiles } from '../utils/fileUpload'
 import { CONVERSATION } from '../constants'
 
 export default {
@@ -140,7 +139,7 @@ export default {
 			// Create a unique id for the upload operation
 			const uploadId = new Date().getTime()
 			// Uploads and shares the files
-			processFiles(files, this.token, uploadId)
+			this.$store.dispatch('initialiseUpload', { files, token: this.token, uploadId })
 		},
 
 		setScrollStatus(payload) {
diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index 548740494..dad481a64 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -125,7 +125,6 @@ import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
 import EmojiPicker from '@nextcloud/vue/dist/Components/EmojiPicker'
 import { EventBus } from '../../services/EventBus'
 import { shareFile } from '../../services/filesSharingServices'
-import { processFiles } from '../../utils/fileUpload'
 import { CONVERSATION } from '../../constants'
 import createTemporaryMessage from '../../utils/temporaryMessage'
 import EmoticonOutline from 'vue-material-design-icons/EmoticonOutline'
@@ -457,7 +456,7 @@ export default {
 			// Create a unique id for the upload operation
 			const uploadId = new Date().getTime()
 			// Uploads and shares the files
-			await processFiles(files, this.token, uploadId, rename)
+			this.$store.dispatch('initialiseUpload', { files, token: this.token, uploadId, rename })
 		},
 
 		/**
diff --git a/src/components/UploadEditor.vue b/src/components/UploadEditor.vue
index 359e5dcb2..5a95d02eb 100644
--- a/src/components/UploadEditor.vue
+++ b/src/components/UploadEditor.vue
@@ -70,7 +70,6 @@
 import Modal from '@nextcloud/vue/dist/Components/Modal'
 import FilePreview from './MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue'
 import Plus from 'vue-material-design-icons/Plus'
-import { processFiles } from '../utils/fileUpload'
 
 export default {
 	name: 'UploadEditor',
@@ -138,7 +137,7 @@ export default {
 
 		handleFileInput(event) {
 			const files = Object.values(event.target.files)
-			processFiles(files, this.token, this.currentUploadId)
+			this.$store.dispatch('initialiseUpload', { files, token: this.token, uploadId: this.currentUploadId })
 		},
 
 		handleRemoveFileFromSelection(id) {
-- 
cgit v1.2.3