From 371c28a8ba3f6f1585bf9fb04463ffe6b2141bb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20K=C3=BChn?= <aku@odoo.com>
Date: Mon, 14 Mar 2022 13:25:16 +0000
Subject: [PATCH] [IMP] mail: turn Activity/noteAsMarkup as field
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-2793280

closes odoo/odoo#86370

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
---
 .../mail/static/src/components/activity/activity.js  |  6 ------
 .../mail/static/src/components/activity/activity.xml |  2 +-
 addons/mail/static/src/models/activity/activity.js   | 12 ++++++++++++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/addons/mail/static/src/components/activity/activity.js b/addons/mail/static/src/components/activity/activity.js
index 23cbc426622..2580bcb6264 100644
--- a/addons/mail/static/src/components/activity/activity.js
+++ b/addons/mail/static/src/components/activity/activity.js
@@ -5,14 +5,8 @@ import { registerMessagingComponent } from '@mail/utils/messaging_component';
 import Popover from "web.Popover";
 import { LegacyComponent } from "@web/legacy/legacy_component";
 
-const { markup } = owl;
-
 export class Activity extends LegacyComponent {
 
-    get noteAsMarkup() {
-        return markup(this.activityView.activity.note);
-    }
-
     /**
      * @returns {ActivityView}
      */
diff --git a/addons/mail/static/src/components/activity/activity.xml b/addons/mail/static/src/components/activity/activity.xml
index 63819e0a55b..cc9847c6ad0 100644
--- a/addons/mail/static/src/components/activity/activity.xml
+++ b/addons/mail/static/src/components/activity/activity.xml
@@ -102,7 +102,7 @@
 
                     <t t-if="activityView.activity.note">
                         <div class="o_Activity_note">
-                            <t t-out="noteAsMarkup"/>
+                            <t t-out="activityView.activity.noteAsMarkup"/>
                         </div>
                     </t>
 
diff --git a/addons/mail/static/src/models/activity/activity.js b/addons/mail/static/src/models/activity/activity.js
index 468d427cd1e..16ea7416c03 100644
--- a/addons/mail/static/src/models/activity/activity.js
+++ b/addons/mail/static/src/models/activity/activity.js
@@ -4,6 +4,8 @@ import { registerModel } from '@mail/model/model_core';
 import { attr, many, one } from '@mail/model/model_field';
 import { clear, insert, unlink, unlinkAll } from '@mail/model/model_field_command';
 
+const { markup } = owl;
+
 registerModel({
     name: 'Activity',
     identifyingFields: ['id'],
@@ -228,6 +230,13 @@ registerModel({
             }
             return this.note;
         },
+        /**
+         * @private
+         * @returns {Markup} 
+         */
+        _computeNoteAsMarkup() {
+            return markup(this.note);
+        },
     },
     fields: {
         activityViews: many('ActivityView', {
@@ -275,6 +284,9 @@ registerModel({
         note: attr({
             compute: '_computeNote',
         }),
+        noteAsMarkup: attr({
+            compute: '_computeNoteAsMarkup',
+        }),
         /**
          * Determines that an activity is linked to a requesting partner or not.
          * It will be used notably in website slides to know who triggered the