Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/four-brooms-live.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@clerk/localizations': patch
'@clerk/clerk-js': patch
---

Fix: localized key for invalid email addreses in InviteMembers form.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ClerkAPIResponseError } from '@clerk/shared';
import { isClerkAPIResponseError } from '@clerk/shared';
import type { MembershipRole, OrganizationResource } from '@clerk/types';
import React from 'react';

Expand All @@ -16,7 +16,7 @@ import {
import type { LocalizationKey } from '../../localization';
import { localizationKeys, useLocalizations } from '../../localization';
import { useRouter } from '../../router';
import { handleError, roleLocalizationKey, useFormControl } from '../../utils';
import { createListFormat, handleError, roleLocalizationKey, useFormControl } from '../../utils';

const isEmail = (str: string) => /^\S+@\S+\.\S+$/.test(str);

Expand All @@ -32,9 +32,9 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
const { navigate } = useRouter();
const { onSuccess, onReset = () => navigate('..'), resetButtonLabel, organization } = props;
const card = useCardState();
const { t } = useLocalizations();
const { t, locale } = useLocalizations();
const [isValidUnsubmittedEmail, setIsValidUnsubmittedEmail] = React.useState(false);
const [invalidEmails, setInvalidEmails] = React.useState<string[]>([]);
const [localizedEmails, setLocalizedEmails] = React.useState<string | null>(null);

if (!organization) {
return null;
Expand Down Expand Up @@ -81,15 +81,6 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
placeholder: '',
});

React.useEffect(() => {
// Remove invalid emails from the tag input
if (invalidEmails.length) {
const invalids = new Set(invalidEmails);
const emails = emailAddressField.value.split(',');
emailAddressField.setValue(emails.filter(e => !invalids.has(e)).join(','));
}
}, [invalidEmails]);

const canSubmit = !!emailAddressField.value.length || isValidUnsubmittedEmail;

const onSubmit = async (e: React.FormEvent) => {
Expand All @@ -98,26 +89,33 @@ export const InviteMembersForm = (props: InviteMembersFormProps) => {
.inviteMembers({ emailAddresses: emailAddressField.value.split(','), role: roleField.value as MembershipRole })
.then(onSuccess)
.catch(err => {
if (err instanceof ClerkAPIResponseError) {
const invalids = err.errors[0].meta?.emailAddresses || [];
if (invalids.length) {
setInvalidEmails(invalids);
} else {
setInvalidEmails([]);
handleError(err, [], card.setError);
}
if (isClerkAPIResponseError(err) && err.errors?.[0]?.code === 'duplicate_record') {
const unlocalizedEmailsList = err.errors[0].meta?.emailAddresses || [];

// Create a localized list of email addresses
const localizedList = createListFormat(unlocalizedEmailsList, locale);
setLocalizedEmails(localizedList);

// Remove any invalid email address
const invalids = new Set(unlocalizedEmailsList);
const emails = emailAddressField.value.split(',');
emailAddressField.setValue(emails.filter(e => !invalids.has(e)).join(','));
} else {
setLocalizedEmails(null);
handleError(err, [], card.setError);
}
});
};

return (
<>
{!!invalidEmails.length && (
{localizedEmails && (
<Alert
variant='danger'
align='start'
title={localizationKeys('organizationProfile.invitePage.detailsTitle__inviteFailed')}
subtitle={invalidEmails.join(', ')}
title={localizationKeys('organizationProfile.invitePage.detailsTitle__inviteFailed', {
email_addresses: localizedEmails,
})}
sx={{ border: 0 }}
/>
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,12 @@ describe('InviteMembersPage', () => {
await userEvent.type(getByTestId('tag-input'), 'test+1@clerk.dev,');
await userEvent.click(getByRole('button', { name: 'Send invitations' }));
await waitFor(() =>
expect(getByText('The invitations could not be sent. Fix the following and try again:')).toBeDefined(),
expect(
getByText(
'The invitations could not be sent. There are already pending invitations for the following email addresses: test+5@clerk.dev, test+6@clerk.dev, and test+7@clerk.dev.',
),
).toBeInTheDocument(),
);
await waitFor(() => expect(getByText('test+5@clerk.dev, test+6@clerk.dev, test+7@clerk.dev')).toBeDefined());
});
});

Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/src/ui/elements/Alert.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ type AlertProps = Omit<PropsOfComponent<typeof AlertCust>, keyof _AlertProps> &
export const Alert = (props: AlertProps): JSX.Element | null => {
const { children, title, subtitle, variant = 'warning', ...rest } = props;

if (!children && (!title || !subtitle)) {
if (!children && !title && !subtitle) {
return null;
}

Expand Down
3 changes: 2 additions & 1 deletion packages/localizations/src/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,8 @@ export const enUS: LocalizationResource = {
title: 'Invite members',
subtitle: 'Invite new members to this organization',
successMessage: 'Invitations successfully sent',
detailsTitle__inviteFailed: 'The invitations could not be sent. Fix the following and try again:',
detailsTitle__inviteFailed:
'The invitations could not be sent. There are already pending invitations for the following email addresses: {{email_addresses}}.',
formButtonPrimary__continue: 'Send invitations',
},
removeDomainPage: {
Expand Down