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

[IMP] hr, mail: use Channel instead of Thread in getChat

Browse Source 
Part of task-2948676.

closes odoo/odoo#99281

Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
This commit is contained in:
Louis Wicket (wil)
2022-08-31 17:54:22 +02:00
parent e1e6417604
commit 9fded39f48
9 changed files with 45 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr/static/src/models/employee.js
+2 -4
View File
@@ -99,7 +99,7 @@ registerModel({
*
* If a chat is not appropriate, a notification is displayed instead.
*
* @returns {Thread|undefined}
* @returns {Channel|undefined}
*/
async getChat() {
if (!this.user && !this.hasCheckedUser) {
@@ -125,7 +125,6 @@ registerModel({
* If a chat is not appropriate, a notification is displayed instead.
*
* @param {Object} [options] forwarded to @see `Thread:open()`
* @returns {Thread|undefined}
*/
async openChat(options) {
const chat = await this.getChat();
@@ -135,11 +134,10 @@ registerModel({
if (!chat) {
return;
}
await chat.open(options);
await chat.thread.open(options);
if (!this.exists()) {
return;
}
return chat;
},
/**
* Opens the most appropriate view that is a profile for this employee.
addons/mail/static/src/js/m2x_avatar_user.js
+1 -2
View File
@@ -42,11 +42,10 @@ const M2XAvatarMixin = {
*
* @private
* @param {Object} params
* @returns {Promise}
*/
async _openChat(params) {
const messaging = await Component.env.services.messaging.get();
return messaging.openChat(params);
messaging.openChat(params);
},
};
addons/mail/static/src/models/channel.js
+31
View File
@@ -6,6 +6,37 @@ import { clear } from '@mail/model/model_field_command';
registerModel({
name: 'Channel',
modelMethods: {
/**
* Performs the `channel_get` RPC on `mail.channel`.
*
* `openChat` is preferable in business code because it will avoid the
* RPC if the chat already exists.
*
* @param {Object} param0
* @param {integer[]} param0.partnerIds
* @param {boolean} [param0.pinForCurrentPartner]
* @returns {Channel|undefined} the created or existing chat
*/
async performRpcCreateChat({ partnerIds, pinForCurrentPartner }) {
// TODO FIX: potential duplicate chat task-2276490
const data = await this.messaging.rpc({
model: 'mail.channel',
method: 'channel_get',
kwargs: {
partners_to: partnerIds,
pin: pinForCurrentPartner,
},
});
if (!data) {
return;
}
const { channel } = this.messaging.models['Thread'].insert(
this.messaging.models['Thread'].convertData(data)
);
return channel;
},
},
recordMethods: {
async fetchChannelMembers() {
const channelData = await this.messaging.rpc({
addons/mail/static/src/models/chat_window.js
+1 -1
View File
@@ -118,7 +118,7 @@ registerModel({
if (!chat) {
return;
}
this.messaging.chatWindowManager.openThread(chat, {
this.messaging.chatWindowManager.openThread(chat.thread, {
makeActive: true,
replaceNewMessage: true,
});
addons/mail/static/src/models/messaging.js
+2 -4
View File
@@ -47,7 +47,7 @@ registerModel({
* @param {integer} [param0.partnerId]
* @param {integer} [param0.userId]
* @param {Object} [options]
* @returns {Thread|undefined}
* @returns {Channel|undefined}
*/
async getChat({ partnerId, userId }) {
if (userId) {
@@ -86,18 +86,16 @@ registerModel({
*
* @param {Object} person forwarded to @see `getChat()`
* @param {Object} [options] forwarded to @see `Thread:open()`
* @returns {Thread|undefined}
*/
async openChat(person, options) {
const chat = await this.getChat(person);
if (!this.exists() || !chat) {
return;
}
await chat.open(options);
await chat.thread.open(options);
if (!this.exists()) {
return;
}
return chat;
},
/**
* Opens the form view of the record with provided id and model.
addons/mail/static/src/models/messaging_notification_handler.js
+1 -1
View File
@@ -617,7 +617,7 @@ registerModel({
if (!this.exists() || !chat || this.messaging.device.isSmall) {
return;
}
this.messaging.chatWindowManager.openThread(chat);
this.messaging.chatWindowManager.openThread(chat.thread);
},
/**
* @private
addons/mail/static/src/models/partner.js
+2 -4
View File
@@ -283,7 +283,7 @@ registerModel({
*
* If a chat is not appropriate, a notification is displayed instead.
*
* @returns {Thread|undefined}
* @returns {Channel|undefined}
*/
async getChat() {
if (!this.user && !this.hasCheckedUser) {
@@ -309,18 +309,16 @@ registerModel({
* If a chat is not appropriate, a notification is displayed instead.
*
* @param {Object} [options] forwarded to @see `Thread:open()`
* @returns {Thread|undefined}
*/
async openChat(options) {
const chat = await this.getChat();
if (!this.exists() || !chat) {
return;
}
await chat.open(options);
await chat.thread.open(options);
if (!this.exists()) {
return;
}
return chat;
},
/**
* Opens the most appropriate view that is a profile for this partner.
addons/mail/static/src/models/thread.js
-28
View File
@@ -361,34 +361,6 @@ registerModel({
this.messaging.models['Thread'].convertData(data)
);
},
/**
* Performs the `channel_get` RPC on `mail.channel`.
*
* `openChat` is preferable in business code because it will avoid the
* RPC if the chat already exists.
*
* @param {Object} param0
* @param {integer[]} param0.partnerIds
* @param {boolean} [param0.pinForCurrentPartner]
* @returns {Thread|undefined} the created or existing chat
*/
async performRpcCreateChat({ partnerIds, pinForCurrentPartner }) {
// TODO FIX: potential duplicate chat task-2276490
const data = await this.messaging.rpc({
model: 'mail.channel',
method: 'channel_get',
kwargs: {
partners_to: partnerIds,
pin: pinForCurrentPartner,
},
});
if (!data) {
return;
}
return this.messaging.models['Thread'].insert(
this.messaging.models['Thread'].convertData(data)
);
},
/**
* Search for thread matching `searchTerm`.
*
addons/mail/static/src/models/user.js
+5 -7
View File
@@ -69,7 +69,7 @@ registerModel({
*
* If a chat is not appropriate, a notification is displayed instead.
*
* @returns {Thread|undefined}
* @returns {Channel|undefined}
*/
async getChat() {
if (!this.partner) {
@@ -90,11 +90,11 @@ registerModel({
return;
}
// in other cases a chat would be valid, find it or try to create it
let chat = this.partner.dmChatWithCurrentPartner && this.partner.dmChatWithCurrentPartner.thread;
if (!chat || !chat.isPinned) {
let chat = this.partner.dmChatWithCurrentPartner;
if (!chat || !chat.thread.isPinned) {
// if chat is not pinned then it has to be pinned client-side
// and server-side, which is a side effect of following rpc
chat = await this.messaging.models['Thread'].performRpcCreateChat({
chat = await this.messaging.models['Channel'].performRpcCreateChat({
partnerIds: [this.partner.id],
});
if (!this.exists()) {
@@ -116,18 +116,16 @@ registerModel({
* If a chat is not appropriate, a notification is displayed instead.
*
* @param {Object} [options] forwarded to @see `Thread:open()`
* @returns {Thread|undefined}
*/
async openChat(options) {
const chat = await this.getChat();
if (!this.exists() || !chat) {
return;
}
await chat.open(options);
await chat.thread.open(options);
if (!this.exists() || !chat.exists()) {
return;
}
return chat;
},
/**
* Opens the most appropriate view that is a profile for this user.