From e46ce4ef007489133397fabecf6f424316684e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20K=C3=BChn?= <aku@odoo.com>
Date: Fri, 4 Aug 2023 08:56:23 +0000
Subject: [PATCH] [FIX] mail: close popover on marking activity as done
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since [1], marking the activity as done from the activity popover
was not automatically closing it.

Steps to reproduce:
- Open Contact kanban view
- Schedule an activity on a contact
- Click on activity widget on kanban card
- Edit activity and mark it as done
=> The activity popover was not automatically closed

Also fixes a bug where marking activity as done in activity view
was crashing.

[1] https://github.com/odoo/odoo/pull/114024

closes odoo/odoo#130828

Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 addons/mail/static/src/core/web/activity_button.js        | 1 +
 .../mail/static/src/views/web/activity/activity_cell.js   | 1 +
 .../static/src/views/web/activity/activity_renderer.xml   | 8 +++++---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/mail/static/src/core/web/activity_button.js b/addons/mail/static/src/core/web/activity_button.js
index f523b40c0a2..a72a7d2347a 100644
--- a/addons/mail/static/src/core/web/activity_button.js
+++ b/addons/mail/static/src/core/web/activity_button.js
@@ -73,6 +73,7 @@ export class ActivityButton extends Component {
                 activityIds: this.props.record.data.activity_ids.currentIds,
                 onActivityChanged: () => {
                     this.props.record.load();
+                    this.popover.close();
                 },
                 resId: this.props.record.resId,
                 resModel: this.props.record.resModel,
diff --git a/addons/mail/static/src/views/web/activity/activity_cell.js b/addons/mail/static/src/views/web/activity/activity_cell.js
index 832d033348b..8e4c74522f8 100644
--- a/addons/mail/static/src/views/web/activity/activity_cell.js
+++ b/addons/mail/static/src/views/web/activity/activity_cell.js
@@ -51,6 +51,7 @@ export class ActivityCell extends Component {
                 defaultActivityTypeId: this.props.activityTypeId,
                 onActivityChanged: () => {
                     this.props.reloadFunc();
+                    this.popover.close();
                 },
                 resId: this.props.resId,
                 resModel: this.props.resModel,
diff --git a/addons/mail/static/src/views/web/activity/activity_renderer.xml b/addons/mail/static/src/views/web/activity/activity_renderer.xml
index 2cbee5ab561..7cb9481811f 100644
--- a/addons/mail/static/src/views/web/activity/activity_renderer.xml
+++ b/addons/mail/static/src/views/web/activity/activity_renderer.xml
@@ -65,9 +65,11 @@
 <t t-name="mail.ActivityViewRow" owl="1">
     <tr class="o_data_row h-100" t-attf-class="{{ activeFilter.resIds.includes(resId) ? 'o_activity_filter_' + activeFilter.progressValue.active : '' }}">
         <t t-set="record" t-value="getRecord(resId)"/>
-        <ActivityRecord archInfo="props.archInfo" record="record" openRecord="props.openRecord" />
-        <t t-foreach="activeColumns" t-as="type" t-key="type[0]">
-            <t t-call="mail.ActivityViewCell"/>
+        <t t-if="record">
+            <ActivityRecord archInfo="props.archInfo" record="record" openRecord="props.openRecord" />
+            <t t-foreach="activeColumns" t-as="type" t-key="type[0]">
+                <t t-call="mail.ActivityViewCell"/>
+            </t>
         </t>
         <td/>
     </tr>