snapshot of https://github.com/RocketChat/Rocket.Chat.git (develop, 2026-09-16; blobs > 131072B omitted)
Some checks failed
Create issues from TODOs / todos (push) Failing after 3s
Close inactive issues / close-issues (push) Has been cancelled
Deploy GitHub Pages / deploy-preview (push) Has been cancelled
CI / ⚙️ Variables Setup (push) Has been cancelled
CI / ⚙️ Test Guard (push) Has been cancelled
CI / 🚀 Notify external services - draft (push) Has been cancelled
CI / 📦 Build Packages (push) Has been cancelled
CI / 📦 Meteor Build (coverage) (push) Has been cancelled
CI / 📦 Meteor Build (production) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], fips) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Publish Docker Images (ghcr.io) (push) Has been cancelled
CI / 📦 Track Image Sizes (push) Has been cancelled
CI / 🔎 Code Check - Action Lint (push) Has been cancelled
CI / 🔎 Code Check (push) Has been cancelled
CI / 🔨 Test Storybook (push) Has been cancelled
CI / 🔨 Test Unit (push) Has been cancelled
CI / 🔨 Test API (CE) (push) Has been cancelled
CI / 🔨 Test API Livechat (CE) (push) Has been cancelled
CI / 🔨 Test UI (CE) (push) Has been cancelled
CI / 🔨 Test API (EE) (push) Has been cancelled
CI / 🔨 Test API Livechat (EE) (push) Has been cancelled
CI / 🔨 Test API Apps (deno-runtime - EE) (push) Has been cancelled
CI / 🔨 Test UI (EE) (push) Has been cancelled
CI / 🔨 Test API (FIPS) (push) Has been cancelled
CI / 🔨 Test API Livechat (FIPS) (push) Has been cancelled
CI / 🔨 Test UI (FIPS) (push) Has been cancelled
CI / 🔨 Test Federation Matrix (push) Has been cancelled
CI / 📊 Report Coverage (push) Has been cancelled
CI / ✅ Tests Done (push) Has been cancelled
CI / 🚀 Publish build assets (push) Has been cancelled
CI / 🚀 Publish Docker Images (DockerHub) (push) Has been cancelled
CI / 🚀 Notify external services (push) Has been cancelled
CI / Update Version Durability (push) Has been cancelled
Release / Release (push) Has been cancelled
Code scanning - action / CodeQL-Build (push) Failing after 1s
Auto-close duplicate issues / auto-close-duplicates (push) Failing after 1s
Some checks failed
Create issues from TODOs / todos (push) Failing after 3s
Close inactive issues / close-issues (push) Has been cancelled
Deploy GitHub Pages / deploy-preview (push) Has been cancelled
CI / ⚙️ Variables Setup (push) Has been cancelled
CI / ⚙️ Test Guard (push) Has been cancelled
CI / 🚀 Notify external services - draft (push) Has been cancelled
CI / 📦 Build Packages (push) Has been cancelled
CI / 📦 Meteor Build (coverage) (push) Has been cancelled
CI / 📦 Meteor Build (production) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [account-service presence-service omnichannel-transcript-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [authorization-service queue-worker-service ddp-streamer-service], fips) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Build Docker (amd64, [rocketchat], fips) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [account-service presence-service omnichannel-transcript-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [authorization-service queue-worker-service ddp-streamer-service], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], ${{ (github.event_name != 'release' && github.ref != 'refs/heads/develop') && 'coverage' || 'production' }}) (push) Has been cancelled
CI / 🚢 Build Docker (arm64, [rocketchat], coverage) (push) Has been cancelled
CI / 🚢 Publish Docker Images (ghcr.io) (push) Has been cancelled
CI / 📦 Track Image Sizes (push) Has been cancelled
CI / 🔎 Code Check - Action Lint (push) Has been cancelled
CI / 🔎 Code Check (push) Has been cancelled
CI / 🔨 Test Storybook (push) Has been cancelled
CI / 🔨 Test Unit (push) Has been cancelled
CI / 🔨 Test API (CE) (push) Has been cancelled
CI / 🔨 Test API Livechat (CE) (push) Has been cancelled
CI / 🔨 Test UI (CE) (push) Has been cancelled
CI / 🔨 Test API (EE) (push) Has been cancelled
CI / 🔨 Test API Livechat (EE) (push) Has been cancelled
CI / 🔨 Test API Apps (deno-runtime - EE) (push) Has been cancelled
CI / 🔨 Test UI (EE) (push) Has been cancelled
CI / 🔨 Test API (FIPS) (push) Has been cancelled
CI / 🔨 Test API Livechat (FIPS) (push) Has been cancelled
CI / 🔨 Test UI (FIPS) (push) Has been cancelled
CI / 🔨 Test Federation Matrix (push) Has been cancelled
CI / 📊 Report Coverage (push) Has been cancelled
CI / ✅ Tests Done (push) Has been cancelled
CI / 🚀 Publish build assets (push) Has been cancelled
CI / 🚀 Publish Docker Images (DockerHub) (push) Has been cancelled
CI / 🚀 Notify external services (push) Has been cancelled
CI / Update Version Durability (push) Has been cancelled
Release / Release (push) Has been cancelled
Code scanning - action / CodeQL-Build (push) Failing after 1s
Auto-close duplicate issues / auto-close-duplicates (push) Failing after 1s
This commit is contained in:
@@ -0,0 +1,299 @@
|
||||
import type { ILivechatContact, Serialized } from '@rocket.chat/core-typings';
|
||||
import { ButtonGroup, Button, IconButton, Divider } from '@rocket.chat/fuselage';
|
||||
import { Field, FieldLabel, FieldRow, FieldError, TextInput } from '@rocket.chat/fuselage-forms';
|
||||
import { validateEmail } from '@rocket.chat/tools';
|
||||
import {
|
||||
CustomFieldsForm,
|
||||
ContextualbarScrollableContent,
|
||||
ContextualbarFooter,
|
||||
ContextualbarHeader,
|
||||
ContextualbarIcon,
|
||||
ContextualbarTitle,
|
||||
ContextualbarClose,
|
||||
ContextualbarDialog,
|
||||
ContextualbarSkeleton,
|
||||
} from '@rocket.chat/ui-client';
|
||||
import { useEndpoint, useSetModal } from '@rocket.chat/ui-contexts';
|
||||
import { useQueryClient } from '@tanstack/react-query';
|
||||
import { Fragment, useId } from 'react';
|
||||
import { Controller, useFieldArray, useForm } from 'react-hook-form';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
import AdvancedContactModal from './AdvancedContactModal';
|
||||
import { useCreateContact } from './hooks/useCreateContact';
|
||||
import { useEditContact } from './hooks/useEditContact';
|
||||
import { useFormSubmitWithDirtyCheck } from '../../../hooks/useFormSubmitWithDirtyCheck';
|
||||
import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
|
||||
import { hasAtLeastOnePermission } from '../../../lib/authorization';
|
||||
import { omnichannelQueryKeys } from '../../../lib/queryKeys';
|
||||
import { ContactManagerInput } from '../additionalForms';
|
||||
import { useCustomFieldsMetadata } from '../directory/hooks/useCustomFieldsMetadata';
|
||||
|
||||
type ContactNewEditProps = {
|
||||
contactData?: Serialized<ILivechatContact> | null;
|
||||
onClose: () => void;
|
||||
onCancel: () => void;
|
||||
};
|
||||
|
||||
type ContactFormData = {
|
||||
name: string;
|
||||
emails: { address: string }[];
|
||||
phones: { phoneNumber: string }[];
|
||||
customFields: Record<any, any>;
|
||||
contactManager: string;
|
||||
};
|
||||
|
||||
const DEFAULT_VALUES = {
|
||||
name: '',
|
||||
emails: [],
|
||||
phones: [],
|
||||
contactManager: '',
|
||||
customFields: {},
|
||||
};
|
||||
|
||||
const getInitialValues = (data: ContactNewEditProps['contactData']): ContactFormData => {
|
||||
if (!data) {
|
||||
return DEFAULT_VALUES;
|
||||
}
|
||||
|
||||
const { name, phones, emails, customFields, contactManager } = data ?? {};
|
||||
|
||||
return {
|
||||
name: name ?? '',
|
||||
emails: emails ?? [],
|
||||
phones: phones ?? [],
|
||||
customFields: customFields ?? {},
|
||||
contactManager: contactManager ?? '',
|
||||
};
|
||||
};
|
||||
|
||||
const validateMultipleFields = (fieldsLength: number, hasLicense: boolean) => fieldsLength >= 1 && !hasLicense;
|
||||
|
||||
const EditContactInfo = ({ contactData, onClose, onCancel }: ContactNewEditProps) => {
|
||||
const { t } = useTranslation();
|
||||
const setModal = useSetModal();
|
||||
|
||||
const { data: hasLicense = false } = useHasLicenseModule('contact-id-verification');
|
||||
const canViewCustomFields = hasAtLeastOnePermission(['view-livechat-room-customfields', 'edit-livechat-room-customfields']);
|
||||
|
||||
const editContact = useEditContact(['current-contacts']);
|
||||
const createContact = useCreateContact(['current-contacts']);
|
||||
const checkExistenceEndpoint = useEndpoint('GET', '/v1/omnichannel/contacts.checkExistence');
|
||||
const queryClient = useQueryClient();
|
||||
const handleOpenUpSellModal = () => setModal(<AdvancedContactModal onCancel={() => setModal(null)} />);
|
||||
|
||||
const { data: customFieldsMetadata = [], isLoading: isLoadingCustomFields } = useCustomFieldsMetadata({
|
||||
scope: 'visitor',
|
||||
enabled: canViewCustomFields,
|
||||
});
|
||||
|
||||
const initialValue = getInitialValues(contactData);
|
||||
|
||||
const {
|
||||
formState: { errors, isSubmitting, isDirty },
|
||||
control,
|
||||
watch,
|
||||
handleSubmit,
|
||||
} = useForm<ContactFormData>({
|
||||
reValidateMode: 'onBlur',
|
||||
defaultValues: initialValue,
|
||||
});
|
||||
|
||||
const {
|
||||
fields: emailFields,
|
||||
append: appendEmail,
|
||||
remove: removeEmail,
|
||||
} = useFieldArray({
|
||||
control,
|
||||
name: 'emails',
|
||||
});
|
||||
|
||||
const {
|
||||
fields: phoneFields,
|
||||
append: appendPhone,
|
||||
remove: removePhone,
|
||||
} = useFieldArray({
|
||||
control,
|
||||
name: 'phones',
|
||||
});
|
||||
|
||||
const { emails, phones } = watch();
|
||||
|
||||
const validateEmailFormat = async (emailValue: string) => {
|
||||
if (!emails) {
|
||||
return true;
|
||||
}
|
||||
|
||||
const currentEmails = emails.map(({ address }) => address);
|
||||
|
||||
if (!validateEmail(emailValue)) {
|
||||
return t('error-invalid-email-address');
|
||||
}
|
||||
|
||||
if (currentEmails.filter((email) => email === emailValue).length > 1) {
|
||||
return t('Email_already_exists');
|
||||
}
|
||||
|
||||
const initialEmails = initialValue.emails.map(({ address }) => address);
|
||||
|
||||
if (!initialEmails.includes(emailValue) && (await checkExistenceEndpoint({ email: emailValue })).exists) {
|
||||
return t('Email_already_exists');
|
||||
}
|
||||
|
||||
return true;
|
||||
};
|
||||
|
||||
const validatePhone = async (phoneValue: string) => {
|
||||
if (!phones) {
|
||||
return true;
|
||||
}
|
||||
|
||||
const currentPhones = phones.map(({ phoneNumber }) => phoneNumber);
|
||||
|
||||
if (currentPhones.filter((phone) => phone === phoneValue).length > 1) {
|
||||
return t('Phone_already_exists');
|
||||
}
|
||||
|
||||
const initialPhones = initialValue.phones.map(({ phoneNumber }) => phoneNumber);
|
||||
|
||||
if (!initialPhones.includes(phoneValue) && (await checkExistenceEndpoint({ phone: phoneValue })).exists) {
|
||||
return t('Phone_already_exists');
|
||||
}
|
||||
|
||||
return true;
|
||||
};
|
||||
|
||||
const validateName = (v: string): string | boolean => (!v.trim() ? t('Required_field', { field: t('Name') }) : true);
|
||||
|
||||
const handleSave = useFormSubmitWithDirtyCheck(
|
||||
async (data: ContactFormData): Promise<void> => {
|
||||
const { name, phones, emails, customFields, contactManager } = data;
|
||||
|
||||
const payload = {
|
||||
name,
|
||||
phones: phones.map(({ phoneNumber }) => phoneNumber),
|
||||
emails: emails.map(({ address }) => address),
|
||||
customFields,
|
||||
contactManager,
|
||||
};
|
||||
|
||||
if (contactData) {
|
||||
await editContact.mutateAsync({ contactId: contactData?._id, ...payload });
|
||||
await queryClient.invalidateQueries({ queryKey: omnichannelQueryKeys.contacts() });
|
||||
return;
|
||||
}
|
||||
|
||||
await createContact.mutateAsync(payload);
|
||||
await queryClient.invalidateQueries({ queryKey: omnichannelQueryKeys.contacts() });
|
||||
},
|
||||
{
|
||||
isDirty,
|
||||
},
|
||||
);
|
||||
|
||||
const formId = useId();
|
||||
|
||||
if (isLoadingCustomFields) {
|
||||
return <ContextualbarSkeleton onClose={onClose} />;
|
||||
}
|
||||
|
||||
return (
|
||||
<ContextualbarDialog onClose={onClose}>
|
||||
<ContextualbarHeader>
|
||||
<ContextualbarIcon name={contactData ? 'pencil' : 'user'} />
|
||||
<ContextualbarTitle>{contactData ? t('Edit_Contact_Profile') : t('New_contact')}</ContextualbarTitle>
|
||||
<ContextualbarClose onClick={onClose} />
|
||||
</ContextualbarHeader>
|
||||
<ContextualbarScrollableContent id={formId} is='form' onSubmit={handleSubmit(handleSave)}>
|
||||
<Field>
|
||||
<FieldLabel required>{t('Name')}</FieldLabel>
|
||||
<FieldRow>
|
||||
<Controller
|
||||
name='name'
|
||||
control={control}
|
||||
rules={{ validate: validateName }}
|
||||
render={({ field }) => <TextInput {...field} error={errors.name?.message} />}
|
||||
/>
|
||||
</FieldRow>
|
||||
{errors.name && <FieldError>{errors.name.message}</FieldError>}
|
||||
</Field>
|
||||
<Field>
|
||||
<FieldLabel>{t('Email')}</FieldLabel>
|
||||
{emailFields.map((field, index) => (
|
||||
<Fragment key={field.id}>
|
||||
<FieldRow>
|
||||
<Controller
|
||||
name={`emails.${index}.address`}
|
||||
control={control}
|
||||
rules={{
|
||||
required: t('Required_field', { field: t('Email') }),
|
||||
validate: validateEmailFormat,
|
||||
}}
|
||||
render={({ field }) => <TextInput {...field} error={errors.emails?.[index]?.address?.message} aria-required='true' />}
|
||||
/>
|
||||
<IconButton title={t('Remove_email')} small onClick={() => removeEmail(index)} marginInlineStart={8} icon='trash' />
|
||||
</FieldRow>
|
||||
{errors.emails?.[index]?.address && <FieldError>{errors.emails?.[index]?.address?.message}</FieldError>}
|
||||
</Fragment>
|
||||
))}
|
||||
<Button
|
||||
marginBlockStart={8}
|
||||
onClick={validateMultipleFields(emailFields.length, hasLicense) ? handleOpenUpSellModal : () => appendEmail({ address: '' })}
|
||||
>
|
||||
{t('Add_email')}
|
||||
</Button>
|
||||
</Field>
|
||||
<Field>
|
||||
<FieldLabel>{t('Phone')}</FieldLabel>
|
||||
{phoneFields.map((field, index) => (
|
||||
<Fragment key={field.id}>
|
||||
<FieldRow>
|
||||
<Controller
|
||||
name={`phones.${index}.phoneNumber`}
|
||||
control={control}
|
||||
rules={{
|
||||
required: t('Required_field', { field: t('Phone') }),
|
||||
validate: validatePhone,
|
||||
}}
|
||||
render={({ field }) => <TextInput {...field} error={errors.phones?.[index]?.phoneNumber?.message} aria-required='true' />}
|
||||
/>
|
||||
<IconButton title={t('Remove_phone')} small onClick={() => removePhone(index)} marginInlineStart={8} icon='trash' />
|
||||
</FieldRow>
|
||||
{errors.phones?.[index]?.phoneNumber && <FieldError>{errors.phones?.[index]?.phoneNumber?.message}</FieldError>}
|
||||
</Fragment>
|
||||
))}
|
||||
<Button
|
||||
marginBlockStart={8}
|
||||
onClick={
|
||||
validateMultipleFields(phoneFields.length, hasLicense) ? handleOpenUpSellModal : () => appendPhone({ phoneNumber: '' })
|
||||
}
|
||||
>
|
||||
{t('Add_phone')}
|
||||
</Button>
|
||||
</Field>
|
||||
<Field>
|
||||
<FieldLabel>{t('Contact_Manager')}</FieldLabel>
|
||||
<FieldRow>
|
||||
<Controller
|
||||
name='contactManager'
|
||||
control={control}
|
||||
render={({ field: { value, onChange } }) => <ContactManagerInput value={value} onChange={onChange} />}
|
||||
/>
|
||||
</FieldRow>
|
||||
</Field>
|
||||
<Divider />
|
||||
{canViewCustomFields && <CustomFieldsForm formName='customFields' formControl={control} metadata={customFieldsMetadata} />}
|
||||
</ContextualbarScrollableContent>
|
||||
<ContextualbarFooter>
|
||||
<ButtonGroup stretch>
|
||||
<Button onClick={onCancel}>{t('Cancel')}</Button>
|
||||
<Button type='submit' form={formId} loading={isSubmitting} primary>
|
||||
{t('Save')}
|
||||
</Button>
|
||||
</ButtonGroup>
|
||||
</ContextualbarFooter>
|
||||
</ContextualbarDialog>
|
||||
);
|
||||
};
|
||||
|
||||
export default EditContactInfo;
|
||||
Reference in New Issue
Block a user