[FIX] mail: fix (inbox reply) composer event handlers (and discard)

task-2092950

closes odoo/odoo#53731

X-original-commit: c29f5776594c4d2278ce163a78d8eb917fb672c0
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>

1 files changed, 14 insertions, 9 deletions

diff --git a/addons/mail/static/src/models/composer/composer.js b/addons/mail/static/src/models/composer/composer.js
index 86dfe78aa5e..da1c6e7ad10 100644
--- a/addons/mail/static/src/models/composer/composer.js
+++ b/addons/mail/static/src/models/composer/composer.js
@@ -27,17 +27,14 @@ function factory(dependencies) {
             });
         }
 
+        /**
+         * Hides the composer, which only makes sense if the composer is
+         * currently used as a Discuss Inbox reply composer.
+         */
         discard() {
-            const discuss = this.env.messaging.discuss;
-            const thread = this.thread;
-            if (
-                !discuss.isOpen ||
-                discuss.thread !== thread ||
-                !discuss.isReplyingToMessage
-            ) {
-                return;
+            if (this.discussAsReplying) {
+                this.discussAsReplying.clearReplyingToMessage();
             }
-            discuss.clearReplyingToMessage();
         }
 
         focus() {
@@ -509,6 +506,14 @@ function factory(dependencies) {
             ],
             default: false,
         }),
+        /**
+         * Instance of discuss if this composer is used as the reply composer
+         * from Inbox. This field is computed from the inverse relation and
+         * should be considered read-only.
+         */
+        discussAsReplying: one2one('mail.discuss', {
+            inverse: 'replyingToMessageOriginThreadComposer',
+        }),
         extraSuggestedPartners: many2many('mail.partner', {
             compute: '_computeExtraSuggestedPartners',
             dependencies: [