Skip to content

Commit 62c8de0

Browse files
refactor(mosaic): drive the invite fixture with the real controller
Rename pendingEmailAddresses to emailAddressesToInvite, return the invited addresses from the invite submit so the toast counts them, and drop the view-side submit guards now that the controllers own canSubmit.
1 parent 296046f commit 62c8de0

6 files changed

Lines changed: 52 additions & 101 deletions

File tree

‎packages/mosaic/src/features/create-organization/create-organization.controller.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import type { MembersRoles } from '../organization-profile/organization-profile-
88
import { resolveDefaultRole } from '../organization-profile/organization-profile-members-panel/organization-profile-invite-members.controller';
99
import {
1010
canSendInvitations,
11-
pendingEmailAddresses,
11+
emailAddressesToInvite,
1212
} from '../organization-profile/organization-profile-members-panel/organization-profile-invite-members.utils';
1313
import type { CreateOrganizationModel } from './create-organization.model';
1414
import type {
@@ -138,7 +138,7 @@ export function useCreateOrganizationInviteController({
138138
return false;
139139
}
140140
await onInvite(organizationId, {
141-
emailAddresses: pendingEmailAddresses(values),
141+
emailAddresses: emailAddressesToInvite(values),
142142
role: selected,
143143
onRejected: setRejectedEmailAddresses,
144144
});

‎packages/mosaic/src/features/create-organization/create-organization.view.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,7 @@ function InviteStep({ invite, onFinish }: CreateOrganizationStepsProps) {
281281
id={formId}
282282
onSubmit={event => {
283283
event.preventDefault();
284-
if (invite.canSubmit && !invite.isPending) {
285-
invite.onSubmit();
286-
}
284+
invite.onSubmit();
287285
}}
288286
/>
289287
}

‎packages/mosaic/src/features/organization-profile/organization-profile-members-panel/organization-profile-invite-members.controller.ts‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { plural, useLocale, useMessages } from '../../../localization';
77
import type { MembersRoles } from './members-table-tab.types';
88
import type { OrganizationProfileInviteMembersDialogProps } from './organization-profile-invite-members.dialog';
99
import type { InviteMembersInput } from './organization-profile-invite-members.model';
10-
import { canSendInvitations, pendingEmailAddresses } from './organization-profile-invite-members.utils';
10+
import { canSendInvitations, emailAddressesToInvite } from './organization-profile-invite-members.utils';
1111

1212
interface InviteMembersValues {
1313
emailAddresses: string[];
@@ -31,29 +31,24 @@ export function useInviteMembersController({ roles, defaultRole, invite }: Invit
3131
const [rejectedEmailAddresses, setRejectedEmailAddresses] = useState<string[]>([]);
3232
const initialRole = roles ? resolveDefaultRole(roles, defaultRole) : null;
3333

34-
const form = useForm<InviteMembersValues, boolean>({
34+
const form = useForm<InviteMembersValues, string[] | null>({
3535
initialValues: { emailAddresses: [], emailDraft: '', role: initialRole },
3636
errorFallback: m.error,
3737
canSubmit: values => canSendInvitations({ ...values, rejectedEmailAddresses }),
38-
onSubmit: async values => {
39-
const { role } = values;
38+
onSubmit: async ({ role, ...draft }) => {
4039
if (!invite || !roles || role === null) {
41-
return false;
40+
return null;
4241
}
43-
await invite({
44-
emailAddresses: pendingEmailAddresses(values),
45-
role,
46-
roles,
47-
onRejected: setRejectedEmailAddresses,
48-
});
49-
return true;
42+
const emailAddresses = emailAddressesToInvite(draft);
43+
await invite({ emailAddresses, role, roles, onRejected: setRejectedEmailAddresses });
44+
return emailAddresses;
5045
},
51-
onSuccess: (invited, values) => {
46+
onSuccess: invited => {
5247
if (!invited) {
5348
return;
5449
}
5550
setOpen(false);
56-
toast.add({ type: 'success', label: plural(m.sent, pendingEmailAddresses(values).length, locale) });
51+
toast.add({ type: 'success', label: plural(m.sent, invited.length, locale) });
5752
},
5853
});
5954

‎packages/mosaic/src/features/organization-profile/organization-profile-members-panel/organization-profile-invite-members.dialog.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ export function OrganizationProfileInviteMembersDialog({
8383
id={formId}
8484
onSubmit={event => {
8585
event.preventDefault();
86-
if (canSubmit && !isPending) {
87-
void onSubmit();
88-
}
86+
void onSubmit();
8987
}}
9088
/>
9189
}
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
const isEmail = (value: string) => /^\S+@\S+\.\S+$/.test(value);
22

3-
interface InviteMembersValidity {
3+
interface InviteMembersDraft {
44
emailAddresses: string[];
55
emailDraft: string;
6+
}
7+
8+
interface InviteMembersValidity extends InviteMembersDraft {
69
rejectedEmailAddresses: string[];
710
role: string | null;
811
}
@@ -15,15 +18,14 @@ export function hasInvalidEmailAddresses(emailAddresses: string[], rejectedEmail
1518
return !emailAddresses.every(value => isValidEmail(value, rejectedEmailAddresses));
1619
}
1720

18-
export function pendingEmailAddresses({
19-
emailAddresses,
20-
emailDraft,
21-
}: Pick<InviteMembersValidity, 'emailAddresses' | 'emailDraft'>) {
21+
export function emailAddressesToInvite({ emailAddresses, emailDraft }: InviteMembersDraft) {
2222
const draft = emailDraft.trim();
2323
return draft && !emailAddresses.includes(draft) ? [...emailAddresses, draft] : emailAddresses;
2424
}
2525

26-
export function canSendInvitations({ rejectedEmailAddresses, role, ...input }: InviteMembersValidity) {
27-
const pending = pendingEmailAddresses(input);
28-
return pending.length > 0 && !hasInvalidEmailAddresses(pending, rejectedEmailAddresses) && role !== null;
26+
export function canSendInvitations({ rejectedEmailAddresses, role, ...draft }: InviteMembersValidity) {
27+
const emailAddresses = emailAddressesToInvite(draft);
28+
return (
29+
emailAddresses.length > 0 && !hasInvalidEmailAddresses(emailAddresses, rejectedEmailAddresses) && role !== null
30+
);
2931
}
Lines changed: 29 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,38 @@
1-
import { useToastManager } from '@clerk/mosaic/components/toast';
2-
import type { OrganizationProfileInviteMembersDialogProps } from '@clerk/mosaic/features/organization-profile/organization-profile-members-panel/organization-profile-invite-members.dialog';
3-
import {
4-
canSendInvitations,
5-
pendingEmailAddresses,
6-
} from '@clerk/mosaic/features/organization-profile/organization-profile-members-panel/organization-profile-invite-members.utils';
7-
import { plural, useLocale, useMessages } from '@clerk/mosaic/localization';
8-
import type { MouseEvent } from 'react';
9-
import { useRef, useState } from 'react';
1+
import type { MembersRoles } from '@clerk/mosaic/features/organization-profile/organization-profile-members-panel/members-table-tab.types';
2+
import { useInviteMembersController } from '@clerk/mosaic/features/organization-profile/organization-profile-members-panel/organization-profile-invite-members.controller';
3+
import type { InviteMembersInput } from '@clerk/mosaic/features/organization-profile/organization-profile-members-panel/organization-profile-invite-members.model';
4+
import { SaveError } from '@clerk/mosaic/utils/errors';
105

116
import { useChaosFixture } from '@/components/ChaosProvider';
127
import { chaosRole } from '@/lib/chaos';
138

14-
const exampleRoles = [
15-
{ value: 'member', label: 'Member', description: 'Role with non-privileged permissions in the organization.' },
16-
{ value: 'admin', label: 'Admin', description: 'Role with elevated permissions in the organization.' },
17-
];
9+
const exampleRoles: MembersRoles = {
10+
roles: [
11+
{ key: 'org:member', name: 'Member' },
12+
{ key: 'org:admin', name: 'Admin' },
13+
],
14+
hasRoleSetMigration: false,
15+
};
1816

1917
const existingMembers = ['ada.lovelace@example.com', 'grace.hopper@example.com'];
2018

21-
export function useInviteMembersFixture(): {
22-
onInvite: (event: MouseEvent<HTMLButtonElement>) => void;
23-
inviteDialog: OrganizationProfileInviteMembersDialogProps;
24-
} {
25-
const m = useMessages('organizationProfile').members.invite;
26-
const locale = useLocale();
27-
const roles = useChaosFixture(exampleRoles, items => items.map((role, index) => ({ ...role, ...chaosRole(index) })));
28-
const toast = useToastManager();
29-
const trigger = useRef<HTMLButtonElement | null>(null);
30-
const [open, setOpen] = useState(false);
31-
const [emailAddresses, setEmailAddresses] = useState<string[]>([]);
32-
const [emailDraft, setEmailDraft] = useState('');
33-
const [rejectedEmailAddresses, setRejectedEmailAddresses] = useState<string[]>([]);
34-
const [role, setRole] = useState<string | null>('member');
35-
const [isPending, setIsPending] = useState(false);
36-
const [error, setError] = useState<string | null>(null);
19+
async function invite({ emailAddresses, onRejected }: InviteMembersInput) {
20+
await new Promise(resolve => setTimeout(resolve, 800));
21+
const rejected = emailAddresses.filter(email => existingMembers.includes(email));
22+
if (rejected.length > 0) {
23+
onRejected(rejected);
24+
throw new SaveError({ global: { code: 'already_a_member_in_organization' } });
25+
}
26+
}
3727

38-
return {
39-
onInvite: event => {
40-
trigger.current = event.currentTarget;
41-
setEmailAddresses([]);
42-
setEmailDraft('');
43-
setRejectedEmailAddresses([]);
44-
setRole('member');
45-
setError(null);
46-
setOpen(true);
47-
},
48-
inviteDialog: {
49-
open,
50-
onOpenChange: setOpen,
51-
finalFocus: trigger,
52-
emailAddresses,
53-
onEmailAddressesChange: setEmailAddresses,
54-
emailDraft,
55-
onEmailDraftChange: setEmailDraft,
56-
rejectedEmailAddresses,
57-
roles,
58-
role,
59-
onRoleChange: setRole,
60-
canSubmit: canSendInvitations({ emailAddresses, emailDraft, rejectedEmailAddresses, role }),
61-
isPending,
62-
error,
63-
onSubmit: async () => {
64-
setIsPending(true);
65-
setError(null);
66-
await new Promise(resolve => setTimeout(resolve, 800));
67-
setIsPending(false);
68-
const invited = pendingEmailAddresses({ emailAddresses, emailDraft });
69-
const rejected = invited.filter(email => existingMembers.includes(email));
70-
if (rejected.length > 0) {
71-
setRejectedEmailAddresses(rejected);
72-
setError(`${rejected.join(', ')} ${rejected.length === 1 ? 'is' : 'are'} already a member.`);
73-
return;
74-
}
75-
setOpen(false);
76-
toast.add({ type: 'success', label: plural(m.sent, invited.length, locale) });
77-
},
78-
},
79-
};
28+
export function useInviteMembersFixture() {
29+
const roles = useChaosFixture(exampleRoles, value => ({
30+
...value,
31+
roles: value.roles.map((role, index) => ({ ...role, name: chaosRole(index).label })),
32+
}));
33+
const { onInvite, inviteDialog } = useInviteMembersController({ roles, defaultRole: 'org:member', invite });
34+
if (!onInvite || !inviteDialog) {
35+
throw new Error('The invite members fixture always passes invite and roles.');
36+
}
37+
return { onInvite, inviteDialog };
8038
}

0 commit comments

Comments
 (0)