[FIX] mail: send is_main with the attachments

task-2783076

closes odoo#85765

Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>

Author: phenix-factory

addons/mail/controllers/discuss.py

@@ -405,6 +405,14 @@ def channel_ping(self, channel_id, rtc_session_id=None, check_rtc_session_ids=No
     # Chatter API
     # --------------------------------------------------------------------------
 
+    @http.route('/mail/thread/data', methods=['POST'], type='json', auth='user')
+    def mail_thread_data(self, thread_model, thread_id, request_list, **kwargs):
+        res = {}
+        thread = request.env[thread_model].with_context(active_test=False).search([('id', '=', thread_id)])
+        if 'attachments' in request_list:
+            res['attachments'] = thread.env['ir.attachment'].search([('res_id', '=', thread.id), ('res_model', '=', thread._name)], order='id desc')._attachment_format(commands=True)
+        return res
+
     @http.route('/mail/thread/messages', methods=['POST'], type='json', auth='user')
     def mail_thread_messages(self, thread_model, thread_id, max_id=None, min_id=None, limit=30, **kwargs):
         return request.env['mail.message']._message_fetch(domain=[

addons/mail/models/ir_attachment.py

@@ -58,6 +58,9 @@ def _attachment_format(self, commands=False):
                 'name': attachment.name,
                 'mimetype': 'application/octet-stream' if safari and attachment.mimetype and 'video' in attachment.mimetype else attachment.mimetype,
             }
+            if attachment.res_id and issubclass(self.pool[attachment.res_model], self.pool['mail.thread']):
+                main_attachment = self.env[attachment.res_model].sudo().browse(attachment.res_id).message_main_attachment_id
+                res['is_main'] = attachment == main_attachment
             if commands:
                 res['originThread'] = [('insert', {
                     'id': attachment.res_id,

addons/mail/models/mail_message.py

@@ -839,13 +839,6 @@ def _message_format(self, fnames, format_reply=True):
             else:
                 author = (0, message_sudo.email_from)
 
-            # Attachments
-            main_attachment = self.env['ir.attachment']
-            if message_sudo.attachment_ids and message_sudo.res_id and issubclass(self.pool[message_sudo.model], self.pool['mail.thread']):
-                main_attachment = self.env[message_sudo.model].sudo().browse(message_sudo.res_id).message_main_attachment_id
-            attachments_formatted = message_sudo.attachment_ids._attachment_format()
-            for attachment in attachments_formatted:
-                attachment['is_main'] = attachment['id'] == main_attachment.id
             # Tracking values
             tracking_value_ids = []
             for tracking in message_sudo.tracking_value_ids:
@@ -890,7 +883,7 @@ def _message_format(self, fnames, format_reply=True):
                 vals['parentMessage'] = message_sudo.parent_id.message_format(format_reply=False)[0]
             vals.update({
                 'notifications': message_sudo.notification_ids._filtered_for_web_client()._notification_format(),
-                'attachment_ids': attachments_formatted,
+                'attachment_ids': message_sudo.attachment_ids._attachment_format(),
                 'tracking_value_ids': tracking_value_ids,
                 'messageReactionGroups': reaction_groups,
                 'record_name': record_name,

addons/mail/static/src/components/attachment_box/tests/attachment_box_tests.js

@@ -102,9 +102,9 @@ QUnit.test('base non-empty rendering', async function (assert) {
         }
     );
     await this.start({
-        async mockRPC(route, args) {
-            if (route.includes('ir.attachment/search_read')) {
-                assert.step('ir.attachment/search_read');
+        async mockRPC(route) {
+            if (route.includes('/mail/thread/data')) {
+                assert.step('/mail/thread/data');
             }
             return this._super(...arguments);
         },
@@ -115,7 +115,7 @@ QUnit.test('base non-empty rendering', async function (assert) {
     });
     await this.createAttachmentBoxComponent(thread);
     assert.verifySteps(
-        ['ir.attachment/search_read'],
+        ['/mail/thread/data'],
         "should have fetched attachments"
     );
     assert.strictEqual(

addons/mail/static/src/components/chatter_topbar/tests/chatter_topbar_tests.js

@@ -148,7 +148,7 @@ QUnit.test('attachment loading is delayed', async function (assert) {
         hasTimeControl: true,
         loadingBaseDelayDuration: 100,
         async mockRPC(route) {
-            if (route.includes('ir.attachment/search_read')) {
+            if (route.includes('/mail/thread/data')) {
                 await makeTestPromise(); // simulate long loading
             }
             return this._super(...arguments);
@@ -191,7 +191,7 @@ QUnit.test('attachment counter while loading attachments', async function (asser
     this.data['res.partner'].records.push({ id: 100 });
     await this.start({
         async mockRPC(route) {
-            if (route.includes('ir.attachment/search_read')) {
+            if (route.includes('/mail/thread/data')) {
                 await makeTestPromise(); // simulate long loading
             }
             return this._super(...arguments);
@@ -234,7 +234,7 @@ QUnit.test('attachment counter transition when attachments become loaded)', asyn
     await this.start({
         async mockRPC(route) {
             const _super = this._super.bind(this, ...arguments); // limitation of class.js
-            if (route.includes('ir.attachment/search_read')) {
+            if (route.includes('/mail/thread/data')) {
                 await attachmentPromise;
             }
             return _super();

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

@@ -34,6 +34,9 @@ function factory(dependencies) {
             if ('id' in data) {
                 data2.id = data.id;
             }
+            if ('is_main' in data) {
+                data2.is_main = data.is_main;
+            }
             if ('mimetype' in data) {
                 data2.mimetype = data.mimetype;
             }

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

@@ -707,25 +707,49 @@ function factory(dependencies) {
             )];
         }
 
+         /**
+          * Fetch attachments linked to a record. Useful for populating the store
+          * with these attachments, which are used by attachment box in the chatter.
+          */
+        async fetchAttachments() {
+            return this.fetchData(['attachments']);
+        }
+
         /**
-         * Fetch attachments linked to a record. Useful for populating the store
-         * with these attachments, which are used by attachment box in the chatter.
+         * Requests the given `requestList` data from the server.
+         *
+         * @param {string[]} requestList
          */
-        async fetchAttachments() {
-            const attachmentsData = await this.async(() => this.env.services.rpc({
-                model: 'ir.attachment',
-                method: 'search_read',
-                domain: [
-                    ['res_id', '=', this.id],
-                    ['res_model', '=', this.model],
-                ],
-                fields: ['id', 'name', 'mimetype'],
-                orderBy: [{ name: 'id', asc: false }],
-            }, { shadow: true }));
-            this.update({
-                originThreadAttachments: insertAndReplace(attachmentsData),
-            });
-            this.update({ areAttachmentsLoaded: true });
+        async fetchData(requestList) {
+            if (this.isTemporary) {
+                return;
+            }
+            const requestSet = new Set(requestList);
+            if (requestSet.has('attachments')) {
+                this.update({ isLoadingAttachments: true });
+            }
+            const {
+                attachments: attachmentsData,
+            } = await this.env.services.rpc({
+                route: '/mail/thread/data',
+                params: {
+                    request_list: [...requestSet],
+                    thread_id: this.id,
+                    thread_model: this.model,
+                },
+            }, { shadow: true });
+            if (!this.exists()) {
+                return;
+            }
+            const values = {};
+            if (attachmentsData) {
+                Object.assign(values, {
+                    areAttachmentsLoaded: true,
+                    isLoadingAttachments: false,
+                    originThreadAttachments: insertAndReplace(attachmentsData),
+                });
+            }
+            this.update(values);
         }
 
         /**
@@ -1074,9 +1098,7 @@ function factory(dependencies) {
                 return;
             }
             this.loadNewMessages();
-            this.update({ isLoadingAttachments: true });
             await this.async(() => this.fetchAttachments());
-            this.update({ isLoadingAttachments: false });
         }
 
         async refreshActivities() {

addons/mail/static/tests/helpers/mock_server.js

@@ -127,6 +127,9 @@ MockServer.include({
             const follower_id = args.follower_id;
             return this._mockRouteMailReadSubscriptionData(follower_id);
         }
+        if (route === '/mail/thread/data') {
+            return this._mockRouteMailThreadData(args.thread_model, args.thread_id, args.request_list);
+        }
         if (route === '/mail/thread/messages') {
             const { min_id, max_id, limit, thread_model, thread_id } = args;
             return this._mockRouteMailThreadFetchMessages(thread_model, thread_id, max_id, min_id, limit);
@@ -502,6 +505,26 @@ MockServer.include({
         return subtypes_list;
     },
 
+    /**
+     * Simulates the `/mail/thread/data` route.
+     *
+     * @param {string} thread_model
+     * @param {integer} thread_id
+     * @param {string[]} request_list
+     * @returns {Object}
+     */
+    async _mockRouteMailThreadData(thread_model, thread_id, request_list) {
+        const res = {};
+        const thread = this._mockSearchRead(thread_model, [[['id', '=', thread_id]]], {})[0];
+        if (request_list.includes('attachments')) {
+            const attachments = this._mockSearchRead('ir.attachment', [
+                [['res_id', '=', thread.id], ['res_model', '=', thread_model]],
+            ], {}); // order not done for simplicity
+            res['attachments'] = this._mockIrAttachment_attachmentFormat(attachments.map(attachment => attachment.id), true);
+        }
+        return res;
+    },
+
     /**
      * Simulates the `/mail/thread/messages` route.
      *
@@ -526,6 +549,39 @@ MockServer.include({
     // Private Mocked Methods
     //--------------------------------------------------------------------------
 
+    /**
+     * Simulates `_attachment_format` on `ir.attachment`.
+     *
+     * @private
+     * @param {string} res_model
+     * @param {string} domain
+     * @returns {Object}
+     */
+    _mockIrAttachment_attachmentFormat(ids, commands = false) {
+        const attachments = this._mockRead('ir.attachment', [ids]);
+        return attachments.map(attachment => {
+            const res = {
+                'checksum': attachment.checksum,
+                'filename': attachment.name,
+                'id': attachment.id,
+                'mimetype': attachment.mimetype,
+                'name': attachment.name,
+            };
+            if (commands) {
+                res['originThread'] = [['insert', {
+                    'id': attachment.res_id,
+                    'model': attachment.res_model,
+                }]];
+            } else {
+                Object.assign(res, {
+                    'res_id': attachment.res_id,
+                    'res_model': attachment.res_model,
+                });
+            }
+            return res;
+        });
+    },
+
     /**
      * Simulates `get_activity_data` on `mail.activity`.
      *