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

[FIX] mail: make getRecentChannels order deterministic

Browse Source 
Fallback to ID compare when the dates are the same.

Added some extra steps in the test to help further debugging if this PR
does not completely resolve the issue.

runbot-28637

Part-of: odoo/odoo#144580
This commit is contained in:
Sébastien Theys
2023-12-04 13:23:38 +00:00
parent 9342f8ab2d
commit a445f36550
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/core/web/thread_service_patch.js
+9 -9
View File
@@ -235,16 +235,16 @@ patch(ThreadService.prototype, {
return Object.values(this.store.Thread.records)
.filter((thread) => thread.model === "discuss.channel")
.sort((a, b) => {
if (!a.lastInterestDateTime && !b.lastInterestDateTime) {
return 0;
if (a.lastInterestDateTime?.ts !== b.lastInterestDateTime?.ts) {
if (!b.lastInterestDateTime) {
return -1;
}
if (!a.lastInterestDateTime) {
return 1;
}
return b.lastInterestDateTime.ts - a.lastInterestDateTime.ts;
}
if (a.lastInterestDateTime && !b.lastInterestDateTime) {
return -1;
}
if (!a.lastInterestDateTime && b.lastInterestDateTime) {
return 1;
}
return b.lastInterestDateTime.ts - a.lastInterestDateTime.ts;
return a.id - b.id;
});
},
getNeedactionChannels() {
addons/mail/static/tests/discuss/core/web/command_palette_tests.js
+2
View File
@@ -43,6 +43,8 @@ QUnit.test("open the chatWindow of a channel from the command palette", async ()
await insertText(".o_command_palette_search input", "#");
advanceTime(commandSetupRegistry.get("#").debounceDelay);
await contains(".o_command", { count: 2 });
await contains(".o_command", { text: "general", before: [".o_command", { text: "project" }] });
await contains(".o_command.focused");
await click(".o_command.focused", { text: "general" });
await contains(".o-mail-ChatWindow", { text: "general" });
});