From 14792f647b5627fc6d54bf2cbcd8fcdf7a10c0bc Mon Sep 17 00:00:00 2001 From: Tiago Evangelista Pinto Date: Mon, 29 Nov 2021 18:30:54 -0300 Subject: [PATCH 1/4] create new setting for livechat widget --- app/livechat/server/api/lib/livechat.js | 3 ++- app/livechat/server/config.ts | 9 +++++++++ app/livechat/server/lib/Livechat.js | 1 + packages/rocketchat-i18n/i18n/en.i18n.json | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/livechat/server/api/lib/livechat.js b/app/livechat/server/api/lib/livechat.js index b374e5139a99a..b70ca9c78cee2 100644 --- a/app/livechat/server/api/lib/livechat.js +++ b/app/livechat/server/api/lib/livechat.js @@ -111,8 +111,9 @@ export async function settings() { forceAcceptDataProcessingConsent: initSettings.Livechat_force_accept_data_processing_consent, showConnecting: initSettings.Livechat_Show_Connecting, agentHiddenInfo: initSettings.Livechat_show_agent_info === false, + clearLivechatUserSession: initSettings.Livechat_clear_livechat_user_session, limitTextLength: initSettings.Livechat_enable_message_character_limit - && (initSettings.Livechat_message_character_limit || initSettings.Message_MaxAllowedSize), + && (initSettings.Livechat_message_character_limit || initSettings.Message_MaxAllowedSize), }, theme: { title: initSettings.Livechat_title, diff --git a/app/livechat/server/config.ts b/app/livechat/server/config.ts index d8b2d124c15aa..3fc868fae397a 100644 --- a/app/livechat/server/config.ts +++ b/app/livechat/server/config.ts @@ -56,6 +56,15 @@ Meteor.startup(function() { enableQuery: omnichannelEnabledQuery, }); + this.add('Livechat_clear_livechat_user_session', false, { + type: 'boolean', + group: 'Omnichannel', + public: true, + section: 'Livechat', + i18nLabel: 'Clear_Livechat_user_session', + enableQuery: [{ _id: 'Livechat_display_offline_form', value: true }, omnichannelEnabledQuery], + }); + this.add('Livechat_validate_offline_email', true, { type: 'boolean', group: 'Omnichannel', diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js index 78d54cd5f1e61..b860a4f1dc758 100644 --- a/app/livechat/server/lib/Livechat.js +++ b/app/livechat/server/lib/Livechat.js @@ -529,6 +529,7 @@ export const Livechat = { 'Livechat_force_accept_data_processing_consent', 'Livechat_data_processing_consent_text', 'Livechat_show_agent_info', + 'Livechat_clear_livechat_user_session', ]).forEach((setting) => { rcSettings[setting._id] = setting.value; }); diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index 7e4aa128245d2..abaa482ba662c 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -866,6 +866,7 @@ "clear_cache_now": "Clear Cache Now", "Clear_filters": "Clear filters", "clear_history": "Clear History", + "Clear_Livechat_user_session": "Clear Livechat user session when chat ended", "Click_here": "Click here", "Click_here_for_more_details_or_contact_sales_for_a_new_license": "Click here for more details or contact __email__ for a new license.", "Click_here_for_more_info": "Click here for more info", From fb1a4afd26538e1b549f794008bb7544778f0aff Mon Sep 17 00:00:00 2001 From: Tiago Evangelista Pinto Date: Mon, 29 Nov 2021 18:45:12 -0300 Subject: [PATCH 2/4] improve names and info --- app/livechat/server/api/lib/livechat.js | 2 +- app/livechat/server/config.ts | 6 +++--- app/livechat/server/lib/Livechat.js | 2 +- packages/rocketchat-i18n/i18n/en.i18n.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/livechat/server/api/lib/livechat.js b/app/livechat/server/api/lib/livechat.js index b70ca9c78cee2..c4e1ebdcbbffa 100644 --- a/app/livechat/server/api/lib/livechat.js +++ b/app/livechat/server/api/lib/livechat.js @@ -111,7 +111,7 @@ export async function settings() { forceAcceptDataProcessingConsent: initSettings.Livechat_force_accept_data_processing_consent, showConnecting: initSettings.Livechat_Show_Connecting, agentHiddenInfo: initSettings.Livechat_show_agent_info === false, - clearLivechatUserSession: initSettings.Livechat_clear_livechat_user_session, + removeGuestInfoWhenChatEnded: initSettings.Livechat_remove_guest_info_when_chat_ended, limitTextLength: initSettings.Livechat_enable_message_character_limit && (initSettings.Livechat_message_character_limit || initSettings.Message_MaxAllowedSize), }, diff --git a/app/livechat/server/config.ts b/app/livechat/server/config.ts index 3fc868fae397a..56ce3950a3be0 100644 --- a/app/livechat/server/config.ts +++ b/app/livechat/server/config.ts @@ -56,13 +56,13 @@ Meteor.startup(function() { enableQuery: omnichannelEnabledQuery, }); - this.add('Livechat_clear_livechat_user_session', false, { + this.add('Livechat_remove_guest_info_when_chat_ended', false, { type: 'boolean', group: 'Omnichannel', public: true, section: 'Livechat', - i18nLabel: 'Clear_Livechat_user_session', - enableQuery: [{ _id: 'Livechat_display_offline_form', value: true }, omnichannelEnabledQuery], + i18nLabel: 'Remove_guest_info_when_chat_ended', + enableQuery: omnichannelEnabledQuery, }); this.add('Livechat_validate_offline_email', true, { diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js index b860a4f1dc758..efc721142164e 100644 --- a/app/livechat/server/lib/Livechat.js +++ b/app/livechat/server/lib/Livechat.js @@ -529,7 +529,7 @@ export const Livechat = { 'Livechat_force_accept_data_processing_consent', 'Livechat_data_processing_consent_text', 'Livechat_show_agent_info', - 'Livechat_clear_livechat_user_session', + 'Livechat_remove_guest_info_when_chat_ended', ]).forEach((setting) => { rcSettings[setting._id] = setting.value; }); diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index abaa482ba662c..e1be9402c548a 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -866,7 +866,7 @@ "clear_cache_now": "Clear Cache Now", "Clear_filters": "Clear filters", "clear_history": "Clear History", - "Clear_Livechat_user_session": "Clear Livechat user session when chat ended", + "Remove_guest_info_when_chat_ended": "Remove guest information when chat ended", "Click_here": "Click here", "Click_here_for_more_details_or_contact_sales_for_a_new_license": "Click here for more details or contact __email__ for a new license.", "Click_here_for_more_info": "Click here for more info", From f7d3e275b23eab90b82c641d772b930e29eb7330 Mon Sep 17 00:00:00 2001 From: Tiago Evangelista Pinto Date: Wed, 1 Dec 2021 01:03:56 -0300 Subject: [PATCH 3/4] depracteWarning on livechat:getInitialData Meteor method --- app/livechat/server/methods/getInitialData.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/livechat/server/methods/getInitialData.js b/app/livechat/server/methods/getInitialData.js index bac76ce8d49a6..1243a3360ec24 100644 --- a/app/livechat/server/methods/getInitialData.js +++ b/app/livechat/server/methods/getInitialData.js @@ -3,6 +3,7 @@ import _ from 'underscore'; import { LivechatRooms, Users, LivechatDepartment, LivechatTrigger, LivechatVisitors } from '../../../models'; import { Livechat } from '../lib/Livechat'; +import { deprecationWarning } from '../../../api/server/helpers/deprecationWarning'; Meteor.methods({ 'livechat:getInitialData'(visitorToken, departmentId) { @@ -98,6 +99,7 @@ Meteor.methods({ info.allowSwitchingDepartments = initSettings.Livechat_allow_switching_departments; info.online = Users.findOnlineAgents().count() > 0; - return info; + + return deprecationWarning({ endpoint: 'livechat:getInitialData', versionWillBeRemoved: '5.0', response: info }); }, }); From 4167b4dd3184563601d04b79cdfa3c946da1674a Mon Sep 17 00:00:00 2001 From: Tiago Evangelista Pinto Date: Wed, 1 Dec 2021 01:11:47 -0300 Subject: [PATCH 4/4] refactoring setting names and texts --- app/livechat/server/api/lib/livechat.js | 2 +- app/livechat/server/config.ts | 4 ++-- app/livechat/server/lib/Livechat.js | 2 +- packages/rocketchat-i18n/i18n/en.i18n.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/livechat/server/api/lib/livechat.js b/app/livechat/server/api/lib/livechat.js index c4e1ebdcbbffa..a8abb9115851c 100644 --- a/app/livechat/server/api/lib/livechat.js +++ b/app/livechat/server/api/lib/livechat.js @@ -111,7 +111,7 @@ export async function settings() { forceAcceptDataProcessingConsent: initSettings.Livechat_force_accept_data_processing_consent, showConnecting: initSettings.Livechat_Show_Connecting, agentHiddenInfo: initSettings.Livechat_show_agent_info === false, - removeGuestInfoWhenChatEnded: initSettings.Livechat_remove_guest_info_when_chat_ended, + clearLocalStorageWhenChatEnded: initSettings.Livechat_clear_local_storage_when_chat_ended, limitTextLength: initSettings.Livechat_enable_message_character_limit && (initSettings.Livechat_message_character_limit || initSettings.Message_MaxAllowedSize), }, diff --git a/app/livechat/server/config.ts b/app/livechat/server/config.ts index 56ce3950a3be0..7adadc1089689 100644 --- a/app/livechat/server/config.ts +++ b/app/livechat/server/config.ts @@ -56,12 +56,12 @@ Meteor.startup(function() { enableQuery: omnichannelEnabledQuery, }); - this.add('Livechat_remove_guest_info_when_chat_ended', false, { + this.add('Livechat_clear_local_storage_when_chat_ended', false, { type: 'boolean', group: 'Omnichannel', public: true, section: 'Livechat', - i18nLabel: 'Remove_guest_info_when_chat_ended', + i18nLabel: 'Clear_livechat_session_when_chat_ended', enableQuery: omnichannelEnabledQuery, }); diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js index efc721142164e..7110fadf8310a 100644 --- a/app/livechat/server/lib/Livechat.js +++ b/app/livechat/server/lib/Livechat.js @@ -529,7 +529,7 @@ export const Livechat = { 'Livechat_force_accept_data_processing_consent', 'Livechat_data_processing_consent_text', 'Livechat_show_agent_info', - 'Livechat_remove_guest_info_when_chat_ended', + 'Livechat_clear_local_storage_when_chat_ended', ]).forEach((setting) => { rcSettings[setting._id] = setting.value; }); diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index e1be9402c548a..30a099f40d39b 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -866,7 +866,7 @@ "clear_cache_now": "Clear Cache Now", "Clear_filters": "Clear filters", "clear_history": "Clear History", - "Remove_guest_info_when_chat_ended": "Remove guest information when chat ended", + "Clear_livechat_session_when_chat_ended": "Clear guest session when chat ended", "Click_here": "Click here", "Click_here_for_more_details_or_contact_sales_for_a_new_license": "Click here for more details or contact __email__ for a new license.", "Click_here_for_more_info": "Click here for more info",