From 77fb6956dcf7b6675fd383876e788ec9437aeef3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20BEAU?= <sebastien.beau@akretion.com>
Date: Fri, 23 Oct 2020 16:23:29 +0200
Subject: [PATCH 1/3] [REF] refactor code, rename enabled to active, and
 simplifie run code

---
 .../models/attachment_synchronize_task.py     | 18 ++++++++-----
 attachment_synchronize/tests/test_import.py   |  2 +-
 .../attachment_synchronize_task_views.xml     | 26 +++++++++----------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/attachment_synchronize/models/attachment_synchronize_task.py b/attachment_synchronize/models/attachment_synchronize_task.py
index 436c79a6a..25688717e 100644
--- a/attachment_synchronize/models/attachment_synchronize_task.py
+++ b/attachment_synchronize/models/attachment_synchronize_task.py
@@ -89,7 +89,7 @@ class AttachmentSynchronizeTask(models.Model):
         "\nFurther operations will be realized on these Attachments Queues depending "
         "on their 'File Type' value.",
     )
-    enabled = fields.Boolean("Enabled", default=True)
+    active = fields.Boolean("Enabled", default=True, old="enabled")
     avoid_duplicated_files = fields.Boolean(
         string="Avoid importing duplicated files",
         help="If checked, a file will not be imported if an Attachment Queue with the "
@@ -139,11 +139,19 @@ class AttachmentSynchronizeTask(models.Model):
         if domain is None:
             domain = []
         domain = expression.AND(
-            [domain, [("method_type", "=", "import"), ("enabled", "=", True)]]
+            [domain, [("method_type", "=", "import")]]
         )
         for task in self.search(domain):
             task.run_import()
 
+    def run(self):
+        for record in self:
+            method = "run_{}".format(record.method_type)
+            if not hasattr(self, method):
+                raise NotImplemented
+            else:
+                getattr(record, method)()
+
     def run_import(self):
         self.ensure_one()
         attach_obj = self.env["attachment.queue"]
@@ -200,10 +208,6 @@ class AttachmentSynchronizeTask(models.Model):
         for task in self:
             task.attachment_ids.filtered(lambda a: a.state == "pending").run()
 
-    def button_toogle_enabled(self):
-        for rec in self:
-            rec.enabled = not rec.enabled
-
     def button_duplicate_record(self):
         self.ensure_one()
-        self.copy({"enabled": False})
+        self.copy({"active": False})
diff --git a/attachment_synchronize/tests/test_import.py b/attachment_synchronize/tests/test_import.py
index 611555763..a8b0031fc 100644
--- a/attachment_synchronize/tests/test_import.py
+++ b/attachment_synchronize/tests/test_import.py
@@ -78,6 +78,6 @@ class TestImport(SyncCommon):
         self._check_attachment_created(count=1)
 
     def test_running_cron_disable_task(self):
-        self.task.write({"after_import": "delete", "enabled": False})
+        self.task.write({"after_import": "delete", "active": False})
         self.env["attachment.synchronize.task"].run_task_import_scheduler()
         self._check_attachment_created(count=0)
diff --git a/attachment_synchronize/views/attachment_synchronize_task_views.xml b/attachment_synchronize/views/attachment_synchronize_task_views.xml
index 7fe1d7999..18f4a2dbc 100644
--- a/attachment_synchronize/views/attachment_synchronize_task_views.xml
+++ b/attachment_synchronize/views/attachment_synchronize_task_views.xml
@@ -5,16 +5,13 @@
         <field name="arch" type="xml">
             <form>
                 <header>
-                    <button name="run_import" type="object" string="Run Import" class="oe_read_only oe_highlight" icon="fa-play-circle" attrs="{'invisible': ['|', ('method_type', '!=', 'import'), ('enabled','=', False)]}"/>
-                </header>
-                <header>
-                    <button name="run_export" type="object" string="Run Export" class="oe_read_only oe_highlight" icon="fa-play-circle" attrs="{'invisible': ['|', ('method_type', '!=', 'export'), ('enabled','=', False)]}"/>
+                    <button name="run" type="object" string="Run" class="oe_read_only oe_highlight" icon="fa-play-circle" attrs="{'invisible': [('active','=', False)]}"/>
                 </header>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
-                        <button name="button_toogle_enabled" type="object" class="oe_stat_button" icon="fa-archive">
+                        <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
                             <field
-                              name="enabled"
+                              name="active"
                               widget="boolean_button"
                               options="{'terminology': {
                                   'string_true': 'Enabled',
@@ -70,16 +67,17 @@
     <record id="view_attachment_import_task_tree" model="ir.ui.view">
         <field name="model">attachment.synchronize.task</field>
         <field name="arch" type="xml">
-            <tree string="Tasks" decoration-muted="enabled == False">
+            <tree string="Tasks" decoration-muted="active == False">
                 <field name="name" select="1"/>
                 <field name="backend_id"/>
                 <field name="filepath"/>
                 <field name="pattern"/>
                 <field name="after_import"/>
                 <field name="move_path"/>
-                <field name="enabled" invisible="1"/>
+                <field name="active" invisible="1"/>
+                <button name="run" type="object" string="Run" icon="fa-play-circle"/>
                 <button name="button_duplicate_record" type="object" string="Copy" icon="fa-clone"/>
-                <button name="button_toogle_enabled" type="object" string="Enable" icon="fa-archive"/>
+                <button name="toggle_active" type="object" string="Active/Inactive" icon="fa-archive"/>
             </tree>
         </field>
     </record>
@@ -87,13 +85,13 @@
     <record id="view_attachment_export_task_tree" model="ir.ui.view">
         <field name="model">attachment.synchronize.task</field>
         <field name="arch" type="xml">
-            <tree string="Tasks" decoration-muted="enabled == False">
+            <tree string="Tasks" decoration-muted="active == False">
                 <field name="name" select="1"/>
                 <field name="backend_id"/>
                 <field name="filepath"/>
-                <field name="enabled" invisible="1"/>
+                <field name="active" invisible="1"/>
                 <button name="button_duplicate_record" type="object" string="Copy" icon="fa-clone"/>
-                <button name="button_toogle_enabled" type="object" string="Enable" icon="fa-archive"/>
+                <button name="toggle_active" type="object" string="Enable" icon="fa-archive"/>
             </tree>
         </field>
     </record>
@@ -120,7 +118,7 @@
         <field name="view_id" eval="False"/>
         <field name="search_view_id" ref="view_attachment_task_search"/>
         <field name="domain">[('method_type', '=', 'import')]</field>
-        <field name="context">{'default_method_type': 'import'}</field>
+        <field name="context">{'default_method_type': 'import', "active_test": False}</field>
     </record>
 
     <record id="act_open_attachment_import_task_view_tree" model="ir.actions.act_window.view">
@@ -152,7 +150,7 @@
         <field name="view_id" eval="False"/>
         <field name="search_view_id" ref="view_attachment_task_search"/>
         <field name="domain">[('method_type', '=', 'export')]</field>
-        <field name="context">{'default_method_type': 'export'}</field>
+        <field name="context">{'default_method_type': 'export', "active_test": False}</field>
     </record>
 
     <record id="act_open_attachment_export_task_view_tree" model="ir.actions.act_window.view">

From 1328114dd9b9e1b4f0c7ae1c36be3d81d0354b22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20BEAU?= <sebastien.beau@akretion.com>
Date: Fri, 23 Oct 2020 19:23:19 +0200
Subject: [PATCH 2/3] [IMP] add smart boutton on form view and action button
 with metric on tree view

---
 .../models/attachment_synchronize_task.py     | 10 ++
 .../views/attachment_queue_views.xml          | 21 ++++
 .../attachment_synchronize_task_views.xml     | 96 +++++++------------
 3 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/attachment_synchronize/models/attachment_synchronize_task.py b/attachment_synchronize/models/attachment_synchronize_task.py
index 25688717e..a7f03edc3 100644
--- a/attachment_synchronize/models/attachment_synchronize_task.py
+++ b/attachment_synchronize/models/attachment_synchronize_task.py
@@ -101,6 +101,16 @@ class AttachmentSynchronizeTask(models.Model):
         "related to this task.\nAn alert will be sent to these emails if any operation "
         "on these Attachment Queue's file type fails.",
     )
+    count_attachment_failed = fields.Integer(compute="_compute_count_state")
+    count_attachment_pending = fields.Integer(compute="_compute_count_state")
+    count_attachment_done = fields.Integer(compute="_compute_count_state")
+
+    def _compute_count_state(self):
+        for record in self:
+            for state in ["failed", "pending", "done"]:
+                record["count_attachment_{}".format(state)] = \
+                    len(record.attachment_ids.filtered(lambda r: r.state == state))
+
 
     def _prepare_attachment_vals(self, data, filename):
         self.ensure_one()
diff --git a/attachment_synchronize/views/attachment_queue_views.xml b/attachment_synchronize/views/attachment_queue_views.xml
index b62863594..16f993585 100644
--- a/attachment_synchronize/views/attachment_queue_views.xml
+++ b/attachment_synchronize/views/attachment_queue_views.xml
@@ -32,4 +32,25 @@
         </field>
     </record>
 
+    <record id="attachment_queue_view_search" model="ir.ui.view">
+        <field name="model">attachment.queue</field>
+        <field name="inherit_id" ref="attachment_queue.view_attachment_queue_search"/>
+        <field name="arch" type="xml">
+            <field name="type" position="after">
+                <field name="task_id" filter_domain="[('task_id.name','ilike',self)]"/>
+            </field>
+        </field>
+    </record>
+
+    <record id="action_attachment_queue_related" model="ir.actions.act_window">
+        <field name="name">Attachments Queue</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">attachment.queue</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" eval="False"/>
+        <field name="domain">[('task_id', '=', active_id)]</field>
+        <field name="search_view_id" ref="attachment_queue.view_attachment_queue_search"/>
+    </record>
+
 </odoo>
diff --git a/attachment_synchronize/views/attachment_synchronize_task_views.xml b/attachment_synchronize/views/attachment_synchronize_task_views.xml
index 18f4a2dbc..e25082bdd 100644
--- a/attachment_synchronize/views/attachment_synchronize_task_views.xml
+++ b/attachment_synchronize/views/attachment_synchronize_task_views.xml
@@ -9,6 +9,30 @@
                 </header>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
+                        <button name="%(action_attachment_queue_related)d" type="action" class="oe_stat_button" icon="fa-thumbs-o-down" context="{'search_default_failed': 1}">
+                            <div class="o_field_widget o_stat_info">
+                                <span class="o_stat_value">
+                                    <field name="count_attachment_failed" widget="statinfo" nolabel="1"/>
+                                </span>
+                                <span class="o_stat_text">Fail</span>
+                            </div>
+                        </button>
+                        <button  name="%(action_attachment_queue_related)d" type="action" class="oe_stat_button" icon="fa-spinner" context="{'search_default_pending': 1}">
+                            <div class="o_field_widget o_stat_info">
+                                <span class="o_stat_value">
+                                    <field name="count_attachment_pending" widget="statinfo" nolabel="1"/>
+                                </span>
+                                <span class="o_stat_text">Pending</span>
+                            </div>
+                        </button>
+                        <button name="%(action_attachment_queue_related)d" type="action" class="oe_stat_button" icon="fa-thumbs-o-up" context="{'search_default_done': 1}">
+                            <div class="o_field_widget o_stat_info">
+                                <span class="o_stat_value">
+                                    <field name="count_attachment_done" widget="statinfo" nolabel="1"/>
+                                </span>
+                                <span class="o_stat_text">Success</span>
+                            </div>
+                        </button>
                         <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
                             <field
                               name="active"
@@ -41,61 +65,37 @@
                         <field name="after_import" />
                         <field name="move_path" colspan="4" attrs="{'invisible':[('after_import','!=','move'), ('after_import','!=','move_rename')]}"/>
                         <field name="new_name" colspan="4" attrs="{'invisible': [('after_import','!=','rename'), ('after_import','!=','move_rename')]}"/>
+                        <field name="file_type"/>
                     </group>
-                    <group string="Attachments">
-                        <group>
-                            <field name="file_type" attrs="{'invisible':[('method_type','!=','import')]}" />
-                            <field name="failure_emails" />
-                        </group>
-                        <field name="attachment_ids" domain="[('task_id', '=', id)]" nolabel="1" attrs="{'invisible':[('method_type','!=','export')]}">
-                            <tree>
-                                <field name="name"/>
-                                <field name="datas_fname"/>
-                                <field name="file_type"/>
-                                <field name="storage_backend_id"/>
-                                <field name="type"/>
-                                <field name="create_date"/>
-                                <field name="state"/>
-                            </tree>
-                        </field>
+                    <group string="Notification">
+                        <field name="failure_emails"/>
                     </group>
                 </sheet>
             </form>
         </field>
     </record>
 
-    <record id="view_attachment_import_task_tree" model="ir.ui.view">
+    <record id="view_attachment_task_tree" model="ir.ui.view">
         <field name="model">attachment.synchronize.task</field>
         <field name="arch" type="xml">
             <tree string="Tasks" decoration-muted="active == False">
                 <field name="name" select="1"/>
                 <field name="backend_id"/>
                 <field name="filepath"/>
-                <field name="pattern"/>
-                <field name="after_import"/>
-                <field name="move_path"/>
                 <field name="active" invisible="1"/>
                 <button name="run" type="object" string="Run" icon="fa-play-circle"/>
+                <field name="count_attachment_failed" string=" "/>
+                <button name="%(action_attachment_queue_related)d" type="action" icon="fa-thumbs-o-down" context="{'search_default_failed': 1}"/>
+                <field name="count_attachment_pending" string=" "/>
+                <button  name="%(action_attachment_queue_related)d" type="action" icon="fa-spinner" context="{'search_default_pending': 1}"/>
+                <field name="count_attachment_done" string=" "/>
+                <button name="%(action_attachment_queue_related)d" type="action" icon="fa-thumbs-o-up" context="{'search_default_done': 1}"/>
                 <button name="button_duplicate_record" type="object" string="Copy" icon="fa-clone"/>
                 <button name="toggle_active" type="object" string="Active/Inactive" icon="fa-archive"/>
             </tree>
         </field>
     </record>
 
-    <record id="view_attachment_export_task_tree" model="ir.ui.view">
-        <field name="model">attachment.synchronize.task</field>
-        <field name="arch" type="xml">
-            <tree string="Tasks" decoration-muted="active == False">
-                <field name="name" select="1"/>
-                <field name="backend_id"/>
-                <field name="filepath"/>
-                <field name="active" invisible="1"/>
-                <button name="button_duplicate_record" type="object" string="Copy" icon="fa-clone"/>
-                <button name="toggle_active" type="object" string="Enable" icon="fa-archive"/>
-            </tree>
-        </field>
-    </record>
-
     <record id="view_attachment_task_search" model="ir.ui.view">
         <field name="model">attachment.synchronize.task</field>
         <field name="arch" type="xml">
@@ -121,20 +121,6 @@
         <field name="context">{'default_method_type': 'import', "active_test": False}</field>
     </record>
 
-    <record id="act_open_attachment_import_task_view_tree" model="ir.actions.act_window.view">
-        <field eval="10" name="sequence"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="view_attachment_import_task_tree"/>
-        <field name="act_window_id" ref="action_attachment_import_task"/>
-    </record>
-
-    <record id="act_open_attachment_import_task_view_form" model="ir.actions.act_window.view">
-        <field eval="10" name="sequence"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="view_attachment_task_form"/>
-        <field name="act_window_id" ref="action_attachment_import_task"/>
-    </record>
-
     <menuitem id="menu_attachment_import_task"
     parent="base.next_id_9"
     sequence="21"
@@ -153,20 +139,6 @@
         <field name="context">{'default_method_type': 'export', "active_test": False}</field>
     </record>
 
-    <record id="act_open_attachment_export_task_view_tree" model="ir.actions.act_window.view">
-        <field eval="10" name="sequence"/>
-        <field name="view_mode">tree</field>
-        <field name="view_id" ref="view_attachment_export_task_tree"/>
-        <field name="act_window_id" ref="action_attachment_export_task"/>
-    </record>
-
-    <record id="act_open_attachment_export_task_view_form" model="ir.actions.act_window.view">
-        <field eval="10" name="sequence"/>
-        <field name="view_mode">form</field>
-        <field name="view_id" ref="view_attachment_task_form"/>
-        <field name="act_window_id" ref="action_attachment_export_task"/>
-    </record>
-
     <menuitem id="menu_attachment_export_task"
     parent="base.next_id_9"
     sequence="22"

From 033e82510d8898c452259c8f7903e6520f2d8faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20BEAU?= <sebastien.beau@akretion.com>
Date: Fri, 23 Oct 2020 22:29:27 +0200
Subject: [PATCH 3/3] [REF] make menu more consistent

In normal tree view duplicate and archive can be done throught the
action menu. So we only need to show this button when this tree view
are included in a form using a o2m or m2m.
So this visibility can be activated by passing value in the context

Also make the copy consitent whatever way you do it
---
 .../models/attachment_synchronize_task.py         | 15 ++++++++++++---
 .../views/attachment_synchronize_task_views.xml   |  4 ++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/attachment_synchronize/models/attachment_synchronize_task.py b/attachment_synchronize/models/attachment_synchronize_task.py
index a7f03edc3..96a16fb6e 100644
--- a/attachment_synchronize/models/attachment_synchronize_task.py
+++ b/attachment_synchronize/models/attachment_synchronize_task.py
@@ -111,7 +111,6 @@ class AttachmentSynchronizeTask(models.Model):
                 record["count_attachment_{}".format(state)] = \
                     len(record.attachment_ids.filtered(lambda r: r.state == state))
 
-
     def _prepare_attachment_vals(self, data, filename):
         self.ensure_one()
         vals = {
@@ -219,5 +218,15 @@ class AttachmentSynchronizeTask(models.Model):
             task.attachment_ids.filtered(lambda a: a.state == "pending").run()
 
     def button_duplicate_record(self):
-        self.ensure_one()
-        self.copy({"active": False})
+        # due to orm limitation method call from ui should not have params
+        # so we need to define this method to be able to copy
+        # if we do not do this the context will be injected in default params
+        # in V14 maybe we can call copy directly
+        self.copy()
+
+    def copy(self, default=None):
+        if default is None:
+            default = {}
+        if "active" not in default:
+            default["active"] = False
+        return super().copy(default=default)
diff --git a/attachment_synchronize/views/attachment_synchronize_task_views.xml b/attachment_synchronize/views/attachment_synchronize_task_views.xml
index e25082bdd..76a4ed76d 100644
--- a/attachment_synchronize/views/attachment_synchronize_task_views.xml
+++ b/attachment_synchronize/views/attachment_synchronize_task_views.xml
@@ -90,8 +90,8 @@
                 <button  name="%(action_attachment_queue_related)d" type="action" icon="fa-spinner" context="{'search_default_pending': 1}"/>
                 <field name="count_attachment_done" string=" "/>
                 <button name="%(action_attachment_queue_related)d" type="action" icon="fa-thumbs-o-up" context="{'search_default_done': 1}"/>
-                <button name="button_duplicate_record" type="object" string="Copy" icon="fa-clone"/>
-                <button name="toggle_active" type="object" string="Active/Inactive" icon="fa-archive"/>
+                <button name="button_duplicate_record" type="object" string="Copy" icon="fa-clone" invisible="not context.get('show_duplicate_button')"/>
+                <button name="toggle_active" type="object" string="Active/Inactive" icon="fa-archive" invisible="not context.get('show_toggle_active_button')"/>
             </tree>
         </field>
     </record>