[PATCH] Upstream patch - 19052022

addons/mail/static/src/components/follow_button/follow_button.js

@@ -55,8 +55,9 @@ class FollowButton extends Component {
      * @private
      * @param {MouseEvent} ev
      */
-    _onClickUnfollow(ev) {
-        this.thread.unfollow();
+    async _onClickUnfollow(ev) {
+        await this.thread.unfollow();
+        this.trigger('reload', { fieldNames: ['message_follower_ids'], keepChanges: true });
     }
 
     /**

addons/mail/static/src/components/follower/follower.js

@@ -7,6 +7,7 @@ const components = {
 const useShouldUpdateBasedOnProps = require('mail/static/src/component_hooks/use_should_update_based_on_props/use_should_update_based_on_props.js');
 const useStore = require('mail/static/src/component_hooks/use_store/use_store.js');
 
+const { markEventHandled } = require('mail/static/src/utils/utils.js');
 const { Component } = owl;
 
 class Follower extends Component {
@@ -61,8 +62,11 @@ class Follower extends Component {
      * @private
      * @param {MouseEvent} ev
      */
-    _onClickRemove(ev) {
-        this.follower.remove();
+    async _onClickRemove(ev) {
+        markEventHandled(ev, 'Follower.clickRemove');
+        await this.follower.remove();
+        this.trigger('reload', { fieldNames:['message_follower_ids'], keepChanges: true });
+        this.trigger('o-hide-follower-list-menu');
     }
 
 }

addons/mail/static/src/components/follower_list_menu/follower_list_menu.js

@@ -6,6 +6,7 @@ const components = {
 };
 const useShouldUpdateBasedOnProps = require('mail/static/src/component_hooks/use_should_update_based_on_props/use_should_update_based_on_props.js');
 const useStore = require('mail/static/src/component_hooks/use_store/use_store.js');
+const { isEventHandled } = require('mail/static/src/utils/utils.js');
 
 const { Component } = owl;
 const { useRef, useState } = owl.hooks;
@@ -133,6 +134,9 @@ class FollowerListMenu extends Component {
      * @param {MouseEvent} ev
      */
     _onClickFollower(ev) {
+        if (isEventHandled(ev, 'Follower.clickRemove')) {
+            return;
+        }
         this._hide();
     }
 }

addons/mail/static/src/components/follower_list_menu/follower_list_menu.xml

@@ -26,6 +26,7 @@
                                     class="o_FollowerMenu_follower dropdown-item"
                                     followerLocalId="follower.localId"
                                     t-on-click="_onClickFollower"
+                                    t-on-o-hide-follower-list-menu="_hide"
                                 />
                             </t>
                         </t>

addons/mail/static/src/models/thread_cache/thread_cache.js

@@ -53,7 +53,7 @@ function factory(dependencies) {
             }
             const messageIds = this.fetchedMessages.map(message => message.id);
             const fetchedMessages = this._loadMessages({
-                extraDomain: [['id', '>', Math.max(...messageIds)]],
+                extraDomain: [['id', '>', Math.max(...messageIds, 0)]],
                 limit: false,
             });
             for (const threadView of this.threadViews) {