From 986cde353520162c1752956045c654d46c78a5c5 Mon Sep 17 00:00:00 2001 From: Renato Becker Date: Fri, 18 May 2018 19:50:49 -0300 Subject: [PATCH] [NEW] Enable/disable Livechat registration form fields (#10584) [NEW] Options to enable/disable each Livechat registration form field --- packages/rocketchat-i18n/i18n/en.i18n.json | 5 +- packages/rocketchat-i18n/i18n/pt.i18n.json | 5 +- .../.app/client/lib/_livechat.js | 14 +++++ .../.app/client/lib/commands.js | 2 +- .../.app/client/views/livechatWindow.js | 10 +++- .../.app/client/views/register.html | 9 ++- .../.app/client/views/register.js | 43 +++++++++++--- .../client/views/app/livechatAppearance.html | 35 +++++++++++ .../client/views/app/livechatAppearance.js | 59 +++++++++++++++++-- packages/rocketchat-livechat/config.js | 22 ++++++- .../server/lib/Livechat.js | 5 +- .../server/methods/getInitialData.js | 6 +- .../server/methods/saveAppearance.js | 5 +- .../server/publications/livechatAppearance.js | 5 +- 14 files changed, 199 insertions(+), 26 deletions(-) diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json index 34bbacfe2a7..7dde0ef4736 100644 --- a/packages/rocketchat-i18n/i18n/en.i18n.json +++ b/packages/rocketchat-i18n/i18n/en.i18n.json @@ -1272,6 +1272,7 @@ "Livechat_online": "Livechat online", "Livechat_open_inquiery_show_connecting": "Show Connecting Message Instead of Input When Guest is Not Yet Connected to an Agent", "Livechat_Queue": "Livechat Queue", + "Livechat_registration_form": "Registration Form", "Livechat_room_count": "Livechat Room Count", "Livechat_Routing_Method": "Livechat Routing Method", "Livechat_Take_Confirm": "Do you want to take this client?", @@ -1893,13 +1894,15 @@ "Show_all": "Show All", "Show_Avatars": "Show Avatars", "Show_counter": "Show counter", - "Show_room_counter_on_sidebar": "Show room counter on sidebar", + "Show_email_field": "Show email field", "Show_more": "Show more", + "Show_name_field": "Show name field", "show_offline_users": "show offline users", "Show_on_registration_page": "Show on registration page", "Show_only_online": "Show Online Only", "Show_preregistration_form": "Show Pre-registration Form", "Show_queue_list_to_all_agents": "Show Queue List to All Agents", + "Show_room_counter_on_sidebar": "Show room counter on sidebar", "Show_the_keyboard_shortcut_list": "Show the keyboard shortcut list", "Showing_archived_results": "

Showing %s archived results

", "Showing_online_users": "Showing: __total_showing__, Online: __online__, Total: __total__ users", diff --git a/packages/rocketchat-i18n/i18n/pt.i18n.json b/packages/rocketchat-i18n/i18n/pt.i18n.json index ac16ff65dc3..28cbe4eb94c 100644 --- a/packages/rocketchat-i18n/i18n/pt.i18n.json +++ b/packages/rocketchat-i18n/i18n/pt.i18n.json @@ -1237,6 +1237,7 @@ "Livechat_online": "Livechat on-line", "Livechat_open_inquiery_show_connecting": "Mostrar conexão de mensagem em vez de entrada quando o visitante ainda não está conectado a um agente", "Livechat_Queue": "Roleta Livechat", + "Livechat_registration_form": "Formulário de pré-registro", "Livechat_room_count": "Contador de salas de livechat", "Livechat_Routing_Method": "Método de roteamento Livechat", "Livechat_Take_Confirm": "Você quer levar esse cliente?", @@ -1838,13 +1839,15 @@ "Show_all": "Mostrar tudo", "Show_Avatars": "Mostrar Avatares", "Show_counter": "Show counter", - "Show_room_counter_on_sidebar": "Mostrar contador do quarto na barra lateral", + "Show_email_field": "Mostrar campo e-mail", "Show_more": "Mostrar mais", + "Show_name_field": "Mostrar campo nome", "show_offline_users": "mostrar usuários offline", "Show_on_registration_page": "Mostrar na página de registro", "Show_only_online": "Mostrar apenas online", "Show_preregistration_form": "Mostrar formulário de pré-registro", "Show_queue_list_to_all_agents": "Mostrar link da roleta à todos agentes", + "Show_room_counter_on_sidebar": "Mostrar contador do quarto na barra lateral", "Show_the_keyboard_shortcut_list": "Exibe a lisgta de atalhos do teclado", "Showing_archived_results": "

Exibindo %s resultados arquivados

", "Showing_online_users": "Mostrando __total_showing__ de __total__ usuários", diff --git a/packages/rocketchat-livechat/.app/client/lib/_livechat.js b/packages/rocketchat-livechat/.app/client/lib/_livechat.js index 781f500bc64..541af4c2a82 100644 --- a/packages/rocketchat-livechat/.app/client/lib/_livechat.js +++ b/packages/rocketchat-livechat/.app/client/lib/_livechat.js @@ -23,6 +23,8 @@ this.Livechat = new (class Livechat { this._videoCall = new ReactiveVar(false); this._transcriptMessage = new ReactiveVar(''); this._conversationFinishedMessage = new ReactiveVar(''); + this._nameFieldRegistrationForm = new ReactiveVar(false); + this._emailFieldRegistrationForm = new ReactiveVar(false); this._connecting = new ReactiveVar(false); this._room = new ReactiveVar(null); this._department = new ReactiveVar(null); @@ -104,6 +106,12 @@ this.Livechat = new (class Livechat { get conversationFinishedMessage() { return this._conversationFinishedMessage.get(); } + get nameFieldRegistrationForm() { + return this._nameFieldRegistrationForm.get(); + } + get emailFieldRegistrationForm() { + return this._emailFieldRegistrationForm.get(); + } get department() { return this._department.get(); } @@ -168,6 +176,12 @@ this.Livechat = new (class Livechat { set conversationFinishedMessage(value) { this._conversationFinishedMessage.set(value); } + set nameFieldRegistrationForm(value) { + this._nameFieldRegistrationForm.set(value); + } + set emailFieldRegistrationForm(value) { + this._emailFieldRegistrationForm.set(value); + } set connecting(value) { this._connecting.set(value); } diff --git a/packages/rocketchat-livechat/.app/client/lib/commands.js b/packages/rocketchat-livechat/.app/client/lib/commands.js index 34631ba9e52..0e5c1dd1f23 100644 --- a/packages/rocketchat-livechat/.app/client/lib/commands.js +++ b/packages/rocketchat-livechat/.app/client/lib/commands.js @@ -17,7 +17,7 @@ this.Commands = { if (Livechat.transcript) { const visitorData = visitor.getData(); const email = visitorData && visitorData.visitorEmails && visitorData.visitorEmails.length > 0 ? visitorData.visitorEmails[0].address : ''; - const transcriptMessage = (!_.isEmpty(Livechat.transcriptMessage)) ? Livechat.transcriptMessage : (TAPi18n.__('Would_you_like_a_copy_if_this_chat_emailed')); + const transcriptMessage = (Livechat.transcriptMessage) ? Livechat.transcriptMessage : (TAPi18n.__('Would_you_like_a_copy_if_this_chat_emailed')); swal({ title: t('Chat_ended'), diff --git a/packages/rocketchat-livechat/.app/client/views/livechatWindow.js b/packages/rocketchat-livechat/.app/client/views/livechatWindow.js index 3116100f6e5..414bd2cdf9a 100644 --- a/packages/rocketchat-livechat/.app/client/views/livechatWindow.js +++ b/packages/rocketchat-livechat/.app/client/views/livechatWindow.js @@ -1,6 +1,10 @@ /* globals Department, Livechat, LivechatVideoCall */ import visitor from '../../imports/client/visitor'; +function showDepartments() { + return Department.find({ showOnRegistration: true }).count() > 1; +}; + Template.livechatWindow.helpers({ title() { return Livechat.title; @@ -21,7 +25,7 @@ Template.livechatWindow.helpers({ if (Session.get('triggered') || visitor.getId()) { return false; } - return Livechat.registrationForm; + return (Livechat.registrationForm && (Livechat.nameFieldRegistrationForm || Livechat.emailFieldRegistrationForm || showDepartments())); }, showSwitchDepartmentForm() { return Livechat.showSwitchDepartmentForm; @@ -115,7 +119,8 @@ Template.livechatWindow.onCreated(function() { } Livechat.videoCall = result.videoCall; Livechat.registrationForm = result.registrationForm; - + Livechat.nameFieldRegistrationForm = result.nameFieldRegistrationForm; + Livechat.emailFieldRegistrationForm = result.emailFieldRegistrationForm; if (result.room) { Livechat.room = result.room._id; @@ -145,6 +150,7 @@ Template.livechatWindow.onCreated(function() { Department.insert(department); }); Livechat.allowSwitchingDepartments = result.allowSwitchingDepartments; + Livechat.ready(); } }); diff --git a/packages/rocketchat-livechat/.app/client/views/register.html b/packages/rocketchat-livechat/.app/client/views/register.html index 9538e7113b9..142ca763759 100644 --- a/packages/rocketchat-livechat/.app/client/views/register.html +++ b/packages/rocketchat-livechat/.app/client/views/register.html @@ -8,9 +8,12 @@ {{{welcomeMessage}}}

- - - + {{#if showNameFieldRegisterForm}} + + {{/if}} + {{#if showEmailFieldRegisterForm}} + + {{/if}} {{#if showDepartments}} +
+ {{_ "Livechat_registration_form"}} + + + + +
{{_ "Conversation_finished"}}
diff --git a/packages/rocketchat-livechat/client/views/app/livechatAppearance.js b/packages/rocketchat-livechat/client/views/app/livechatAppearance.js index d056e985504..4a2d07feaa3 100644 --- a/packages/rocketchat-livechat/client/views/app/livechatAppearance.js +++ b/packages/rocketchat-livechat/client/views/app/livechatAppearance.js @@ -82,6 +82,21 @@ Template.livechatAppearance.helpers({ conversationFinishedMessage() { return Template.instance().conversationFinishedMessage.get(); }, + registrationFormEnabled() { + if (Template.instance().registrationFormEnabled.get()) { + return 'checked'; + } + }, + registrationFormNameFieldEnabled() { + if (Template.instance().registrationFormNameFieldEnabled.get()) { + return 'checked'; + } + }, + registrationFormEmailFieldEnabled() { + if (Template.instance().registrationFormEmailFieldEnabled.get()) { + return 'checked'; + } + }, sampleColor() { if (Template.instance().previewState.get().indexOf('offline') !== -1) { return Template.instance().colorOffline.get(); @@ -181,6 +196,9 @@ Template.livechatAppearance.onCreated(function() { this.colorOffline = new ReactiveVar(null); this.offlineEmail = new ReactiveVar(null); this.conversationFinishedMessage = new ReactiveVar(null); + this.registrationFormEnabled = new ReactiveVar(null); + this.registrationFormNameFieldEnabled = new ReactiveVar(null); + this.registrationFormEmailFieldEnabled = new ReactiveVar(null); this.autorun(() => { const setting = LivechatAppearance.findOne('Livechat_title'); @@ -226,18 +244,26 @@ Template.livechatAppearance.onCreated(function() { const setting = LivechatAppearance.findOne('Livechat_conversation_finished_message'); this.conversationFinishedMessage.set(setting && setting.value); }); + this.autorun(() => { + const setting = LivechatAppearance.findOne('Livechat_registration_form'); + this.registrationFormEnabled.set(setting && setting.value); + }); + this.autorun(() => { + const setting = LivechatAppearance.findOne('Livechat_name_field_registration_form'); + this.registrationFormNameFieldEnabled.set(setting && setting.value); + }); + this.autorun(() => { + const setting = LivechatAppearance.findOne('Livechat_email_field_registration_form'); + this.registrationFormEmailFieldEnabled.set(setting && setting.value); + }); }); Template.livechatAppearance.events({ 'change .preview-mode'(e, instance) { instance.previewState.set(e.currentTarget.value); }, - 'change .preview-settings, keyup .preview-settings'(e, instance) { - let value = e.currentTarget.value; - if (e.currentTarget.type === 'radio') { - value = value === 'true'; - } - instance[e.currentTarget.name].set(value); + 'change .js-input-check'(e, instance) { + instance[e.currentTarget.name].set(e.currentTarget.checked); }, 'click .reset-settings'(e, instance) { e.preventDefault(); @@ -271,6 +297,15 @@ Template.livechatAppearance.events({ const settingConversationFinishedMessage = LivechatAppearance.findOne('Livechat_conversation_finished_message'); instance.conversationFinishedMessage.set(settingConversationFinishedMessage && settingConversationFinishedMessage.value); + + const settingRegistrationFormEnabled = LivechatAppearance.findOne('Livechat_registration_form'); + instance.registrationFormEnabled.set(settingRegistrationFormEnabled && settingRegistrationFormEnabled.value); + + const settingRegistrationFormNameFieldEnabled = LivechatAppearance.findOne('Livechat_name_field_registration_form'); + instance.registrationFormNameFieldEnabled.set(settingRegistrationFormNameFieldEnabled && settingRegistrationFormNameFieldEnabled.value); + + const settingRegistrationFormEmailFieldEnabled = LivechatAppearance.findOne('Livechat_email_field_registration_form'); + instance.registrationFormEmailFieldEnabled.set(settingRegistrationFormEmailFieldEnabled && settingRegistrationFormEmailFieldEnabled.value); }, 'submit .rocket-form'(e, instance) { e.preventDefault(); @@ -319,6 +354,18 @@ Template.livechatAppearance.events({ { _id: 'Livechat_conversation_finished_message', value: s.trim(instance.conversationFinishedMessage.get()) + }, + { + _id: 'Livechat_registration_form', + value: instance.registrationFormEnabled.get() + }, + { + _id: 'Livechat_name_field_registration_form', + value: instance.registrationFormNameFieldEnabled.get() + }, + { + _id: 'Livechat_email_field_registration_form', + value: instance.registrationFormEmailFieldEnabled.get() } ]; diff --git a/packages/rocketchat-livechat/config.js b/packages/rocketchat-livechat/config.js index c2a67cbf7c9..054f23531e8 100644 --- a/packages/rocketchat-livechat/config.js +++ b/packages/rocketchat-livechat/config.js @@ -74,7 +74,6 @@ Meteor.startup(function() { i18nLabel: 'Offline_success_message' }); - RocketChat.settings.add('Livechat_registration_form', true, { type: 'boolean', group: 'Livechat', public: true, i18nLabel: 'Show_preregistration_form' }); RocketChat.settings.add('Livechat_allow_switching_departments', true, { type: 'boolean', group: 'Livechat', public: true, i18nLabel: 'Allow_switching_departments' }); RocketChat.settings.add('Livechat_show_agent_email', true, { type: 'boolean', group: 'Livechat', public: true, i18nLabel: 'Show_agent_email' }); @@ -85,6 +84,27 @@ Meteor.startup(function() { i18nLabel: 'Conversation_finished_message' }); + RocketChat.settings.add('Livechat_registration_form', true, { + type: 'boolean', + group: 'Livechat', + public: true, + i18nLabel: 'Show_preregistration_form' + }); + + RocketChat.settings.add('Livechat_name_field_registration_form', true, { + type: 'boolean', + group: 'Livechat', + public: true, + i18nLabel: 'Show_name_field' + }); + + RocketChat.settings.add('Livechat_email_field_registration_form', true, { + type: 'boolean', + group: 'Livechat', + public: true, + i18nLabel: 'Show_email_field' + }); + RocketChat.settings.add('Livechat_guest_count', 1, { type: 'int', group: 'Livechat' }); RocketChat.settings.add('Livechat_Room_Count', 1, { diff --git a/packages/rocketchat-livechat/server/lib/Livechat.js b/packages/rocketchat-livechat/server/lib/Livechat.js index 7ef7354ea38..e547a37c70b 100644 --- a/packages/rocketchat-livechat/server/lib/Livechat.js +++ b/packages/rocketchat-livechat/server/lib/Livechat.js @@ -276,7 +276,10 @@ RocketChat.Livechat = { 'Language', 'Livechat_enable_transcript', 'Livechat_transcript_message', - 'Livechat_conversation_finished_message' + 'Livechat_conversation_finished_message', + 'Livechat_name_field_registration_form', + 'Livechat_email_field_registration_form' + ]).forEach((setting) => { settings[setting._id] = setting.value; }); diff --git a/packages/rocketchat-livechat/server/methods/getInitialData.js b/packages/rocketchat-livechat/server/methods/getInitialData.js index 01415950fc7..8f4ac1d5a30 100644 --- a/packages/rocketchat-livechat/server/methods/getInitialData.js +++ b/packages/rocketchat-livechat/server/methods/getInitialData.js @@ -21,7 +21,9 @@ Meteor.methods({ offlineUnavailableMessage: null, displayOfflineForm: null, videoCall: null, - conversationFinishedMessage: null + conversationFinishedMessage: null, + nameFieldRegistrationForm: null, + emailFieldRegistrationForm: null }; const room = RocketChat.models.Rooms.findOpenByVisitorToken(visitorToken, { @@ -69,6 +71,8 @@ Meteor.methods({ info.transcript = initSettings.Livechat_enable_transcript; info.transcriptMessage = initSettings.Livechat_transcript_message; info.conversationFinishedMessage = initSettings.Livechat_conversation_finished_message; + info.nameFieldRegistrationForm = initSettings.Livechat_name_field_registration_form; + info.emailFieldRegistrationForm = initSettings.Livechat_email_field_registration_form; info.agentData = room && room[0] && room[0].servedBy && RocketChat.models.Users.getAgentInfo(room[0].servedBy._id); diff --git a/packages/rocketchat-livechat/server/methods/saveAppearance.js b/packages/rocketchat-livechat/server/methods/saveAppearance.js index a9aa4cccf98..4a8e4fc6fb2 100644 --- a/packages/rocketchat-livechat/server/methods/saveAppearance.js +++ b/packages/rocketchat-livechat/server/methods/saveAppearance.js @@ -15,7 +15,10 @@ Meteor.methods({ 'Livechat_offline_title', 'Livechat_offline_title_color', 'Livechat_offline_email', - 'Livechat_conversation_finished_message' + 'Livechat_conversation_finished_message', + 'Livechat_registration_form', + 'Livechat_name_field_registration_form', + 'Livechat_email_field_registration_form' ]; const valid = settings.every((setting) => { diff --git a/packages/rocketchat-livechat/server/publications/livechatAppearance.js b/packages/rocketchat-livechat/server/publications/livechatAppearance.js index db0a1788d0b..f31024d2df7 100644 --- a/packages/rocketchat-livechat/server/publications/livechatAppearance.js +++ b/packages/rocketchat-livechat/server/publications/livechatAppearance.js @@ -20,7 +20,10 @@ Meteor.publish('livechat:appearance', function() { 'Livechat_offline_title', 'Livechat_offline_title_color', 'Livechat_offline_email', - 'Livechat_conversation_finished_message' + 'Livechat_conversation_finished_message', + 'Livechat_registration_form', + 'Livechat_name_field_registration_form', + 'Livechat_email_field_registration_form' ] } };