[NEW] [ENTERPRISE] Allows to set a group of departments accepted for forwarding chats

app/livechat/client/views/app/tabbar/visitorForward.html

@@ -9,37 +9,34 @@ <h3>{{_ "Forward_chat"}}</h3>
 				</div>
 			{{/with}}
 			<form>
-				{{#if showDefaultDepartmentForm}}
-					<div class="input-line">
-						<label for="name">{{_ "Forward_to_department"}}</label>
-						<div class="form-group">
-							{{> livechatAutocompleteUser
-								onClickTag=onClickTagDepartment
-								list=selectedDepartments
-								onSelect=onSelectDepartments
-								collection='CachedDepartmentList'
-								endpoint='livechat/department.autocomplete'
-								field='name'
-								sort='name'
-								icon="queue"
-								label="Enter_a_department_name"
-								placeholder="Enter_a_department_name"
-								name="department"
-								noMatchTemplate="userSearchEmpty"
-								templateItem="popupList_item_channel"
-								template="roomSearch"
-								noMatchTemplate="roomSearchEmpty"
-								modifier=departmentModifier
-								conditions=departmentConditions
-							}}
-						</div>
-					</div>
-					<div class="form-divisor">
-						<span>{{_ "or"}}</span>
+				<div class="input-line">
+					<label for="name">{{_ "Forward_to_department"}}</label>
+					<div class="form-group">
+						{{> livechatAutocompleteUser
+							onClickTag=onClickTagDepartment
+							list=selectedDepartments
+							onSelect=onSelectDepartments
+							collection='CachedDepartmentList'
+							endpoint='livechat/department.autocomplete'
+							field='name'
+							sort='name'
+							icon="queue"
+							label="Enter_a_department_name"
+							placeholder="Enter_a_department_name"
+							name="department"
+							noMatchTemplate="userSearchEmpty"
+							templateItem="popupList_item_channel"
+							template="roomSearch"
+							noMatchTemplate="roomSearchEmpty"
+							modifier=departmentModifier
+							conditions=departmentConditions
+						}}
 					</div>
-				{{else}}
-					{{> Template.dynamic template=customFieldsTemplate data=data }}
-				{{/if}}
+				</div>
+				<div class="form-divisor">
+					<span>{{_ "or"}}</span>
+				</div>
+
 				<div class="input-line">
 					<label for="agent">{{_ "Forward_to_user"}}</label>
 					<div class="form-group">

app/livechat/client/views/app/tabbar/visitorForward.js

@@ -8,7 +8,6 @@ import { ChatRoom } from '../../../../../models';
 import { t } from '../../../../../utils';
 import './visitorForward.html';
 import { APIClient } from '../../../../../utils/client';
-import { getCustomFormTemplate } from '../customTemplates/register';
 
 Template.visitorForward.helpers({
 	visitor() {
@@ -54,16 +53,9 @@ Template.visitorForward.helpers({
 		return Template.instance().onSelectDepartments;
 	},
 	departmentConditions() {
-		return { enabled: true, numAgents: { $gt: 0 } };
-	},
-	customFieldsTemplate() {
-		return getCustomFormTemplate('visitorForward');
-	},
-	showDefaultDepartmentForm() {
-		return !getCustomFormTemplate('visitorForward') && Template.instance().departments.get().filter((department) => department.enabled === true).length > 0;
-	},
-	data() {
-		return Template.instance().room;
+		const departmentForwardRestrictions = Template.instance().departmentForwardRestrictions.get();
+		console.log(departmentForwardRestrictions);
+		return { enabled: true, numAgents: { $gt: 0 }, ...departmentForwardRestrictions };
 	},
 });
 
@@ -73,6 +65,7 @@ Template.visitorForward.onCreated(async function() {
 	this.departments = new ReactiveVar([]);
 	this.selectedAgents = new ReactiveVar([]);
 	this.selectedDepartments = new ReactiveVar([]);
+	this.departmentForwardRestrictions = new ReactiveVar();
 
 	this.onSelectDepartments = ({ item: department }) => {
 		department.text = department.name;
@@ -99,6 +92,12 @@ Template.visitorForward.onCreated(async function() {
 
 	this.autorun(() => {
 		this.room.set(ChatRoom.findOne({ _id: Template.currentData().roomId }));
+		const { departmentId } = this.room.get();
+		if (departmentId) {
+			Meteor.call('livechat:getDepartmentForwardRestrictions', departmentId, (err, result) => {
+				this.departmentForwardRestrictions.set(result);
+			});
+		}
 	});
 
 	const { departments } = await APIClient.v1.get('livechat/department');
@@ -123,12 +122,6 @@ Template.visitorForward.events({
 			transferData.departmentId = department && department._id;
 		}
 
-		instance.$('.customFormField').each((i, el) => {
-			const elField = instance.$(el);
-			const name = elField.attr('name');
-			transferData[name] = elField.val();
-		});
-
 		if (!transferData.userId && !transferData.departmentId) {
 			return;
 		}

app/livechat/server/index.js

@@ -69,6 +69,7 @@ import './methods/saveOfficeHours';
 import './methods/sendTranscript';
 import './methods/getFirstRoomMessage';
 import './methods/getTagsList';
+import './methods/getDepartmentForwardRestrictions';
 import './lib/Analytics';
 import './lib/QueueManager';
 import './lib/OfficeClock';

app/livechat/server/methods/getDepartmentForwardRestrictions.js

@@ -0,0 +1,13 @@
+import { Meteor } from 'meteor/meteor';
+
+import { callbacks } from '../../../callbacks';
+
+Meteor.methods({
+	'livechat:getDepartmentForwardRestrictions'(departmentId) {
+		if (!Meteor.userId()) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'livechat:getTagsList' });
+		}
+
+		return callbacks.run('livechat.onLoadForwardDepartmentRestrictions', departmentId);
+	},
+});

ee/app/livechat-enterprise/client/views/app/registerCustomTemplates.js

@@ -2,9 +2,7 @@ import { addCustomFormTemplate } from '../../../../../../app/livechat/client/vie
 import './customTemplates/livechatDepartmentCustomFieldsForm';
 import './customTemplates/livechatAgentEditCustomFieldsForm';
 import './customTemplates/livechatAgentInfoCustomFieldsForm';
-import './customTemplates/visitorForwardCustomFieldsForm';
 
 addCustomFormTemplate('livechatDepartmentForm', 'livechatDepartmentCustomFieldsForm');
 addCustomFormTemplate('livechatAgentEditForm', 'livechatAgentEditCustomFieldsForm');
 addCustomFormTemplate('livechatAgentInfoForm', 'livechatAgentInfoCustomFieldsForm');
-addCustomFormTemplate('visitorForward', 'visitorForwardCustomFieldsForm');

ee/app/livechat-enterprise/server/hooks/onLoadForwardDepartmentRestrictions.js

@@ -0,0 +1,17 @@
+import { callbacks } from '../../../../../app/callbacks';
+import { LivechatDepartment } from '../../../../../app/models/server';
+
+callbacks.add('livechat.onLoadForwardDepartmentRestrictions', (departmentId) => {
+	if (!departmentId) {
+		return {};
+	}
+	const department = LivechatDepartment.findOneById(departmentId);
+	if (!department) {
+		return {};
+	}
+	const { departmentsAllowedToForward } = department;
+	if (!departmentsAllowedToForward) {
+		return {};
+	}
+	return { _id: { $in: departmentsAllowedToForward } };
+}, callbacks.priority.MEDIUM, 'livechat-on-load-forward-department-restrictions');

ee/app/livechat-enterprise/server/index.js

@@ -6,6 +6,7 @@ import './hooks/beforeListTags';
 import './hooks/setPredictedVisitorAbandonmentTime';
 import './hooks/beforeForwardRoomToDepartment';
 import './hooks/afterRemoveDepartment';
+import './hooks/onLoadForwardDepartmentRestrictions';
 import './methods/addMonitor';
 import './methods/getUnitsFromUserRoles';
 import './methods/removeMonitor';