The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
feat: update team member creation dialog with invite functionality (#2366)
Catalin Pit25e148d45963
diff --git a/apps/remix/app/components/dialogs/team-member-create-dialog.tsx b/apps/remix/app/components/dialogs/team-member-create-dialog.tsxindex 8f822cfad..b8e5cfef5 100644--- a/apps/remix/app/components/dialogs/team-member-create-dialog.tsx+++ b/apps/remix/app/components/dialogs/team-member-create-dialog.tsx@@ -1,10 +1,10 @@-import { useEffect, useMemo, useState } from 'react';+import { useEffect, useMemo, useRef, useState } from 'react';import { zodResolver } from '@hookform/resolvers/zod';import { Trans, useLingui } from '@lingui/react/macro';import { TeamMemberRole } from '@prisma/client';import type * as DialogPrimitive from '@radix-ui/react-dialog';-import { InfoIcon } from 'lucide-react';+import { InfoIcon, UserPlusIcon } from 'lucide-react';import { useForm } from 'react-hook-form';import { Link } from 'react-router';import { match } from 'ts-pattern';@@ -13,6 +13,7 @@ import { z } from 'zod';import { TEAM_MEMBER_ROLE_HIERARCHY } from '@documenso/lib/constants/teams';import { TEAM_MEMBER_ROLE_MAP } from '@documenso/lib/constants/teams-translations';import { trpc } from '@documenso/trpc/react';+import { Alert, AlertDescription } from '@documenso/ui/primitives/alert';import { Button } from '@documenso/ui/primitives/button';import {Dialog,@@ -44,6 +45,7 @@ import {import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';import { useToast } from '@documenso/ui/primitives/use-toast';+import { OrganisationMemberInviteDialog } from '~/components/dialogs/organisation-member-invite-dialog';import { useCurrentTeam } from '~/providers/team';export type TeamMemberCreateDialogProps = {@@ -64,11 +66,14 @@ type TAddTeamMembersFormSchema = z.infer<typeof ZAddTeamMembersFormSchema>;export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDialogProps) => {const [open, setOpen] = useState(false);const [step, setStep] = useState<'SELECT' | 'MEMBERS'>('SELECT');+ const [inviteDialogOpen, setInviteDialogOpen] = useState(false);+ const prevInviteDialogOpenRef = useRef(false);const { t } = useLingui();const { toast } = useToast();const team = useCurrentTeam();+ const utils = trpc.useUtils();const form = useForm<TAddTeamMembersFormSchema>({resolver: zodResolver(ZAddTeamMembersFormSchema),@@ -96,7 +101,29 @@ export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDi);}, [organisationMemberQuery, teamMemberQuery]);+ const hasNoAvailableMembers =+ !organisationMemberQuery.isLoading && avaliableOrganisationMembers.length === 0;+const onFormSubmit = async ({ members }: TAddTeamMembersFormSchema) => {+ if (members.length === 0) {+ if (hasNoAvailableMembers) {+ setInviteDialogOpen(true);+ return;+ }++ // Don't show error if on SELECT step - the disabled Next button already communicates this+ if (step === 'SELECT') {+ return;+ }++ toast({+ title: t`No members selected`,+ description: t`Please select at least one member to add to the team.`,+ variant: 'destructive',+ });+ return;+ }+try {await createTeamMembers({teamId: team.id,@@ -123,9 +150,20 @@ export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDiif (!open) {form.reset();setStep('SELECT');+ setInviteDialogOpen(false);}}, [open, form]);+ // Invalidate queries when invite dialog closes (transitions from true to false) to refresh available members+ useEffect(() => {+ if (prevInviteDialogOpenRef.current && !inviteDialogOpen) {+ void utils.organisation.member.find.invalidate({+ organisationId: team.organisationId,+ });+ }+ prevInviteDialogOpenRef.current = inviteDialogOpen;+ }, [inviteDialogOpen, utils, team.organisationId]);+return (<Dialog{...props}@@ -134,9 +172,11 @@ export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDi// Since it would be annoying to redo the whole process.><DialogTrigger onClick={(e) => e.stopPropagation()} asChild>- <Button variant="secondary" onClick={() => setOpen(true)}>- <Trans>Add members</Trans>- </Button>+ {trigger ?? (+ <Button variant="secondary" onClick={() => setOpen(true)}>+ <Trans>Add members</Trans>+ </Button>+ )}</DialogTrigger><DialogContent hideClose={true} position="center">@@ -149,7 +189,7 @@ export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDi<TooltipTrigger asChild><InfoIcon className="mx-2 h-4 w-4" /></TooltipTrigger>- <TooltipContent className="text-muted-foreground z-[99999] max-w-xs">+ <TooltipContent className="z-[99999] max-w-xs text-muted-foreground"><Trans>To be able to add members to a team, you must first add them to theorganisation. For more information, please see the{' '}@@ -186,7 +226,18 @@ export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDi.exhaustive()}<Form {...form}>- <form onSubmit={form.handleSubmit(onFormSubmit)}>+ <form+ onSubmit={form.handleSubmit(onFormSubmit)}+ onKeyDown={(e) => {+ if (e.key === 'Enter' && form.getValues('members').length === 0) {+ e.preventDefault();+ if (hasNoAvailableMembers) {+ setInviteDialogOpen(true);+ }+ // Don't show toast - the disabled Next button already communicates this+ }+ }}+ ><fieldset disabled={form.formState.isSubmitting}>{step === 'SELECT' && (<>@@ -194,46 +245,102 @@ export const TeamMemberCreateDialog = ({ trigger, ...props }: TeamMemberCreateDicontrol={form.control}name="members"render={({ field }) => (- <FormItem>+ <FormItem className="space-y-2"><FormLabel><Trans>Members</Trans></FormLabel><FormControl>- <MultiSelectCombobox- options={avaliableOrganisationMembers.map((member) => ({- label: member.name,- value: member.id,- }))}- loading={organisationMemberQuery.isLoading}- selectedValues={field.value.map(- (member) => member.organisationMemberId,- )}- onChange={(value) => {- field.onChange(- value.map((organisationMemberId) => ({- organisationMemberId,- teamRole:- field.value.find(- (member) =>- member.organisationMemberId === organisationMemberId,- )?.teamRole || TeamMemberRole.MEMBER,- })),- );- }}- className="bg-background w-full"- emptySelectionPlaceholder={t`Select members`}- />+ {hasNoAvailableMembers ? (+ <div className="flex flex-col items-center justify-center rounded-lg border border-dashed border-muted-foreground/25 bg-muted/30 px-6 py-12 text-center">+ <div className="mb-4 flex h-12 w-12 items-center justify-center rounded-full bg-muted">+ <UserPlusIcon className="h-6 w-6 text-muted-foreground" />+ </div>+ <h3 className="mb-2 text-sm font-semibold">+ <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>+ </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>+ }+ />+ </div>+ ) : (+ <MultiSelectCombobox+ options={avaliableOrganisationMembers.map((member) => ({+ label: member.name,+ value: member.id,+ }))}+ loading={organisationMemberQuery.isLoading}+ selectedValues={field.value.map(+ (member) => member.organisationMemberId,+ )}+ onChange={(value) => {+ field.onChange(+ value.map((organisationMemberId) => ({+ organisationMemberId,+ teamRole:+ field.value.find(+ (member) =>+ member.organisationMemberId === organisationMemberId,+ )?.teamRole || TeamMemberRole.MEMBER,+ })),+ );+ }}+ className="w-full bg-background"+ emptySelectionPlaceholder={t`Select members`}+ />+ )}</FormControl>- <FormDescription>- <Trans>Select members to add to this team</Trans>- </FormDescription>+ {!hasNoAvailableMembers && (+ <>+ <FormDescription>+ <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>+ </>+ )}</FormItem>)}/>- <DialogFooter>+ <DialogFooter className="mt-4"><Button type="button" variant="secondary" onClick={() => setOpen(false)}><Trans>Cancel</Trans></Button>