From 25b5ab1bc3ddf53558b439cd8b5f8932f159b948 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@openerp.com>
Date: Sat, 8 Oct 2022 09:39:10 +0000
Subject: [PATCH] [IMP] im_livechat: cleanup broken form views
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes odoo/odoo#102773

X-original-commit: 7140ed65fe45ec782999151e1c9878f28ab2ccc9
Signed-off-by: Fabien Pinckaers <fp@odoo.com>
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../models/chatbot_script_answer.py           |  2 +-
 .../views/chatbot_script_step_views.xml       | 46 ++++++++++---------
 .../views/chatbot_script_views.xml            |  6 +--
 .../views/im_livechat_channel_views.xml       | 44 ++++++++----------
 4 files changed, 45 insertions(+), 53 deletions(-)

diff --git a/addons/im_livechat/models/chatbot_script_answer.py b/addons/im_livechat/models/chatbot_script_answer.py
index 1d14db22cd5..9b5cce42db3 100644
--- a/addons/im_livechat/models/chatbot_script_answer.py
+++ b/addons/im_livechat/models/chatbot_script_answer.py
@@ -12,7 +12,7 @@ class ChatbotScriptAnswer(models.Model):
     _description = 'Chatbot Script Answer'
     _order = 'script_step_id, sequence, id'
 
-    name = fields.Char(string='Name', required=True, translate=True)
+    name = fields.Char(string='Answer', required=True, translate=True)
     sequence = fields.Integer(string='Sequence', default=1)
     redirect_link = fields.Char('Redirect Link',
         help="The visitor will be redirected to this link upon clicking the option "
diff --git a/addons/im_livechat/views/chatbot_script_step_views.xml b/addons/im_livechat/views/chatbot_script_step_views.xml
index 9452abf138f..ba2471efce5 100644
--- a/addons/im_livechat/views/chatbot_script_step_views.xml
+++ b/addons/im_livechat/views/chatbot_script_step_views.xml
@@ -15,28 +15,30 @@
                 </div>
                 <sheet>
                     <group>
-                        <field name="sequence" invisible="1"/>
-                        <field name="message" widget="text_emojis" placeholder="e.g. 'How can I help you?'"
-                            attrs="{'required': [('step_type', '!=', 'forward_operator')]}"/>
-                        <field name="chatbot_script_id" invisible="1"/>
-                        <field name="step_type"/>
-                        <field name="triggering_answer_ids" widget="chatbot_triggering_answers_widget"
-                                options="{'no_create': True}">
-                            <tree>
-                                <!-- added only to correctly fetch the display_name for the tag display -->
-                                <field name="display_name" invisible="1"/>
-                            </tree>
-                        </field>
-                    </group>
-                    <group>
-                        <field name="answer_ids" attrs="{'invisible': [('step_type', '!=', 'question_selection')]}" nolabel="1">
-                            <tree editable="bottom">
-                                <field name="sequence" widget="handle"/>
-                                <field name="display_name" invisible="1"/>
-                                <field name="name"/>
-                                <field name="redirect_link" string="Optional Link"/>
-                            </tree>
-                        </field>
+                        <group>
+                            <field name="sequence" invisible="1"/>
+                            <field name="message" widget="text_emojis" placeholder="e.g. 'How can I help you?'"
+                                attrs="{'required': [('step_type', '!=', 'forward_operator')]}"/>
+                            <field name="chatbot_script_id" invisible="1"/>
+                            <field name="step_type"/>
+                            <field name="triggering_answer_ids" widget="chatbot_triggering_answers_widget"
+                                    options="{'no_create': True}">
+                                <tree>
+                                    <!-- added only to correctly fetch the display_name for the tag display -->
+                                    <field name="display_name" invisible="1"/>
+                                </tree>
+                            </field>
+                        </group>
+                        <group>
+                            <field name="answer_ids" attrs="{'invisible': [('step_type', '!=', 'question_selection')]}" nolabel="1" colspan="2">
+                                <tree editable="bottom">
+                                    <field name="sequence" widget="handle"/>
+                                    <field name="display_name" invisible="1"/>
+                                    <field name="name"/>
+                                    <field name="redirect_link" string="Optional Link"/>
+                                </tree>
+                            </field>
+                        </group>
                     </group>
                 </sheet>
             </form>
diff --git a/addons/im_livechat/views/chatbot_script_views.xml b/addons/im_livechat/views/chatbot_script_views.xml
index ae6b9285429..de67db5ce19 100644
--- a/addons/im_livechat/views/chatbot_script_views.xml
+++ b/addons/im_livechat/views/chatbot_script_views.xml
@@ -34,10 +34,8 @@
                     </div>
                     <notebook>
                         <page string="Script">
-                            <group colspan="2">
-                                <field name="script_step_ids" widget="chatbot_steps_one2many" nolabel="1"
-                                    context="{'chatbot_script_answer_display_short_name': 1}"/>
-                            </group>
+                            <field name="script_step_ids" widget="chatbot_steps_one2many" nolabel="1"
+                                context="{'chatbot_script_answer_display_short_name': 1}"/>
                         </page>
                     </notebook>
                 </sheet>
diff --git a/addons/im_livechat/views/im_livechat_channel_views.xml b/addons/im_livechat/views/im_livechat_channel_views.xml
index e580c8e4e99..23fd496f7bb 100644
--- a/addons/im_livechat/views/im_livechat_channel_views.xml
+++ b/addons/im_livechat/views/im_livechat_channel_views.xml
@@ -98,8 +98,7 @@
                         </div>
                         <notebook>
                             <page string="Operators" name="operators">
-                                <group>
-                                    <field name="user_ids" nolabel="1" colspan="2">
+                                    <field name="user_ids" colspan="2">
                                         <kanban>
                                             <field name="id"/>
                                             <field name="name"/>
@@ -117,10 +116,9 @@
                                             </templates>
                                         </kanban>
                                     </field>
-                                    <p class="text-muted" style="padding-left: 8px">
+                                    <p class="text-muted" colspan="2">
                                         Operators that do not show any activity In Odoo for more than 30 minutes will be considered as disconnected.
                                     </p>
-                                </group>
                             </page>
                             <page string="Options" name="options">
                                 <group>
@@ -146,31 +144,25 @@
                                 </group>
                             </page>
                             <page string="Channel Rules" name="channel_rules">
-                                <span class="text-muted">Define rules for your live support channel. You can apply an action for the given URL, and per country.<br />To identify the country, GeoIP must be installed on your server, otherwise, the countries of the rule will not be taken into account.</span>
-                                <group>
-                                    <field name="rule_ids" nolabel="1"/>
-                                </group>
+                                <field name="rule_ids" colspan="2"/>
+                                <div class="text-muted" colspan="2">Define rules for your live support channel. You can apply an action for the given URL, and per country.<br />To identify the country, GeoIP must be installed on your server, otherwise, the countries of the rule will not be taken into account.</div>
                             </page>
                             <page string="Widget" name="configuration_widget">
-                                <group attrs='{"invisible": [["web_page", "!=", False]]}'>
-                                    <div class="alert alert-warning mt4 mb16" role="alert">
+                                <div class="alert alert-warning mt4 mb16" role="alert" attrs='{"invisible": [["web_page", "!=", False]]}'>
                                     Save your Channel to get your configuration widget.
-                                    </div>
-                                </group>
-                                <group>
-                                    <div attrs='{"invisible": [["web_page", "=", False]]}'>
-                                        <separator string="How to use the Website Live Chat widget?"/>
-                                        <p>
-                                            Copy and paste this code into your website, within the &lt;head&gt; tag:
-                                        </p>
-                                        <field name="script_external" readonly="1" widget="CopyClipboardText"/>
-                                        <p>
-                                            or copy this url and send it by email to your customers or suppliers:
-                                        </p>
-                                        <field name="web_page" readonly="1" widget="CopyClipboardChar"/>
-                                        <p>For websites built with the Odoo CMS, go to Website > Configuration > Settings and select the Website Live Chat Channel you want to add to your website.</p>
-                                    </div>
-                                </group>
+                                </div>
+                                <div attrs='{"invisible": [["web_page", "=", False]]}'>
+                                    <separator string="How to use the Website Live Chat widget?"/>
+                                    <p>
+                                        Copy and paste this code into your website, within the &lt;head&gt; tag:
+                                    </p>
+                                    <field name="script_external" readonly="1" widget="CopyClipboardText"/>
+                                    <p>
+                                        or copy this url and send it by email to your customers or suppliers:
+                                    </p>
+                                    <field name="web_page" readonly="1" widget="CopyClipboardChar"/>
+                                    <p>For websites built with the Odoo CMS, go to Website > Configuration > Settings and select the Website Live Chat Channel you want to add to your website.</p>
+                                </div>
                             </page>
                         </notebook>
                     </sheet>