Regression: Contact manager edit/view not working (#26155)

Co-authored-by: murtaza98 <murtaza.patrawala@rocket.chat>

apps/meteor/app/livechat/server/api/lib/users.js

@@ -1,7 +1,7 @@
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { Users } from '@rocket.chat/models';
 
-import { hasAllPermissionAsync } from '../../../../authorization/server/functions/hasPermission';
+import { hasAllPermissionAsync, hasAtLeastOnePermissionAsync } from '../../../../authorization/server/functions/hasPermission';
 
 /**
  * @param {IRole['_id']} role the role id
@@ -41,7 +41,7 @@ async function findUsers({ role, text, pagination: { offset, count, sort } }) {
 	};
 }
 export async function findAgents({ userId, text, pagination: { offset, count, sort } }) {
-	if (!(await hasAllPermissionAsync(userId, ['view-l-room', 'transfer-livechat-guest']))) {
+	if (!(await hasAtLeastOnePermissionAsync(userId, ['manage-livechat-agents', 'transfer-livechat-guest', 'edit-omnichannel-contact']))) {
 		throw new Error('error-not-authorized');
 	}
 

apps/meteor/app/livechat/server/api/rest.js

@@ -9,4 +9,4 @@ import './v1/customField.js';
 import './v1/room.js';
 import './v1/videoCall.js';
 import './v1/transfer.js';
-import './v1/contact.js';
+import './v1/contact';

apps/meteor/app/livechat/server/api/v1/contact.ts

@@ -0,0 +1,70 @@
+import { Match, check } from 'meteor/check';
+import { Meteor } from 'meteor/meteor';
+import { LivechatVisitors } from '@rocket.chat/models';
+
+import { API } from '../../../../api/server';
+import { Contacts } from '../../lib/Contacts';
+
+API.v1.addRoute(
+	'omnichannel/contact',
+	{ authRequired: true },
+	{
+		async post() {
+			check(this.bodyParams, {
+				_id: Match.Maybe(String),
+				token: String,
+				name: String,
+				email: Match.Maybe(String),
+				phone: Match.Maybe(String),
+				username: Match.Maybe(String),
+				customFields: Match.Maybe(Object),
+				contactManager: Match.Maybe({
+					username: String,
+				}),
+			});
+
+			const contact = await Contacts.registerContact(this.bodyParams);
+
+			return API.v1.success({ contact });
+		},
+		async get() {
+			check(this.queryParams, {
+				contactId: String,
+			});
+
+			const contact = await LivechatVisitors.findOneById(this.queryParams.contactId);
+
+			return API.v1.success({ contact });
+		},
+	},
+);
+
+API.v1.addRoute(
+	'omnichannel/contact.search',
+	{ authRequired: true },
+	{
+		async get() {
+			check(this.queryParams, {
+				email: Match.Maybe(String),
+				phone: Match.Maybe(String),
+			});
+
+			const { email, phone } = this.queryParams;
+
+			if (!email && !phone) {
+				throw new Meteor.Error('error-invalid-params');
+			}
+
+			const query = Object.assign(
+				{},
+				{
+					...(email && { visitorEmails: { address: email } }),
+					...(phone && { phone: { phoneNumber: phone } }),
+				},
+			);
+
+			const contact = await LivechatVisitors.findOne(query);
+			return API.v1.success({ contact });
+		},
+	},
+);

apps/meteor/app/livechat/server/lib/Contacts.js → apps/meteor/app/livechat/server/lib/Contacts.ts

@@ -1,12 +1,35 @@
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 import s from 'underscore.string';
-import { LivechatVisitors, LivechatRooms, Users } from '@rocket.chat/models';
+import { MatchKeysAndValues, OnlyFieldsOfType } from 'mongodb';
+import { LivechatVisitors, Users, LivechatRooms } from '@rocket.chat/models';
+import { ILivechatCustomField, ILivechatVisitor, IOmnichannelRoom } from '@rocket.chat/core-typings';
 
 import { LivechatCustomField, Rooms, LivechatInquiry, Subscriptions } from '../../../models/server';
 
+type RegisterContactProps = {
+	_id?: string;
+	token: string;
+	name: string;
+	username?: string;
+	email?: string;
+	phone?: string;
+	customFields?: Record<string, unknown | string>;
+	contactManager?: {
+		username: string;
+	};
+};
+
 export const Contacts = {
-	async registerContact({ token, name, email, phone, username, customFields = {}, contactManager = {} } = {}) {
+	async registerContact({
+		token,
+		name,
+		email = '',
+		phone,
+		username,
+		customFields = {},
+		contactManager,
+	}: RegisterContactProps): Promise<string> {
 		check(token, String);
 
 		const visitorEmail = s.trim(email).toLowerCase();
@@ -23,11 +46,6 @@ export const Contacts = {
 		}
 
 		let contactId;
-		const updateUser = {
-			$set: {
-				token,
-			},
-		};
 
 		const user = await LivechatVisitors.getVisitorByToken(token, { projection: { _id: 1 } });
 
@@ -46,31 +64,39 @@ export const Contacts = {
 				const userData = {
 					username,
 					ts: new Date(),
+					token,
 				};
 
-				contactId = await LivechatVisitors.insertOne(userData);
+				contactId = (await LivechatVisitors.insertOne(userData)).insertedId;
 			}
 		}
 
-		updateUser.$set.name = name;
-		updateUser.$set.phone = (phone && [{ phoneNumber: phone }]) || null;
-		updateUser.$set.visitorEmails = (visitorEmail && [{ address: visitorEmail }]) || null;
-
-		const allowedCF = LivechatCustomField.find({ scope: 'visitor' }, { fields: { _id: 1 } }).map(({ _id }) => _id);
+		const allowedCF: ILivechatCustomField['_id'][] = LivechatCustomField.find({ scope: 'visitor' }, { fields: { _id: 1 } }).map(
+			({ _id }: ILivechatCustomField) => _id,
+		);
 
 		const livechatData = Object.keys(customFields)
 			.filter((key) => allowedCF.includes(key) && customFields[key] !== '' && customFields[key] !== undefined)
-			.reduce((obj, key) => {
+			.reduce((obj: Record<string, unknown | string>, key) => {
 				obj[key] = customFields[key];
 				return obj;
 			}, {});
 
-		updateUser.$set.livechatData = livechatData;
-		updateUser.$set.contactManager = (contactManager?.username && { username: contactManager.username }) || null;
+		const updateUser: { $set: MatchKeysAndValues<ILivechatVisitor>; $unset?: OnlyFieldsOfType<ILivechatVisitor> } = {
+			$set: {
+				token,
+				name,
+				livechatData,
+				...(phone && { phone: [{ phoneNumber: phone }] }),
+				...(visitorEmail && { visitorEmails: [{ address: visitorEmail }] }),
+				...(contactManager?.username && { contactManager: { username: contactManager.username } }),
+			},
+			...(!contactManager?.username && { $unset: { contactManager: 1 } }),
+		};
 
-		await LivechatVisitors.updateById(contactId, updateUser);
+		await LivechatVisitors.updateOne({ _id: contactId }, updateUser);
 
-		const rooms = await LivechatRooms.findByVisitorId(contactId).toArray();
+		const rooms: IOmnichannelRoom[] = await LivechatRooms.findByVisitorId(contactId, {}).toArray();
 
 		rooms?.length &&
 			rooms.forEach((room) => {

apps/meteor/client/components/AutoCompleteAgent.js

@@ -7,26 +7,29 @@ import { AsyncStatePhase } from '../lib/asyncState';
 import { useAgentsList } from './Omnichannel/hooks/useAgentsList';
 
 const AutoCompleteAgent = (props) => {
-	const { value, onChange = () => {}, haveAll = false } = props;
+	const { value, onChange = () => {}, haveAll = false, haveNoAgentsSelectedOption = false } = props;
 	const [agentsFilter, setAgentsFilter] = useState('');
 
 	const debouncedAgentsFilter = useDebouncedValue(agentsFilter, 500);
 
 	const { itemsList: AgentsList, loadMoreItems: loadMoreAgents } = useAgentsList(
-		useMemo(() => ({ text: debouncedAgentsFilter, haveAll }), [debouncedAgentsFilter, haveAll]),
+		useMemo(
+			() => ({ text: debouncedAgentsFilter, haveAll, haveNoAgentsSelectedOption }),
+			[debouncedAgentsFilter, haveAll, haveNoAgentsSelectedOption],
+		),
 	);
 
 	const { phase: agentsPhase, items: agentsItems, itemCount: agentsTotal } = useRecordList(AgentsList);
 
 	const sortedByName = agentsItems.sort((a, b) => {
-		if (a.value === 'all') {
+		if (['all', 'no-agent-selected'].includes(a.value)) {
 			return -1;
 		}
 
-		if (a.usename > b.usename) {
+		if (a.username > b.username) {
 			return 1;
 		}
-		if (a.usename < b.usename) {
+		if (a.username < b.username) {
 			return -1;
 		}
 

apps/meteor/client/components/Omnichannel/hooks/useAgentsList.ts

@@ -9,6 +9,7 @@ import { RecordList } from '../../../lib/lists/RecordList';
 type AgentsListOptions = {
 	text: string;
 	haveAll: boolean;
+	haveNoAgentsSelectedOption: boolean;
 };
 
 export const useAgentsList = (
@@ -52,12 +53,19 @@ export const useAgentsList = (
 					_updatedAt: new Date(),
 				});
 
+			options.haveNoAgentsSelectedOption &&
+				items.unshift({
+					label: t('Empty_no_agent_selected'),
+					value: 'no-agent-selected',
+					_updatedAt: new Date(),
+				});
+
 			return {
 				items,
 				itemCount: total + 1,
 			};
 		},
-		[getAgents, options.haveAll, options.text, t],
+		[getAgents, options.haveAll, options.haveNoAgentsSelectedOption, options.text, t],
 	);
 
 	const { loadMoreItems, initialItemCount } = useScrollableRecordList(itemsList, fetchData, 25);