From 18edb4abf49c5367f784adea0e8e47cd383b631b Mon Sep 17 00:00:00 2001
From: Rahul Prajapati <rapr@odoo.com>
Date: Tue, 29 Mar 2022 13:19:53 +0000
Subject: [PATCH] [IMP] mail: cleanup iseditable in attachments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit:

- isEditable field doesn't makes sense as attachments can't be Edited
- There is a Dead code in attachment_card component

After this commit:

- refactored isEditable to isDeletable
- removed the Dead code

Task-2782079

closes odoo/odoo#87654

Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../attachment_card/attachment_card.xml       | 54 +++++++++----------
 .../attachment_image/attachment_image.xml     |  2 +-
 addons/mail/static/src/models/attachment.js   | 10 ++--
 3 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/addons/mail/static/src/components/attachment_card/attachment_card.xml b/addons/mail/static/src/components/attachment_card/attachment_card.xml
index 96b0b3a02f2..665405195a1 100644
--- a/addons/mail/static/src/components/attachment_card/attachment_card.xml
+++ b/addons/mail/static/src/components/attachment_card/attachment_card.xml
@@ -28,34 +28,32 @@
                         </t>
                     </div>
                     <!-- Attachment aside -->
-                    <t t-if="(!attachmentCard.attachmentList.composerViewOwner or attachmentCard.attachment.isEditable)">
-                        <div class="o_AttachmentCard_aside position-relative rounded-right overflow-hidden" t-att-class="{ 'o-has-multiple-action d-flex flex-column': !attachmentCard.attachmentList.composerViewOwner and attachmentCard.attachment.isEditable }">
-                            <!-- Uploading icon -->
-                            <t t-if="attachmentCard.attachment.isUploading and attachmentCard.attachmentList.composerViewOwner">
-                                <div class="o_AttachmentCard_asideItem o_AttachmentCard_asideItemUploading d-flex justify-content-center align-items-center w-100 h-100" title="Uploading">
-                                    <i class="fa fa-spin fa-spinner"/>
-                                </div>
-                            </t>
-                            <!-- Uploaded icon -->
-                            <t t-if="!attachmentCard.attachment.isUploading and attachmentCard.attachmentList.composerViewOwner">
-                                <div class="o_AttachmentCard_asideItem o_AttachmentCard_asideItemUploaded d-flex justify-content-center align-items-center w-100 h-100 text-primary" title="Uploaded">
-                                    <i class="fa fa-check"/>
-                                </div>
-                            </t>
-                            <!-- Remove button -->
-                            <t t-if="attachmentCard.attachment.isEditable">
-                                <button class="o_AttachmentCard_asideItem o_AttachmentCard_asideItemUnlink btn top-0 justify-content-center align-items-center d-flex w-100 h-100 rounded-0" t-attf-class="{{ attachmentCard.attachmentList.composerViewOwner ? 'o-pretty position-absolute btn-primary' : 'bg-300' }}" t-on-click="attachmentCard.onClickUnlink" title="Remove">
-                                    <i class="fa fa-trash"/>
-                                </button>
-                            </t>
-                            <!-- Download button -->
-                            <t t-if="!attachmentCard.attachmentList.composerViewOwner and !attachmentCard.attachment.isUploading">
-                                <button class="o_AttachmentCard_asideItem o_AttachmentCard_asideItemDownload btn d-flex justify-content-center align-items-center w-100 h-100 rounded-0 bg-300" t-on-click="attachmentCard.attachment.onClickDownload" title="Download">
-                                    <i class="fa fa-download"/>
-                                </button>
-                            </t>
-                        </div>
-                    </t>
+                    <div class="o_AttachmentCard_aside position-relative rounded-right overflow-hidden" t-att-class="{ 'o-has-multiple-action d-flex flex-column': !attachmentCard.attachmentList.composerViewOwner and attachmentCard.attachment.isDeletable }">
+                        <!-- Uploading icon -->
+                        <t t-if="attachmentCard.attachment.isUploading and attachmentCard.attachmentList.composerViewOwner">
+                            <div class="o_AttachmentCard_asideItem o_AttachmentCard_asideItemUploading d-flex justify-content-center align-items-center w-100 h-100" title="Uploading">
+                                <i class="fa fa-spin fa-spinner"/>
+                            </div>
+                        </t>
+                        <!-- Uploaded icon -->
+                        <t t-if="!attachmentCard.attachment.isUploading and attachmentCard.attachmentList.composerViewOwner">
+                            <div class="o_AttachmentCard_asideItem o_AttachmentCard_asideItemUploaded d-flex justify-content-center align-items-center w-100 h-100 text-primary" title="Uploaded">
+                                <i class="fa fa-check"/>
+                            </div>
+                        </t>
+                        <!-- Remove button -->
+                        <t t-if="attachmentCard.attachment.isDeletable">
+                            <button class="o_AttachmentCard_asideItem o_AttachmentCard_asideItemUnlink btn top-0 justify-content-center align-items-center d-flex w-100 h-100 rounded-0" t-attf-class="{{ attachmentCard.attachmentList.composerViewOwner ? 'o-pretty position-absolute btn-primary' : 'bg-300' }}" t-on-click="attachmentCard.onClickUnlink" title="Remove">
+                                <i class="fa fa-trash"/>
+                            </button>
+                        </t>
+                        <!-- Download button -->
+                        <t t-if="!attachmentCard.attachmentList.composerViewOwner and !attachmentCard.attachment.isUploading">
+                            <button class="o_AttachmentCard_asideItem o_AttachmentCard_asideItemDownload btn d-flex justify-content-center align-items-center w-100 h-100 rounded-0 bg-300" t-on-click="attachmentCard.attachment.onClickDownload" title="Download">
+                                <i class="fa fa-download"/>
+                            </button>
+                        </t>
+                    </div>
                 </div>
             </div>
         </t>
diff --git a/addons/mail/static/src/components/attachment_image/attachment_image.xml b/addons/mail/static/src/components/attachment_image/attachment_image.xml
index 486668cc8e4..65643900d17 100644
--- a/addons/mail/static/src/components/attachment_image/attachment_image.xml
+++ b/addons/mail/static/src/components/attachment_image/attachment_image.xml
@@ -20,7 +20,7 @@
                             <i class="fa fa-spin fa-spinner"/>
                         </div>
                     </t>
-                    <t t-if="attachmentImage.attachment.isEditable">
+                    <t t-if="attachmentImage.attachment.isDeletable">
                         <div class="o_AttachmentImage_imageOverlay position-absolute top-0 bottom-0 start-0 end-0 text-right p-2 text-white opacity-0 opacity-100-hover">
                             <div class="o_AttachmentImage_action o_AttachmentImage_actionUnlink btn btn-sm btn-dark rounded opacity-75 opacity-100-hover"
                                 t-att-class="{'o-pretty': attachmentImage.attachmentList.composerViewOwner}" t-on-click="attachmentImage.onClickUnlink" title="Remove"
diff --git a/addons/mail/static/src/models/attachment.js b/addons/mail/static/src/models/attachment.js
index a130c981d48..deedb5187e4 100644
--- a/addons/mail/static/src/models/attachment.js
+++ b/addons/mail/static/src/models/attachment.js
@@ -163,9 +163,9 @@ registerModel({
          * @private
          * @returns {boolean}
          */
-        _computeIsEditable() {
+        _computeIsDeletable() {
             if (!this.messaging) {
-                return;
+                return false;
             }
 
             if (this.messages.length && this.originThread && this.originThread.model === 'mail.channel') {
@@ -316,10 +316,10 @@ registerModel({
             required: true,
         }),
         /**
-         * States whether this attachment is editable.
+         * States whether this attachment is deletable.
          */
-        isEditable: attr({
-            compute: '_computeIsEditable',
+        isDeletable: attr({
+            compute: '_computeIsDeletable',
         }),
         /**
          * States id the attachment is an image.