From e7c0e9d1d92d5b750792e06733cfe9da39bd71fa Mon Sep 17 00:00:00 2001
From: vancouver29 <vancouver2990@gmail.com>
Date: Mon, 17 Apr 2023 15:57:34 +0200
Subject: [PATCH] [IMP] attachment_preview: fix _onPreviewAttachment and remove
 class o_attachment_preview

---
 .../src/js/components/chatter/chatter.esm.js  |  5 ++++
 .../attachment_card/attachment_card.esm.js    | 25 ++++++-------------
 .../static/src/xml/attachment_preview.xml     |  4 +--
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/attachment_preview/static/src/js/components/chatter/chatter.esm.js b/attachment_preview/static/src/js/components/chatter/chatter.esm.js
index 5eee6df0..393a6706 100644
--- a/attachment_preview/static/src/js/components/chatter/chatter.esm.js
+++ b/attachment_preview/static/src/js/components/chatter/chatter.esm.js
@@ -205,12 +205,17 @@ odoo.define("attachment_preview.chatter", function (require) {
             attachment_title,
             split_screen
         ) {
+            if (!canPreview(attachment_extension)) {
+                return;
+            }
+
             var url = getUrl(
                 attachment_id,
                 attachment_url,
                 attachment_extension,
                 attachment_title
             );
+
             if (split_screen) {
                 this.trigger("onAttachmentPreview", {url: url});
             } else {
diff --git a/attachment_preview/static/src/js/models/attachment_card/attachment_card.esm.js b/attachment_preview/static/src/js/models/attachment_card/attachment_card.esm.js
index 5a381cd9..92626def 100644
--- a/attachment_preview/static/src/js/models/attachment_card/attachment_card.esm.js
+++ b/attachment_preview/static/src/js/models/attachment_card/attachment_card.esm.js
@@ -242,34 +242,23 @@ odoo.define("attachment_preview.attachment_card", function (require) {
                     $target = $(event.currentTarget),
                     split_screen = $target.attr("data-target") !== "new",
                     attachment_id = this.attachment.id,
-                    attachment_extension = "pdf",
                     attachment_title = this.attachment.filename,
                     attachment_url = this.attachment.defaultSource;
                 active_attachment_id = attachment_id;
 
-                if (attachment_extension) {
+                rpc.query({
+                    model: "ir.attachment",
+                    method: "get_attachment_extension",
+                    args: [attachment_id],
+                }).then(function (extension) {
                     self._showPreview(
                         attachment_id,
                         attachment_url,
-                        attachment_extension,
+                        extension,
                         attachment_title,
                         split_screen
                     );
-                } else {
-                    rpc.query({
-                        model: "ir.attachment",
-                        method: "get_attachment_extension",
-                        args: [attachment_id],
-                    }).then(function (extension) {
-                        self.showPreview(
-                            attachment_id,
-                            attachment_url,
-                            extension,
-                            null,
-                            split_screen
-                        );
-                    });
-                }
+                });
             },
         }
     );
diff --git a/attachment_preview/static/src/xml/attachment_preview.xml b/attachment_preview/static/src/xml/attachment_preview.xml
index 0455eb05..92c2094e 100644
--- a/attachment_preview/static/src/xml/attachment_preview.xml
+++ b/attachment_preview/static/src/xml/attachment_preview.xml
@@ -13,7 +13,7 @@
             >
                 <div
                     t-if="attachmentCard.attachment.downloadUrl"
-                    class="o_AttachmentCard_asideItem d-flex justify-content-center align-items-center ml4 o_attachment_preview"
+                    class="o_AttachmentCard_asideItem d-flex justify-content-center align-items-center ml4"
                     t-att-data-id="attachmentCard.attachment.id"
                     t-att-data-url="attachmentCard.attachment.defaultSource"
                     t-on-click="attachmentCard._onPreviewAttachment"
@@ -27,7 +27,7 @@
                 </div>
                 <div
                     t-if="attachmentCard.attachment.downloadUrl"
-                    class="o_AttachmentCard_asideItem d-flex justify-content-center align-items-center ml4 o_attachment_preview o_attachment_preview_new_tab"
+                    class="o_AttachmentCard_asideItem d-flex justify-content-center align-items-center ml4 o_attachment_preview_new_tab"
                     data-target="new"
                     t-att-data-id="attachmentCard.attachment.id"
                     t-att-data-url="attachmentCard.attachment.defaultSource"