Skip to content

The Open Source DocuSign Alternative.

fix: update team member invitation ux (#2687)

David Nguyen283334921b61
diff --git a/apps/remix/app/components/dialogs/team-member-create-dialog.tsx b/apps/remix/app/components/dialogs/team-member-create-dialog.tsx
index b8e5cfef5..f9ccf3f5e 100644
--- a/apps/remix/app/components/dialogs/team-member-create-dialog.tsx
+++ b/apps/remix/app/components/dialogs/team-member-create-dialog.tsx
@@ -10,8 +10,10 @@ import { Link } from 'react-router';
import { match } from 'ts-pattern';
import { z } from 'zod';
+import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
import { TEAM_MEMBER_ROLE_HIERARCHY } from '@documenso/lib/constants/teams';
import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams-translations';
+import { canExecuteOrganisationAction } from '@documenso/lib/utils/organisations';
import { trpc } from '@documenso/trpc/react';
import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';
import { Button } from '@documenso/ui/primitives/button';
@@ -73,8 +75,14 @@ export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDi
const { toast } = useToast();
const team = useCurrentTeam();
+ const organisation = useCurrentOrganisation();
const utils = trpc.useUtils();
+ const canInviteOrganisationMembers = canExecuteOrganisationAction(
+ 'MANAGE_ORGANISATION',
+ organisation.currentOrganisationRole,
+ );
+
const form = useForm<TAddTeamMembersFormSchema>({
resolver: zodResolver(ZAddTeamMembersFormSchema),
defaultValues: {
@@ -106,7 +114,7 @@ export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDi
const onFormSubmit = async ({ members }: TAddTeamMembersFormSchema) => {
if (members.length === 0) {
- if (hasNoAvailableMembers) {
+ if (hasNoAvailableMembers && canInviteOrganisationMembers) {
setInviteDialogOpen(true);
return;
}
@@ -231,7 +239,7 @@ export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDi
onKeyDown={(e) => {
if (e.key === 'Enter' && form.getValues('members').length === 0) {
e.preventDefault();
- if (hasNoAvailableMembers) {
+ if (hasNoAvailableMembers && canInviteOrganisationMembers) {
setInviteDialogOpen(true);
}
// Don't show toast - the disabled Next button already communicates this
@@ -260,21 +268,32 @@ export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDi
<Trans>No organisation members available</Trans>
</h3>
<p className="mb-6 max-w-sm text-sm text-muted-foreground">
- <Trans>
- To add members to this team, you must first add them to the
- organisation.
- </Trans>
+ {canInviteOrganisationMembers ? (
+ <Trans>
+ To add members to this team, you must first add them to the
+ organisation.
+ </Trans>
+ ) : (
+ <Trans>
+ To add members to this team, they must first be invited to the
+ organisation. Only organisation admins and managers can invite
+ new members — please contact one of them to invite members on
+ your behalf.
+ </Trans>
+ )}
</p>
- <OrganisationMemberInviteDialog
- open={inviteDialogOpen}
- onOpenChange={setInviteDialogOpen}
- trigger={
- <Button type="button" variant="default">
- <UserPlusIcon className="mr-2 h-4 w-4" />
- <Trans>Invite organisation members</Trans>
- </Button>
- }
- />
+ {canInviteOrganisationMembers && (
+ <OrganisationMemberInviteDialog
+ open={inviteDialogOpen}
+ onOpenChange={setInviteDialogOpen}
+ trigger={
+ <Button type="button" variant="default">
+ <UserPlusIcon className="mr-2 h-4 w-4" />
+ <Trans>Invite organisation members</Trans>
+ </Button>
+ }
+ />
+ )}
</div>
) : (
<MultiSelectCombobox
@@ -310,30 +329,32 @@ export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDi
<Trans>Select members to add to this team</Trans>
</FormDescription>
- <Alert
- variant="neutral"
- className="mt-2 flex items-center gap-2 space-y-0"
- >
- <div>
- <UserPlusIcon className="h-5 w-5 text-muted-foreground" />
- </div>
- <AlertDescription className="mt-0 flex-1">
- <Trans>Can't find someone?</Trans>{' '}
- <OrganisationMemberInviteDialog
- open={inviteDialogOpen}
- onOpenChange={setInviteDialogOpen}
- trigger={
- <Button
- type="button"
- variant="link"
- className="h-auto p-0 text-sm font-medium text-documenso-700 hover:text-documenso-600"
- >
- <Trans>Invite them to the organisation first</Trans>
- </Button>
- }
- />
- </AlertDescription>
- </Alert>
+ {canInviteOrganisationMembers && (
+ <Alert
+ variant="neutral"
+ className="mt-2 flex items-center gap-2 space-y-0"
+ >
+ <div>
+ <UserPlusIcon className="h-5 w-5 text-muted-foreground" />
+ </div>
+ <AlertDescription className="mt-0 flex-1">
+ <Trans>Can't find someone?</Trans>{' '}
+ <OrganisationMemberInviteDialog
+ open={inviteDialogOpen}
+ onOpenChange={setInviteDialogOpen}
+ trigger={
+ <Button
+ type="button"
+ variant="link"
+ className="h-auto p-0 text-sm font-medium text-documenso-700 hover:text-documenso-600"
+ >
+ <Trans>Invite them to the organisation first</Trans>
+ </Button>
+ }
+ />
+ </AlertDescription>
+ </Alert>
+ )}
</>
)}
</FormItem>