[IMP] contentgrid: Allow to send to ContentGrid lateron

etobella · etobella · commit b6db1313a216 · 2025-08-28T14:17:49.000+02:00
diff --git a/contentgrid/README.rst b/contentgrid/README.rst
@@ -137,8 +137,21 @@ of it in contentgrid and a link to the app:
 
 |ContentGrid Popup|
 
+Also, related records will show the same icon in the thread menu and
+will allow us to check the data sent to ContentGrid.
+
+|ContentGrid Thread|
+
+In case we want to force the send, we can do it manually by using the
+*Allow manual send* field on the configuration. This will show a button
+that sends the data to content grid (only attachments not sent)
+
+|image1|
+
 .. |ContentGrid Attachment| image:: https://raw.githubusercontent.com/dixmit/contentgrid/18.0/contentgrid/static/img/contentgrid_attachment.png
 .. |ContentGrid Popup| image:: https://raw.githubusercontent.com/dixmit/contentgrid/18.0/contentgrid/static/img/contentgrid_popup.png
+.. |ContentGrid Thread| image:: https://raw.githubusercontent.com/dixmit/contentgrid/18.0/contentgrid/static/img/contentgrid_thread.png
+.. |image1| image:: https://raw.githubusercontent.com/dixmit/contentgrid/18.0/contentgrid/static/img/contentgrid_thread_force.png
 
 Bug Tracker
 ===========
diff --git a/contentgrid/models/__init__.py b/contentgrid/models/__init__.py
@@ -2,3 +2,4 @@
 from . import ir_attachment
 from . import contentgrid_record
 from . import contentgrid_connection
+from . import mail_thread
diff --git a/contentgrid/models/contentgrid_configuration.py b/contentgrid/models/contentgrid_configuration.py
@@ -47,6 +47,9 @@ class ContentgridConfiguration(models.Model):
         comodel_name="contentgrid.connection", required=True
     )
     configuration_data = fields.Text(required=True)
+    allow_manual_send = fields.Boolean(
+        default=False,
+    )
 
     @api.constrains("configuration_data")
     def _check_configuration_data(self):
diff --git a/contentgrid/models/ir_attachment.py b/contentgrid/models/ir_attachment.py
@@ -17,7 +17,7 @@ class IrAttachment(models.Model):
         ondelete="cascade",
     )
 
-    def _push_to_contentgrid(self):
+    def _push_to_contentgrid(self, manual_send=False):
         self.ensure_one()
         if self.contentgrid_ids:
             return
@@ -26,12 +26,13 @@ def _push_to_contentgrid(self):
         record = self.env[self.res_model].browse(self.res_id).exists()
         if not record:
             return
-        for contentgrid_config in self.env["contentgrid.configuration"].search(
-            [
-                ("model_id.model", "=", self.res_model),
-                ("active", "=", True),
-            ],
-        ):
+        domain = [
+            ("model_id.model", "=", self.res_model),
+            ("active", "=", True),
+        ]
+        if manual_send:
+            domain.append(("allow_manual_send", "=", True))
+        for contentgrid_config in self.env["contentgrid.configuration"].search(domain):
             contentgrid_config._push_to_contentgrid(self, record)
 
     @api.model_create_multi
@@ -51,14 +52,6 @@ def _to_store(self, store: Store, **kwargs):
 
     def get_contentgrid_data(self):
         self.ensure_one()
-        result = []
-        for contentgrid_record in self.contentgrid_ids:
-            record_data = {
-                "res_model": contentgrid_record.res_model,
-                "res_id": contentgrid_record.res_id,
-                "name": contentgrid_record.name,
-            }
-            result.append(record_data)
         return [
             record._get_contentgrid_data() for record in self.contentgrid_ids.sudo()
         ]
diff --git a/contentgrid/models/mail_thread.py b/contentgrid/models/mail_thread.py
@@ -0,0 +1,51 @@
+# Copyright 2025 Dixmit
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+from odoo.tools.safe_eval import safe_eval
+
+from odoo.addons.mail.tools.discuss import Store
+
+
+class MailThread(models.AbstractModel):
+    _inherit = "mail.thread"
+
+    contentgrid_record_ids = fields.One2many(
+        "contentgrid.record",
+        "res_id",
+        domain=lambda self: [("res_model", "=", self._name)],
+    )
+
+    def _thread_to_store(self, store: Store, /, *, request_list=None, **kwargs):
+        result = super()._thread_to_store(store, request_list=request_list, **kwargs)
+        contentgrid_config = (
+            self.env["contentgrid.configuration"]
+            .search(
+                [
+                    ("model_id.model", "=", self._name),
+                    ("active", "=", True),
+                    ("allow_manual_send", "=", True),
+                ],
+            )
+            .filtered(lambda r: self.filtered_domain(safe_eval(r.domain)))
+        )
+        store.add(
+            self,
+            {
+                "contentgrid": bool(self.contentgrid_record_ids),
+                "sendContentGrid": bool(contentgrid_config),
+            },
+            as_thread=True,
+        )
+        return result
+
+    def get_contentgrid_data(self):
+        self.ensure_one()
+        return [
+            record._get_contentgrid_data()
+            for record in self.contentgrid_record_ids.sudo()
+        ]
+
+    def send_contentgrid_data(self):
+        self.ensure_one()
+        self.attachment_ids._push_to_contentgrid(manual_send=True)
diff --git a/contentgrid/readme/USAGE.md b/contentgrid/readme/USAGE.md
@@ -7,3 +7,12 @@ All integrated documents will have the contentgrid icon on the attachment:
 If you press the icon, a popup will be launched showing the information of it in contentgrid and a link to the app:
 
 ![ContentGrid Popup](../static/img/contentgrid_popup.png)
+
+Also, related records will show the same icon in the thread menu and will allow us to check the data sent to ContentGrid.
+
+![ContentGrid Thread](../static/img/contentgrid_thread.png)
+
+In case we want to force the send, we can do it manually by using the *Allow manual send* field on the configuration.
+This will show a button that sends the data to content grid (only attachments not sent)
+
+![ContentGrid Thread](../static/img/contentgrid_thread_force.png)
diff --git a/contentgrid/static/description/icon.png b/contentgrid/static/description/icon.png
diff --git a/contentgrid/static/description/index.html b/contentgrid/static/description/index.html
@@ -486,6 +486,13 @@ <h1><a class="toc-backref" href="#toc-entry-3">Usage</a></h1>
 <p>If you press the icon, a popup will be launched showing the information
 of it in contentgrid and a link to the app:</p>
 <p><img alt="ContentGrid Popup" src="https://raw.githubusercontent.com/dixmit/contentgrid/18.0/contentgrid/static/img/contentgrid_popup.png" /></p>
+<p>Also, related records will show the same icon in the thread menu and
+will allow us to check the data sent to ContentGrid.</p>
+<p><img alt="ContentGrid Thread" src="https://raw.githubusercontent.com/dixmit/contentgrid/18.0/contentgrid/static/img/contentgrid_thread.png" /></p>
+<p>In case we want to force the send, we can do it manually by using the
+<em>Allow manual send</em> field on the configuration. This will show a button
+that sends the data to content grid (only attachments not sent)</p>
+<p><img alt="image1" src="https://raw.githubusercontent.com/dixmit/contentgrid/18.0/contentgrid/static/img/contentgrid_thread_force.png" /></p>
 </div>
 <div class="section" id="bug-tracker">
 <h1><a class="toc-backref" href="#toc-entry-4">Bug Tracker</a></h1>
diff --git a/contentgrid/static/img/contentgrid_thread.png b/contentgrid/static/img/contentgrid_thread.png
diff --git a/contentgrid/static/img/contentgrid_thread_force.png b/contentgrid/static/img/contentgrid_thread_force.png
diff --git a/contentgrid/static/src/components/chatter/chatter.esm.js b/contentgrid/static/src/components/chatter/chatter.esm.js
@@ -0,0 +1,25 @@
+import {Chatter} from "@mail/chatter/web_portal/chatter";
+import {ContentGridDialog} from "../contentgrid_dialog/contentgrid_dialog.esm";
+import {patch} from "@web/core/utils/patch";
+import {useService} from "@web/core/utils/hooks";
+
+patch(Chatter.prototype, {
+    setup() {
+        super.setup();
+        this.orm = useService("orm");
+        this.dialog = useService("dialog");
+    },
+    async onClickContentGrid() {
+        const contentgrid_data = await this.orm.call(
+            this.state.thread.model,
+            "get_contentgrid_data",
+            [this.state.thread.id]
+        );
+        this.dialog.add(ContentGridDialog, {data: contentgrid_data});
+    },
+    async oClickSendContentGrid() {
+        await this.orm.call(this.state.thread.model, "send_contentgrid_data", [
+            this.state.thread.id,
+        ]);
+    },
+});
diff --git a/contentgrid/static/src/components/chatter/chatter.xml b/contentgrid/static/src/components/chatter/chatter.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates xml:space="preserve">
+    <t t-inherit="mail.Chatter" t-inherit-mode="extension">
+        <xpath expr="//div[hasclass('o-mail-Followers')]" position="before">
+            <button
+                t-if="state.thread and state.thread.contentgrid"
+                class="btn btn-link text-action"
+                t-on-click="onClickContentGrid"
+            >
+                <i
+                    class="fcg fcg-contentgrid"
+                    aria-hidden="ContentGrid"
+                    title="ContentGrid"
+                />
+            </button>
+        </xpath>
+        <xpath expr="//button[hasclass('o-mail-Chatter-activity')]" position="after">
+            <button
+                t-if="state.thread.sendContentGrid"
+                class="o-mail-Chatter-sendContentGrid btn btn-secondary text-nowrap ms-1"
+                t-att-class="{ 'my-2': !props.compactHeight }"
+                t-on-click="oClickSendContentGrid"
+            >
+                <i
+                    class="fcg fcg-contentgrid"
+                    aria-hidden="ContentGrid"
+                    title="ContentGrid"
+                />
+                <span>
+                            Send Content Grid
+                        </span>
+            </button>
+        </xpath>
+    </t>
+</templates>
diff --git a/contentgrid/static/src/components/contentgrid_dialog/contentgrid_dialog.esm.js b/contentgrid/static/src/components/contentgrid_dialog/contentgrid_dialog.esm.js
@@ -4,7 +4,6 @@ import {Dialog} from "@web/core/dialog/dialog";
 export class ContentGridDialog extends Component {
     setup() {
         super.setup();
-        console.log(this.props.data);
         this.state = useState({
             currentTab: this.props.data[0].id,
         });
@@ -30,4 +29,5 @@ ContentGridDialog.components = {Dialog};
 ContentGridDialog.template = "contentgrid.ContentGridDialog";
 ContentGridDialog.props = {
     data: {type: Object},
+    close: Function,
 };
diff --git a/contentgrid/views/contentgrid_configuration.xml b/contentgrid/views/contentgrid_configuration.xml
@@ -18,6 +18,7 @@
                         <field name="name" />
                         <field name="model_id" />
                         <field name="connection_id" />
+                        <field name="allow_manual_send" />
                         <field name="res_model" invisible="1" />
                         <field name="active" invisible="1" />
                     </group>

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,9 @@ class ContentgridConfiguration(models.Model):`
`47`	`47`	`comodel_name="contentgrid.connection", required=True`
`48`	`48`	`)`
`49`	`49`	`configuration_data = fields.Text(required=True)`
	`50`	`+ allow_manual_send = fields.Boolean(`
	`51`	`+ default=False,`
	`52`	`+ )`
`50`	`53`
`51`	`54`	`@api.constrains("configuration_data")`
`52`	`55`	`def _check_configuration_data(self):`