@@ -196,16 +190,7 @@
(from #)
-
-
-
-
-
-
-
diff --git a/addons/im_livechat/static/src/models/livechat_button_view.js b/addons/im_livechat/static/src/models/livechat_button_view.js
index 57f34071b0f..9e5c78c7a8b 100644
--- a/addons/im_livechat/static/src/models/livechat_button_view.js
+++ b/addons/im_livechat/static/src/models/livechat_button_view.js
@@ -13,14 +13,14 @@ registerModel({
* @returns {string}
*/
_computeButtonBackgroundColor() {
- return this.messaging.publicLivechatOptions.button_background_color;
+ return this.messaging.publicLivechatGlobal.options.button_background_color;
},
/**
* @returns {string}
*/
_computeButtonText() {
- if (this.messaging.publicLivechatOptions.button_text) {
- return this.messaging.publicLivechatOptions.button_text;
+ if (this.messaging.publicLivechatGlobal.options.button_text) {
+ return this.messaging.publicLivechatGlobal.options.button_text;
}
return this.env._t("Chat with one of our collaborators");
},
@@ -28,14 +28,14 @@ registerModel({
* @returns {string}
*/
_computeButtonTextColor() {
- return this.messaging.publicLivechatOptions.button_text_color;
+ return this.messaging.publicLivechatGlobal.options.button_text_color;
},
/**
* @private
* @returns {integer}
*/
_computeChannelId() {
- return this.messaging.publicLivechatOptions.channel_id;
+ return this.messaging.publicLivechatGlobal.options.channel_id;
},
/**
* @private
@@ -84,18 +84,18 @@ registerModel({
* @returns {integer}
*/
_computeCurrentPartnerId() {
- if (!this.messaging.isPublicLivechatAvailable) {
+ if (!this.messaging.publicLivechatGlobal.isAvailable) {
return clear();
}
- return this.messaging.publicLivechatOptions.current_partner_id;
+ return this.messaging.publicLivechatGlobal.options.current_partner_id;
},
/**
* @private
* @returns {string}
*/
_computeDefaultMessage() {
- if (this.messaging.publicLivechatOptions.default_message) {
- return this.messaging.publicLivechatOptions.default_message;
+ if (this.messaging.publicLivechatGlobal.options.default_message) {
+ return this.messaging.publicLivechatGlobal.options.default_message;
}
return this.env._t("How may I help you?");
},
@@ -104,8 +104,8 @@ registerModel({
* @returns {string}
*/
_computeDefaultUsername() {
- if (this.messaging.publicLivechatOptions.default_username) {
- return this.messaging.publicLivechatOptions.default_username;
+ if (this.messaging.publicLivechatGlobal.options.default_username) {
+ return this.messaging.publicLivechatGlobal.options.default_username;
}
return this.env._t("Visitor");
},
@@ -114,7 +114,7 @@ registerModel({
* @returns {string}
*/
_computeHeaderBackgroundColor() {
- return this.messaging.publicLivechatOptions.header_background_color;
+ return this.messaging.publicLivechatGlobal.options.header_background_color;
},
/**
* @private
@@ -126,8 +126,8 @@ registerModel({
// as we use it for specific things (e.g: showing "please select an option above")
return clear();
}
- if (this.messaging.publicLivechatOptions.input_placeholder) {
- return this.messaging.publicLivechatOptions.input_placeholder;
+ if (this.messaging.publicLivechatGlobal.options.input_placeholder) {
+ return this.messaging.publicLivechatGlobal.options.input_placeholder;
}
return this.env._t("Ask something ...");
},
@@ -161,7 +161,7 @@ registerModel({
if (!this.sessionCookie) {
return clear();
}
- const data = localStorage.getItem(this.sessionCookieKey);
+ const data = localStorage.getItem(this.chatbotSessionCookieKey);
if (!data) {
return clear();
}
@@ -173,14 +173,14 @@ registerModel({
*/
_computeServerUrl() {
if (this.isChatbot) {
- return this.messaging.publicLivechatServerUrlChatbot;
+ return this.messaging.publicLivechatGlobal.chatbotServerUrl;
}
- return this.messaging.publicLivechatServerUrl;
+ return this.messaging.publicLivechatGlobal.serverUrl;
},
/**
* @returns {string|FieldCommand}
*/
- _computeSessionCookieKey() {
+ _computeChatbotSessionCookieKey() {
if (!this.sessionCookie) {
return clear();
}
@@ -191,7 +191,7 @@ registerModel({
* @returns {string}
*/
_computeTitleColor() {
- return this.messaging.publicLivechatOptions.title_color;
+ return this.messaging.publicLivechatGlobal.options.title_color;
},
},
fields: {
@@ -213,6 +213,9 @@ registerModel({
inverse: 'livechatButtonViewOwner',
isCausal: true,
}),
+ chatbotSessionCookieKey: attr({
+ compute: '_computeChatbotSessionCookieKey',
+ }),
chatbotState: attr({
compute: '_computeChatbotState',
}),
@@ -272,9 +275,6 @@ registerModel({
compute: '_computeServerUrl',
}),
sessionCookie: attr(),
- sessionCookieKey: attr({
- compute: '_computeSessionCookieKey',
- }),
testChatbotData: attr(),
titleColor: attr({
compute: '_computeTitleColor',
diff --git a/addons/im_livechat/static/src/models/messaging.js b/addons/im_livechat/static/src/models/messaging.js
index 3895166f897..8d845ab7ae1 100644
--- a/addons/im_livechat/static/src/models/messaging.js
+++ b/addons/im_livechat/static/src/models/messaging.js
@@ -1,18 +1,12 @@
/** @odoo-module **/
import { addFields, addRecordMethods, patchRecordMethods } from '@mail/model/model_core';
-import { attr, many, one } from '@mail/model/model_field';
+import { many, one } from '@mail/model/model_field';
import { clear, insertAndReplace } from '@mail/model/model_field_command';
// ensure that the model definition is loaded before the patch
import '@mail/models/messaging';
addFields('Messaging', {
- isInPublicLivechat: attr({
- default: false,
- }),
- isPublicLivechatAvailable: attr({
- default: false,
- }),
livechatButtonView: one('LivechatButtonView', {
compute: '_computeLivechatButtonView',
isCausal: true,
@@ -24,11 +18,8 @@ addFields('Messaging', {
inverse: 'messagingAsPinnedLivechat',
readonly: true,
}),
- publicLivechatOptions: attr({
- default: {},
- }),
- publicLivechatServerUrl: attr({
- default: '',
+ publicLivechatGlobal: one('PublicLivechatGlobal', {
+ isCausal: true,
}),
});
@@ -38,7 +29,7 @@ addRecordMethods('Messaging', {
* @returns {FieldCommand}
*/
_computeLivechatButtonView() {
- if (this.isInPublicLivechat && this.isPublicLivechatAvailable) {
+ if (this.publicLivechatGlobal && this.publicLivechatGlobal.isAvailable) {
return insertAndReplace();
}
return clear();
@@ -50,7 +41,7 @@ patchRecordMethods('Messaging', {
* @override
*/
_computeNotificationHandler() {
- if (this.isInPublicLivechat) {
+ if (this.publicLivechatGlobal) {
return clear();
}
return this._super();
diff --git a/addons/im_livechat/static/src/models/messaging_initializer.js b/addons/im_livechat/static/src/models/messaging_initializer.js
index 9b1e1b231e2..19a19ccd503 100644
--- a/addons/im_livechat/static/src/models/messaging_initializer.js
+++ b/addons/im_livechat/static/src/models/messaging_initializer.js
@@ -10,7 +10,7 @@ patchRecordMethods('MessagingInitializer', {
* @override
*/
async performInitRpc() {
- if (this.messaging.isInPublicLivechat) {
+ if (this.messaging.publicLivechatGlobal) {
return {};
} else {
return this._super();
diff --git a/addons/im_livechat/static/src/models/public_livechat.js b/addons/im_livechat/static/src/models/public_livechat.js
index 8af2b0c9683..c9e49744b04 100644
--- a/addons/im_livechat/static/src/models/public_livechat.js
+++ b/addons/im_livechat/static/src/models/public_livechat.js
@@ -3,36 +3,38 @@
import PublicLivechat from '@im_livechat/legacy/models/public_livechat';
import { registerModel } from '@mail/model/model_core';
-import { attr, one } from '@mail/model/model_field';
-import { clear } from '@mail/model/model_field_command';
+import { attr, many, one } from '@mail/model/model_field';
registerModel({
name: 'PublicLivechat',
identifyingFields: ['livechatButtonOwner'],
- recordMethods: {
- /**
- * @private
- * @returns {FieldCommand|im_livechat/legacy/models/public_livechat}
- */
- _computeLegacyPublicLivechat() {
- if (!this.data) {
- return clear();
- }
- return new PublicLivechat({
- parent: this.livechatButtonOwner.widget,
- data: this.data,
+ lifecycleHooks: {
+ _created() {
+ this.update({
+ legacyPublicLivechat: new PublicLivechat(this.messaging, {
+ parent: this.livechatButtonOwner.widget,
+ data: this.data,
+ }),
});
},
+ _willDelete() {
+ this.legacyPublicLivechat.destroy();
+ },
+ },
+ recordMethods: {
},
fields: {
data: attr(),
- legacyPublicLivechat: attr({
- compute: '_computeLegacyPublicLivechat',
- }),
+ legacyPublicLivechat: attr(),
livechatButtonOwner: one('LivechatButtonView', {
inverse: 'publicLivechat',
readonly: true,
required: true,
}),
+ messages: many('PublicLivechatMessage'),
+ // amount of messages that have not yet been read on this chat
+ unreadCounter: attr({
+ default: 0,
+ }),
},
});
diff --git a/addons/im_livechat/static/src/models/public_livechat_global.js b/addons/im_livechat/static/src/models/public_livechat_global.js
new file mode 100644
index 00000000000..ba551eae407
--- /dev/null
+++ b/addons/im_livechat/static/src/models/public_livechat_global.js
@@ -0,0 +1,21 @@
+/** @odoo-module **/
+
+import { registerModel } from '@mail/model/model_core';
+import { attr } from '@mail/model/model_field';
+
+registerModel({
+ name: 'PublicLivechatGlobal',
+ identifyingFields: ['messaging'],
+ fields: {
+ chatbotServerUrl: attr(),
+ isAvailable: attr({
+ default: false,
+ }),
+ options: attr({
+ default: {},
+ }),
+ serverUrl: attr({
+ default: '',
+ }),
+ },
+});
diff --git a/addons/im_livechat/static/src/models/public_livechat_message.js b/addons/im_livechat/static/src/models/public_livechat_message.js
new file mode 100644
index 00000000000..e0853e88b87
--- /dev/null
+++ b/addons/im_livechat/static/src/models/public_livechat_message.js
@@ -0,0 +1,16 @@
+/** @odoo-module **/
+
+import { registerModel } from '@mail/model/model_core';
+import { attr } from '@mail/model/model_field';
+
+registerModel({
+ name: 'PublicLivechatMessage',
+ identifyingFields: ['id'],
+ fields: {
+ id: attr({
+ readonly: true,
+ required: true,
+ }),
+ legacyPublicLivechatMessage: attr(),
+ },
+});
diff --git a/addons/im_livechat/static/src/models/public_livechat_window.js b/addons/im_livechat/static/src/models/public_livechat_window.js
index a6ad3972f11..cc69ef41179 100644
--- a/addons/im_livechat/static/src/models/public_livechat_window.js
+++ b/addons/im_livechat/static/src/models/public_livechat_window.js
@@ -4,43 +4,31 @@ import PublicLivechatWindow from '@im_livechat/legacy/widgets/public_livechat_wi
import { registerModel } from '@mail/model/model_core';
import { attr, one } from '@mail/model/model_field';
-import { clear } from '@mail/model/model_field_command';
registerModel({
name: 'PublicLivechatWindow',
identifyingFields: ['livechatButtonViewOwner'],
lifecycleHooks: {
- _willDelete() {
- if (this.legacyChatWindow) {
- this.legacyChatWindow.destroy();
- }
+ _created() {
+ this.update({
+ legacyChatWindow: new PublicLivechatWindow(
+ this.livechatButtonViewOwner.widget,
+ this.messaging,
+ this.messaging.livechatButtonView.publicLivechat.legacyPublicLivechat,
+ {
+ headerBackgroundColor: this.livechatButtonViewOwner.headerBackgroundColor,
+ placeholder: this.livechatButtonViewOwner.inputPlaceholder,
+ titleColor: this.livechatButtonViewOwner.titleColor,
+ },
+ ),
+ });
},
- },
- recordMethods: {
- /**
- * @private
- * @returns {im_livechat/legacy/widgets/public_chat_window|FieldCommand}
- */
- _computeLegacyChatWindow() {
- if (!this.livechatButtonViewOwner.widget && this.legacyChatWindow) {
- this.legacyChatWindow.destroy();
- return clear();
- }
- return new PublicLivechatWindow(
- this.livechatButtonViewOwner.widget,
- this.messaging.livechatButtonView.publicLivechat.legacyPublicLivechat,
- {
- displayStars: false,
- headerBackgroundColor: this.livechatButtonViewOwner.headerBackgroundColor,
- placeholder: this.livechatButtonViewOwner.inputPlaceholder,
- titleColor: this.livechatButtonViewOwner.titleColor,
- },
- );
+ _willDelete() {
+ this.legacyChatWindow.destroy();
},
},
fields: {
legacyChatWindow: attr({
- compute: '_computeLegacyChatWindow',
default: null,
}),
livechatButtonViewOwner: one('LivechatButtonView', {
diff --git a/addons/im_livechat/static/src/public/main.js b/addons/im_livechat/static/src/public/main.js
index 159711679f4..2e7f9f371a0 100644
--- a/addons/im_livechat/static/src/public/main.js
+++ b/addons/im_livechat/static/src/public/main.js
@@ -3,6 +3,7 @@
import { publicLivechatService } from '@im_livechat/services/public_livechat_service';
import { isAvailable, options, serverUrl } from 'im_livechat.loaderData';
+import { insertAndReplace } from '@mail/model/model_field_command';
import { messagingService } from '@mail/services/messaging_service';
import { makeMessagingToLegacyEnv } from '@mail/utils/make_messaging_to_legacy_env';
@@ -11,10 +12,7 @@ import { registry } from '@web/core/registry';
const messagingValuesService = {
start() {
return {
- isInPublicLivechat: true,
- isPublicLivechatAvailable: isAvailable,
- publicLivechatOptions: options,
- publicLivechatServerUrl: serverUrl,
+ publicLivechatGlobal: insertAndReplace({ isAvailable, options, serverUrl }),
};
}
};
diff --git a/addons/website_livechat/static/src/legacy/website_livechat_chatbot_test_script.js b/addons/website_livechat/static/src/legacy/website_livechat_chatbot_test_script.js
index 1894a48f9c6..2aed88feef3 100644
--- a/addons/website_livechat/static/src/legacy/website_livechat_chatbot_test_script.js
+++ b/addons/website_livechat/static/src/legacy/website_livechat_chatbot_test_script.js
@@ -90,9 +90,7 @@ publicWidget.registry.livechatChatbotTestScript = publicWidget.Widget.extend({
const messaging = this.env.services.messaging.get();
return this._super(...arguments).then(() => {
messaging.update({
- isInPublicLivechat: true,
- isPublicLivechatAvailable: true,
- publicLivechatServerUrlChatbot: this.$el.data().serverUrl,
+ publicLivechatGlobal: insertAndReplace({ isAvailable: true, chatbotServerUrl: this.$el.data().serverUrl }),
});
this.livechatButton = new LivechatButtonTestChatbot(this, messaging, this.$el.data());
this.livechatButton.appendTo(document.body);
diff --git a/addons/website_livechat/static/src/models/messaging.js b/addons/website_livechat/static/src/models/messaging.js
deleted file mode 100644
index 92f4db61ebf..00000000000
--- a/addons/website_livechat/static/src/models/messaging.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/** @odoo-module **/
-
-import { addFields } from '@mail/model/model_core';
-import { attr } from '@mail/model/model_field';
-// ensure that the model definition is loaded before the patch
-import '@mail/models/messaging';
-
-addFields('Messaging', {
- publicLivechatServerUrlChatbot: attr(),
-});