Skip to content

The Open Source DocuSign Alternative.

fix: remove old dialogs (#3006)

David Nguyendee3259088b1
diff --git a/apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx b/apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
deleted file mode 100644
index 694f2d56a..000000000
--- a/apps/remix/app/components/dialogs/document-move-to-folder-dialog.tsx
+++ /dev/null
@@ -1,243 +0,0 @@
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { FolderType } from '@documenso/lib/types/folder-type';
-import { formatDocumentsPath } from '@documenso/lib/utils/teams';
-import { trpc } from '@documenso/trpc/react';
-import { Button } from '@documenso/ui/primitives/button';
-import {
- Dialog,
- DialogContent,
- DialogDescription,
- DialogFooter,
- DialogHeader,
- DialogTitle,
-} from '@documenso/ui/primitives/dialog';
-import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import type * as DialogPrimitive from '@radix-ui/react-dialog';
-import { FolderIcon, HomeIcon, Loader2, Search } from 'lucide-react';
-import { useEffect, useState } from 'react';
-import { useForm } from 'react-hook-form';
-import { useNavigate } from 'react-router';
-import { z } from 'zod';
-
-import { useCurrentTeam } from '~/providers/team';
-
-export type DocumentMoveToFolderDialogProps = {
- documentId: number;
- open: boolean;
- onOpenChange: (open: boolean) => void;
- currentFolderId?: string;
-} & Omit<DialogPrimitive.DialogProps, 'children'>;
-
-const ZMoveDocumentFormSchema = z.object({
- folderId: z.string().nullable().optional(),
-});
-
-type TMoveDocumentFormSchema = z.infer<typeof ZMoveDocumentFormSchema>;
-
-export const DocumentMoveToFolderDialog = ({
- documentId,
- open,
- onOpenChange,
- currentFolderId,
- ...props
-}: DocumentMoveToFolderDialogProps) => {
- const { _ } = useLingui();
- const { toast } = useToast();
-
- const navigate = useNavigate();
- const team = useCurrentTeam();
-
- const [searchTerm, setSearchTerm] = useState('');
-
- const form = useForm<TMoveDocumentFormSchema>({
- resolver: zodResolver(ZMoveDocumentFormSchema),
- defaultValues: {
- folderId: currentFolderId,
- },
- });
-
- const { data: folders, isLoading: isFoldersLoading } = trpc.folder.findFoldersInternal.useQuery(
- {
- parentId: currentFolderId,
- type: FolderType.DOCUMENT,
- },
- {
- enabled: open,
- },
- );
-
- const { mutateAsync: updateDocument } = trpc.document.update.useMutation();
-
- useEffect(() => {
- if (!open) {
- form.reset();
- setSearchTerm('');
- } else {
- form.reset({ folderId: currentFolderId });
- }
- }, [open, currentFolderId, form]);
-
- const onSubmit = async (data: TMoveDocumentFormSchema) => {
- try {
- await updateDocument({
- documentId,
- data: {
- folderId: data.folderId ?? null,
- },
- });
-
- const documentsPath = formatDocumentsPath(team.url);
-
- if (data.folderId) {
- await navigate(`${documentsPath}/f/${data.folderId}`);
- } else {
- await navigate(documentsPath);
- }
-
- toast({
- title: _(msg`Document moved`),
- description: _(msg`The document has been moved successfully.`),
- variant: 'default',
- });
-
- onOpenChange(false);
- } catch (err) {
- const error = AppError.parseError(err);
-
- if (error.code === AppErrorCode.NOT_FOUND) {
- toast({
- title: _(msg`Error`),
- description: _(msg`The folder you are trying to move the document to does not exist.`),
- variant: 'destructive',
- });
-
- return;
- }
-
- if (error.code === AppErrorCode.UNAUTHORIZED) {
- toast({
- title: _(msg`Error`),
- description: _(msg`You are not allowed to move this document.`),
- variant: 'destructive',
- });
-
- return;
- }
-
- toast({
- title: _(msg`Error`),
- description: _(msg`An error occurred while moving the document.`),
- variant: 'destructive',
- });
- }
- };
-
- const filteredFolders = folders?.data.filter((folder) =>
- folder.name.toLowerCase().includes(searchTerm.toLowerCase()),
- );
-
- return (
- <Dialog {...props} open={open} onOpenChange={onOpenChange}>
- <DialogContent>
- <DialogHeader>
- <DialogTitle>
- <Trans>Move Document to Folder</Trans>
- </DialogTitle>
-
- <DialogDescription>
- <Trans>Select a folder to move this document to.</Trans>
- </DialogDescription>
- </DialogHeader>
-
- <div className="relative">
- <Search className="absolute top-3 left-2 h-4 w-4 text-muted-foreground" />
- <Input
- placeholder={_(msg`Search folders...`)}
- value={searchTerm}
- onChange={(e) => setSearchTerm(e.target.value)}
- className="pl-8"
- />
- </div>
-
- <Form {...form}>
- <form onSubmit={form.handleSubmit(onSubmit)} className="flex flex-col gap-y-4">
- <FormField
- control={form.control}
- name="folderId"
- render={({ field }) => (
- <FormItem>
- <FormLabel>
- <Trans>Folder</Trans>
- </FormLabel>
-
- <FormControl>
- <div className="max-h-96 space-y-2 overflow-y-auto">
- {isFoldersLoading ? (
- <div className="flex h-10 items-center justify-center">
- <Loader2 className="h-4 w-4 animate-spin" />
- </div>
- ) : (
- <>
- <Button
- type="button"
- variant={field.value === null ? 'default' : 'outline'}
- className="w-full justify-start"
- onClick={() => field.onChange(null)}
- disabled={currentFolderId === null}
- >
- <HomeIcon className="mr-2 h-4 w-4" />
- <Trans>Home (No Folder)</Trans>
- </Button>
-
- {filteredFolders?.map((folder) => (
- <Button
- key={folder.id}
- type="button"
- variant={field.value === folder.id ? 'default' : 'outline'}
- className="w-full justify-start"
- onClick={() => field.onChange(folder.id)}
- disabled={currentFolderId === folder.id}
- >
- <FolderIcon className="mr-2 h-4 w-4" />
- {folder.name}
- </Button>
- ))}
-
- {searchTerm && filteredFolders?.length === 0 && (
- <div className="px-2 py-2 text-center text-muted-foreground text-sm">
- <Trans>No folders found</Trans>
- </div>
- )}
- </>
- )}
- </div>
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
-
- <DialogFooter>
- <Button type="button" variant="secondary" onClick={() => onOpenChange(false)}>
- <Trans>Cancel</Trans>
- </Button>
-
- <Button
- type="submit"
- disabled={isFoldersLoading || form.formState.isSubmitting || currentFolderId === null}
- >
- <Trans>Move</Trans>
- </Button>
- </DialogFooter>
- </form>
- </Form>
- </DialogContent>
- </Dialog>
- );
-};
diff --git a/apps/remix/app/components/dialogs/document-resend-dialog.tsx b/apps/remix/app/components/dialogs/document-resend-dialog.tsx
deleted file mode 100644
index 493d07138..000000000
--- a/apps/remix/app/components/dialogs/document-resend-dialog.tsx
+++ /dev/null
@@ -1,203 +0,0 @@
-import { useSession } from '@documenso/lib/client-only/providers/session';
-import { getRecipientType } from '@documenso/lib/client-only/recipient-type';
-import { AppError } from '@documenso/lib/errors/app-error';
-import type { TRecipientLite } from '@documenso/lib/types/recipient';
-import { recipientAbbreviation } from '@documenso/lib/utils/recipient-formatter';
-import type { Document } from '@documenso/prisma/types/document-legacy-schema';
-import { trpc as trpcReact } from '@documenso/trpc/react';
-import { cn } from '@documenso/ui/lib/utils';
-import { Button } from '@documenso/ui/primitives/button';
-import { Checkbox } from '@documenso/ui/primitives/checkbox';
-import {
- Dialog,
- DialogClose,
- DialogContent,
- DialogFooter,
- DialogHeader,
- DialogTitle,
- DialogTrigger,
-} from '@documenso/ui/primitives/dialog';
-import { DropdownMenuItem } from '@documenso/ui/primitives/dropdown-menu';
-import { Form, FormControl, FormField, FormItem, FormLabel } from '@documenso/ui/primitives/form/form';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import { SigningStatus, type Team, type User } from '@prisma/client';
-import { History } from 'lucide-react';
-import { useState } from 'react';
-import { useForm, useWatch } from 'react-hook-form';
-import * as z from 'zod';
-
-import { useCurrentTeam } from '~/providers/team';
-import { getDistributeErrorMessage } from '~/utils/toast-error-messages';
-
-import { StackAvatar } from '../general/stack-avatar';
-
-const FORM_ID = 'resend-email';
-
-export type DocumentResendDialogProps = {
- document: Pick<Document, 'id' | 'userId' | 'teamId' | 'status'> & {
- user: Pick<User, 'id' | 'name' | 'email'>;
- recipients: TRecipientLite[];
- team: Pick<Team, 'id' | 'url'> | null;
- };
- recipients: TRecipientLite[];
-};
-
-export const ZResendDocumentFormSchema = z.object({
- recipients: z.array(z.number()).min(1, {
- message: 'You must select at least one item.',
- }),
-});
-
-export type TResendDocumentFormSchema = z.infer<typeof ZResendDocumentFormSchema>;
-
-export const DocumentResendDialog = ({ document, recipients }: DocumentResendDialogProps) => {
- const { user } = useSession();
- const team = useCurrentTeam();
-
- const { toast } = useToast();
- const { _ } = useLingui();
-
- const [isOpen, setIsOpen] = useState(false);
- const isOwner = document.userId === user.id;
- const isCurrentTeamDocument = team && document.team?.url === team.url;
-
- const isDisabled =
- (!isOwner && !isCurrentTeamDocument) ||
- document.status !== 'PENDING' ||
- !recipients.some((r) => r.signingStatus === SigningStatus.NOT_SIGNED);
-
- const { mutateAsync: resendDocument } = trpcReact.document.redistribute.useMutation();
-
- const form = useForm<TResendDocumentFormSchema>({
- resolver: zodResolver(ZResendDocumentFormSchema),
- defaultValues: {
- recipients: [],
- },
- });
-
- const {
- handleSubmit,
- formState: { isSubmitting },
- } = form;
-
- const selectedRecipients = useWatch({
- control: form.control,
- name: 'recipients',
- });
-
- const onFormSubmit = async ({ recipients }: TResendDocumentFormSchema) => {
- try {
- await resendDocument({ documentId: document.id, recipients });
-
- toast({
- title: _(msg`Document re-sent`),
- description: _(msg`Your document has been re-sent successfully.`),
- duration: 5000,
- });
-
- setIsOpen(false);
- } catch (err) {
- const error = AppError.parseError(err);
- const errorMessage = getDistributeErrorMessage(error.code);
-
- toast({
- title: _(errorMessage.title),
- description: _(errorMessage.description),
- variant: 'destructive',
- duration: 7500,
- });
- }
- };
-
- return (
- <Dialog open={isOpen} onOpenChange={setIsOpen}>
- <DialogTrigger asChild>
- <DropdownMenuItem disabled={isDisabled} onSelect={(e) => e.preventDefault()}>
- <History className="mr-2 h-4 w-4" />
- <Trans>Resend</Trans>
- </DropdownMenuItem>
- </DialogTrigger>
-
- <DialogContent className="sm:max-w-sm" hideClose>
- <DialogHeader>
- <DialogTitle asChild>
- <h1 className="text-center text-xl">
- <Trans>Who do you want to remind?</Trans>
- </h1>
- </DialogTitle>
- </DialogHeader>
-
- <Form {...form}>
- <form id={FORM_ID} onSubmit={handleSubmit(onFormSubmit)} className="px-3">
- <FormField
- control={form.control}
- name="recipients"
- render={({ field: { value, onChange } }) => (
- <>
- {recipients.map((recipient) => (
- <FormItem key={recipient.id} className="flex flex-row items-center justify-between gap-x-3">
- <FormLabel
- className={cn('my-2 flex items-center gap-2 font-normal', {
- 'opacity-50': !value.includes(recipient.id),
- })}
- >
- <StackAvatar
- key={recipient.id}
- type={getRecipientType(recipient)}
- fallbackText={recipientAbbreviation(recipient)}
- />
- {recipient.email}
- </FormLabel>
-
- <FormControl>
- <Checkbox
- className="h-5 w-5 rounded-full border border-neutral-400"
- value={recipient.id}
- checked={value.includes(recipient.id)}
- onCheckedChange={(checked: boolean) =>
- checked
- ? onChange([...value, recipient.id])
- : onChange(value.filter((v) => v !== recipient.id))
- }
- />
- </FormControl>
- </FormItem>
- ))}
- </>
- )}
- />
- </form>
- </Form>
-
- <DialogFooter>
- <div className="flex w-full flex-1 flex-nowrap gap-4">
- <DialogClose asChild>
- <Button
- type="button"
- className="flex-1 bg-black/5 hover:bg-black/10 dark:bg-muted dark:hover:bg-muted/80"
- variant="secondary"
- disabled={isSubmitting}
- >
- <Trans>Cancel</Trans>
- </Button>
- </DialogClose>
-
- <Button
- className="flex-1"
- loading={isSubmitting}
- type="submit"
- form={FORM_ID}
- disabled={isSubmitting || selectedRecipients.length === 0}
- >
- <Trans>Send reminder</Trans>
- </Button>
- </div>
- </DialogFooter>
- </DialogContent>
- </Dialog>
- );
-};
diff --git a/apps/remix/app/components/dialogs/envelope-redistribute-dialog.tsx b/apps/remix/app/components/dialogs/envelope-redistribute-dialog.tsx
index 161fd94d0..1a54c7893 100644
--- a/apps/remix/app/components/dialogs/envelope-redistribute-dialog.tsx
+++ b/apps/remix/app/components/dialogs/envelope-redistribute-dialog.tsx
@@ -25,14 +25,16 @@ import { Trans, useLingui } from '@lingui/react/macro';
import { DocumentStatus, EnvelopeType, SigningStatus } from '@prisma/client';
import { useEffect, useState } from 'react';
import { useForm } from 'react-hook-form';
+import { match } from 'ts-pattern';
import * as z from 'zod';
import { getDistributeErrorMessage } from '~/utils/toast-error-messages';
import { StackAvatar } from '../general/stack-avatar';
export type EnvelopeRedistributeDialogProps = {
- envelope: Pick<TEnvelope, 'id' | 'userId' | 'teamId' | 'status' | 'type' | 'documentMeta'> & {
+ envelope: Pick<TEnvelope, 'id' | 'status' | 'type'> & {
recipients: TEnvelopeRecipientLite[];
};
+ envelopeType?: EnvelopeType;
trigger?: React.ReactNode;
};
@@ -44,7 +46,7 @@ export const ZEnvelopeRedistributeFormSchema = z.object({
export type TEnvelopeRedistributeFormSchema = z.infer<typeof ZEnvelopeRedistributeFormSchema>;
-export const EnvelopeRedistributeDialog = ({ envelope, trigger }: EnvelopeRedistributeDialogProps) => {
+export const EnvelopeRedistributeDialog = ({ envelope, envelopeType, trigger }: EnvelopeRedistributeDialogProps) => {
const recipients = envelope.recipients;
const { toast } = useToast();
@@ -70,9 +72,23 @@ export const EnvelopeRedistributeDialog = ({ envelope, trigger }: EnvelopeRedist
try {
await redistributeEnvelope({ envelopeId: envelope.id, recipients });
+ const successMessage = match(envelopeType)
+ .with(EnvelopeType.DOCUMENT, () => ({
+ title: t`Document resent`,
+ description: t`Your document has been resent successfully.`,
+ }))
+ .with(EnvelopeType.TEMPLATE, () => ({
+ title: t`Template resent`,
+ description: t`Your template has been resent successfully.`,
+ }))
+ .otherwise(() => ({
+ title: t`Envelope resent`,
+ description: t`Your envelope has been resent successfully.`,
+ }));
+
toast({
- title: t`Envelope resent`,
- description: t`Your envelope has been resent successfully.`,
+ title: successMessage.title,
+ description: successMessage.description,
duration: 5000,
});
diff --git a/apps/remix/app/components/dialogs/envelopes-bulk-move-dialog.tsx b/apps/remix/app/components/dialogs/envelopes-bulk-move-dialog.tsx
index f0c81da77..69dbb8793 100644
--- a/apps/remix/app/components/dialogs/envelopes-bulk-move-dialog.tsx
+++ b/apps/remix/app/components/dialogs/envelopes-bulk-move-dialog.tsx
@@ -28,7 +28,7 @@ export type EnvelopesBulkMoveDialogProps = {
open: boolean;
onOpenChange: (open: boolean) => void;
currentFolderId?: string;
- onSuccess?: () => void;
+ onSuccess?: (folderId: string | null) => Promise<void> | void;
} & Omit<DialogPrimitive.DialogProps, 'children'>;
const ZBulkMoveFormSchema = z.object({
@@ -99,11 +99,12 @@ export const EnvelopesBulkMoveDialog = ({
await trpcUtils.template.findTemplates.invalidate();
}
+ await onSuccess?.(data.folderId);
+
toast({
description: t`Selected items have been moved.`,
});
- onSuccess?.();
onOpenChange(false);
} catch (err) {
const error = AppError.parseError(err);
diff --git a/apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx b/apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
deleted file mode 100644
index df619f149..000000000
--- a/apps/remix/app/components/dialogs/template-move-to-folder-dialog.tsx
+++ /dev/null
@@ -1,232 +0,0 @@
-import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
-import { FolderType } from '@documenso/lib/types/folder-type';
-import { formatTemplatesPath } from '@documenso/lib/utils/teams';
-import { trpc } from '@documenso/trpc/react';
-import { Button } from '@documenso/ui/primitives/button';
-import {
- Dialog,
- DialogContent,
- DialogDescription,
- DialogFooter,
- DialogHeader,
- DialogTitle,
-} from '@documenso/ui/primitives/dialog';
-import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import type * as DialogPrimitive from '@radix-ui/react-dialog';
-import { FolderIcon, HomeIcon, Loader2, Search } from 'lucide-react';
-import { useEffect, useState } from 'react';
-import { useForm } from 'react-hook-form';
-import { useNavigate } from 'react-router';
-import { z } from 'zod';
-
-import { useCurrentTeam } from '~/providers/team';
-
-export type TemplateMoveToFolderDialogProps = {
- templateId: number;
- templateTitle: string;
- isOpen: boolean;
- onOpenChange: (open: boolean) => void;
- currentFolderId?: string | null;
-} & Omit<DialogPrimitive.DialogProps, 'children'>;
-
-const ZMoveTemplateFormSchema = z.object({
- folderId: z.string().nullable().optional(),
-});
-
-type TMoveTemplateFormSchema = z.infer<typeof ZMoveTemplateFormSchema>;
-
-export function TemplateMoveToFolderDialog({
- templateId,
- templateTitle,
- isOpen,
- onOpenChange,
- currentFolderId,
- ...props
-}: TemplateMoveToFolderDialogProps) {
- const { _ } = useLingui();
- const { toast } = useToast();
-
- const navigate = useNavigate();
- const team = useCurrentTeam();
-
- const [searchTerm, setSearchTerm] = useState('');
-
- const form = useForm<TMoveTemplateFormSchema>({
- resolver: zodResolver(ZMoveTemplateFormSchema),
- defaultValues: {
- folderId: currentFolderId ?? null,
- },
- });
-
- const { data: folders, isLoading: isFoldersLoading } = trpc.folder.findFoldersInternal.useQuery(
- {
- parentId: currentFolderId ?? null,
- type: FolderType.TEMPLATE,
- },
- {
- enabled: isOpen,
- },
- );
-
- const { mutateAsync: updateTemplate } = trpc.template.updateTemplate.useMutation();
-
- useEffect(() => {
- if (!isOpen) {
- form.reset();
- setSearchTerm('');
- } else {
- form.reset({ folderId: currentFolderId ?? null });
- }
- }, [isOpen, currentFolderId, form]);
-
- const onSubmit = async (data: TMoveTemplateFormSchema) => {
- try {
- await updateTemplate({
- templateId,
- data: {
- folderId: data.folderId ?? null,
- },
- });
-
- toast({
- title: _(msg`Template moved`),
- description: _(msg`The template has been moved successfully.`),
- variant: 'default',
- });
-
- onOpenChange(false);
-
- const templatesPath = formatTemplatesPath(team.url);
-
- if (data.folderId) {
- void navigate(`${templatesPath}/f/${data.folderId}`);
- } else {
- void navigate(templatesPath);
- }
- } catch (err) {
- const error = AppError.parseError(err);
-
- if (error.code === AppErrorCode.NOT_FOUND) {
- toast({
- title: _(msg`Error`),
- description: _(msg`The folder you are trying to move the template to does not exist.`),
- variant: 'destructive',
- });
-
- return;
- }
-
- toast({
- title: _(msg`Error`),
- description: _(msg`An error occurred while moving the template.`),
- variant: 'destructive',
- });
- }
- };
-
- const filteredFolders = folders?.data?.filter((folder) =>
- folder.name.toLowerCase().includes(searchTerm.toLowerCase()),
- );
-
- return (
- <Dialog {...props} open={isOpen} onOpenChange={onOpenChange}>
- <DialogContent>
- <DialogHeader>
- <DialogTitle>
- <Trans>Move Template to Folder</Trans>
- </DialogTitle>
-
- <DialogDescription>
- <Trans>Move &quot;{templateTitle}&quot; to a folder</Trans>
- </DialogDescription>
- </DialogHeader>
-
- <div className="relative">
- <Search className="absolute top-3 left-2 h-4 w-4 text-muted-foreground" />
- <Input
- placeholder={_(msg`Search folders...`)}
- value={searchTerm}
- onChange={(e) => setSearchTerm(e.target.value)}
- className="pl-8"
- />
- </div>
-
- <Form {...form}>
- <form onSubmit={form.handleSubmit(onSubmit)} className="mt-4 flex flex-col gap-y-4">
- <FormField
- control={form.control}
- name="folderId"
- render={({ field }) => (
- <FormItem>
- <FormLabel>
- <Trans>Folder</Trans>
- </FormLabel>
-
- <FormControl>
- <div className="max-h-96 space-y-2 overflow-y-auto">
- {isFoldersLoading ? (
- <div className="flex h-10 items-center justify-center">
- <Loader2 className="h-4 w-4 animate-spin" />
- </div>
- ) : (
- <>
- <Button
- type="button"
- variant={field.value === null ? 'default' : 'outline'}
- className="w-full justify-start"
- onClick={() => field.onChange(null)}
- disabled={currentFolderId === null}
- >
- <HomeIcon className="mr-2 h-4 w-4" />
- <Trans>Home (No Folder)</Trans>
- </Button>
-
- {filteredFolders?.map((folder) => (
- <Button
- key={folder.id}
- type="button"
- variant={field.value === folder.id ? 'default' : 'outline'}
- className="w-full justify-start"
- onClick={() => field.onChange(folder.id)}
- disabled={currentFolderId === folder.id}
- >
- <FolderIcon className="mr-2 h-4 w-4" />
- {folder.name}
- </Button>
- ))}
-
- {searchTerm && filteredFolders?.length === 0 && (
- <div className="px-2 py-2 text-center text-muted-foreground text-sm">
- <Trans>No folders found</Trans>
- </div>
- )}
- </>
- )}
- </div>
- </FormControl>
- <FormMessage />
- </FormItem>
- )}
- />
-
- <DialogFooter>
- <Button type="button" variant="secondary" onClick={() => onOpenChange(false)}>
- <Trans>Cancel</Trans>
- </Button>
-
- <Button type="submit" disabled={isFoldersLoading || form.formState.isSubmitting}>
- <Trans>Move</Trans>
- </Button>
- </DialogFooter>
- </form>
- </Form>
- </DialogContent>
- </Dialog>
- );
-}
diff --git a/apps/remix/app/components/general/document/document-page-view-dropdown.tsx b/apps/remix/app/components/general/document/document-page-view-dropdown.tsx
index e18852d95..668a0cd2e 100644
--- a/apps/remix/app/components/general/document/document-page-view-dropdown.tsx
+++ b/apps/remix/app/components/general/document/document-page-view-dropdown.tsx
@@ -19,6 +19,7 @@ import {
Download,
Edit,
FileOutputIcon,
+ History,
Loader,
MoreHorizontal,
Pencil,
@@ -29,10 +30,10 @@ import {
import { useState } from 'react';
import { Link, useNavigate } from 'react-router';
-import { DocumentResendDialog } from '~/components/dialogs/document-resend-dialog';
import { EnvelopeDeleteDialog } from '~/components/dialogs/envelope-delete-dialog';
import { EnvelopeDownloadDialog } from '~/components/dialogs/envelope-download-dialog';
import { EnvelopeDuplicateDialog } from '~/components/dialogs/envelope-duplicate-dialog';
+import { EnvelopeRedistributeDialog } from '~/components/dialogs/envelope-redistribute-dialog';
import { EnvelopeRenameDialog } from '~/components/dialogs/envelope-rename-dialog';
import { EnvelopeSaveAsTemplateDialog } from '~/components/dialogs/envelope-save-as-template-dialog';
import { DocumentRecipientLinkCopyDialog } from '~/components/general/document/document-recipient-link-copy-dialog';
@@ -67,8 +68,6 @@ export const DocumentPageViewDropdown = ({ envelope }: DocumentPageViewDropdownP
const documentsPath = formatDocumentsPath(team.url);
- const nonSignedRecipients = envelope.recipients.filter((item) => item.signingStatus !== 'SIGNED');
-
return (
<DropdownMenu>
<DropdownMenuTrigger data-testid="document-page-view-action-btn">
@@ -172,13 +171,20 @@ export const DocumentPageViewDropdown = ({ envelope }: DocumentPageViewDropdownP
/>
)}
- <DocumentResendDialog
- document={{
- ...envelope,
- id: mapSecondaryIdToDocumentId(envelope.secondaryId),
- }}
- recipients={nonSignedRecipients}
- />
+ {canManageDocument && (
+ <EnvelopeRedistributeDialog
+ envelope={envelope}
+ envelopeType={EnvelopeType.DOCUMENT}
+ trigger={
+ <DropdownMenuItem asChild onSelect={(e) => e.preventDefault()}>
+ <div>
+ <History className="mr-2 h-4 w-4" />
+ <Trans>Resend</Trans>
+ </div>
+ </DropdownMenuItem>
+ }
+ />
+ )}
<DocumentShareButton
documentId={mapSecondaryIdToDocumentId(envelope.secondaryId)}
diff --git a/apps/remix/app/components/tables/documents-table-action-dropdown.tsx b/apps/remix/app/components/tables/documents-table-action-dropdown.tsx
index 543b84836..febe3ea1a 100644
--- a/apps/remix/app/components/tables/documents-table-action-dropdown.tsx
+++ b/apps/remix/app/components/tables/documents-table-action-dropdown.tsx
@@ -25,6 +25,7 @@ import {
EyeIcon,
FileOutputIcon,
FolderInput,
+ History,
Loader,
MoreHorizontal,
Pencil,
@@ -35,10 +36,10 @@ import {
import { useState } from 'react';
import { Link } from 'react-router';
-import { DocumentResendDialog } from '~/components/dialogs/document-resend-dialog';
import { EnvelopeCancelDialog } from '~/components/dialogs/envelope-cancel-dialog';
import { EnvelopeDeleteDialog } from '~/components/dialogs/envelope-delete-dialog';
import { EnvelopeDuplicateDialog } from '~/components/dialogs/envelope-duplicate-dialog';
+import { EnvelopeRedistributeDialog } from '~/components/dialogs/envelope-redistribute-dialog';
import { EnvelopeSaveAsTemplateDialog } from '~/components/dialogs/envelope-save-as-template-dialog';
import { DocumentRecipientLinkCopyDialog } from '~/components/general/document/document-recipient-link-copy-dialog';
import { useCurrentTeam } from '~/providers/team';
@@ -95,8 +96,6 @@ export const DocumentsTableActionDropdown = ({ row, onMoveDocument }: DocumentsT
const documentsPath = formatDocumentsPath(team.url);
const formatPath = `${documentsPath}/${row.envelopeId}/edit`;
- const nonSignedRecipients = row.recipients.filter((item) => item.signingStatus !== 'SIGNED');
-
return (
<DropdownMenu>
<DropdownMenuTrigger data-testid="document-table-action-btn">
@@ -244,7 +243,25 @@ export const DocumentsTableActionDropdown = ({ row, onMoveDocument }: DocumentsT
/>
)}
- <DocumentResendDialog document={row} recipients={nonSignedRecipients} />
+ {canManageDocument && (
+ <EnvelopeRedistributeDialog
+ envelope={{
+ id: row.envelopeId,
+ status: row.status,
+ type: EnvelopeType.DOCUMENT,
+ recipients: row.recipients,
+ }}
+ envelopeType={EnvelopeType.DOCUMENT}
+ trigger={
+ <DropdownMenuItem asChild onSelect={(e) => e.preventDefault()}>
+ <div>
+ <History className="mr-2 h-4 w-4" />
+ <Trans>Resend</Trans>
+ </div>
+ </DropdownMenuItem>
+ }
+ />
+ )}
<DocumentShareButton
documentId={row.id}
diff --git a/apps/remix/app/components/tables/documents-table.tsx b/apps/remix/app/components/tables/documents-table.tsx
index ddffc8a9c..934123318 100644
--- a/apps/remix/app/components/tables/documents-table.tsx
+++ b/apps/remix/app/components/tables/documents-table.tsx
@@ -29,7 +29,7 @@ export type DocumentsTableProps = {
data?: TFindDocumentsResponse;
isLoading?: boolean;
isLoadingError?: boolean;
- onMoveDocument?: (documentId: number) => void;
+ onMoveDocument?: (envelopeId: string) => void;
enableSelection?: boolean;
rowSelection?: RowSelectionState;
onRowSelectionChange?: (selection: RowSelectionState) => void;
@@ -117,7 +117,7 @@ export const DocumentsTable = ({
<DocumentsTableActionButton row={row.original} />
<DocumentsTableActionDropdown
row={row.original}
- onMoveDocument={onMoveDocument ? () => onMoveDocument(row.original.id) : undefined}
+ onMoveDocument={onMoveDocument ? () => onMoveDocument(row.original.envelopeId) : undefined}
/>
</div>
),
diff --git a/apps/remix/app/components/tables/templates-table-action-dropdown.tsx b/apps/remix/app/components/tables/templates-table-action-dropdown.tsx
index 8872a1a78..9d8a288f5 100644
--- a/apps/remix/app/components/tables/templates-table-action-dropdown.tsx
+++ b/apps/remix/app/components/tables/templates-table-action-dropdown.tsx
@@ -11,15 +11,15 @@ import { Trans } from '@lingui/react/macro';
import { DocumentStatus, EnvelopeType, type TemplateDirectLink } from '@prisma/client';
import { Copy, Download, Edit, FolderIcon, MoreHorizontal, Pencil, Share2Icon, Trash2, Upload } from 'lucide-react';
import { useState } from 'react';
-import { Link } from 'react-router';
+import { Link, useNavigate } from 'react-router';
import { EnvelopeDeleteDialog } from '../dialogs/envelope-delete-dialog';
import { EnvelopeDownloadDialog } from '../dialogs/envelope-download-dialog';
import { EnvelopeDuplicateDialog } from '../dialogs/envelope-duplicate-dialog';
import { EnvelopeRenameDialog } from '../dialogs/envelope-rename-dialog';
+import { EnvelopesBulkMoveDialog } from '../dialogs/envelopes-bulk-move-dialog';
import { TemplateBulkSendDialog } from '../dialogs/template-bulk-send-dialog';
import { TemplateDirectLinkDialog } from '../dialogs/template-direct-link-dialog';
-import { TemplateMoveToFolderDialog } from '../dialogs/template-move-to-folder-dialog';
export type TemplatesTableActionDropdownProps = {
row: {
@@ -44,6 +44,7 @@ export const TemplatesTableActionDropdown = ({
onDelete,
}: TemplatesTableActionDropdownProps) => {
const trpcUtils = trpcReact.useUtils();
+ const navigate = useNavigate();
const [isRenameDialogOpen, setRenameDialogOpen] = useState(false);
const [isMoveToFolderDialogOpen, setMoveToFolderDialogOpen] = useState(false);
@@ -153,12 +154,13 @@ export const TemplatesTableActionDropdown = ({
)}
</DropdownMenuContent>
- <TemplateMoveToFolderDialog
- templateId={row.id}
- templateTitle={row.title}
- isOpen={isMoveToFolderDialogOpen}
+ <EnvelopesBulkMoveDialog
+ envelopeIds={[row.envelopeId]}
+ envelopeType={EnvelopeType.TEMPLATE}
+ open={isMoveToFolderDialogOpen}
onOpenChange={setMoveToFolderDialogOpen}
- currentFolderId={row.folderId}
+ currentFolderId={row.folderId ?? undefined}
+ onSuccess={(folderId) => navigate(folderId ? `${templateRootPath}/f/${folderId}` : templateRootPath)}
/>
<EnvelopeRenameDialog
diff --git a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx
index 7771d9faf..854283075 100644
--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx
@@ -16,10 +16,9 @@ import { msg } from '@lingui/core/macro';
import { Trans } from '@lingui/react/macro';
import { EnvelopeType, FolderType, OrganisationType } from '@prisma/client';
import { useEffect, useMemo, useState } from 'react';
-import { Link, useParams, useSearchParams } from 'react-router';
+import { Link, useNavigate, useParams, useSearchParams } from 'react-router';
import { z } from 'zod';
-import { DocumentMoveToFolderDialog } from '~/components/dialogs/document-move-to-folder-dialog';
import { EnvelopesBulkCancelDialog } from '~/components/dialogs/envelopes-bulk-cancel-dialog';
import { EnvelopesBulkDeleteDialog } from '~/components/dialogs/envelopes-bulk-delete-dialog';
import { EnvelopesBulkMoveDialog } from '~/components/dialogs/envelopes-bulk-move-dialog';
@@ -55,9 +54,12 @@ export default function DocumentsPage() {
const { folderId } = useParams();
const [searchParams] = useSearchParams();
+ const navigate = useNavigate();
+
+ const documentsPath = formatDocumentsPath(team.url);
const [isMovingDocument, setIsMovingDocument] = useState(false);
- const [documentToMove, setDocumentToMove] = useState<number | null>(null);
+ const [documentToMove, setDocumentToMove] = useState<string | null>(null);
const [rowSelection, setRowSelection] = useSessionStorage<RowSelectionState>('documents-bulk-selection', {});
const [isBulkMoveDialogOpen, setIsBulkMoveDialogOpen] = useState(false);
@@ -200,8 +202,8 @@ export default function DocumentsPage() {
data={data}
isLoading={isLoading}
isLoadingError={isLoadingError}
- onMoveDocument={(documentId) => {
- setDocumentToMove(documentId);
+ onMoveDocument={(envelopeId) => {
+ setDocumentToMove(envelopeId);
setIsMovingDocument(true);
}}
enableSelection
@@ -213,8 +215,9 @@ export default function DocumentsPage() {
</div>
{documentToMove && (
- <DocumentMoveToFolderDialog
- documentId={documentToMove}
+ <EnvelopesBulkMoveDialog
+ envelopeIds={[documentToMove]}
+ envelopeType={EnvelopeType.DOCUMENT}
open={isMovingDocument}
currentFolderId={folderId}
onOpenChange={(open) => {
@@ -224,6 +227,9 @@ export default function DocumentsPage() {
setDocumentToMove(null);
}
}}
+ onSuccess={(destinationFolderId) =>
+ navigate(destinationFolderId ? `${documentsPath}/f/${destinationFolderId}` : documentsPath)
+ }
/>
)}
diff --git a/packages/app-tests/e2e/envelopes/envelope-expiration-send.spec.ts b/packages/app-tests/e2e/envelopes/envelope-expiration-send.spec.ts
index 5aaaa3a58..7af9a2310 100644
--- a/packages/app-tests/e2e/envelopes/envelope-expiration-send.spec.ts
+++ b/packages/app-tests/e2e/envelopes/envelope-expiration-send.spec.ts
@@ -270,7 +270,7 @@ test('[ENVELOPE_EXPIRATION]: resending refreshes expiresAt', async ({ page }) =>
await page.getByLabel('test.documenso.com').first().click();
await page.getByRole('button', { name: 'Send reminder' }).click();
- await expect(page.getByText('Document re-sent', { exact: true })).toBeVisible({
+ await expect(page.getByText('Document resent', { exact: true })).toBeVisible({
timeout: 10_000,
});
diff --git a/packages/app-tests/e2e/teams/team-documents.spec.ts b/packages/app-tests/e2e/teams/team-documents.spec.ts
index 3e8192b78..6d5f2ca08 100644
--- a/packages/app-tests/e2e/teams/team-documents.spec.ts
+++ b/packages/app-tests/e2e/teams/team-documents.spec.ts
@@ -238,7 +238,7 @@ test('[TEAMS]: resend pending team document', async ({ page }) => {
await page.getByLabel('test.documenso.com').first().click();
await page.getByRole('button', { name: 'Send reminder' }).click();
- await expectToastTextToBeVisible(page, 'Document re-sent');
+ await expectToastTextToBeVisible(page, 'Document resent');
});
test('[TEAMS]: delete draft team document', async ({ page }) => {