[FIX] LiveChat switch department not working

packages/rocketchat-livechat/.app/client/lib/chatMessages.js

@@ -121,6 +121,8 @@ this.ChatMessages = class ChatMessages {
 				};
 			}
 
+			hideError();
+
 			Meteor.call('sendMessageLivechat', msgObject, agent, (error, result) => {
 				if (error) {
 					ChatMessage.update(msgObject._id, { $set: { error: true } });

packages/rocketchat-livechat/.app/client/lib/error.js

@@ -1,3 +1,7 @@
 this.showError = msg => {
 	$('.error').addClass('show').find('span').html(msg);
 };
+
+this.hideError = () => {
+	$('.error').removeClass('show');
+};

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

@@ -136,9 +136,15 @@ Template.livechatWindow.onCreated(function() {
 				visitor.setConnected();
 			}
 
+			loadDepartments(result.departments);
+
 			if (result.visitor) {
 				visitor.setData(result.visitor);
 
+				if (result.visitor.department) {
+					Livechat.department = result.visitor.department;
+				}
+
 				if (visitor.name) {
 					Livechat.guestName = visitor.name;
 				}
@@ -163,8 +169,6 @@ Template.livechatWindow.onCreated(function() {
 			Triggers.setTriggers(result.triggers);
 			Triggers.init();
 
-			loadDepartments(result.departments);
-
 			Livechat.allowSwitchingDepartments = result.allowSwitchingDepartments;
 
 			Livechat.ready();

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

@@ -36,40 +36,36 @@ Template.switchDepartment.events({
 
 		instance.error.set();
 		swal({
-			text: t('Are_you_sure_do_you_want_end_this_chat_and_switch_department'),
+			text: t('Are_you_sure_do_you_want_switch_the_department'),
 			title: '',
 			type: 'warning',
 			showCancelButton: true,
 			confirmButtonColor: '#DD6B55',
 			confirmButtonText: t('Yes'),
 			cancelButtonText: t('No'),
 			html: false
-		}).then((result) => {
-			if (!result.value) {
-				return;
-			}	
+		}, () => {
+			const guestData = {
+				roomId: visitor.getRoom(),
+				visitorToken: visitor.getToken(),
+				departmentId: departmentId
+			};
 
-			Meteor.call('livechat:closeByVisitor', { roomId: visitor.getRoom(), token: visitor.getToken() }, (error) => {
+			Meteor.call('livechat:setDepartmentForVisitor', guestData, (error, result) => {
 				if (error) {
-					return console.log('Error ->', error);
-				}
-
-				const guestData = {
-					token: visitor.getToken(),
-					department: departmentId
-				};
-				Meteor.call('livechat:setDepartmentForVisitor', guestData, (error) => {
-					if (error) {
-						return console.log('Error ->', error);
-					}
+					instance.error.set(error.error);
+				} else if (result) {
+					instance.error.set();
 					Livechat.department = departmentId;
 					Livechat.showSwitchDepartmentForm = false;
 					swal({
 						title: t('Department_switched'),
 						type: 'success',
 						timer: 2000
 					});
-				});
+				} else {
+					instance.error.set(t('No_available_agents_to_transfer'));
+				}
 			});
 		});
 	},

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

@@ -3,6 +3,7 @@
   "Appearance": "Appearance",
   "Are_you_sure_do_you_want_end_this_chat": "Are you sure you want to end this chat?",
   "Are_you_sure_do_you_want_end_this_chat_and_switch_department": "Are you sure you want to end this chat and switch department?",
+  "Are_you_sure_do_you_want_switch_the_department": "Are you sure you want to switch the department?",
   "Cancel": "Cancel",
   "Change": "Change",
   "Chat_ended": "Chat ended!",

packages/rocketchat-livechat/.app/i18n/pt-BR.i18n.json

@@ -3,6 +3,7 @@
   "Appearance": "Aparência",
   "Are_you_sure_do_you_want_end_this_chat": "Você tem certeza que deseja encerrar?",
   "Are_you_sure_do_you_want_end_this_chat_and_switch_department": "Tem certeza que deseja fechar esse chat e trocar de departamento?",
+  "Are_you_sure_do_you_want_switch_the_department": "Tem certeza que deseja trocar de departamento?",
   "Cancel": "Cancelar",
   "Change": "Mudar",
   "Chat_ended": "Chat encerrado!",

packages/rocketchat-livechat/server/lib/Livechat.js

@@ -190,7 +190,7 @@ RocketChat.Livechat = {
 
 		const user = LivechatVisitors.getVisitorByToken(token, { fields: { _id: 1 } });
 		if (user) {
-			return Meteor.users.update(user._id, updateUser);
+			return LivechatVisitors.updateById(user._id, updateUser);
 		}
 		return false;
 	},
@@ -392,6 +392,13 @@ RocketChat.Livechat = {
 			RocketChat.models.Messages.createUserLeaveWithRoomIdAndUser(room._id, { _id: servedBy._id, username: servedBy.username });
 			RocketChat.models.Messages.createUserJoinWithRoomIdAndUser(room._id, { _id: agent.agentId, username: agent.username });
 
+			const guestData = {
+				token: guest.token,
+				department: transferData.departmentId
+			};
+
+			this.setDepartmentForGuest(guestData);
+
 			RocketChat.Livechat.stream.emit(room._id, {
 				type: 'agentData',
 				data: RocketChat.models.Users.getAgentInfo(agent.agentId)

packages/rocketchat-livechat/server/methods/getAgentData.js

@@ -8,7 +8,6 @@ Meteor.methods({
 		const room = RocketChat.models.Rooms.findOneById(roomId);
 		const visitor = LivechatVisitors.getVisitorByToken(token);
 
-		// allow to only user to send transcripts from their own chats
 		if (!room || room.t !== 'l' || !room.v || room.v.token !== visitor.token) {
 			throw new Meteor.Error('error-invalid-room', 'Invalid room');
 		}

packages/rocketchat-livechat/server/methods/getInitialData.js

@@ -46,7 +46,8 @@ Meteor.methods({
 			fields: {
 				name: 1,
 				username: 1,
-				visitorEmails: 1
+				visitorEmails: 1,
+				department: 1
 			}
 		});
 

packages/rocketchat-livechat/server/methods/setDepartmentForVisitor.js

@@ -1,13 +1,26 @@
+import LivechatVisitors from '../models/LivechatVisitors';
+
 Meteor.methods({
-	'livechat:setDepartmentForVisitor'({ token, department } = {}) {
-		RocketChat.Livechat.setDepartmentForGuest.call(this, {
-			token,
-			department
-		});
+	'livechat:setDepartmentForVisitor'({ roomId, visitorToken, departmentId } = {}) {
+		check(roomId, String);
+		check(visitorToken, String);
+		check(departmentId, String);
+
+		const room = RocketChat.models.Rooms.findOneById(roomId);
+		const visitor = LivechatVisitors.getVisitorByToken(visitorToken);
+
+		if (!room || room.t !== 'l' || !room.v || room.v.token !== visitor.token) {
+			throw new Meteor.Error('error-invalid-room', 'Invalid room');
+		}
 
 		// update visited page history to not expire
-		RocketChat.models.Messages.keepHistoryForToken(token);
+		RocketChat.models.Messages.keepHistoryForToken(visitorToken);
+
+		const transferData = {
+			roomId,
+			departmentId
+		};
 
-		return true;
+		return RocketChat.Livechat.transfer(room, visitor, transferData);
 	}
 });