From 9b40d8644658a3ae7fafe5aaf1bb94aa893d30c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Theys?= <seb@odoo.com>
Date: Tue, 5 Jul 2022 14:25:31 +0000
Subject: [PATCH] [IMP] mail: remove isActive from ComposerSuggestionView

Part of task-2741982

Part-of: odoo/odoo#95341
---
 .../composer_suggestion_view.js               |  2 +-
 .../composer_suggestion_view.xml              |  2 +-
 .../src/models/composer_suggestion_view.js    | 20 +++----------------
 .../mail/static/src/models/composer_view.js   |  1 +
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/addons/mail/static/src/components/composer_suggestion_view/composer_suggestion_view.js b/addons/mail/static/src/components/composer_suggestion_view/composer_suggestion_view.js
index 0608b22836b..3cc0debf443 100644
--- a/addons/mail/static/src/components/composer_suggestion_view/composer_suggestion_view.js
+++ b/addons/mail/static/src/components/composer_suggestion_view/composer_suggestion_view.js
@@ -37,7 +37,7 @@ export class ComposerSuggestionView extends Component {
         if (
             this.root.el &&
             this.composerSuggestionView.composerViewOwner.hasToScrollToActiveSuggestionView &&
-            this.composerSuggestionView.isActive
+            this.composerSuggestionView.composerViewOwnerAsActiveSuggestionView
         ) {
             this.root.el.scrollIntoView({
                 block: 'center',
diff --git a/addons/mail/static/src/components/composer_suggestion_view/composer_suggestion_view.xml b/addons/mail/static/src/components/composer_suggestion_view/composer_suggestion_view.xml
index 0c295b6ef92..99d2efd8b9a 100644
--- a/addons/mail/static/src/components/composer_suggestion_view/composer_suggestion_view.xml
+++ b/addons/mail/static/src/components/composer_suggestion_view/composer_suggestion_view.xml
@@ -3,7 +3,7 @@
 
     <t t-name="mail.ComposerSuggestionView" owl="1">
         <t t-if="composerSuggestionView">
-            <a class="o_ComposerSuggestionView dropdown-item d-flex w-100 py-2 px-4" t-att-class="{ 'active bg-300': composerSuggestionView.isActive }" t-attf-class="{{ className }}" href="#" t-att-title="composerSuggestionView.title" role="menuitem" t-on-click="composerSuggestionView.onClick" t-ref="root">
+            <a class="o_ComposerSuggestionView dropdown-item d-flex w-100 py-2 px-4" t-att-class="{ 'active bg-300': composerSuggestionView.composerViewOwnerAsActiveSuggestionView }" t-attf-class="{{ className }}" href="#" t-att-title="composerSuggestionView.title" role="menuitem" t-on-click="composerSuggestionView.onClick" t-ref="root">
                 <t t-if="composerSuggestionView.suggestable.cannedResponse">
                     <strong class="o_ComposerSuggestionView_part1 flex-shrink-0 mw-100 pe-2 text-truncate"><t t-esc="composerSuggestionView.suggestable.cannedResponse.source"/></strong>
                     <em class="o_ComposerSuggestionView_part2 text-600 text-truncate"><t t-esc="composerSuggestionView.suggestable.cannedResponse.substitution"/></em>
diff --git a/addons/mail/static/src/models/composer_suggestion_view.js b/addons/mail/static/src/models/composer_suggestion_view.js
index fd75a1249fb..d664f6021e2 100644
--- a/addons/mail/static/src/models/composer_suggestion_view.js
+++ b/addons/mail/static/src/models/composer_suggestion_view.js
@@ -38,19 +38,6 @@ registerModel({
             }
             return clear();
         },
-        /**
-         * @private
-         * @returns {boolean|FieldCommand}
-         */
-        _computeIsActive() {
-            if (this.composerSuggestionListViewOwnerAsMainSuggestion && this === this.composerSuggestionListViewOwnerAsMainSuggestion.composerViewOwner.activeSuggestionView) {
-                return true;
-            }
-            if (this.composerSuggestionListViewOwnerAsExtraSuggestion && this === this.composerSuggestionListViewOwnerAsExtraSuggestion.composerViewOwner.activeSuggestionView) {
-                return true;
-            }
-            return clear();
-        },
         /**
          * @private
          * @returns {string}
@@ -104,6 +91,9 @@ registerModel({
             compute: '_computeComposerViewOwner',
             required: true,
         }),
+        composerViewOwnerAsActiveSuggestionView: one('ComposerView', {
+            inverse: 'activeSuggestionView',
+        }),
         composerSuggestionListViewOwnerAsExtraSuggestion: one('ComposerSuggestionListView', {
             inverse: 'extraSuggestionViews',
             readonly: true,
@@ -112,10 +102,6 @@ registerModel({
             inverse: 'mainSuggestionViews',
             readonly: true,
         }),
-        isActive: attr({
-            compute: '_computeIsActive',
-            default: false,
-        }),
         /**
          * The text that identifies this suggestion in a mention.
          */
diff --git a/addons/mail/static/src/models/composer_view.js b/addons/mail/static/src/models/composer_view.js
index 9bc713151ae..6b1f24afc97 100644
--- a/addons/mail/static/src/models/composer_view.js
+++ b/addons/mail/static/src/models/composer_view.js
@@ -1407,6 +1407,7 @@ registerModel({
          */
         activeSuggestionView: one('ComposerSuggestionView', {
             compute: '_computeActiveSuggestionView',
+            inverse: 'composerViewOwnerAsActiveSuggestionView',
         }),
         /**
          * Determines the attachment list that will be used to display the attachments.