[MIG] mail_tracking: Migration to 16.0

mail_tracking/__manifest__.py

@@ -7,7 +7,7 @@
 {
     "name": "Email tracking",
     "summary": "Email tracking system for all mails sent",
-    "version": "15.0.3.1.0",
+    "version": "16.0.1.0.0",
     "category": "Social Network",
     "website": "https://github.com/OCA/social",
     "author": ("Tecnativa, " "Odoo Community Association (OCA)"),
@@ -25,23 +25,24 @@
         "views/res_partner_view.xml",
     ],
     "assets": {
+        "mail.assets_messaging": [
+            "mail_tracking/static/src/js/models/*.js",
+        ],
         "web.assets_backend": [
+            "mail_tracking/static/src/xml/mail_tracking.xml",
             "mail_tracking/static/src/css/mail_tracking.scss",
             "mail_tracking/static/src/css/failed_message.scss",
-            "mail_tracking/static/src/js/mail_tracking.esm.js",
             "mail_tracking/static/src/js/message.esm.js",
             "mail_tracking/static/src/js/failed_message/mail_failed_box.esm.js",
-            "mail_tracking/static/src/js/failed_message/thread.esm.js",
             "mail_tracking/static/src/js/models/thread.esm.js",
-            "mail_tracking/static/src/js/chatter.esm.js",
-            "mail_tracking/static/src/js/discuss/discuss.esm.js",
-        ],
-        "web.assets_qweb": [
             "mail_tracking/static/src/xml/mail_tracking.xml",
             "mail_tracking/static/src/xml/failed_message/common.xml",
             "mail_tracking/static/src/xml/failed_message/thread.xml",
             "mail_tracking/static/src/xml/failed_message/discuss.xml",
         ],
+        "web.assets_frontend": [
+            "mail_tracking/static/src/css/failed_message.scss",
+        ],
     },
     "demo": ["demo/demo.xml"],
 }

mail_tracking/demo/demo.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<odoo>
+<odoo noupdate="True">
         <!-- Message with CC -->
         <record id="mail_message_cc" model="mail.message">
             <field name="model">res.partner</field>

mail_tracking/models/mail_message.py

@@ -130,6 +130,7 @@ def tracking_status(self):
         """Generates a complete status tracking of the messages by partner"""
         res = {}
         for message in self:
+            tracking_delta = 0
             partner_trackings = []
             partners_already = self.env["res.partner"]
             partners = self.env["res.partner"]
@@ -162,13 +163,15 @@ def tracking_status(self):
                         "recipient": recipient,
                         "partner_id": tracking.partner_id.id,
                         "isCc": False,
+                        "tracking_delta": "%i-%i" % (message.id, tracking_delta),
                     }
                 )
                 if tracking.partner_id:
                     # Discard mails with tracking
                     email_cc_list.discard(tracking.partner_id.email)
                     email_to_list.discard(tracking.partner_id.email)
                     partners_already |= tracking.partner_id
+                tracking_delta += 1
             # Search all partner recipients for this message
             if message.partner_ids:
                 partners |= message.partner_ids
@@ -197,17 +200,29 @@ def tracking_status(self):
                     isCc = True
                 tracking_status = tracking_unknown_values.copy()
                 tracking_status.update(
-                    {"recipient": partner.name, "partner_id": partner.id, "isCc": isCc}
+                    {
+                        "recipient": partner.name,
+                        "partner_id": partner.id,
+                        "isCc": isCc,
+                        "tracking_delta": "%i-%i" % (message.id, tracking_delta),
+                    }
                 )
                 partner_trackings.append(tracking_status)
+                tracking_delta += 1
             # Process Cc/To recipients without partner
             for cc, lst in [(True, email_cc_list), (False, email_to_list)]:
                 for email in lst:
                     tracking_status = tracking_unknown_values.copy()
                     tracking_status.update(
-                        {"recipient": email, "partner_id": False, "isCc": cc}
+                        {
+                            "recipient": email,
+                            "partner_id": False,
+                            "isCc": cc,
+                            "tracking_delta": "%i-%i" % (message.id, tracking_delta),
+                        }
                     )
                     partner_trackings.append(tracking_status)
+                    tracking_delta += 1
             res[message.id] = {
                 "partner_trackings": partner_trackings,
                 "is_failed_message": message.is_failed_message,

mail_tracking/static/src/css/failed_message.scss

@@ -116,8 +116,8 @@
         margin-bottom: 0px;
 
         &.o_mail_not_discussion {
-            background-color: rgba(gray("300"), 0.5);
-            border-bottom: 1px solid gray("400");
+            background-color: rgba(map-get($grays, "300"), 0.5);
+            border-bottom: 1px solid map-get($grays, "400");
         }
 
         .o_thread_message_sidebar {

mail_tracking/static/src/js/failed_message/mail_failed_box.esm.js

@@ -50,9 +50,7 @@ export class MessageFailedBox extends Component {
 }
 
 Object.assign(MessageFailedBox, {
-    props: {
-        chatterLocalId: String,
-    },
+    props: {record: Object},
     template: "mail_tracking.MessageFailedBox",
 });
 

mail_tracking/static/src/js/chatter.esm.js → mail_tracking/static/src/js/models/chatter.esm.js

@@ -1,14 +1,11 @@
 /** @odoo-module **/
-import {
-    registerFieldPatchModel,
-    registerInstancePatchModel,
-} from "@mail/model/model_core";
+
 import {attr} from "@mail/model/model_field";
+import {registerPatch} from "@mail/model/model_core";
 
-registerInstancePatchModel(
-    "mail.chatter",
-    "mail/static/src/models/chatter/chatter.esm.js",
-    {
+registerPatch({
+    name: "Chatter",
+    modelMethods: {
         async refresh() {
             this._super(...arguments);
             this.thread.refreshMessagefailed();
@@ -22,14 +19,10 @@ registerInstancePatchModel(
             this._super(...arguments);
             this.thread.refreshMessagefailed();
         },
-    }
-);
-registerFieldPatchModel(
-    "mail.chatter",
-    "mail/static/src/models/chatter/chatter.esm.js",
-    {
+    },
+    fields: {
         isMessageFailedBoxVisible: attr({
             default: true,
         }),
-    }
-);
+    },
+});

mail_tracking/static/src/js/models/discuss_sidebar_mailbox_view.esm.js

@@ -0,0 +1,22 @@
+/** @odoo-module **/
+
+import {one} from "@mail/model/model_field";
+import {registerPatch} from "@mail/model/model_core";
+
+registerPatch({
+    name: "DiscussSidebarMailboxView",
+    fields: {
+        discussViewOwnerAsFailedmsg: one("DiscussView", {
+            identifying: true,
+            inverse: "failedmsgView",
+        }),
+        mailbox: {
+            compute() {
+                if (this.discussViewOwnerAsFailedmsg) {
+                    return this.messaging.failedmsg;
+                }
+                return this._super();
+            },
+        },
+    },
+});

mail_tracking/static/src/js/models/discuss_view.esm.js

@@ -0,0 +1,14 @@
+/** @odoo-module **/
+
+import {one} from "@mail/model/model_field";
+import {registerPatch} from "@mail/model/model_core";
+
+registerPatch({
+    name: "DiscussView",
+    fields: {
+        failedmsgView: one("DiscussSidebarMailboxView", {
+            default: {},
+            inverse: "discussViewOwnerAsFailedmsg",
+        }),
+    },
+});