From 60f5c1ab3ac4e6b6df50dfb953c9e60b84ba2b02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre=20K=C3=BChn?= Date: Mon, 13 Jun 2022 15:12:25 +0000 Subject: [PATCH] [IMP] mail: remove shift left/right actions on chat window header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-2882557 closes odoo/odoo#93484 Signed-off-by: Sébastien Theys (seb) --- .../chat_window_header/chat_window_header.xml | 12 - addons/mail/static/src/models/chat_window.js | 89 ---- .../src/models/chat_window_header_view.js | 2 - .../static/src/models/chat_window_manager.js | 50 -- .../components/chat_window_manager_tests.js | 485 +----------------- 5 files changed, 27 insertions(+), 611 deletions(-) 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 3eed590e531..44e6ec2d00b 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 @@ -55,18 +55,6 @@ - -
- - -
- - -
- - -
-
diff --git a/addons/mail/static/src/models/chat_window.js b/addons/mail/static/src/models/chat_window.js index 82dabc432c7..43c0b759244 100644 --- a/addons/mail/static/src/models/chat_window.js +++ b/addons/mail/static/src/models/chat_window.js @@ -223,20 +223,6 @@ registerModel({ } await this.thread.toggleCall(); }, - /** - * @param {MouseEvent} ev - */ - onClickShiftNext(ev) { - markEventHandled(ev, 'ChatWindowHeader.ClickShiftNext'); - this.shiftNext(); - }, - /** - * @param {MouseEvent} ev - */ - onClickShiftPrev(ev) { - markEventHandled(ev, 'ChatWindowHeader.ClickShiftPrev'); - this.shiftPrev(); - }, /** * Handles click on the "add users" button. * @@ -341,18 +327,6 @@ registerModel({ this.threadView.messageListView.getScrollableElement().scrollTop ); }, - /** - * Swap this chat window with the previous one. - */ - shiftPrev() { - this.manager.shiftPrev(this); - }, - /** - * Swap this chat window with the next one. - */ - shiftNext() { - this.manager.shiftNext(this); - }, /** * @param {Object} [param0={}] * @param {boolean} [param0.notifyServer] @@ -422,35 +396,6 @@ registerModel({ _computeHasNewMessageForm() { return this.isVisible && !this.isFolded && !this.thread; }, - /** - * @private - * @returns {boolean} - */ - _computeHasShiftPrev() { - if (!this.manager) { - return false; - } - const allVisible = this.manager.allOrderedVisible; - const index = allVisible.findIndex(visible => visible === this); - if (index === -1) { - return false; - } - return index < allVisible.length - 1; - }, - /** - * @private - * @returns {boolean} - */ - _computeHasShiftNext() { - if (!this.manager) { - return false; - } - const index = this.manager.allOrderedVisible.findIndex(visible => visible === this); - if (index === -1) { - return false; - } - return index > 0; - }, /** * @private * @returns {boolean} @@ -526,26 +471,6 @@ registerModel({ _computeNewMessageFormInputPlaceholder() { return this.env._t("Search user..."); }, - /** - * @private - * @returns {string} - */ - _computeShiftNextText() { - if (this.messaging.locale.textDirection === 'rtl') { - return this.env._t("Shift left"); - } - return this.env._t("Shift right"); - }, - /** - * @private - * @returns {string} - */ - _computeShiftPrevText() { - if (this.messaging.locale.textDirection === 'rtl') { - return this.env._t("Shift right"); - } - return this.env._t("Shift left"); - }, /** * @private * @returns {ThreadViewer} @@ -675,14 +600,6 @@ registerModel({ hasNewMessageForm: attr({ compute: '_computeHasNewMessageForm', }), - hasShiftPrev: attr({ - compute: '_computeHasShiftPrev', - default: false, - }), - hasShiftNext: attr({ - compute: '_computeHasShiftNext', - default: false, - }), /** * Determines whether `this.thread` should be displayed. */ @@ -756,12 +673,6 @@ registerModel({ newMessageFormInputPlaceholder: attr({ compute: '_computeNewMessageFormInputPlaceholder', }), - shiftNextText: attr({ - compute: '_computeShiftNextText', - }), - shiftPrevText: attr({ - compute: '_computeShiftPrevText', - }), /** * Determines the `Thread` that should be displayed by `this`. * If no `Thread` is linked, `this` is considered "new message". diff --git a/addons/mail/static/src/models/chat_window_header_view.js b/addons/mail/static/src/models/chat_window_header_view.js index 35d9b2e2289..7740ddab0e3 100644 --- a/addons/mail/static/src/models/chat_window_header_view.js +++ b/addons/mail/static/src/models/chat_window_header_view.js @@ -14,8 +14,6 @@ registerModel({ onClick(ev) { if ( isEventHandled(ev, 'ChatWindow.onClickCommand') || - isEventHandled(ev, 'ChatWindowHeader.ClickShiftNext') || - isEventHandled(ev, 'ChatWindowHeader.ClickShiftPrev') || isEventHandled(ev, 'ChatWindow.onClickHideMemberList') || isEventHandled(ev, 'ChatWindow.onClickShowMemberList') ) { diff --git a/addons/mail/static/src/models/chat_window_manager.js b/addons/mail/static/src/models/chat_window_manager.js index e9331ec530a..dd137cdd858 100644 --- a/addons/mail/static/src/models/chat_window_manager.js +++ b/addons/mail/static/src/models/chat_window_manager.js @@ -136,56 +136,6 @@ registerModel({ thread.notifyFoldStateToServer(foldState); } }, - /** - * Shift provided chat window to previous visible index, which swap visible order of this - * chat window and the preceding visible one - * - * @param {ChatWindow} chatWindow - */ - shiftPrev(chatWindow) { - const chatWindows = this.allOrdered; - const index = chatWindows.findIndex(cw => cw === chatWindow); - if (index === chatWindows.length - 1) { - // already first one - return; - } - const otherChatWindow = chatWindows[index + 1]; - const _newOrdered = [...this.allOrdered]; - _newOrdered[index] = otherChatWindow; - _newOrdered[index + 1] = chatWindow; - this.update({ allOrdered: replace(_newOrdered) }); - chatWindow.focus(); - for (const loopedChatWindow of [chatWindow, otherChatWindow]) { - if (loopedChatWindow.threadView) { - loopedChatWindow.threadView.addComponentHint('adjust-scroll'); - } - } - }, - /** - * Shift provided chat window to next visible index, which swap visible order of this - * chat window and the following visible one. - * - * @param {ChatWindow} chatWindow - */ - shiftNext(chatWindow) { - const chatWindows = this.allOrdered; - const index = chatWindows.findIndex(cw => cw === chatWindow); - if (index === 0) { - // already last one - return; - } - const otherChatWindow = chatWindows[index - 1]; - const _newOrdered = [...this.allOrdered]; - _newOrdered[index] = otherChatWindow; - _newOrdered[index - 1] = chatWindow; - this.update({ allOrdered: replace(_newOrdered) }); - chatWindow.focus(); - for (const loopedChatWindow of [chatWindow, otherChatWindow]) { - if (loopedChatWindow.threadView) { - loopedChatWindow.threadView.addComponentHint('adjust-scroll'); - } - } - }, /** * @param {ChatWindow} chatWindow1 * @param {ChatWindow} chatWindow2 diff --git a/addons/mail/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js index bec3c270814..d8cc3592ce0 100644 --- a/addons/mail/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js +++ b/addons/mail/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js @@ -10,7 +10,6 @@ import { startServer, } from '@mail/../tests/helpers/test_utils'; -import { makeFakeLocalizationService } from "@web/../tests/helpers/mock_services"; import { file, dom } from 'web.test_utils'; const { createFile, inputFiles } = file; const { triggerEvent } = dom; @@ -206,13 +205,14 @@ QUnit.test('open chat from "new message" chat window should open chat in place o * Enough space for 3 visible chat windows: * 10 + 325 + 5 + 325 + 5 + 325 + 10 = 1000 < 1920 */ - assert.expect(11); + assert.expect(12); const pyEnv = await startServer(); const resPartnerId1 = pyEnv['res.partner'].create({ name: "Partner 131" }); pyEnv['res.users'].create({ partner_id: resPartnerId1 }); - pyEnv['mail.channel'].create([ + const [, mailChannelId2] = pyEnv['mail.channel'].create([ { + name: 'channel-1', channel_last_seen_partner_ids: [ [0, 0, { is_minimized: true, @@ -221,9 +221,10 @@ QUnit.test('open chat from "new message" chat window should open chat in place o ], }, { + name: 'channel-2', channel_last_seen_partner_ids: [ [0, 0, { - is_minimized: true, + is_minimized: false, partner_id: pyEnv.currentPartnerId, }], ], @@ -231,7 +232,7 @@ QUnit.test('open chat from "new message" chat window should open chat in place o ]); const imSearchDef = makeDeferred(); patchUiSize({ width: 1920 }); - const { click, createMessagingMenuComponent } = await start({ + const { click, createMessagingMenuComponent, insertText, messaging } = await start({ mockRPC(route, args) { if (args.method === 'im_search') { imSearchDef.resolve(); @@ -242,8 +243,8 @@ QUnit.test('open chat from "new message" chat window should open chat in place o assert.containsN( document.body, '.o_ChatWindow', - 2, - "should have 2 chat windows initially" + 1, + "should have 1 chat window initially" ); assert.containsNone( document.body, @@ -262,8 +263,8 @@ QUnit.test('open chat from "new message" chat window should open chat in place o assert.containsN( document.body, '.o_ChatWindow', - 3, - "should have 3 chat window after opening 'new message' chat window", + 2, + "should have 2 chat windows after opening 'new message' chat window", ); assert.containsOnce( document.body, @@ -271,24 +272,33 @@ QUnit.test('open chat from "new message" chat window should open chat in place o "'new message' chat window should have new message form input" ); assert.hasClass( - document.querySelector('.o_ChatWindow[data-visible-index="2"]'), + document.querySelector('.o_ChatWindow[data-visible-index="1"]'), 'o-new-message', "'new message' chat window should be the last chat window initially", ); - await click('.o_ChatWindow[data-visible-index="2"] .o_ChatWindowHeader_commandShiftNext'); + // open channel-2 + await click(`.o_MessagingMenu_toggler`); + await click(`.o_NotificationListItem[data-thread-local-id="${ + messaging.models['Thread'].findFromIdentifyingData({ + id: mailChannelId2, + model: 'mail.channel', + }).localId + }"]`); + assert.containsN( + document.body, + '.o_ChatWindow', + 3, + "should have 3 chat windows after opening chat window of 'channel-2'", + ); assert.hasClass( document.querySelector('.o_ChatWindow[data-visible-index="1"]'), 'o-new-message', - "'new message' chat window should have moved to the middle after clicking shift previous", + "'new message' chat window should be in the middle after opening chat window of 'channel-2'", ); // search for a user in "new message" autocomplete - document.execCommand('insertText', false, "131"); - document.querySelector(`.o_ChatWindow_newMessageFormInput`) - .dispatchEvent(new window.KeyboardEvent('keydown')); - document.querySelector(`.o_ChatWindow_newMessageFormInput`) - .dispatchEvent(new window.KeyboardEvent('keyup')); + await insertText('.o_ChatWindow_newMessageFormInput', "131"); // Wait for search RPC to be resolved. The following await lines are // necessary because autocomplete is an external lib therefore it is not // possible to use `afterNextRender`. @@ -1122,208 +1132,6 @@ QUnit.test('open 2 different chat windows: enough screen width [REQUIRE FOCUS]', ); }); -QUnit.test('open 2 chat windows: check shift operations are available', async function (assert) { - assert.expect(9); - - const pyEnv = await startServer(); - pyEnv['mail.channel'].create([{ name: 'mailChannel1' }, { name: 'mailChannel2' }]); - const { click, createMessagingMenuComponent } = await start(); - await createMessagingMenuComponent(); - - await click('.o_MessagingMenu_toggler'); - await afterNextRender(() => { - document.querySelectorAll('.o_MessagingMenu_dropdownMenu .o_NotificationList_preview')[0].click(); - }); - await click('.o_MessagingMenu_toggler'); - await afterNextRender(() => { - document.querySelectorAll('.o_MessagingMenu_dropdownMenu .o_NotificationList_preview')[1].click(); - }); - assert.containsN( - document.body, - '.o_ChatWindow', - 2, - "should have opened 2 chat windows" - ); - assert.containsOnce( - document.querySelectorAll('.o_ChatWindow')[0], - '.o_ChatWindowHeader_commandShiftPrev', - "first chat window should be allowed to shift left" - ); - assert.containsNone( - document.querySelectorAll('.o_ChatWindow')[0], - '.o_ChatWindowHeader_commandShiftNext', - "first chat window should not be allowed to shift right" - ); - assert.containsNone( - document.querySelectorAll('.o_ChatWindow')[1], - '.o_ChatWindowHeader_commandShiftPrev', - "second chat window should not be allowed to shift left" - ); - assert.containsOnce( - document.querySelectorAll('.o_ChatWindow')[1], - '.o_ChatWindowHeader_commandShiftNext', - "second chat window should be allowed to shift right" - ); - - const initialFirstChatWindowThreadLocalId = - document.querySelectorAll('.o_ChatWindow')[0].dataset.threadLocalId; - const initialSecondChatWindowThreadLocalId = - document.querySelectorAll('.o_ChatWindow')[1].dataset.threadLocalId; - await afterNextRender(() => { - document.querySelectorAll('.o_ChatWindow')[0] - .querySelector(':scope .o_ChatWindowHeader_commandShiftPrev') - .click(); - }); - assert.strictEqual( - document.querySelectorAll('.o_ChatWindow')[0].dataset.threadLocalId, - initialSecondChatWindowThreadLocalId, - "First chat window should be second after it has been shift left" - ); - assert.strictEqual( - document.querySelectorAll('.o_ChatWindow')[1].dataset.threadLocalId, - initialFirstChatWindowThreadLocalId, - "Second chat window should be first after the first has been shifted left" - ); - - await afterNextRender(() => { - document.querySelectorAll('.o_ChatWindow')[1] - .querySelector(':scope .o_ChatWindowHeader_commandShiftNext') - .click(); - }); - assert.strictEqual( - document.querySelectorAll('.o_ChatWindow')[0].dataset.threadLocalId, - initialFirstChatWindowThreadLocalId, - "First chat window should be back at first place after being shifted left then right" - ); - assert.strictEqual( - document.querySelectorAll('.o_ChatWindow')[1].dataset.threadLocalId, - initialSecondChatWindowThreadLocalId, - "Second chat window should be back at second place after first one has been shifted left then right" - ); -}); - -QUnit.test('open 2 folded chat windows: check shift operations are available', async function (assert) { - /** - * computation uses following info: - * ([mocked] global window width: 900px) - * (others: @see `mail/static/src/models/chat_window_manager.js:visual`) - * - * - chat window width: 325px - * - start/end/between gap width: 10px/10px/5px - * - global width: 900px - * - * 2 visible chat windows + hidden menu: - * 10 + 325 + 5 + 325 + 10 = 675 < 900 - */ - assert.expect(13); - - const pyEnv = await startServer(); - const resPartnerId1 = pyEnv['res.partner'].create({ name: "Demo" }); - const channel = { - channel_last_seen_partner_ids: [ - [0, 0, { - fold_state: 'folded', - is_minimized: true, - partner_id: pyEnv.currentPartnerId, - }], - ], - channel_type: "channel", - }; - const chat = { - channel_last_seen_partner_ids: [ - [0, 0, { - fold_state: 'folded', - is_minimized: true, - partner_id: pyEnv.currentPartnerId, - }], - [0, 0, { partner_id: resPartnerId1 }], - ], - channel_type: "chat", - }; - pyEnv['mail.channel'].create([channel, chat]); - patchUiSize({ width: 900 }); - const { click } = await start(); - - assert.containsN( - document.body, - '.o_ChatWindow', - 2, - "should have opened 2 chat windows initially" - ); - assert.hasClass( - document.querySelector('.o_ChatWindow[data-visible-index="0"]'), - 'o-folded', - "first chat window should be folded" - ); - assert.hasClass( - document.querySelector('.o_ChatWindow[data-visible-index="1"]'), - 'o-folded', - "second chat window should be folded" - ); - assert.containsOnce( - document.body, - '.o_ChatWindow .o_ChatWindowHeader_commandShiftPrev', - "there should be only one chat window allowed to shift left even if folded" - ); - assert.containsOnce( - document.body, - '.o_ChatWindow .o_ChatWindowHeader_commandShiftNext', - "there should be only one chat window allowed to shift right even if folded" - ); - - const initialFirstChatWindowThreadLocalId = - document.querySelector('.o_ChatWindow[data-visible-index="0"]').dataset.threadLocalId; - const initialSecondChatWindowThreadLocalId = - document.querySelector('.o_ChatWindow[data-visible-index="1"]').dataset.threadLocalId; - await click('.o_ChatWindowHeader_commandShiftPrev'); - assert.strictEqual( - document.querySelector('.o_ChatWindow[data-visible-index="0"]').dataset.threadLocalId, - initialSecondChatWindowThreadLocalId, - "First chat window should be second after it has been shift left" - ); - assert.strictEqual( - document.querySelector('.o_ChatWindow[data-visible-index="1"]').dataset.threadLocalId, - initialFirstChatWindowThreadLocalId, - "Second chat window should be first after the first has been shifted left" - ); - - await click('.o_ChatWindowHeader_commandShiftPrev'); - assert.strictEqual( - document.querySelector('.o_ChatWindow[data-visible-index="0"]').dataset.threadLocalId, - initialFirstChatWindowThreadLocalId, - "First chat window should be back at first place" - ); - assert.strictEqual( - document.querySelector('.o_ChatWindow[data-visible-index="1"]').dataset.threadLocalId, - initialSecondChatWindowThreadLocalId, - "Second chat window should be back at second place" - ); - - await click('.o_ChatWindowHeader_commandShiftNext'); - assert.strictEqual( - document.querySelector('.o_ChatWindow[data-visible-index="0"]').dataset.threadLocalId, - initialSecondChatWindowThreadLocalId, - "First chat window should be second after it has been shift right" - ); - assert.strictEqual( - document.querySelector('.o_ChatWindow[data-visible-index="1"]').dataset.threadLocalId, - initialFirstChatWindowThreadLocalId, - "Second chat window should be first after the first has been shifted right" - ); - - await click('.o_ChatWindowHeader_commandShiftNext'); - assert.strictEqual( - document.querySelector('.o_ChatWindow[data-visible-index="0"]').dataset.threadLocalId, - initialFirstChatWindowThreadLocalId, - "First chat window should be back at first place" - ); - assert.strictEqual( - document.querySelector('.o_ChatWindow[data-visible-index="1"]').dataset.threadLocalId, - initialSecondChatWindowThreadLocalId, - "Second chat window should be back at second place" - ); -}); - QUnit.test('open 3 different chat windows: not enough screen width', async function (assert) { /** * computation uses following info: @@ -2156,89 +1964,6 @@ QUnit.test('focusing a chat window of a chat should make new message separator d ); }); -QUnit.test('Textual representations of shift previous/next operations are correctly mapped to left/right in LTR locale', async function (assert) { - assert.expect(2); - - const pyEnv = await startServer(); - pyEnv['mail.channel'].create([ - { - channel_last_seen_partner_ids: [ - [0, 0, { - is_minimized: true, - partner_id: pyEnv.currentPartnerId, - }], - ], - }, - { - channel_last_seen_partner_ids: [ - [0, 0, { - is_minimized: true, - partner_id: pyEnv.currentPartnerId, - }], - ], - }, - ]); - await start(); - - assert.strictEqual( - document.querySelector('.o_ChatWindowHeader_commandShiftPrev').title, - "Shift left", - "shift previous operation should be have 'Shift left' as title in LTR locale" - ); - assert.strictEqual( - document.querySelector('.o_ChatWindowHeader_commandShiftNext').title, - "Shift right", - "shift next operation should have 'Shift right' as title in LTR locale" - ); -}); - -QUnit.test('Textual representations of shift previous/next operations are correctly mapped to right/left in RTL locale', async function (assert) { - assert.expect(2); - - const pyEnv = await startServer(); - pyEnv['mail.channel'].create([ - { - channel_last_seen_partner_ids: [ - [0, 0, { - is_minimized: true, - partner_id: pyEnv.currentPartnerId, - }], - ], - }, - { - channel_last_seen_partner_ids: [ - [0, 0, { - is_minimized: true, - partner_id: pyEnv.currentPartnerId, - }], - ], - }, - ]); - await start({ - services: { - localization: makeFakeLocalizationService({ - dateFormat: '%m/%d/%Y', - timeFormat: '%H:%M:%S', - direction: 'rtl', - grouping: [], - thousandsSep: ',', - decimalPoint: '.', - }), - }, - }); - - assert.strictEqual( - document.querySelector('.o_ChatWindowHeader_commandShiftPrev').title, - "Shift right", - "shift previous operation should have 'Shift right' as title in RTL locale" - ); - assert.strictEqual( - document.querySelector('.o_ChatWindowHeader_commandShiftNext').title, - "Shift left", - "shift next operation should have 'Shift left' as title in RTL locale" - ); -}); - QUnit.test('chat window should open when receiving a new DM', async function (assert) { assert.expect(1); @@ -2377,161 +2102,5 @@ QUnit.test('should not have chat window hidden menu in mobile (transition from 2 ); }); -QUnit.skip('chat window scroll position should remain the same after switching previous', async function (assert) { - assert.expect(2); - - const pyEnv = await startServer(); - - const [mailChannelId1, mailChannelId2] = pyEnv['mail.channel'].create([ - { - channel_last_seen_partner_ids: [ - [0, 0, { - fold_state: 'open', - is_minimized: true, - partner_id: pyEnv.currentPartnerId, - }], - ], - channel_type: "chat", - uuid: 'channel-10-uuid', - }, - { - channel_last_seen_partner_ids: [ - [0, 0, { - fold_state: 'open', - is_minimized: true, - partner_id: pyEnv.currentPartnerId, - }], - ], - channel_type: "chat", - uuid: 'channel-10-uuid', - } - ]); - - for (let i = 0; i < 10; i++) { - pyEnv['mail.message'].create({ - body: "not empty", - model: "mail.channel", - res_id: mailChannelId1, - }); - } - for (let i = 0; i < 10; i++) { - pyEnv['mail.message'].create({ - body: "not empty", - model: "mail.channel", - res_id: mailChannelId2, - }); - } - const { afterEvent, createMessagingMenuComponent, messaging } = await start(); - await createMessagingMenuComponent(); - - const thread1LocalId = messaging.models['Thread'].findFromIdentifyingData({ - id: mailChannelId1, - model: 'mail.channel', - }).localId; - const thread2LocalId = messaging.models['Thread'].findFromIdentifyingData({ - id: mailChannelId2, - model: 'mail.channel', - }).localId; - document.querySelector(`.o_ChatWindow[data-thread-local-id="${thread1LocalId}"] .o_ThreadView_messageList`).scrollTop = 100; - document.querySelector(`.o_ChatWindow[data-thread-local-id="${thread2LocalId}"] .o_ThreadView_messageList`).scrollTop = 110; - - await afterEvent({ - eventName: 'o-thread-view-hint-processed', - func: () => document.querySelector('.o_ChatWindowHeader_commandShiftPrev').click(), - message: "Should wait until the scroll is adjusted after a command shift.", - predicate: ({ hint }) => { - return hint.type === 'adjust-scroll'; - }, - }); - assert.strictEqual( - document.querySelector(`.o_ChatWindow[data-thread-local-id="${thread2LocalId}"] .o_ThreadView_messageList`).scrollTop, - 110, - "Scroll position should remain the same after a chat window shift" - ); - assert.strictEqual( - document.querySelector(`.o_ChatWindow[data-thread-local-id="${thread1LocalId}"] .o_ThreadView_messageList`).scrollTop, - 100, - "Scroll position should remain the same after a chat window shift" - ); -}); - -QUnit.skip('chat window scroll position should remain the same after switching next', async function (assert) { - assert.expect(2); - - const pyEnv = await startServer(); - const [mailChannelId1, mailChannelId2] = pyEnv['mail.channel'].create([ - { - channel_last_seen_partner_ids: [ - [0, 0, { - fold_state: 'open', - is_minimized: true, - partner_id: pyEnv.currentPartnerId, - }], - ], - channel_type: "chat", - uuid: 'channel-10-uuid', - }, - { - channel_last_seen_partner_ids: [ - [0, 0, { - fold_state: 'open', - is_minimized: true, - partner_id: pyEnv.currentPartnerId, - }], - ], - channel_type: "chat", - uuid: 'channel-10-uuid', - } - ]); - - for (let i = 0; i < 10; i++) { - pyEnv['mail.message'].create({ - body: "not empty", - model: "mail.channel", - res_id: mailChannelId1, - }); - } - for (let i = 0; i < 10; i++) { - pyEnv['mail.message'].create({ - body: "not empty", - model: "mail.channel", - res_id: mailChannelId2, - }); - } - const { afterEvent, createMessagingMenuComponent, messaging } = await start(); - await createMessagingMenuComponent(); - - const thread1LocalId = messaging.models['Thread'].findFromIdentifyingData({ - id: mailChannelId1, - model: 'mail.channel', - }).localId; - const thread2LocalId = messaging.models['Thread'].findFromIdentifyingData({ - id: mailChannelId2, - model: 'mail.channel', - }).localId; - document.querySelector(`.o_ChatWindow[data-thread-local-id="${thread1LocalId}"] .o_ThreadView_messageList`).scrollTop = 100; - document.querySelector(`.o_ChatWindow[data-thread-local-id="${thread2LocalId}"] .o_ThreadView_messageList`).scrollTop = 110; - - await afterEvent({ - eventName: 'o-thread-view-hint-processed', - func: () => document.querySelector('.o_ChatWindowHeader_commandShiftNext').click(), - message: "Should wait until the scroll is adjusted after a command shift.", - predicate: ({ hint }) => { - return hint.type === 'adjust-scroll'; - }, - }); - assert.strictEqual( - document.querySelector(`.o_ChatWindow[data-thread-local-id="${thread2LocalId}"] .o_ThreadView_messageList`).scrollTop, - 110, - "Scroll position should remain the same after a chat window shift" - ); - assert.strictEqual( - document.querySelector(`.o_ChatWindow[data-thread-local-id="${thread1LocalId}"] .o_ThreadView_messageList`).scrollTop, - 100, - "Scroll position should remain the same after a chat window shift" - ); -}); - - }); });