summaryrefslogtreecommitdiff
path: root/addons/im_livechat
diff options
context:
space:
mode:
authorJulien Giannone <jgi@odoo.com>2021-02-10 08:15:20 +0000
committerJulien Giannone <jgi@odoo.com>2021-02-23 07:27:10 +0000
commitbecb242a43ed559bc7729b979f03743b729ce16c (patch)
treea87c00831835b1bdfd95dc519e866deb66329fae /addons/im_livechat
parent6e47db5efcd78157f054144315a4812bbb6fbbd9 (diff)
[FIX] im_livechat: Unpin livechat channel for admin when no message sent
This commit unpins a livechat channel initiated by an admin when it's closed and no message has been sent closes odoo/odoo#66178 Task-id: 2276571 Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
Diffstat (limited to 'addons/im_livechat')
-rw-r--r--addons/im_livechat/static/src/bugfix/bugfix.js24
-rw-r--r--addons/im_livechat/static/src/components/chat_window_manager/chat_window_manager_tests.js73
-rw-r--r--addons/im_livechat/views/im_livechat_channel_templates.xml1
3 files changed, 98 insertions, 0 deletions
diff --git a/addons/im_livechat/static/src/bugfix/bugfix.js b/addons/im_livechat/static/src/bugfix/bugfix.js
index 8e0a4170e09..2a81f5e2d26 100644
--- a/addons/im_livechat/static/src/bugfix/bugfix.js
+++ b/addons/im_livechat/static/src/bugfix/bugfix.js
@@ -7,4 +7,28 @@
odoo.define('im_livechat/static/src/bugfix/bugfix.js', function (require) {
'use strict';
+const {
+ registerInstancePatchModel,
+} = require('mail/static/src/model/model_core.js');
+
+registerInstancePatchModel('mail.chat_window', 'im_livechat/static/src/models/chat_window/chat_window.js', {
+
+ /**
+ * @override
+ */
+ close({ notifyServer } = {}) {
+ if (
+ this.thread &&
+ this.thread.model === 'mail.channel' &&
+ this.thread.channel_type === 'livechat' &&
+ this.thread.mainCache.isLoaded &&
+ this.thread.messages.length === 0
+ ) {
+ notifyServer = true;
+ this.thread.unpin();
+ }
+ this._super({ notifyServer });
+ }
+});
+
});
diff --git a/addons/im_livechat/static/src/components/chat_window_manager/chat_window_manager_tests.js b/addons/im_livechat/static/src/components/chat_window_manager/chat_window_manager_tests.js
new file mode 100644
index 00000000000..8d782924c90
--- /dev/null
+++ b/addons/im_livechat/static/src/components/chat_window_manager/chat_window_manager_tests.js
@@ -0,0 +1,73 @@
+odoo.define('im_livechat/static/src/components/chat_window_manager/chat_window_manager_tests.js', function (require) {
+'use strict';
+
+const {
+ afterEach,
+ afterNextRender,
+ beforeEach,
+ start,
+} = require('mail/static/src/utils/test_utils.js');
+
+QUnit.module('im_livechat', {}, function () {
+QUnit.module('components', {}, function () {
+QUnit.module('chat_window_manager', {}, function () {
+QUnit.module('chat_window_manager_tests.js', {
+ beforeEach() {
+ beforeEach(this);
+
+ this.start = async params => {
+ const { afterEvent, env, widget } = await start(Object.assign(
+ { hasChatWindow: true, hasMessagingMenu: true },
+ params,
+ { data: this.data }
+ ));
+ this.debug = params && params.debug;
+ this.afterEvent = afterEvent;
+ this.env = env;
+ this.widget = widget;
+ };
+ },
+ afterEach() {
+ afterEach(this);
+ },
+});
+
+QUnit.test('closing a chat window with no message from admin side unpins it', async function (assert) {
+ assert.expect(1);
+
+ this.data['res.partner'].records.push({ id: 10, name: "Demo" });
+ this.data['res.users'].records.push({
+ id: 42,
+ partner_id: 10,
+ });
+ this.data['mail.channel'].records.push(
+ {
+ channel_type: "livechat",
+ id: 10,
+ is_pinned: true,
+ members: [this.data.currentPartnerId, 10],
+ uuid: 'channel-10-uuid',
+ },
+ );
+ await this.start();
+
+ await afterNextRender(() => document.querySelector(`.o_MessagingMenu_toggler`).click());
+ await afterNextRender(() => document.querySelector(`.o_NotificationList_preview`).click());
+ await afterNextRender(() => document.querySelector(`.o_ChatWindowHeader_commandClose`).click());
+ const channels = await this.env.services.rpc({
+ model: 'mail.channel',
+ method: 'read',
+ args: [10],
+ }, { shadow: true });
+ assert.strictEqual(
+ channels[0].is_pinned,
+ false,
+ 'Livechat channel should not be pinned',
+ );
+});
+
+});
+});
+});
+
+});
diff --git a/addons/im_livechat/views/im_livechat_channel_templates.xml b/addons/im_livechat/views/im_livechat_channel_templates.xml
index 05fcf528240..da4a0a628dd 100644
--- a/addons/im_livechat/views/im_livechat_channel_templates.xml
+++ b/addons/im_livechat/views/im_livechat_channel_templates.xml
@@ -31,6 +31,7 @@
<template id="qunit_suite" name="livechat_tests" inherit_id="web.qunit_suite_tests">
<xpath expr="." position="inside">
<script type="text/javascript" src="/im_livechat/static/src/bugfix/bugfix_tests.js"></script>
+ <script type="text/javascript" src="/im_livechat/static/src/components/chat_window_manager/chat_window_manager_tests.js"/>
<script type="text/javascript" src="/im_livechat/static/src/components/composer/composer_tests.js"></script>
<script type="text/javascript" src="/im_livechat/static/src/components/discuss/discuss_tests.js"></script>
<script type="text/javascript" src="/im_livechat/static/src/components/messaging_menu/messaging_menu_tests.js"/>