From 196ca9ea3a1f2a208a28deec426c927a8542c05d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Theys?= Date: Mon, 25 Jan 2021 10:19:03 +0000 Subject: [PATCH] [REV] mail: open partner/employee form on chat header click MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c3c01633ce9359e3e9020ba5bdd919d5441ab3b2. task-2252924 closes odoo/odoo#65001 X-original-commit: 3a32fd92b81d889072884097bb936d4a4e8a89cf Signed-off-by: Alexandre Kühn (aku) --- .../chat_window_header/chat_window_header.js | 16 ----- .../chat_window_header.scss | 5 -- .../chat_window_header/chat_window_header.xml | 2 +- .../chat_window_manager_tests.js | 59 ------------------- 4 files changed, 1 insertion(+), 81 deletions(-) diff --git a/addons/mail/static/src/components/chat_window_header/chat_window_header.js b/addons/mail/static/src/components/chat_window_header/chat_window_header.js index 5b30eb80805..7deb538f745 100644 --- a/addons/mail/static/src/components/chat_window_header/chat_window_header.js +++ b/addons/mail/static/src/components/chat_window_header/chat_window_header.js @@ -24,13 +24,11 @@ class ChatWindowHeader extends Component { useStore(props => { const chatWindow = this.env.models['mail.chat_window'].get(props.chatWindowLocalId); const thread = chatWindow && chatWindow.thread; - const correspondent = thread && thread.correspondent; return { chatWindow, chatWindowHasShiftNext: chatWindow && chatWindow.hasShiftNext, chatWindowHasShiftPrev: chatWindow && chatWindow.hasShiftPrev, chatWindowName: chatWindow && chatWindow.name, - correspondent, isDeviceMobile: this.env.messaging.device.isMobile, thread, threadLocalMessageUnreadCounter: thread && thread.localMessageUnreadCounter, @@ -79,9 +77,6 @@ class ChatWindowHeader extends Component { * @param {MouseEvent} ev */ _onClick(ev) { - if (isEventHandled(ev, 'ChatWindowHeader.openProfile')) { - return; - } if (isEventHandled(ev, 'ChatWindowHeader.ClickShiftNext')) { return; } @@ -92,17 +87,6 @@ class ChatWindowHeader extends Component { this.trigger('o-clicked', { chatWindow }); } - /** - * @private - * @param {MouseEvent} ev - */ - _onClickName(ev) { - if (this.chatWindow.thread && this.chatWindow.thread.correspondent) { - markEventHandled(ev, 'ChatWindowHeader.openProfile'); - this.chatWindow.thread.correspondent.openProfile(); - } - } - /** * @private * @param {MouseEvent} ev diff --git a/addons/mail/static/src/components/chat_window_header/chat_window_header.scss b/addons/mail/static/src/components/chat_window_header/chat_window_header.scss index a7627c1ccab..c5c23634d20 100644 --- a/addons/mail/static/src/components/chat_window_header/chat_window_header.scss +++ b/addons/mail/static/src/components/chat_window_header/chat_window_header.scss @@ -52,11 +52,6 @@ white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - - &.o-clickable:hover { - font-weight: $font-weight-bold; - text-decoration: $link-hover-decoration; - } } .o_ChatWindowHeader_rightArea { diff --git a/addons/mail/static/src/components/chat_window_header/chat_window_header.xml b/addons/mail/static/src/components/chat_window_header/chat_window_header.xml index fc8a324992f..5499fea1749 100644 --- a/addons/mail/static/src/components/chat_window_header/chat_window_header.xml +++ b/addons/mail/static/src/components/chat_window_header/chat_window_header.xml @@ -15,7 +15,7 @@ threadLocalId="chatWindow.thread.localId" /> -
+
diff --git a/addons/mail/static/src/components/chat_window_manager/chat_window_manager_tests.js b/addons/mail/static/src/components/chat_window_manager/chat_window_manager_tests.js index d97ece53081..ef26aa4d785 100644 --- a/addons/mail/static/src/components/chat_window_manager/chat_window_manager_tests.js +++ b/addons/mail/static/src/components/chat_window_manager/chat_window_manager_tests.js @@ -10,12 +10,9 @@ const { start, } = require('mail/static/src/utils/test_utils.js'); -const Bus = require('web.Bus'); -const core = require('web.core'); const { file: { createFile, inputFiles }, dom: { triggerEvent }, - makeTestPromise, } = require('web.test_utils'); QUnit.module('mail', {}, function () { @@ -2138,62 +2135,6 @@ QUnit.test('focusing a chat window of a chat should make new message separator d ); }); -QUnit.test('chat window: click on correspondent name in chat header redirects to user form', async function (assert) { - assert.expect(4); - - this.data['res.partner'].records.push({ id: 7, name: "Demo" }); - this.data['mail.channel'].records.push({ - channel_type: "chat", - is_minimized: true, - members: [this.data.currentPartnerId, 7], - }); - const partnerFormDeferred = makeTestPromise(); - const bus = new Bus(); - bus.on('do-action', null, payload => { - assert.step('action_open_partner_form'); - assert.deepEqual(payload.action, { - res_id: 7, - res_model: "res.partner", - type: "ir.actions.act_window", - views: [[false, "form"]] - }, "opened form view should be the form view displaying the clicked correspondent (partner 7)"); - partnerFormDeferred.resolve(); - }); - await this.start({ env: { bus } }); - const chatWindowHeaderName = document.querySelector('.o_ChatWindowHeader_name'); - assert.hasClass( - chatWindowHeaderName, - 'o-clickable', - "name of thread in header part of chat window should be clickable when thread has a single correspondent" - ); - - await chatWindowHeaderName.click(); - await partnerFormDeferred; - assert.verifySteps( - ['action_open_partner_form'], - "should open partner form on click of chat header name when the thread has single correspondent" - ); -}); - -QUnit.test('chat window: chat header should not be clickable when thread has multiple correspondents', async function (assert) { - assert.expect(1); - - this.data['res.partner'].records.push({ id: 7, name: "Demo" }, { id: 8, name: "Portal" }); - this.data['mail.channel'].records.push({ - channel_type: "channel", - is_minimized: true, - members: [this.data.currentPartnerId, 7, 8], - }); - await this.start(); - - const chatWindowHeader = document.querySelector('.o_ChatWindowHeader_name'); - assert.doesNotHaveClass( - chatWindowHeader, - 'o-clickable', - "name of thread in header part of chat window should not be clickable when thread has multiple correspondents" - ); -}); - QUnit.test('Textual representations of shift previous/next operations are correctly mapped to left/right in LTR locale', async function (assert) { assert.expect(2);