pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] mail: allow folded chat windows to be shifted

Browse Source 
task-2313414

closes odoo/odoo#55593

X-original-commit: 609dab84c6085af1ab27ee142c6ee674d7d321e9
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
Signed-off-by: Sébastien Theys (seb) <seb@odoo.com>
This commit is contained in:
Xavier Dubuc
2020-08-06 21:27:15 +00:00
committed by Alexandre Kühn
parent 9637de2f9e
commit c9e25aab34
2 changed files with 140 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/components/chat_window/chat_window.js
+3
View File
@@ -115,6 +115,9 @@ class ChatWindow extends Component {
isDoFocus: false,
isFocused: true,
});
if (this.chatWindow.isFolded) {
return;
}
if (!this.chatWindow.thread) {
this._inputRef.comp.focus();
} else {
addons/mail/static/src/components/chat_window_manager/chat_window_manager_tests.js
+137 -1
View File
@@ -746,7 +746,6 @@ QUnit.test('focus next visible chat window when closing current chat window with
);
});
QUnit.test('[technical] chat window: composer state conservation on toggle home menu', async function (assert) {
// technical as show/hide home menu simulation are involved and home menu implementation
// have side-effects on DOM that may make chat window components not work
@@ -1179,6 +1178,143 @@ QUnit.test('open 2 chat windows: check shift operations are available', async fu
);
});
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/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 channel = {
channel_type: "channel",
id: 20,
is_minimized: true,
is_pinned: true,
name: "General",
state: 'folded',
};
const chat = {
channel_type: "chat",
direct_partner: [{
id: 7,
name: "Demo",
}],
id: 10,
is_minimized: true,
is_pinned: true,
state: 'folded',
};
this.data['mail.channel'].records = [channel, chat];
Object.assign(this.data.initMessaging, {
channel_slots: {
channel_channel: [channel],
channel_direct_message: [chat],
},
});
await this.start({
env: {
browser: {
innerWidth: 900,
},
},
});
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_commandShiftLeft',
"there should be only one chat window allowed to shift left even if folded"
);
assert.containsOnce(
document.body,
'.o_ChatWindow .o_ChatWindowHeader_commandShiftRight',
"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 afterNextRender(() =>
document.querySelector('.o_ChatWindowHeader_commandShiftLeft').click()
);
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 afterNextRender(() =>
document.querySelector('.o_ChatWindowHeader_commandShiftLeft').click()
);
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 afterNextRender(() =>
document.querySelector('.o_ChatWindowHeader_commandShiftRight').click()
);
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 afterNextRender(() =>
document.querySelector('.o_ChatWindowHeader_commandShiftRight').click()
);
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: