From 9ba879fc614c1188396b18e9e824765b32bc49bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20K=C3=BChn?= Date: Mon, 27 Jul 2020 16:09:07 +0000 Subject: [PATCH] [FIX] im_livechat: hide 'add attachment' button in livechat Message attachments are not yet supported in livechat for livechat visitors, so the "Add file" button should not be visible. closes #54927 Forward-port-of: #54972 Forward-port-of: #54957 X-original-commit: 91a548a6a7456dfd50833671a3938fcf55ed18c6 --- addons/im_livechat/__manifest__.py | 1 + .../src/components/composer/composer.xml | 10 +++ .../src/components/composer/composer_tests.js | 75 +++++++++++++++++++ .../views/im_livechat_channel_templates.xml | 1 + 4 files changed, 87 insertions(+) create mode 100644 addons/im_livechat/static/src/components/composer/composer.xml create mode 100644 addons/im_livechat/static/src/components/composer/composer_tests.js diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py index eab86ec678b..3837720eaa9 100644 --- a/addons/im_livechat/__manifest__.py +++ b/addons/im_livechat/__manifest__.py @@ -41,6 +41,7 @@ Help your customers with this chat, and analyse their feedback. 'depends': ["mail", "rating", "digest"], 'qweb': [ 'static/src/bugfix/bugfix.xml', + 'static/src/components/composer/composer.xml', 'static/src/components/discuss_sidebar/discuss_sidebar.xml', 'static/src/components/thread_icon/thread_icon.xml', ], diff --git a/addons/im_livechat/static/src/components/composer/composer.xml b/addons/im_livechat/static/src/components/composer/composer.xml new file mode 100644 index 00000000000..5219522049e --- /dev/null +++ b/addons/im_livechat/static/src/components/composer/composer.xml @@ -0,0 +1,10 @@ + + + + + + $0 + + + + diff --git a/addons/im_livechat/static/src/components/composer/composer_tests.js b/addons/im_livechat/static/src/components/composer/composer_tests.js new file mode 100644 index 00000000000..cf488b14d97 --- /dev/null +++ b/addons/im_livechat/static/src/components/composer/composer_tests.js @@ -0,0 +1,75 @@ +odoo.define('im_livechat/static/src/components/composer/composer_tests.js', function (require) { +'use strict'; + +const components = { + Composer: require('mail/static/src/components/composer/composer.js'), +}; +const { + afterEach, + afterNextRender, + beforeEach, + start, +} = require('mail/static/src/utils/test_utils.js'); + +QUnit.module('im_livechat', {}, function () { +QUnit.module('components', {}, function () { +QUnit.module('composer', {}, function () { +QUnit.module('composer_tests.js', { + beforeEach() { + beforeEach(this); + + this.createComposerComponent = async (composer, otherProps) => { + const ComposerComponent = components.Composer; + ComposerComponent.env = this.env; + this.component = new ComposerComponent(null, Object.assign({ + composerLocalId: composer.localId, + }, otherProps)); + delete ComposerComponent.env; + await afterNextRender(() => this.component.mount(this.widget.el)); + }; + + this.start = async params => { + let { env, widget } = await start(Object.assign({}, params, { + data: this.data, + })); + this.env = env; + this.widget = widget; + }; + }, + afterEach() { + afterEach(this); + if (this.component) { + this.component.destroy(); + } + if (this.widget) { + this.widget.destroy(); + } + this.env = undefined; + }, +}); + +QUnit.test('livechat: no add attachment button', async function (assert) { + // Attachments are not yet supported in livechat, especially from livechat + // visitor PoV. This may likely change in the future with task-2029065. + assert.expect(2); + + await this.start(); + const thread = this.env.models['mail.thread'].create({ + channel_type: 'livechat', + id: 10, + model: 'mail.channel', + }); + await this.createComposerComponent(thread.composer); + assert.containsOnce(document.body, '.o_Composer', "should have a composer"); + assert.containsNone( + document.body, + '.o_Composer_buttonAttachment', + "composer linked to livechat should not have a 'Add attachment' button" + ); +}); + +}); +}); +}); + +}); diff --git a/addons/im_livechat/views/im_livechat_channel_templates.xml b/addons/im_livechat/views/im_livechat_channel_templates.xml index 037ef048a00..5abff085ca9 100644 --- a/addons/im_livechat/views/im_livechat_channel_templates.xml +++ b/addons/im_livechat/views/im_livechat_channel_templates.xml @@ -29,6 +29,7 @@