From 17a3a84aaa783eb30e37a4eb319d65d051f516a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20K=C3=BChn?= <aku@odoo.com>
Date: Wed, 24 Jan 2024 11:19:31 +0100
Subject: [PATCH] [FIX] mail: fold discuss app category when no conversation
 selected
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before this commit, when no conversation was selected in the
Discuss app, folding a category such as "Channels" results in
a crash.

This happens because `store.discuss.thread` is `undefined`, so it
must be properly guarded in the template of discuss sidebar category.

closes odoo/odoo#150828

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 .../static/src/discuss/core/web/discuss_sidebar_categories.xml | 2 +-
 addons/mail/static/tests/discuss/core/web/discuss_tests.js     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/discuss/core/web/discuss_sidebar_categories.xml b/addons/mail/static/src/discuss/core/web/discuss_sidebar_categories.xml
index 6f016708cfd..ad304bf8779 100644
--- a/addons/mail/static/src/discuss/core/web/discuss_sidebar_categories.xml
+++ b/addons/mail/static/src/discuss/core/web/discuss_sidebar_categories.xml
@@ -34,7 +34,7 @@
                 <t t-set="thread" t-value="thread"/>
             </t>
         </t>
-        <t t-elif="store.discuss.thread.in(category.threads)" t-call="mail.DiscussSidebarChannel">
+        <t t-elif="store.discuss.thread?.in(category.threads)" t-call="mail.DiscussSidebarChannel">
             <t t-set="thread" t-value="store.discuss.thread"/>
         </t>
     </t>
diff --git a/addons/mail/static/tests/discuss/core/web/discuss_tests.js b/addons/mail/static/tests/discuss/core/web/discuss_tests.js
index 857ff05c9f6..cc7540cd7d0 100644
--- a/addons/mail/static/tests/discuss/core/web/discuss_tests.js
+++ b/addons/mail/static/tests/discuss/core/web/discuss_tests.js
@@ -199,4 +199,7 @@ QUnit.test("no conversation selected when opening non-existing channel in discus
     const { openDiscuss } = await start();
     await openDiscuss(200); // non-existing id
     await contains("h4", { text: "No conversation selected." });
+    await contains(".o-mail-DiscussSidebarCategory-channel .oi-chevron-down");
+    await click(".o-mail-DiscussSidebar .btn", { text: "Channels" }); // check no crash
+    await contains(".o-mail-DiscussSidebarCategory-channel .oi-chevron-right");
 });