From 80cf38e0fc7b99f19fe10a4e2d0e6ce41e64bbce Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sat, 16 Nov 2024 18:26:27 +0200
Subject: [PATCH] note email impr

---
 .../templates/stream/notes/email-received.tpl |  2 +-
 .../src/views/stream/notes/email-received.js  | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/client/res/templates/stream/notes/email-received.tpl b/client/res/templates/stream/notes/email-received.tpl
index e48d38bad5..90c44bbd48 100644
--- a/client/res/templates/stream/notes/email-received.tpl
+++ b/client/res/templates/stream/notes/email-received.tpl
@@ -46,7 +46,7 @@
 
 {{#if hasPost}}
 <div class="stream-post-container">
-    <span class="cell cell-post">{{{post}}}</span>
+    <span class="cell cell-post {{#if mutedPost}} text-muted {{/if}}">{{{post}}}</span>
 </div>
 {{/if}}
 
diff --git a/client/src/views/stream/notes/email-received.js b/client/src/views/stream/notes/email-received.js
index 88c14b5f9a..7c3ef60ccb 100644
--- a/client/src/views/stream/notes/email-received.js
+++ b/client/src/views/stream/notes/email-received.js
@@ -76,12 +76,19 @@ class EmailReceivedNoteStreamView extends NoteStreamView {
      */
     emailId
 
+    /**
+     * @private
+     * @type {boolean}
+     */
+    emailNotLoaded = false
+
     data() {
         return {
             ...super.data(),
             emailId: this.emailId,
             emailName: this.emailName,
-            hasPost: this.hasPost && !this.detailsIsShown,
+            hasPost: this.hasPost && (!this.detailsIsShown || !this.bodyFieldView),
+            mutedPost: this.hasPost && this.detailsIsShown && !this.bodyFieldView && !this.emailNotLoaded,
             hasAttachments: this.hasAttachments,
             emailIconClassName: this.getMetadata().get(['clientDefs', 'Email', 'iconClass']) || '',
             isPinned: this.isThis && this.model.get('isPinned') && this.model.collection &&
@@ -214,7 +221,15 @@ class EmailReceivedNoteStreamView extends NoteStreamView {
 
         Espo.Ui.notify(' ... ');
 
-        await this.formModel.fetch();
+        try {
+            await this.formModel.fetch();
+        } catch (e) {
+            this.emailNotLoaded = true;
+
+            await this.reRender();
+
+            return;
+        }
 
         this.bodyFieldView = new EmailBodyFieldView({
             name: 'body',