From cf3456038333a83cd7d34ca543fb1666af8adb0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20K=C3=BChn?= <aku@odoo.com>
Date: Fri, 7 Oct 2022 15:26:41 +0000
Subject: [PATCH] [FIX] im_livechat, *: Fix broken test page of chatbot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

*: website_livechat

Task-3006246
Task-3010911

closes odoo/odoo#102985

X-original-commit: 59002571344405ce4fb691761f62d4fb909ffc17
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../static/src/public_models/chatbot.js       |  2 +-
 .../src/public_models/livechat_button_view.js |  3 -
 .../public_models/public_livechat_global.js   | 17 +++++-
 .../views/im_livechat_chatbot_templates.xml   | 12 ++--
 addons/website_livechat/__manifest__.py       |  1 -
 .../website_livechat_chatbot_test_script.js   | 61 -------------------
 .../src/public_models/livechat_button_view.js |  2 +-
 .../public_models/public_livechat_global.js   | 24 +++++++-
 8 files changed, 47 insertions(+), 75 deletions(-)
 delete mode 100644 addons/website_livechat/static/src/legacy/website_livechat_chatbot_test_script.js

diff --git a/addons/im_livechat/static/src/public_models/chatbot.js b/addons/im_livechat/static/src/public_models/chatbot.js
index d5a2ed5ed0c..4b0c9bc997a 100644
--- a/addons/im_livechat/static/src/public_models/chatbot.js
+++ b/addons/im_livechat/static/src/public_models/chatbot.js
@@ -367,7 +367,7 @@ registerModel({
         data: attr({
             compute() {
                 if (this.messaging.publicLivechatGlobal.isTestChatbot) {
-                    return this.messaging.publicLivechatGlobal.testChatbotData.chatbot;
+                    return this.messaging.publicLivechatGlobal.testChatbotData;
                 }
                 if (this.state === 'init') {
                     return this.messaging.publicLivechatGlobal.rule.chatbot;
diff --git a/addons/im_livechat/static/src/public_models/livechat_button_view.js b/addons/im_livechat/static/src/public_models/livechat_button_view.js
index c8e2b266f51..7b448826b1a 100644
--- a/addons/im_livechat/static/src/public_models/livechat_button_view.js
+++ b/addons/im_livechat/static/src/public_models/livechat_button_view.js
@@ -450,9 +450,6 @@ registerModel({
         }),
         serverUrl: attr({
             compute() {
-                if (this.messaging.publicLivechatGlobal.chatbot.isActive) {
-                    return this.messaging.publicLivechatGlobal.chatbot.serverUrl;
-                }
                 return this.messaging.publicLivechatGlobal.serverUrl;
             },
         }),
diff --git a/addons/im_livechat/static/src/public_models/public_livechat_global.js b/addons/im_livechat/static/src/public_models/public_livechat_global.js
index ede12d1b553..eac4083035d 100644
--- a/addons/im_livechat/static/src/public_models/public_livechat_global.js
+++ b/addons/im_livechat/static/src/public_models/public_livechat_global.js
@@ -192,6 +192,12 @@ registerModel({
             default: false,
         }),
         isTestChatbot: attr({
+            compute() {
+                if (!this.options) {
+                    return clear();
+                }
+                return Boolean(this.options.isTestChatbot);
+            },
             default: false,
         }),
         lastMessage: one('PublicLivechatMessage', {
@@ -204,7 +210,7 @@ registerModel({
         }),
         livechatButtonView: one('LivechatButtonView', {
             compute() {
-                if (this.isAvailable && this.isAvailableForMe && this.hasLoadedQWebTemplate && this.env.services.public_livechat_service) {
+                if (this.isAvailable && (this.isAvailableForMe || this.isTestChatbot) && this.hasLoadedQWebTemplate && this.env.services.public_livechat_service) {
                     return {};
                 }
                 return clear();
@@ -227,7 +233,14 @@ registerModel({
             default: '',
         }),
         sessionCookie: attr(),
-        testChatbotData: attr(),
+        testChatbotData: attr({
+            compute() {
+                if (!this.options) {
+                    return clear();
+                }
+                return this.options.testChatbotData;
+            },
+        }),
         welcomeMessages: many('PublicLivechatMessage', {
             compute() {
                 return this.messages.filter((message) => {
diff --git a/addons/im_livechat/views/im_livechat_chatbot_templates.xml b/addons/im_livechat/views/im_livechat_chatbot_templates.xml
index bbe8bc25525..a62eadae237 100644
--- a/addons/im_livechat/views/im_livechat_chatbot_templates.xml
+++ b/addons/im_livechat/views/im_livechat_chatbot_templates.xml
@@ -2,15 +2,17 @@
 <odoo>
     <data>
         <template id="chatbot_test_script_page">
+            <script>
+                <t t-call="im_livechat.loader">
+                    <t t-set="info" t-value="{ 'available': True, 'options': { 'isTestChatbot': True, 'testChatbotChannelData': channel_data, 'testChatbotData': chatbot_data }, 'server_url': server_url }"/>
+                </t>
+            </script>
             <t t-call="web.frontend_layout">
                 <t t-set="no_livechat" t-value="True"/>
                 <t t-set="title" t-value="chatbot_data['chatbot_name']"/>
 
-                <div id="wrap" class="o_livechat_js_chatbot_test_script"
-                    t-att-data-chatbot="json.dumps(chatbot_data)"
-                    t-att-data-channel="json.dumps(channel_data)"
-                    t-att-data-server-url="server_url">
-                        <div groups="im_livechat.im_livechat_group_user" t-ignore="true"
+                <div id="wrap">
+                    <div groups="im_livechat.im_livechat_group_user" t-ignore="true"
                             class="alert alert-info alert-dismissible rounded-0 fade show d-print-none css_editable_mode_hidden mb-0">
                         <div t-ignore="true" class="text-center">
                             <a t-attf-href="/web#view_type=form&amp;model=chatbot.script&amp;id=#{chatbot_data['chatbot_script_id']}&amp;action=im_livechat.chatbot_script_action">
diff --git a/addons/website_livechat/__manifest__.py b/addons/website_livechat/__manifest__.py
index 8a9f0346739..ae3dc016f95 100644
--- a/addons/website_livechat/__manifest__.py
+++ b/addons/website_livechat/__manifest__.py
@@ -37,7 +37,6 @@ Allow website visitors to chat with the collaborators. This module also brings a
         ],
         'web.assets_frontend': [
             'website_livechat/static/src/legacy/public_livechat.js',
-            'website_livechat/static/src/legacy/website_livechat_chatbot_test_script.js',
             'website_livechat/static/src/legacy/public_livechat.scss',
         ],
         'website.assets_wysiwyg': [
diff --git a/addons/website_livechat/static/src/legacy/website_livechat_chatbot_test_script.js b/addons/website_livechat/static/src/legacy/website_livechat_chatbot_test_script.js
deleted file mode 100644
index a9a78d557ce..00000000000
--- a/addons/website_livechat/static/src/legacy/website_livechat_chatbot_test_script.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/** @odoo-module alias=website_livechat.chatbot_test_script **/
-
-import publicWidget from 'web.public.widget';
-import {deleteCookie} from 'web.utils.cookies';
-
-import LivechatButton from '@im_livechat/legacy/widgets/livechat_button';
-
-/**
- * Override of the LivechatButton to create a testing environment for the chatbot script.
- *
- * The biggest difference here is that we don't have a 'im_livechat.channel' to work with.
- * The 'mail.channel' holding the conversation between the bot and the testing user has been created
- * by the 'chatbot/<model("chatbot.script"):chatbot>/test' endpoint.
- */
-const LivechatButtonTestChatbot = LivechatButton.extend({
-    /**
-     * Initialize various data received from the 'chatbot_test_script_page' template.
-     */
-    init: function (parent, messaging, chatbotData) {
-        this._super(...arguments);
-
-        this.messaging.publicLivechatGlobal.livechatButtonView.update({
-            rule: {
-                'action': 'auto_popup',
-                'auto_popup_timer': 0,
-            },
-        });
-        this.messaging.publicLivechatGlobal.update({ isTestChatbot: true });
-        this.messaging.publicLivechatGlobal.update({ testChatbotData: chatbotData.chatbot });
-        this.messaging.publicLivechatGlobal.chatbot.update({
-            currentStep: {
-                data: this.messaging.publicLivechatGlobal.chatbot.lastWelcomeStep,
-            },
-        });
-    },
-});
-
-publicWidget.registry.livechatChatbotTestScript = publicWidget.Widget.extend({
-    selector: '.o_livechat_js_chatbot_test_script',
-    init(parent) {
-        this._super(...arguments);
-        this.env = parent.env;
-    },
-    /**
-     * Remove any existing session cookie to start fresh
-     */
-    async start() {
-        deleteCookie('im_livechat_session');
-        deleteCookie('im_livechat_auto_popup');
-        deleteCookie('im_livechat_history');
-        deleteCookie('im_livechat_previous_operator_pid');
-        const messaging = await this.env.services.messaging.get();
-        return this._super(...arguments).then(() => {
-            messaging.update({
-                publicLivechatGlobal: { isAvailable: true, chatbot: { serverUrl: this.$el.data().serverUrl } },
-            });
-            this.livechatButton = new LivechatButtonTestChatbot(this, messaging, this.$el.data());
-            this.livechatButton.appendTo(document.body);
-        });
-    }
-});
diff --git a/addons/website_livechat/static/src/public_models/livechat_button_view.js b/addons/website_livechat/static/src/public_models/livechat_button_view.js
index ca2c807f2a8..d05d302dc15 100644
--- a/addons/website_livechat/static/src/public_models/livechat_button_view.js
+++ b/addons/website_livechat/static/src/public_models/livechat_button_view.js
@@ -40,7 +40,7 @@ registerPatch({
                 return this._super();
             }
             this.messaging.publicLivechatGlobal.update({
-                publicLivechat: { data: this.messaging.publicLivechatGlobal.testChatbotData.channel },
+                publicLivechat: { data: this.messaging.publicLivechatGlobal.options.testChatbotChannelData },
             });
             await this.openChatWindow();
             this.widget._sendWelcomeMessage();
diff --git a/addons/website_livechat/static/src/public_models/public_livechat_global.js b/addons/website_livechat/static/src/public_models/public_livechat_global.js
index 76076256d9d..9a749b59350 100644
--- a/addons/website_livechat/static/src/public_models/public_livechat_global.js
+++ b/addons/website_livechat/static/src/public_models/public_livechat_global.js
@@ -2,7 +2,7 @@
 
 import { registerPatch } from '@mail/model/model_core';
 
-import {setCookie} from 'web.utils.cookies';
+import { deleteCookie, setCookie } from 'web.utils.cookies';
 
 registerPatch({
     name: 'PublicLivechatGlobal',
@@ -19,6 +19,28 @@ registerPatch({
          */
         willStart() {
             if (this.isTestChatbot) {
+                /**
+                 * Override of the LivechatButton to create a testing environment for the chatbot script.
+                 *
+                 * The biggest difference here is that we don't have a 'im_livechat.channel' to work with.
+                 * The 'mail.channel' holding the conversation between the bot and the testing user has been created
+                 * by the 'chatbot/<model("chatbot.script"):chatbot>/test' endpoint.
+                 */
+                deleteCookie('im_livechat_session');
+                deleteCookie('im_livechat_auto_popup');
+                deleteCookie('im_livechat_history');
+                deleteCookie('im_livechat_previous_operator_pid');
+                this.update({
+                    rule: {
+                        'action': 'auto_popup',
+                        'auto_popup_timer': 0,
+                    },
+                });
+                this.chatbot.update({
+                    currentStep: {
+                        data: this.chatbot.lastWelcomeStep,
+                    },
+                });
                 /**
                  * Overridden to avoid calling the "init" endpoint as it
                  * requires a im_livechat.channel linked to work properly.