[FIX] mail, im_livechat: avoid creating chat bubble when discuss is open

pmah-odoo · alexkuhn · commit 79cce73474ee · 2025-07-20T20:38:58.000Z
Before this commit, receiving a message while the Discuss app was open still created a chat bubble in the background. These would appear after leaving the Discuss app. This commit avoids inserting chat bubbles when Discuss is active, except for livechat messages. Messages still trigger notifications without creating bubbles task-4752392 closes odoo#219796 X-original-commit: 888e2ca Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
diff --git a/addons/im_livechat/static/src/core/public_web/thread_model_patch.js b/addons/im_livechat/static/src/core/public_web/thread_model_patch.js
@@ -62,6 +62,10 @@ patch(Thread.prototype, {
         return super.avatarUrl;
     },
 
+    get inChathubOnNewMessage() {
+        return this.channel_type === "livechat" || super.inChathubOnNewMessage;
+    },
+
     /**
      * @override
      * @param {boolean} pushState
diff --git a/addons/im_livechat/static/tests/chat_window_patch.test.js b/addons/im_livechat/static/tests/chat_window_patch.test.js
@@ -2,6 +2,7 @@ import {
     click,
     contains,
     openDiscuss,
+    openFormView,
     setupChatHub,
     start,
     startServer,
@@ -138,3 +139,53 @@ test("do not ask confirmation if other operators are present", async () => {
     await click("[title*='Close Chat Window']");
     await contains(".o_notification", { text: "You left Visitor #12." });
 });
+
+test.tags("desktop");
+test("Show livechats with new message in chat hub even when in discuss app)", async () => {
+    // Chat hub show conversations with new message only when outside of discuss app by default.
+    // Live chats are special in that agents are expected to see their ongoing conversations at all
+    // time. Closing chat window ends the conversation. Hence the livechat always are shown on chat hub.
+    const pyEnv = await startServer();
+    const guestId = pyEnv["mail.guest"].create({ name: "Visitor 11" });
+    const [livechatId, channelId] = pyEnv["discuss.channel"].create([
+        {
+            anonymous_name: "Visitor 11",
+            channel_member_ids: [
+                Command.create({ partner_id: serverState.partnerId }),
+                Command.create({ guest_id: guestId }),
+            ],
+            channel_type: "livechat",
+            livechat_operator_id: serverState.partnerId,
+        },
+        {
+            channel_member_ids: [Command.create({ partner_id: serverState.partnerId })],
+            channel_type: "channel",
+            name: "general",
+        },
+    ]);
+    pyEnv["mail.message"].create({
+        author_id: serverState.partnerId,
+        body: "<p>Test</p>",
+        message_type: "comment",
+        model: "discuss.channel",
+        res_id: channelId,
+    });
+    await start();
+    await openDiscuss(channelId);
+    await contains(".o-mail-Message:contains('Test')");
+    // simulate livechat visitor sending a message
+    await withGuest(guestId, () =>
+        rpc("/mail/message/post", {
+            post_data: {
+                body: "Hello, I need help!",
+                message_type: "comment",
+                subtype_xmlid: "mail.mt_comment",
+            },
+            thread_id: livechatId,
+            thread_model: "discuss.channel",
+        })
+    );
+    await contains(".o-mail-DiscussSidebar-item:contains('Visitor 11') .badge", { text: "1" });
+    await openFormView("res.partner", serverState.partnerId);
+    await contains(".o-mail-ChatWindow-header:contains('Visitor 11')");
+});
diff --git a/addons/mail/static/src/core/public_web/thread_model_patch.js b/addons/mail/static/src/core/public_web/thread_model_patch.js
@@ -29,14 +29,13 @@ patch(Thread.prototype, {
                         (channel_notifications === "mentions" &&
                             message.recipients?.includes(this.store.self)))))
         ) {
-            if (this.model === "discuss.channel") {
+            if (this.model === "discuss.channel" && this.inChathubOnNewMessage) {
                 await this.store.chatHub.initPromise;
                 let chatWindow = this.store.ChatWindow.get({ thread: this });
                 if (!chatWindow) {
                     chatWindow = this.store.ChatWindow.insert({ thread: this });
                     if (
                         this.autoOpenChatWindowOnNewMessage &&
-                        !this.store.discuss.isActive &&
                         this.store.chatHub.opened.length < this.store.chatHub.maxOpened
                     ) {
                         chatWindow.open();
@@ -48,6 +47,10 @@ patch(Thread.prototype, {
             this.store.env.services["mail.out_of_focus"].notify(message, this);
         }
     },
+    /** Condition for whether the conversation should become present in chat hub on new message */
+    get inChathubOnNewMessage() {
+        return !this.store.discuss.isActive;
+    },
     get autoOpenChatWindowOnNewMessage() {
         return false;
     },
diff --git a/addons/mail/static/tests/messaging/messaging.test.js b/addons/mail/static/tests/messaging/messaging.test.js
@@ -1,4 +1,5 @@
 import {
+    click,
     contains,
     defineMailModels,
     insertText,
@@ -58,42 +59,63 @@ test("Receiving a new message out of discuss app should open a chat bubble", asy
     await contains(".o-mail-ChatBubble[name='Dumbledore']");
 });
 
-test("Receiving a new message in discuss app should open a chat bubble after leaving discuss app", async () => {
+test("Show conversations with new message in chat hub (outside of discuss app)", async () => {
     const pyEnv = await startServer();
     const partnerId = pyEnv["res.partner"].create({ name: "Dumbledore" });
     const userId = pyEnv["res.users"].create({ partner_id: partnerId });
-    const channelId = pyEnv["discuss.channel"].create({
-        channel_member_ids: [
-            Command.create({ partner_id: serverState.partnerId }),
-            Command.create({ partner_id: partnerId }),
-        ],
-        channel_type: "chat",
-    });
-    onRpcBefore("/mail/data", (args) => {
-        if (args.fetch_params.includes("init_messaging")) {
-            asyncStep(`/mail/data - ${JSON.stringify(args)}`);
-        }
-    });
-    await start();
-    await waitForSteps([
-        `/mail/data - ${JSON.stringify({
-            fetch_params: ["failures", "systray_get_activities", "init_messaging"],
-            context: { lang: "en", tz: "taht", uid: serverState.userId, allowed_company_ids: [1] },
-        })}`,
+    const [chatId, groupChatId] = pyEnv["discuss.channel"].create([
+        {
+            channel_member_ids: [
+                Command.create({ partner_id: serverState.partnerId }),
+                Command.create({ partner_id: partnerId }),
+            ],
+            channel_type: "chat",
+        },
+        {
+            channel_member_ids: [
+                Command.create({ partner_id: serverState.partnerId }),
+                Command.create({ partner_id: partnerId }),
+            ],
+            channel_type: "group",
+            name: "GroupChat",
+        },
     ]);
-    // send after init_messaging because bus subscription is done after init_messaging
+    await start();
+    // simulate receiving new message (chat, outside discuss app)
+    await withUser(userId, () =>
+        rpc("/mail/message/post", {
+            post_data: { body: "Chat Message 1", message_type: "comment" },
+            thread_id: chatId,
+            thread_model: "discuss.channel",
+        })
+    );
+    await click(".o-mail-ChatBubble[name='Dumbledore']");
+    await contains(".o-mail-ChatWindow-header:contains('Dumbledore')");
+    await click(".o-mail-ChatWindow [title*='Close Chat Window']");
+    // simulate receiving new message (group chat, outside discuss app)
+    await withUser(userId, () =>
+        rpc("/mail/message/post", {
+            post_data: { body: "GroupChat Message", message_type: "comment" },
+            thread_id: groupChatId,
+            thread_model: "discuss.channel",
+        })
+    );
+    await contains(".o-mail-ChatBubble[name='GroupChat']");
     await openDiscuss();
-    // simulate receiving new message
+    // simulate receiving new message (chat, inside discuss app)
     await withUser(userId, () =>
         rpc("/mail/message/post", {
             post_data: { body: "Tricky", message_type: "comment" },
-            thread_id: channelId,
+            thread_id: chatId,
             thread_model: "discuss.channel",
         })
     );
-    // leaving discuss.
+    await contains(".o-mail-DiscussSidebar-item:contains('Dumbledore') .badge", { text: "1" });
+    // check no new chat window/bubble while in discuss app
     await openFormView("res.partner", partnerId);
-    await contains(".o-mail-ChatBubble[name='Dumbledore']");
+    await contains(".o-mail-ChatBubble[name='GroupChat']");
+    await contains(".o-mail-ChatBubble[name='Dumbledore']", { count: 0 });
+    await contains(".o-mail-ChatWindow-header:contains('Dumbledore')", { count: 0 });
 });
 
 test("Posting a message in discuss app should not open a chat window after leaving discuss app", async () => {
