Skip to content

The Open Source DocuSign Alternative.

feat: add document page view

David Nguyen071475769c2c
diff --git a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-button.tsx b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-button.tsx
new file mode 100644
index 000000000..334089a5f
--- /dev/null
+++ b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-button.tsx
@@ -0,0 +1,110 @@
+'use client';
+
+import Link from 'next/link';
+
+import { CheckCircle, Download, EyeIcon, Pencil } from 'lucide-react';
+import { useSession } from 'next-auth/react';
+import { match } from 'ts-pattern';
+
+import { downloadPDF } from '@documenso/lib/client-only/download-pdf';
+import { formatDocumentsPath } from '@documenso/lib/utils/teams';
+import type { Document, Recipient, Team, User } from '@documenso/prisma/client';
+import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client';
+import { trpc as trpcClient } from '@documenso/trpc/client';
+import { Button } from '@documenso/ui/primitives/button';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+export type DocumentPageViewButtonProps = {
+ document: Document & {
+ User: Pick<User, 'id' | 'name' | 'email'>;
+ Recipient: Recipient[];
+ team: Pick<Team, 'id' | 'url'> | null;
+ };
+ team?: Pick<Team, 'id' | 'url'>;
+};
+
+export const DocumentPageViewButton = ({ document, team }: DocumentPageViewButtonProps) => {
+ const { data: session } = useSession();
+ const { toast } = useToast();
+
+ if (!session) {
+ return null;
+ }
+
+ const recipient = document.Recipient.find((recipient) => recipient.email === session.user.email);
+
+ const isRecipient = !!recipient;
+ const isPending = document.status === DocumentStatus.PENDING;
+ const isComplete = document.status === DocumentStatus.COMPLETED;
+ const isSigned = recipient?.signingStatus === SigningStatus.SIGNED;
+ const role = recipient?.role;
+
+ const documentsPath = formatDocumentsPath(document.team?.url);
+
+ const onDownloadClick = async () => {
+ try {
+ const documentWithData = await trpcClient.document.getDocumentById.query({
+ id: document.id,
+ teamId: team?.id,
+ });
+
+ const documentData = documentWithData?.documentData;
+
+ if (!documentData) {
+ throw new Error('No document available');
+ }
+
+ await downloadPDF({ documentData, fileName: documentWithData.title });
+ } catch (err) {
+ toast({
+ title: 'Something went wrong',
+ description: 'An error occurred while downloading your document.',
+ variant: 'destructive',
+ });
+ }
+ };
+
+ return match({
+ isRecipient,
+ isPending,
+ isComplete,
+ isSigned,
+ })
+ .with({ isRecipient: true, isPending: true, isSigned: false }, () => (
+ <Button className="w-full" asChild>
+ <Link href={`/sign/${recipient?.token}`}>
+ {match(role)
+ .with(RecipientRole.SIGNER, () => (
+ <>
+ <Pencil className="-ml-1 mr-2 h-4 w-4" />
+ Sign
+ </>
+ ))
+ .with(RecipientRole.APPROVER, () => (
+ <>
+ <CheckCircle className="-ml-1 mr-2 h-4 w-4" />
+ Approve
+ </>
+ ))
+ .otherwise(() => (
+ <>
+ <EyeIcon className="-ml-1 mr-2 h-4 w-4" />
+ View
+ </>
+ ))}
+ </Link>
+ </Button>
+ ))
+ .with({ isComplete: false }, () => (
+ <Button className="w-full" asChild>
+ <Link href={`${documentsPath}/${document.id}/edit`}>Edit</Link>
+ </Button>
+ ))
+ .with({ isComplete: true }, () => (
+ <Button className="w-full" onClick={onDownloadClick}>
+ <Download className="-ml-1 mr-2 inline h-4 w-4" />
+ Download
+ </Button>
+ ))
+ .otherwise(() => null);
+};
diff --git a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-dropdown.tsx b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-dropdown.tsx
new file mode 100644
index 000000000..3e108aed5
--- /dev/null
+++ b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-dropdown.tsx
@@ -0,0 +1,160 @@
+'use client';
+
+import { useState } from 'react';
+
+import Link from 'next/link';
+
+import { Copy, Download, Edit, Loader, MoreHorizontal, Share, Trash2 } from 'lucide-react';
+import { useSession } from 'next-auth/react';
+
+import { downloadPDF } from '@documenso/lib/client-only/download-pdf';
+import { formatDocumentsPath } from '@documenso/lib/utils/teams';
+import { DocumentStatus } from '@documenso/prisma/client';
+import type { Document, Recipient, Team, User } from '@documenso/prisma/client';
+import { trpc as trpcClient } from '@documenso/trpc/client';
+import { DocumentShareButton } from '@documenso/ui/components/document/document-share-button';
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuLabel,
+ DropdownMenuTrigger,
+} from '@documenso/ui/primitives/dropdown-menu';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+import { ResendDocumentActionItem } from '../_action-items/resend-document';
+import { DeleteDocumentDialog } from '../delete-document-dialog';
+import { DuplicateDocumentDialog } from '../duplicate-document-dialog';
+
+export type DocumentPageViewDropdownProps = {
+ document: Document & {
+ User: Pick<User, 'id' | 'name' | 'email'>;
+ Recipient: Recipient[];
+ team: Pick<Team, 'id' | 'url'> | null;
+ };
+ team?: Pick<Team, 'id' | 'url'>;
+};
+
+export const DocumentPageViewDropdown = ({ document, team }: DocumentPageViewDropdownProps) => {
+ const { data: session } = useSession();
+ const { toast } = useToast();
+
+ const [isDeleteDialogOpen, setDeleteDialogOpen] = useState(false);
+ const [isDuplicateDialogOpen, setDuplicateDialogOpen] = useState(false);
+
+ if (!session) {
+ return null;
+ }
+
+ const recipient = document.Recipient.find((recipient) => recipient.email === session.user.email);
+
+ const isOwner = document.User.id === session.user.id;
+ const isDraft = document.status === DocumentStatus.DRAFT;
+ const isComplete = document.status === DocumentStatus.COMPLETED;
+ const isDocumentDeletable = isOwner;
+ const isCurrentTeamDocument = team && document.team?.url === team.url;
+
+ const documentsPath = formatDocumentsPath(team?.url);
+
+ const onDownloadClick = async () => {
+ try {
+ const documentWithData = await trpcClient.document.getDocumentById.query({
+ id: document.id,
+ teamId: team?.id,
+ });
+
+ const documentData = documentWithData?.documentData;
+
+ if (!documentData) {
+ return;
+ }
+
+ await downloadPDF({ documentData, fileName: document.title });
+ } catch (err) {
+ toast({
+ title: 'Something went wrong',
+ description: 'An error occurred while downloading your document.',
+ variant: 'destructive',
+ });
+ }
+ };
+
+ const nonSignedRecipients = document.Recipient.filter((item) => item.signingStatus !== 'SIGNED');
+
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger>
+ <MoreHorizontal className="text-muted-foreground h-5 w-5" />
+ </DropdownMenuTrigger>
+
+ <DropdownMenuContent className="w-52" align="end" forceMount>
+ <DropdownMenuLabel>Action</DropdownMenuLabel>
+
+ {(isOwner || isCurrentTeamDocument) && !isComplete && (
+ <DropdownMenuItem asChild>
+ <Link href={`${documentsPath}/${document.id}/edit`}>
+ <Edit className="mr-2 h-4 w-4" />
+ Edit
+ </Link>
+ </DropdownMenuItem>
+ )}
+
+ {isComplete && (
+ <DropdownMenuItem onClick={onDownloadClick}>
+ <Download className="mr-2 h-4 w-4" />
+ Download
+ </DropdownMenuItem>
+ )}
+
+ <DropdownMenuItem onClick={() => setDuplicateDialogOpen(true)}>
+ <Copy className="mr-2 h-4 w-4" />
+ Duplicate
+ </DropdownMenuItem>
+
+ <DropdownMenuItem onClick={() => setDeleteDialogOpen(true)} disabled={!isDocumentDeletable}>
+ <Trash2 className="mr-2 h-4 w-4" />
+ Delete
+ </DropdownMenuItem>
+
+ <DropdownMenuLabel>Share</DropdownMenuLabel>
+
+ <ResendDocumentActionItem
+ document={document}
+ recipients={nonSignedRecipients}
+ team={team}
+ />
+
+ <DocumentShareButton
+ documentId={document.id}
+ token={isOwner ? undefined : recipient?.token}
+ trigger={({ loading, disabled }) => (
+ <DropdownMenuItem disabled={disabled || isDraft} onSelect={(e) => e.preventDefault()}>
+ <div className="flex items-center">
+ {loading ? <Loader className="mr-2 h-4 w-4" /> : <Share className="mr-2 h-4 w-4" />}
+ Share Signing Card
+ </div>
+ </DropdownMenuItem>
+ )}
+ />
+ </DropdownMenuContent>
+
+ {isDocumentDeletable && (
+ <DeleteDocumentDialog
+ id={document.id}
+ status={document.status}
+ documentTitle={document.title}
+ open={isDeleteDialogOpen}
+ onOpenChange={setDeleteDialogOpen}
+ />
+ )}
+ {isDuplicateDialogOpen && (
+ <DuplicateDocumentDialog
+ id={document.id}
+ open={isDuplicateDialogOpen}
+ onOpenChange={setDuplicateDialogOpen}
+ team={team}
+ />
+ )}
+ </DropdownMenu>
+ );
+};
diff --git a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-information.tsx b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-information.tsx
new file mode 100644
index 000000000..00bbe0d83
--- /dev/null
+++ b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view-information.tsx
@@ -0,0 +1,71 @@
+'use client';
+
+import { useMemo } from 'react';
+
+import { DateTime } from 'luxon';
+
+import { useIsMounted } from '@documenso/lib/client-only/hooks/use-is-mounted';
+import { useLocale } from '@documenso/lib/client-only/providers/locale';
+import type { Document, Recipient, User } from '@documenso/prisma/client';
+
+export type DocumentPageViewInformationProps = {
+ userId: number;
+ document: Document & {
+ User: Pick<User, 'id' | 'name' | 'email'>;
+ Recipient: Recipient[];
+ };
+};
+
+export const DocumentPageViewInformation = ({
+ document,
+ userId,
+}: DocumentPageViewInformationProps) => {
+ const isMounted = useIsMounted();
+ const { locale } = useLocale();
+
+ const documentInformation = useMemo(() => {
+ let createdValue = DateTime.fromJSDate(document.createdAt).toFormat('MMMM d, yyyy');
+ let lastModifiedValue = DateTime.fromJSDate(document.updatedAt).toRelative();
+
+ if (!isMounted) {
+ createdValue = DateTime.fromJSDate(document.createdAt)
+ .setLocale(locale)
+ .toFormat('MMMM d, yyyy');
+
+ lastModifiedValue = DateTime.fromJSDate(document.updatedAt).setLocale(locale).toRelative();
+ }
+
+ return [
+ {
+ description: 'Uploaded by',
+ value: userId === document.userId ? 'You' : document.User.name ?? document.User.email,
+ },
+ {
+ description: 'Created',
+ value: createdValue,
+ },
+ {
+ description: 'Last modified',
+ value: lastModifiedValue,
+ },
+ ];
+ }, [isMounted, document, locale, userId]);
+
+ return (
+ <section className="dark:bg-background text-foreground border-border bg-widget mt-6 flex flex-col rounded-xl border">
+ <h1 className="px-4 py-3 font-medium">Information</h1>
+
+ <ul className="divide-y border-t">
+ {documentInformation.map((item) => (
+ <li
+ key={item.description}
+ className="flex items-center justify-between px-4 py-2.5 text-sm last:border-b"
+ >
+ <span className="text-muted-foreground">{item.description}</span>
+ <span>{item.value}</span>
+ </li>
+ ))}
+ </ul>
+ </section>
+ );
+};
diff --git a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx
index 6759d91ac..c821bfac8 100644
--- a/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx
+++ b/apps/web/src/app/(dashboard)/documents/[id]/document-page-view.tsx
@@ -1,22 +1,42 @@
import Link from 'next/link';
import { redirect } from 'next/navigation';
-import { ChevronLeft, Users2 } from 'lucide-react';
+import {
+ CheckIcon,
+ ChevronLeft,
+ Clock,
+ MailIcon,
+ MailOpenIcon,
+ PenIcon,
+ PlusIcon,
+ Users2,
+} from 'lucide-react';
+import { match } from 'ts-pattern';
import { DOCUMENSO_ENCRYPTION_KEY } from '@documenso/lib/constants/crypto';
+import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
-import { getFieldsForDocument } from '@documenso/lib/server-only/field/get-fields-for-document';
import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
import { symmetricDecrypt } from '@documenso/lib/universal/crypto';
import { formatDocumentsPath } from '@documenso/lib/utils/teams';
+import { DocumentStatus, RecipientRole, SigningStatus } from '@documenso/prisma/client';
import type { Team } from '@documenso/prisma/client';
-import { DocumentStatus as InternalDocumentStatus } from '@documenso/prisma/client';
+import { SignatureIcon } from '@documenso/ui/icons/signature';
+import { AvatarWithText } from '@documenso/ui/primitives/avatar';
+import { Badge } from '@documenso/ui/primitives/badge';
+import { Card, CardContent } from '@documenso/ui/primitives/card';
import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
-import { EditDocumentForm } from '~/app/(dashboard)/documents/[id]/edit-document';
import { StackAvatarsWithTooltip } from '~/components/(dashboard)/avatar/stack-avatars-with-tooltip';
-import { DocumentStatus } from '~/components/formatter/document-status';
+import {
+ DocumentStatus as DocumentStatusComponent,
+ FRIENDLY_STATUS_MAP,
+} from '~/components/formatter/document-status';
+
+import { DocumentPageViewButton } from './document-page-view-button';
+import { DocumentPageViewDropdown } from './document-page-view-dropdown';
+import { DocumentPageViewInformation } from './document-page-view-information';
export type DocumentPageViewProps = {
params: {
@@ -67,65 +87,196 @@ export const DocumentPageView = async ({ params, team }: DocumentPageViewProps)
documentMeta.password = securePassword;
}
- const [recipients, fields] = await Promise.all([
- getRecipientsForDocument({
- documentId,
- userId: user.id,
- }),
- getFieldsForDocument({
- documentId,
- userId: user.id,
- }),
- ]);
+ const recipients = await getRecipientsForDocument({
+ documentId,
+ userId: user.id,
+ });
+
+ const documentWithRecipients = {
+ ...document,
+ Recipient: recipients,
+ };
return (
<div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
- <Link href={documentRootPath} className="flex items-center text-[#7AC455] hover:opacity-80">
+ <Link href="/documents" className="flex items-center text-[#7AC455] hover:opacity-80">
<ChevronLeft className="mr-2 inline-block h-5 w-5" />
Documents
</Link>
- <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={document.title}>
- {document.title}
- </h1>
+ <div>
+ <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={document.title}>
+ {document.title}
+ </h1>
- <div className="mt-2.5 flex items-center gap-x-6">
- <DocumentStatus inheritColor status={document.status} className="text-muted-foreground" />
+ <div className="mt-2.5 flex items-center gap-x-6">
+ <DocumentStatusComponent
+ inheritColor
+ status={document.status}
+ className="text-muted-foreground"
+ />
- {recipients.length > 0 && (
- <div className="text-muted-foreground flex items-center">
- <Users2 className="mr-2 h-5 w-5" />
+ {recipients.length > 0 && (
+ <div className="text-muted-foreground flex items-center">
+ <Users2 className="mr-2 h-5 w-5" />
- <StackAvatarsWithTooltip recipients={recipients} position="bottom">
- <span>{recipients.length} Recipient(s)</span>
- </StackAvatarsWithTooltip>
- </div>
- )}
+ <StackAvatarsWithTooltip recipients={recipients} position="bottom">
+ <span>{recipients.length} Recipient(s)</span>
+ </StackAvatarsWithTooltip>
+ </div>
+ )}
+ </div>
</div>
- {document.status !== InternalDocumentStatus.COMPLETED && (
- <EditDocumentForm
- className="mt-8"
- document={document}
- user={user}
- documentMeta={documentMeta}
- recipients={recipients}
- fields={fields}
- documentData={documentData}
- documentRootPath={documentRootPath}
- />
- )}
-
- {document.status === InternalDocumentStatus.COMPLETED && (
- <div className="mx-auto mt-12 max-w-2xl">
- <LazyPDFViewer
- document={document}
- key={documentData.id}
- documentMeta={documentMeta}
- documentData={documentData}
- />
+ <div className="mt-6 grid w-full grid-cols-12 gap-8">
+ <Card
+ className="relative col-span-12 rounded-xl before:rounded-xl lg:col-span-6 xl:col-span-7"
+ gradient
+ >
+ <CardContent className="p-2">
+ <LazyPDFViewer document={document} key={documentData.id} documentData={documentData} />
+ </CardContent>
+ </Card>
+
+ <div className="col-span-12 lg:col-span-6 xl:col-span-5">
+ <div className="sticky top-20">
+ <section className="dark:bg-background border-border bg-widget sticky flex flex-col rounded-xl border pb-4 pt-6">
+ <div className="flex flex-row items-center justify-between px-4">
+ <h3 className="text-foreground text-2xl font-semibold">
+ Document {FRIENDLY_STATUS_MAP[document.status].label.toLowerCase()}
+ </h3>
+
+ <DocumentPageViewDropdown document={documentWithRecipients} team={team} />
+ </div>
+
+ <p className="text-muted-foreground mt-2 px-4 text-sm ">
+ {match(document.status)
+ .with(
+ DocumentStatus.COMPLETED,
+ () => 'This document has been signed by all recipients',
+ )
+ .with(
+ DocumentStatus.DRAFT,
+ () => 'This document is currently a draft and has not been sent',
+ )
+ .with(DocumentStatus.PENDING, () => {
+ const pendingRecipients = recipients.filter(
+ (recipient) => recipient.signingStatus === 'NOT_SIGNED',
+ );
+
+ return `Waiting on ${pendingRecipients.length} recipient${
+ pendingRecipients.length > 1 ? 's' : ''
+ }`;
+ })
+ .exhaustive()}
+ </p>
+
+ <div className="mt-4 border-t px-4 pt-4">
+ <DocumentPageViewButton document={documentWithRecipients} team={team} />
+ </div>
+ </section>
+
+ {/* Document information section. */}
+ <DocumentPageViewInformation document={documentWithRecipients} userId={user.id} />
+
+ {/* Recipients section. */}
+ <section className="dark:bg-background border-border bg-widget mt-6 flex flex-col rounded-xl border">
+ <div className="flex flex-row items-center justify-between px-4 py-3">
+ <h1 className="text-foreground font-medium">Recipients</h1>
+
+ {document.status !== DocumentStatus.COMPLETED && (
+ <Link
+ href={`${documentRootPath}/${document.id}/edit?step=signers`}
+ title="Modify recipients"
+ className="flex flex-row items-center justify-between"
+ >
+ {recipients.length === 0 ? (
+ <PlusIcon className="ml-2 h-4 w-4" />
+ ) : (
+ <PenIcon className="ml-2 h-3 w-3" />
+ )}
+ </Link>
+ )}
+ </div>
+
+ <ul className="text-muted-foreground divide-y border-t">
+ {recipients.length === 0 && (
+ <li className="flex flex-col items-center justify-center py-6 text-sm">
+ No recipients
+ </li>
+ )}
+
+ {recipients.map((recipient) => (
+ <li
+ key={recipient.id}
+ className="flex items-center justify-between px-4 py-2.5 text-sm"
+ >
+ <AvatarWithText
+ avatarFallback={recipient.email.slice(0, 1).toUpperCase()}
+ primaryText={
+ <p className="text-muted-foreground text-sm">{recipient.email}</p>
+ }
+ secondaryText={
+ <p className="text-muted-foreground/70 text-xs">
+ {RECIPIENT_ROLES_DESCRIPTION[recipient.role].roleName}
+ </p>
+ }
+ />
+
+ {document.status !== DocumentStatus.DRAFT &&
+ recipient.signingStatus === SigningStatus.SIGNED && (
+ <Badge variant="default">
+ {match(recipient.role)
+ .with(RecipientRole.APPROVER, () => (
+ <>
+ <CheckIcon className="mr-1 h-3 w-3" />
+ Approved
+ </>
+ ))
+ .with(RecipientRole.CC, () =>
+ document.status === DocumentStatus.COMPLETED ? (
+ <>
+ <MailIcon className="mr-1 h-3 w-3" />
+ Sent
+ </>
+ ) : (
+ <>
+ <CheckIcon className="mr-1 h-3 w-3" />
+ Ready
+ </>
+ ),
+ )
+
+ .with(RecipientRole.SIGNER, () => (
+ <>
+ <SignatureIcon className="mr-1 h-3 w-3" />
+ Signed
+ </>
+ ))
+ .with(RecipientRole.VIEWER, () => (
+ <>
+ <MailOpenIcon className="mr-1 h-3 w-3" />
+ Viewed
+ </>
+ ))
+ .exhaustive()}
+ </Badge>
+ )}
+
+ {document.status !== DocumentStatus.DRAFT &&
+ recipient.signingStatus === SigningStatus.NOT_SIGNED && (
+ <Badge variant="secondary">
+ <Clock className="mr-1 h-3 w-3" />
+ Pending
+ </Badge>
+ )}
+ </li>
+ ))}
+ </ul>
+ </section>
+ </div>
</div>
- )}
+ </div>
</div>
);
};
diff --git a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx
index 813458062..fe278486e 100644
--- a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx
+++ b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx
@@ -2,10 +2,16 @@
import { useState } from 'react';
-import { useRouter } from 'next/navigation';
+import { useRouter, useSearchParams } from 'next/navigation';
-import type { DocumentData, DocumentMeta, Field, Recipient, User } from '@documenso/prisma/client';
-import { DocumentStatus } from '@documenso/prisma/client';
+import {
+ type DocumentData,
+ type DocumentMeta,
+ DocumentStatus,
+ type Field,
+ type Recipient,
+ type User,
+} from '@documenso/prisma/client';
import type { DocumentWithData } from '@documenso/prisma/types/document-with-data';
import { trpc } from '@documenso/trpc/react';
import { cn } from '@documenso/ui/lib/utils';
@@ -49,12 +55,9 @@ export const EditDocumentForm = ({
documentRootPath,
}: EditDocumentFormProps) => {
const { toast } = useToast();
- const router = useRouter();
- // controlled stepper state
- const [step, setStep] = useState<EditDocumentStep>(
- document.status === DocumentStatus.DRAFT ? 'title' : 'signers',
- );
+ const router = useRouter();
+ const searchParams = useSearchParams();
const { mutateAsync: addTitle } = trpc.document.setTitleForDocument.useMutation();
const { mutateAsync: addFields } = trpc.field.addFields.useMutation();
@@ -86,6 +89,24 @@ export const EditDocumentForm = ({
},
};
+ const [step, setStep] = useState<EditDocumentStep>(() => {
+ // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+ const searchParamStep = searchParams?.get('step') as EditDocumentStep | undefined;
+
+ let initialStep: EditDocumentStep =
+ document.status === DocumentStatus.DRAFT ? 'title' : 'signers';
+
+ if (
+ searchParamStep &&
+ documentFlow[searchParamStep] !== undefined &&
+ !(recipients.length === 0 && (searchParamStep === 'subject' || searchParamStep === 'fields'))
+ ) {
+ initialStep = searchParamStep;
+ }
+
+ return initialStep;
+ });
+
const onAddTitleFormSubmit = async (data: TAddTitleFormSchema) => {
try {
// Custom invocation server action
diff --git a/apps/web/src/app/(dashboard)/documents/[id]/edit/document-edit-page-view.tsx b/apps/web/src/app/(dashboard)/documents/[id]/edit/document-edit-page-view.tsx
new file mode 100644
index 000000000..87b3738bb
--- /dev/null
+++ b/apps/web/src/app/(dashboard)/documents/[id]/edit/document-edit-page-view.tsx
@@ -0,0 +1,121 @@
+import Link from 'next/link';
+import { redirect } from 'next/navigation';
+
+import { ChevronLeft, Users2 } from 'lucide-react';
+
+import { DOCUMENSO_ENCRYPTION_KEY } from '@documenso/lib/constants/crypto';
+import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
+import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
+import { getFieldsForDocument } from '@documenso/lib/server-only/field/get-fields-for-document';
+import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
+import { symmetricDecrypt } from '@documenso/lib/universal/crypto';
+import { formatDocumentsPath } from '@documenso/lib/utils/teams';
+import type { Team } from '@documenso/prisma/client';
+import { DocumentStatus as InternalDocumentStatus } from '@documenso/prisma/client';
+
+import { EditDocumentForm } from '~/app/(dashboard)/documents/[id]/edit-document';
+import { StackAvatarsWithTooltip } from '~/components/(dashboard)/avatar/stack-avatars-with-tooltip';
+import { DocumentStatus } from '~/components/formatter/document-status';
+
+export type DocumentEditPageViewProps = {
+ params: {
+ id: string;
+ };
+ team?: Team;
+};
+
+export const DocumentEditPageView = async ({ params, team }: DocumentEditPageViewProps) => {
+ const { id } = params;
+
+ const documentId = Number(id);
+
+ const documentRootPath = formatDocumentsPath(team?.url);
+
+ if (!documentId || Number.isNaN(documentId)) {
+ redirect(documentRootPath);
+ }
+
+ const { user } = await getRequiredServerComponentSession();
+
+ const document = await getDocumentById({
+ id: documentId,
+ userId: user.id,
+ teamId: team?.id,
+ }).catch(() => null);
+
+ if (!document || !document.documentData) {
+ redirect(documentRootPath);
+ }
+
+ if (document.status === InternalDocumentStatus.COMPLETED) {
+ redirect(`${documentRootPath}/${documentId}`);
+ }
+
+ const { documentData, documentMeta } = document;
+
+ if (documentMeta?.password) {
+ const key = DOCUMENSO_ENCRYPTION_KEY;
+
+ if (!key) {
+ throw new Error('Missing DOCUMENSO_ENCRYPTION_KEY');
+ }
+
+ const securePassword = Buffer.from(
+ symmetricDecrypt({
+ key,
+ data: documentMeta.password,
+ }),
+ ).toString('utf-8');
+
+ documentMeta.password = securePassword;
+ }
+
+ const [recipients, fields] = await Promise.all([
+ getRecipientsForDocument({
+ documentId,
+ userId: user.id,
+ }),
+ getFieldsForDocument({
+ documentId,
+ userId: user.id,
+ }),
+ ]);
+
+ return (
+ <div className="mx-auto -mt-4 w-full max-w-screen-xl px-4 md:px-8">
+ <Link href={documentRootPath} className="flex items-center text-[#7AC455] hover:opacity-80">
+ <ChevronLeft className="mr-2 inline-block h-5 w-5" />
+ Documents
+ </Link>
+
+ <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={document.title}>
+ {document.title}
+ </h1>
+
+ <div className="mt-2.5 flex items-center gap-x-6">
+ <DocumentStatus inheritColor status={document.status} className="text-muted-foreground" />
+
+ {recipients.length > 0 && (
+ <div className="text-muted-foreground flex items-center">
+ <Users2 className="mr-2 h-5 w-5" />
+
+ <StackAvatarsWithTooltip recipients={recipients} position="bottom">
+ <span>{recipients.length} Recipient(s)</span>
+ </StackAvatarsWithTooltip>
+ </div>
+ )}
+ </div>
+
+ <EditDocumentForm
+ className="mt-8"
+ document={document}
+ user={user}
+ documentMeta={documentMeta}
+ recipients={recipients}
+ fields={fields}
+ documentData={documentData}
+ documentRootPath={documentRootPath}
+ />
+ </div>
+ );
+};
diff --git a/apps/web/src/app/(dashboard)/documents/[id]/edit/page.tsx b/apps/web/src/app/(dashboard)/documents/[id]/edit/page.tsx
new file mode 100644
index 000000000..6c613a287
--- /dev/null
+++ b/apps/web/src/app/(dashboard)/documents/[id]/edit/page.tsx
@@ -0,0 +1,11 @@
+import { DocumentEditPageView } from './document-edit-page-view';
+
+export type DocumentPageProps = {
+ params: {
+ id: string;
+ };
+};
+
+export default function DocumentEditPage({ params }: DocumentPageProps) {
+ return <DocumentEditPageView params={params} />;
+}
diff --git a/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx b/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx
index e8e3d6130..ff2291c54 100644
--- a/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx
+++ b/apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx
@@ -119,7 +119,7 @@ export const ResendDocumentActionItem = ({
<DialogContent className="sm:max-w-sm" hideClose>
<DialogHeader>
- <DialogTitle>
+ <DialogTitle asChild>
<h1 className="text-center text-xl">Who do you want to remind?</h1>
</DialogTitle>
</DialogHeader>
diff --git a/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx b/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx
index 78ffd0b3b..455f50be5 100644
--- a/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx
+++ b/apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx
@@ -94,7 +94,7 @@ export const DataTableActionButton = ({ row, team }: DataTableActionButtonProps)
isOwner ? { isDraft: true, isOwner: true } : { isDraft: true, isCurrentTeamDocument: true },
() => (
<Button className="w-32" asChild>
- <Link href={`${documentsPath}/${row.id}`}>
+ <Link href={`${documentsPath}/${row.id}/edit`}>
<Edit className="-ml-1 mr-2 h-4 w-4" />
Edit
</Link>
diff --git a/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx b/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx
index 2bd888bb0..6231b834c 100644
--- a/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx
+++ b/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx
@@ -142,7 +142,7 @@ export const DataTableActionDropdown = ({ row, team }: DataTableActionDropdownPr
)}
<DropdownMenuItem disabled={(!isOwner && !isCurrentTeamDocument) || isComplete} asChild>
- <Link href={`${documentsPath}/${row.id}`}>
+ <Link href={`${documentsPath}/${row.id}/edit`}>
<Edit className="mr-2 h-4 w-4" />
Edit
</Link>
diff --git a/apps/web/src/app/(dashboard)/documents/duplicate-document-dialog.tsx b/apps/web/src/app/(dashboard)/documents/duplicate-document-dialog.tsx
index 14370cff8..dc4e353d5 100644
--- a/apps/web/src/app/(dashboard)/documents/duplicate-document-dialog.tsx
+++ b/apps/web/src/app/(dashboard)/documents/duplicate-document-dialog.tsx
@@ -47,7 +47,7 @@ export const DuplicateDocumentDialog = ({
const { mutateAsync: duplicateDocument, isLoading: isDuplicateLoading } =
trpcReact.document.duplicateDocument.useMutation({
onSuccess: (newId) => {
- router.push(`${documentsPath}/${newId}`);
+ router.push(`${documentsPath}/${newId}/edit`);
toast({
title: 'Document Duplicated',
diff --git a/apps/web/src/app/(dashboard)/documents/upload-document.tsx b/apps/web/src/app/(dashboard)/documents/upload-document.tsx
index ed91620dc..f3a3989ab 100644
--- a/apps/web/src/app/(dashboard)/documents/upload-document.tsx
+++ b/apps/web/src/app/(dashboard)/documents/upload-document.tsx
@@ -83,7 +83,7 @@ export const UploadDocument = ({ className, team }: UploadDocumentProps) => {
timestamp: new Date().toISOString(),
});
- router.push(`${formatDocumentsPath(team?.url)}/${id}`);
+ router.push(`${formatDocumentsPath(team?.url)}/${id}/edit`);
} catch (error) {
console.error(error);
diff --git a/apps/web/src/app/(dashboard)/templates/data-table-templates.tsx b/apps/web/src/app/(dashboard)/templates/data-table-templates.tsx
index 309695c88..81bfd0ac2 100644
--- a/apps/web/src/app/(dashboard)/templates/data-table-templates.tsx
+++ b/apps/web/src/app/(dashboard)/templates/data-table-templates.tsx
@@ -76,7 +76,7 @@ export const TemplatesDataTable = ({
duration: 5000,
});
- router.push(`${documentRootPath}/${id}`);
+ router.push(`${documentRootPath}/${id}/edit`);
} catch (err) {
toast({
title: 'Error',
diff --git a/apps/web/src/app/(teams)/t/[teamUrl]/documents/[id]/edit/page.tsx b/apps/web/src/app/(teams)/t/[teamUrl]/documents/[id]/edit/page.tsx
new file mode 100644
index 000000000..7c421e5bd
--- /dev/null
+++ b/apps/web/src/app/(teams)/t/[teamUrl]/documents/[id]/edit/page.tsx
@@ -0,0 +1,21 @@
+import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
+import { getTeamByUrl } from '@documenso/lib/server-only/team/get-team';
+
+import { DocumentEditPageView } from '~/app/(dashboard)/documents/[id]/edit/document-edit-page-view';
+
+export type DocumentPageProps = {
+ params: {
+ id: string;
+ teamUrl: string;
+ };
+};
+
+export default async function TeamsDocumentEditPage({ params }: DocumentPageProps) {
+ const { teamUrl } = params;
+
+ const { user } = await getRequiredServerComponentSession();
+
+ const team = await getTeamByUrl({ userId: user.id, teamUrl });
+
+ return <DocumentEditPageView params={params} team={team} />;
+}
diff --git a/apps/web/src/components/formatter/document-status.tsx b/apps/web/src/components/formatter/document-status.tsx
index 3deaa302a..f8a8ef98b 100644
--- a/apps/web/src/components/formatter/document-status.tsx
+++ b/apps/web/src/components/formatter/document-status.tsx
@@ -13,7 +13,7 @@ type FriendlyStatus = {
color: string;
};
-const FRIENDLY_STATUS_MAP: Record<ExtendedDocumentStatus, FriendlyStatus> = {
+export const FRIENDLY_STATUS_MAP: Record<ExtendedDocumentStatus, FriendlyStatus> = {
PENDING: {
label: 'Pending',
icon: Clock,
diff --git a/packages/lib/constants/recipient-roles.ts b/packages/lib/constants/recipient-roles.ts
index 48d9d611b..d86026782 100644
--- a/packages/lib/constants/recipient-roles.ts
+++ b/packages/lib/constants/recipient-roles.ts
@@ -11,7 +11,7 @@ export const RECIPIENT_ROLES_DESCRIPTION: {
[RecipientRole.CC]: {
actionVerb: 'CC',
progressiveVerb: 'CC',
- roleName: 'CC',
+ roleName: 'Cc',
},
[RecipientRole.SIGNER]: {
actionVerb: 'Sign',
diff --git a/packages/lib/server-only/document/get-document-by-id.ts b/packages/lib/server-only/document/get-document-by-id.ts
index 71b614976..603763365 100644
--- a/packages/lib/server-only/document/get-document-by-id.ts
+++ b/packages/lib/server-only/document/get-document-by-id.ts
@@ -21,6 +21,19 @@ export const getDocumentById = async ({ id, userId, teamId }: GetDocumentByIdOpt
include: {
documentData: true,
documentMeta: true,
+ User: {
+ select: {
+ id: true,
+ name: true,
+ email: true,
+ },
+ },
+ team: {
+ select: {
+ id: true,
+ url: true,
+ },
+ },
},
});
};
diff --git a/packages/ui/primitives/badge.tsx b/packages/ui/primitives/badge.tsx
index fd56bc1ce..3569a4a7e 100644
--- a/packages/ui/primitives/badge.tsx
+++ b/packages/ui/primitives/badge.tsx
@@ -6,16 +6,20 @@ import { cva } from 'class-variance-authority';
import { cn } from '../lib/utils';
const badgeVariants = cva(
- 'inline-flex items-center border rounded-full px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2',
+ 'inline-flex items-center rounded-md px-2 py-1.5 text-xs font-medium ring-1 ring-inset w-fit',
{
variants: {
variant: {
- default: 'bg-primary hover:bg-primary/80 border-transparent text-primary-foreground',
- secondary:
- 'bg-secondary hover:bg-secondary/80 border-transparent text-secondary-foreground',
+ neutral:
+ 'bg-gray-50 text-gray-600 ring-gray-500/10 dark:bg-gray-400/10 dark:text-gray-400 dark:ring-gray-400/20',
destructive:
- 'bg-destructive hover:bg-destructive/80 border-transparent text-destructive-foreground',
- outline: 'text-foreground',
+ 'bg-red-50 text-red-700 ring-red-600/10 dark:bg-red-400/10 dark:text-red-400 dark:ring-red-400/20',
+ warning:
+ 'bg-yellow-50 text-yellow-800 ring-yellow-600/20 dark:bg-yellow-400/10 dark:text-yellow-500 dark:ring-yellow-400/20',
+ default:
+ 'bg-green-50 text-green-700 ring-green-600/20 dark:bg-green-500/10 dark:text-green-400 dark:ring-green-500/20',
+ secondary:
+ 'bg-blue-50 text-blue-700 ring-blue-700/10 dark:bg-blue-400/10 dark:text-blue-400 dark:ring-blue-400/30',
},
},
defaultVariants: {