From aea1b65ab2a5fc5385ba119e6e728e36ff111774 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@winzerhof-wurst.at>
Date: Thu, 25 Aug 2022 14:26:56 +0200
Subject: [PATCH] Make it clear that not all attachments will be sent

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
---
 src/components/Composer.vue            |  2 +-
 src/components/ComposerAttachments.vue | 38 ++++++++++++++++++--------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/components/Composer.vue b/src/components/Composer.vue
index 2c76730a86..125b4013cf 100644
--- a/src/components/Composer.vue
+++ b/src/components/Composer.vue
@@ -1035,8 +1035,8 @@ export default {
 			this.attachmentsPromise = this.attachmentsPromise
 				.then(() => uploaded)
 				.then(() => this.callSaveDraft(true, this.getMessageData))
-				.catch((error) => logger.error('could not upload attachments', { error }))
 				.then(() => logger.debug('attachments uploaded'))
+				.catch((error) => logger.error('could not upload attachments', { error }))
 		},
 		async onMailvelopeLoaded(mailvelope) {
 			this.encrypt = isPgpgMessage(this.body)
diff --git a/src/components/ComposerAttachments.vue b/src/components/ComposerAttachments.vue
index 59a5fbe398..f0b66384ea 100644
--- a/src/components/ComposerAttachments.vue
+++ b/src/components/ComposerAttachments.vue
@@ -22,14 +22,21 @@
 
 <template>
 	<div class="new-message-attachments">
-		<div v-if="hasNextLine" class="message-attachments-count" @click="isToggle = !isToggle">
+		<div v-if="hasNextLine"
+			class="new-message-attachments--counter"
+			:class="{ 'new-message-attachments--counter--with-errors': hasAttachmentErrors }"
+			@click="isToggle = !isToggle">
 			<span>
 				{{ n('mail', '{count} attachment', '{count} attachments', attachments.length, { count: attachments.length }) }} ({{ formatBytes(totalSizeOfUpload()) }})
 			</span>
 			<ChevronUp v-if="isToggle" :size="24" />
 			<ChevronDown v-if="!isToggle" :size="24" />
 		</div>
-		<ul class="new-message-attachments--list" :class="isToggle ? 'hide' : (hasNextLine ? 'active' : '')">
+		<ul class="new-message-attachments--list"
+			:class="{
+				hide: isToggle,
+				active: !isToggle && hasNextLine,
+			}">
 			<ComposerAttachment
 				v-for="attachment in attachments"
 				ref="attachments"
@@ -110,6 +117,9 @@ export default {
 		}
 	},
 	computed: {
+		hasAttachmentErrors() {
+			return this.attachments.some(attachment => attachment.error)
+		},
 		uploadProgress() {
 			let uploaded = 0
 			let total = 0
@@ -268,7 +278,7 @@ export default {
 							}])
 						})
 				} catch (error) {
-
+					logger.error('Could not upload file', { file, error })
 				}
 			}, e.target.files)
 
@@ -422,7 +432,19 @@ export default {
 <style scoped lang="scss">
 
 .new-message-attachments {
-	ul.new-message-attachments--list {
+	&--counter {
+		color: var(--color-text-maxcontrast);
+		padding: 10px 20px;
+		cursor:pointer;
+		display:flex;
+		align-items: center;
+
+		&--with-errors {
+			color:red;
+		}
+	}
+
+	&--list {
 		display: flex;
 		flex-wrap: wrap;
 		// 2 and a half attachment height
@@ -441,13 +463,5 @@ export default {
 			max-height: 287px;
 		}
 	}
-
-	.message-attachments-count {
-		color: var(--color-text-maxcontrast);
-		padding: 10px 20px;
-		cursor:pointer;
-		display:flex;
-		align-items: center;
-	}
 }
 </style>