Livechat CRM integration improvements

client/startup/defaultRoomTypes.coffee

@@ -22,6 +22,8 @@ RocketChat.roomTypes.add 'c', 10,
 		return roomData.name
 	condition: ->
 		return RocketChat.authz.hasAtLeastOnePermission ['view-c-room', 'view-joined-room']
+	showJoinLink: (roomId) ->
+		return !! ChatRoom.findOne { _id: roomId, t: 'c' }
 
 RocketChat.roomTypes.add 'd', 20,
 	template: 'directMessages'

packages/rocketchat-lib/client/lib/roomTypes.coffee

@@ -71,6 +71,41 @@ RocketChat.roomTypes = new class
 	findRoom = (roomType, identifier, user) ->
 		return roomTypes[roomType]?.findRoom identifier, user
 
+	canSendMessage = (roomId) ->
+		return ChatSubscription.find({ rid: roomId }).count() > 0
+
+	verifyCanSendMessage = (roomId) ->
+		room = ChatRoom.findOne({ _id: roomId }, { fields: { t: 1 } })
+		return if not room?.t?
+
+		roomType = room.t
+
+		return roomTypes[roomType]?.canSendMessage roomId if roomTypes[roomType]?.canSendMessage?
+
+		return canSendMessage roomId
+
+	verifyShowJoinLink = (roomId) ->
+		room = ChatRoom.findOne({ _id: roomId }, { fields: { t: 1 } })
+		return if not room?.t?
+
+		roomType = room.t
+
+		if not roomTypes[roomType]?.showJoinLink?
+			return false
+
+		return roomTypes[roomType].showJoinLink roomId
+
+	getNotSubscribedTpl = (roomId) ->
+		room = ChatRoom.findOne({ _id: roomId }, { fields: { t: 1 } })
+		return if not room?.t?
+
+		roomType = room.t
+
+		if not roomTypes[roomType]?.notSubscribedTpl?
+			return false
+
+		return roomTypes[roomType].notSubscribedTpl
+
 	# addType: addType
 	getTypes: getAllTypes
 	getIdentifiers: getIdentifiers
@@ -86,4 +121,8 @@ RocketChat.roomTypes = new class
 
 	checkCondition: checkCondition
 
+	verifyCanSendMessage: verifyCanSendMessage
+	verifyShowJoinLink: verifyShowJoinLink
+	getNotSubscribedTpl: getNotSubscribedTpl
+
 	add: add

packages/rocketchat-lib/i18n/en.i18n.json

@@ -241,6 +241,7 @@
   "close" : "close",
   "Close" : "Close",
   "Closed" : "Closed",
+  "Closed_by_visitor" : "Closed by visitor",
   "Closing_chat" : "Closing chat",
   "Collapse_Embedded_Media_By_Default" : "Collapse embedded media by default",
   "Color" : "Color",
@@ -1126,6 +1127,7 @@
   "There_are_no_agents_added_to_this_department_yet" : "There are no agents added to this department yet.",
   "There_are_no_integrations" : "There are no integrations",
   "There_are_no_users_in_this_role" : "There are no users in this role.",
+  "This_conversation_is_already_closed" : "This conversation is already closed.",
   "This_email_has_already_been_used_and_has_not_been_verified__Please_change_your_password" : "This email has already been used and has not been verified. Please change your password.",
   "This_is_a_desktop_notification" : "This is a desktop notification",
   "This_is_a_push_test_messsage" : "This is a push test messsage",

packages/rocketchat-lib/i18n/pt.i18n.json

@@ -240,6 +240,7 @@
   "close" : "fechar",
   "Close" : "Fechar",
   "Closed" : "Fechado",
+  "Closed_by_visitor" : "Encerrado pelo visitante",
   "Closing_chat" : "Encerrando chat",
   "Collapse_Embedded_Media_By_Default" : "Esconder mídia por padrão",
   "Color" : "Cor",
@@ -1095,6 +1096,7 @@
   "There_are_no_agents_added_to_this_department_yet" : "Não há agentes adicionados a este departamento ainda.",
   "There_are_no_integrations" : "Não há integrações",
   "There_are_no_users_in_this_role" : "Não há usuários neste papel.",
+  "This_conversation_is_already_closed" : "Esta conversa já está fechada.",
   "This_email_has_already_been_used_and_has_not_been_verified__Please_change_your_password" : "Este e-mail já foi utilizado e não foi verificado. Por favor, altere sua senha.",
   "This_is_a_desktop_notification" : "Esta é uma notificação de desktop",
   "This_is_a_push_test_messsage" : "Este é uma mensagem de teste de push notification",
@@ -1260,4 +1262,4 @@
   "Your_mail_was_sent_to_s" : "O seu e-mail foi enviado para %s",
   "Your_password_is_wrong" : "Sua senha está errada!",
   "Your_push_was_sent_to_s_devices" : "Sua natificação foi enviada para %s dispositivos"
-}
+}

packages/rocketchat-livechat/app/client/components/modal.html

@@ -0,0 +1,8 @@
+<template name="modal">
+	<div class="modal">
+		<div class="overlay"></div>
+		<div class="wrapper">
+			{{> Template.contentBlock}}
+		</div>
+	</div>
+</template>

packages/rocketchat-livechat/app/client/stylesheets/main.less

@@ -24,10 +24,12 @@ body {
 	overflow: hidden;
 	position: relative;
 	// background-color: @primary-background-color;
+
+	border-top-right-radius: 5px;
+	border-top-left-radius: 5px;
 }
 
 input,
-button,
 select,
 textarea {
 	font-family: inherit;
@@ -40,6 +42,17 @@ textarea {
 	outline: none;
 }
 
+button {
+	background: none;
+	border: none;
+	padding: 0px;
+	text-align: left;
+	cursor: pointer;
+	text-transform: inherit;
+	color: inherit;
+	font-style: inherit;
+}
+
 input:focus {
 	outline: none;
 	box-shadow: 0 0 0;
@@ -114,13 +127,16 @@ input:focus {
 	flex-direction: column;
 	height: 100%;
 
+	border-top-right-radius: inherit;
+	border-top-left-radius: inherit;
+
 	.title {
 		flex: 1 0 @header-min-height;
 
 		line-height: @header-min-height;
 
-		border-top-right-radius: 5px;
-		border-top-left-radius: 5px;
+		border-top-right-radius: inherit;
+		border-top-left-radius: inherit;
 		color: #FFF;
 		z-index: 10;
 		cursor: pointer;
@@ -398,6 +414,56 @@ input:focus {
 				color: @primary-font-color;
 			}
 		}
+		.toggle-options {
+			clear: both;
+			color: @secondary-font-color;
+			margin-left: 6px;
+			outline: none;
+			margin-top: 5px;
+			font-size: 0.65rem;
+		}
+
+		.options-menu {
+			min-width: 100px;
+			// min-height: 40px;
+			bottom: 21px;
+			left: 6px;
+			border-radius: 2px;
+			padding: 6px 0;
+			background-color: #fff;
+			color: @secondary-font-color;
+
+			box-shadow: 0px 1px 1px 0 rgba(0,0,0,0.2), 0 2px 10px 0 rgba(0,0,0,.16);
+			position: absolute;
+			z-index: 200;
+
+			.transition(transform 0.15s ease, visibility 0.15s ease, opacity 0.15s ease);
+
+			.transform(translateY(30px));
+			opacity: 0;
+			visibility: hidden;
+
+			&.show {
+				.transform(translateY(0px));
+				opacity: 1;
+				display: block;
+				visibility: visible;
+			}
+
+			ul {
+				li {
+					padding: 0 13px 0 8px;
+					&:hover {
+						background-color: #EEE;
+					}
+					button {
+						display: block;
+						padding: 4px 2px;
+						outline: none;
+					}
+				}
+			}
+		}
 	}
 	.offline {
 		flex: 1 1 100%;
@@ -475,8 +541,13 @@ input:focus {
 	}
 }
 
-#survey {
+.modal {
+	border-top-right-radius: inherit;
+	border-top-left-radius: inherit;
+
 	.overlay {
+		border-top-right-radius: inherit;
+		border-top-left-radius: inherit;
 		background-color: rgba(0,0,0,0.5);
 		position: fixed;
 		height: 100%;
@@ -510,7 +581,7 @@ input:focus {
 		}
 
 		.content {
-			overflow-y: scroll;
+			overflow-y: auto;
 			padding: 10px;
 			flex: 1 1 100%;
 
@@ -572,6 +643,11 @@ input:focus {
 	}
 }
 
+.sweet-overlay {
+	border-top-right-radius: inherit;
+	border-top-left-radius: inherit;
+}
+
 @media all and(max-height: 200px) {
 	.livechat-room {
 		.title {

packages/rocketchat-livechat/app/client/views/messages.html

@@ -20,5 +20,8 @@
 			<textarea class="input-message" placeholder="{{_ "Type_your_message"}}"></textarea>
 		</div>
 		<i class="send-button icon-paper-plane" aria-label="{{_ "Send"}}"></i>
+
+		{{> options show=showOptions}}
+		<button class="toggle-options">{{optionsLink}}</button>
 	</div>
 </template>

packages/rocketchat-livechat/app/client/views/messages.js

@@ -1,5 +1,5 @@
 Template.messages.helpers({
-	messages: function() {
+	messages() {
 		return ChatMessage.find({
 			rid: visitor.getRoom(),
 			t: {
@@ -10,6 +10,20 @@ Template.messages.helpers({
 				ts: 1
 			}
 		});
+	},
+	showOptions() {
+		if (Template.instance().showOptions.get()) {
+			return 'show';
+		} else {
+			return '';
+		}
+	},
+	optionsLink() {
+		if (Template.instance().showOptions.get()) {
+			return t('Close_menu');
+		} else {
+			return t('Options');
+		}
 	}
 });
 
@@ -35,16 +49,18 @@ Template.messages.events({
 	},
 	'click .error': function(event) {
 		return $(event.currentTarget).removeClass('show');
+	},
+	'click .toggle-options': function(event, instance) {
+		instance.showOptions.set(!instance.showOptions.get());
 	}
 });
 
 Template.messages.onCreated(function() {
-	var self;
-	self = this;
+	this.atBottom = true;
 
-	self.atBottom = true;
+	this.showOptions = new ReactiveVar(false);
 
-	self.updateMessageInputHeight = function(input) {
+	this.updateMessageInputHeight = function(input) {
 		// Inital height is 28. If the scrollHeight is greater than that( we have more text than area ),
 		// increase the size of the textarea. The max-height is set at 200
 		// even if the scrollHeight become bigger than that it should never exceed that.
@@ -56,6 +72,16 @@ Template.messages.onCreated(function() {
 			return $(input).height($(input).val() === '' ? '15px' : (inputScrollHeight >= 200 ? inputScrollHeight - 50 : inputScrollHeight - 20));
 		}
 	};
+
+	$(document).click((/*event*/) => {
+		if (!this.showOptions.get()) {
+			return;
+		}
+		let target = $(event.target);
+		if (!target.closest('.options-menu').length && !target.is('.options-menu') && !target.closest('.toggle-options').length && !target.is('.toggle-options')) {
+			this.showOptions.set(false);
+		}
+	});
 });
 
 Template.messages.onRendered(function() {

packages/rocketchat-livechat/app/client/views/options.html

@@ -0,0 +1,7 @@
+<template name="options">
+	<div class="options-menu {{show}}">
+		<ul>
+			<li><button class="end-chat"><i class="icon-cancel"></i> {{_ "End_chat"}}</button></li>
+		</ul>
+	</div>
+</template>

packages/rocketchat-livechat/app/client/views/options.js

@@ -0,0 +1,29 @@
+Template.options.events({
+	'click .end-chat'() {
+		swal({
+			text: t('Are_you_sure_do_you_want_end_this_chat'),
+			title: '',
+			type: 'warning',
+			showCancelButton: true,
+			confirmButtonColor: '#DD6B55',
+			confirmButtonText: t('Yes'),
+			cancelButtonText: t('No'),
+			closeOnConfirm: false,
+			html: false
+		}, () => {
+			Meteor.call('livechat:closeByVisitor', (error) => {
+				if (error) {
+					return console.log('Error ->', error);
+				}
+
+				swal({
+					title: '',
+					text: t('Chat_ended'),
+					type: 'success',
+					timer: 1500,
+					showConfirmButton: false
+				});
+			});
+		});
+	}
+});

packages/rocketchat-livechat/app/i18n/en.i18n.json

@@ -1,13 +1,20 @@
 {
   "Additional_Feedback" : "Additional Feedback",
   "Appearance" : "Appearance",
+  "Are_you_sure_do_you_want_end_this_chat" : "Are you sure do you want end this chat?",
+  "Cancel" : "Cancel",
+  "Chat_ended" : "Chat ended!",
+  "Close_menu" : "Close menu",
   "Conversation_finished" : "Conversation finished",
+  "End_chat" : "End chat",
   "How_friendly_was_the_chat_agent" : "How friendly was the chat agent?",
   "How_knowledgeable_was_the_chat_agent" : "How knowledgeable was the chat agent?",
   "How_responsive_was_the_chat_agent" : "How responsive was the chat agent?",
   "How_satisfied_were_you_with_this_chat" : "How satisfied were you with this chat?",
   "Installation" : "Installation",
   "New_messages" : "New messages",
+  "No" : "No",
+  "Options" : "Options",
   "Please_answer_survey" : "Please take a moment to answer a quick survey about this chat",
   "Please_fill_name_and_email" : "Please fill name and email",
   "Powered_by" : "Powered by",
@@ -25,5 +32,6 @@
   "User_joined" : "User joined",
   "User_left" : "User left",
   "We_are_offline_Sorry_for_the_inconvenience" : "We are offline. Sorry for the inconvenience.",
+  "Yes" : "Yes",
   "You_must_complete_all_fields" : "You must complete all fields"
-}
+}