snapshot of https://github.com/RocketChat/Rocket.Chat.git (develop, 2026-09-16; blobs > 131072B omitted)

apps/meteor/client/views/omnichannel/contactInfo/hooks/useCreateContact.ts

@@ -0,0 +1,26 @@
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import type { QueryKey } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
+
+import { useContactRoute } from '../../hooks/useContactRoute';
+
+export const useCreateContact = (invalidateQueries: QueryKey) => {
+	const { t } = useTranslation();
+	const createContact = useEndpoint('POST', '/v1/omnichannel/contacts');
+	const dispatchToastMessage = useToastMessageDispatch();
+	const queryClient = useQueryClient();
+	const handleNavigate = useContactRoute();
+
+	return useMutation({
+		mutationFn: createContact,
+		onSuccess: async ({ contactId }) => {
+			handleNavigate({ context: 'details', id: contactId });
+			dispatchToastMessage({ type: 'success', message: t('Contact_has_been_created') });
+			await queryClient.invalidateQueries({ queryKey: invalidateQueries });
+		},
+		onError: (error) => {
+			dispatchToastMessage({ type: 'error', message: error });
+		},
+	});
+};

apps/meteor/client/views/omnichannel/contactInfo/hooks/useEditContact.ts

@@ -0,0 +1,26 @@
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import type { QueryKey } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
+
+import { useContactRoute } from '../../hooks/useContactRoute';
+
+export const useEditContact = (invalidateQueries?: QueryKey) => {
+	const { t } = useTranslation();
+	const updateContact = useEndpoint('POST', '/v1/omnichannel/contacts.update');
+	const dispatchToastMessage = useToastMessageDispatch();
+	const queryClient = useQueryClient();
+	const handleNavigate = useContactRoute();
+
+	return useMutation({
+		mutationFn: updateContact,
+		onSuccess: async ({ contact }) => {
+			handleNavigate({ context: 'details', id: contact?._id });
+			dispatchToastMessage({ type: 'success', message: t('Contact_has_been_updated') });
+			await queryClient.invalidateQueries({ queryKey: invalidateQueries });
+		},
+		onError: (error) => {
+			dispatchToastMessage({ type: 'error', message: error });
+		},
+	});
+};

apps/meteor/client/views/omnichannel/contactInfo/hooks/useReviewContact.ts

@@ -0,0 +1,26 @@
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import type { QueryKey } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
+
+import { useContactRoute } from '../../hooks/useContactRoute';
+
+export const useReviewContact = (invalidateQueries?: QueryKey) => {
+	const { t } = useTranslation();
+	const updateContact = useEndpoint('POST', '/v1/omnichannel/contacts.conflicts');
+	const dispatchToastMessage = useToastMessageDispatch();
+	const queryClient = useQueryClient();
+	const handleNavigate = useContactRoute();
+
+	return useMutation({
+		mutationFn: updateContact,
+		onSuccess: async ({ contact }) => {
+			handleNavigate({ context: 'details', id: contact?._id });
+			dispatchToastMessage({ type: 'success', message: t('Contact_has_been_updated') });
+			await queryClient.invalidateQueries({ queryKey: invalidateQueries });
+		},
+		onError: (error) => {
+			dispatchToastMessage({ type: 'error', message: error });
+		},
+	});
+};

apps/meteor/client/views/omnichannel/contactInfo/hooks/useValidCustomFields.spec.ts

@@ -0,0 +1,87 @@
+import type { ILivechatCustomField } from '@rocket.chat/core-typings';
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { renderHook, waitFor } from '@testing-library/react';
+
+import { useValidCustomFields } from './useValidCustomFields';
+
+const makeField = (partial: Pick<ILivechatCustomField, '_id' | 'scope'> & Partial<ILivechatCustomField>): ILivechatCustomField => ({
+	_updatedAt: new Date(),
+	label: 'Field',
+	visibility: 'visible',
+	...partial,
+});
+
+const buildWrapper = ({ withPermission, customFields }: { withPermission: boolean; customFields: ILivechatCustomField[] }) => {
+	const builder = mockAppRoot().withEndpoint(
+		'GET',
+		'/v1/livechat/custom-fields',
+		() =>
+			({
+				customFields,
+				total: customFields.length,
+				offset: 0,
+				count: customFields.length,
+			}) as any,
+	);
+
+	if (withPermission) {
+		builder.withPermission('view-livechat-room-customfields');
+	}
+
+	return builder.build();
+};
+
+describe('useValidCustomFields', () => {
+	const visitorField = makeField({ _id: 'cf_visitor', scope: 'visitor' });
+	const roomField = makeField({ _id: 'cf_room', scope: 'room' });
+
+	describe('scope', () => {
+		const userCustomFields = {
+			cf_visitor: 'visitor value',
+			cf_room: 'room value',
+		};
+
+		it('keeps only visitor-scoped custom fields when scope is visitor', async () => {
+			const { result } = renderHook(() => useValidCustomFields(userCustomFields, 'visitor'), {
+				wrapper: buildWrapper({ withPermission: true, customFields: [visitorField, roomField] }),
+			});
+
+			await waitFor(() => expect(result.current).toEqual([['cf_visitor', 'visitor value']]));
+		});
+
+		it('keeps only room-scoped custom fields when scope is room', async () => {
+			const { result } = renderHook(() => useValidCustomFields(userCustomFields, 'room'), {
+				wrapper: buildWrapper({ withPermission: true, customFields: [visitorField, roomField] }),
+			});
+
+			await waitFor(() => expect(result.current).toEqual([['cf_room', 'room value']]));
+		});
+
+		it('omits a key when the field is defined for the other scope', async () => {
+			const { result } = renderHook(() => useValidCustomFields({ cf_room: 'room only' }, 'visitor'), {
+				wrapper: buildWrapper({ withPermission: true, customFields: [roomField] }),
+			});
+
+			await waitFor(() => expect(result.current).toEqual([]));
+		});
+	});
+
+	describe('other filters (baseline)', () => {
+		it('returns an empty list without view permission even when scope matches', async () => {
+			const { result } = renderHook(() => useValidCustomFields({ cf_visitor: 'x' }, 'visitor'), {
+				wrapper: buildWrapper({ withPermission: false, customFields: [visitorField] }),
+			});
+
+			await waitFor(() => expect(result.current).toEqual([]));
+		});
+
+		it('excludes fields that are not set as visible', async () => {
+			const hiddenField = makeField({ _id: 'cf_hidden', scope: 'visitor', visibility: 'hidden' });
+			const { result } = renderHook(() => useValidCustomFields({ cf_hidden: 'secret', cf_visitor: 'ok' }, 'visitor'), {
+				wrapper: buildWrapper({ withPermission: true, customFields: [hiddenField, visitorField] }),
+			});
+
+			await waitFor(() => expect(result.current).toEqual([['cf_visitor', 'ok']]));
+		});
+	});
+});

apps/meteor/client/views/omnichannel/contactInfo/hooks/useValidCustomFields.ts

@@ -0,0 +1,27 @@
+import type { ILivechatCustomField } from '@rocket.chat/core-typings';
+import { usePermission } from '@rocket.chat/ui-contexts';
+import { useMemo } from 'react';
+
+import { useCustomFieldsQuery } from '../../hooks/useCustomFieldsQuery';
+
+const checkIsVisibleAndCorrectScope = (key: string, customFields: ILivechatCustomField[], scope: 'visitor' | 'room') => {
+	const field = customFields?.find(({ _id }) => _id === key);
+	return field?.visibility === 'visible' && field?.scope === scope;
+};
+
+export const useValidCustomFields = (userCustomFields: Record<string, string | unknown> | undefined, scope: 'visitor' | 'room') => {
+	const { data, isError } = useCustomFieldsQuery();
+	const canViewCustomFields = usePermission('view-livechat-room-customfields');
+
+	const customFieldEntries = useMemo(() => {
+		if (!canViewCustomFields || !userCustomFields || !data?.customFields || isError) {
+			return [];
+		}
+
+		return Object.entries(userCustomFields).filter(
+			([key, value]) => checkIsVisibleAndCorrectScope(key, data?.customFields, scope) && value,
+		);
+	}, [canViewCustomFields, userCustomFields, data?.customFields, isError, scope]);
+
+	return customFieldEntries;
+};