chore: fix conflicts

AGENTS.md

@@ -1,57 +0,0 @@
-# Agent Guidelines for Documenso
-
-## Build/Test/Lint Commands
-
-- `npm run build` - Build all packages
-- `npm run lint` - Lint all packages
-- `npm run lint:fix` - Auto-fix linting issues
-- `npm run test:e2e` - Run E2E tests with Playwright
-- `npm run test:dev -w @documenso/app-tests` - Run single E2E test in dev mode
-- `npm run test-ui:dev -w @documenso/app-tests` - Run E2E tests with UI
-- `npm run format` - Format code with Prettier
-- `npm run dev` - Start development server for Remix app
-
-## Code Style Guidelines
-
-- Use TypeScript for all code; prefer `type` over `interface`
-- Use functional components with `const Component = () => {}`
-- Never use classes; prefer functional/declarative patterns
-- Use descriptive variable names with auxiliary verbs (isLoading, hasError)
-- Directory names: lowercase with dashes (auth-wizard)
-- Use named exports for components
-- Never use 'use client' directive
-- Never use 1-line if statements
-- Structure files: exported component, subcomponents, helpers, static content, types
-
-## Error Handling & Validation
-
-- Use custom AppError class when throwing errors
-- When catching errors on the frontend use `const error = AppError.parse(error)` to get the error code
-- Use early returns and guard clauses
-- Use Zod for form validation and react-hook-form for forms
-- Use error boundaries for unexpected errors
-
-## UI & Styling
-
-- Use Shadcn UI, Radix, and Tailwind CSS with mobile-first approach
-- Use `<Form>` `<FormItem>` elements with fieldset having `:disabled` attribute when loading
-- Use Lucide icons with longhand names (HomeIcon vs Home)
-
-## TRPC Routes
-
-- Each route in own file: `routers/teams/create-team.ts`
-- Associated types file: `routers/teams/create-team.types.ts`
-- Request/response schemas: `Z[RouteName]RequestSchema`, `Z[RouteName]ResponseSchema`
-- Only use GET and POST methods in OpenAPI meta
-- Deconstruct input argument on its own line
-- Prefer route names such as get/getMany/find/create/update/delete
-- "create" routes request schema should have the ID and data in the top level
-- "update" routes request schema should have the ID in the top level and the data in a nested "data" object
-
-## Translations & Remix
-
-- Use `<Trans>string</Trans>` for JSX translations from `@lingui/react/macro`
-- Use `t\`string\`` macro for TypeScript translations
-- Use `(params: Route.Params)` and `(loaderData: Route.LoaderData)` for routes
-- Directly return data from loaders, don't use `json()`
-- Use `superLoaderJson` when sending complex data through loaders such as dates or prisma decimals

README.md

@@ -214,6 +214,8 @@ For detailed instructions on how to configure and run the Docker container, plea
 
 We support a variety of deployment methods, and are actively working on adding more. Stay tuned for updates!
 
+> Please note that the below deployment methods are for v0.9, we will update these to v1.0 once it has been released.
+
 ### Fetch, configure, and build
 
 First, clone the code from Github:
@@ -256,7 +258,7 @@ npm run start
 
 This will start the server on `localhost:3000`. For now, any reverse proxy can then do the frontend and SSL termination.
 
-> If you want to run with another port than 3000, you can start the application with `next -p <ANY PORT>` from the `apps/remix` folder.
+> If you want to run with another port than 3000, you can start the application with `next -p <ANY PORT>` from the `apps/web` folder.
 
 ### Run as a service
 

SIGNING.md

@@ -18,7 +18,7 @@ For the digital signature of your documents you need a signing certificate in .p
 
 4. You will be prompted to enter a password for the p12 file. Choose a strong password and remember it, as you will need it to use the certificate (**can be empty for dev certificates**)
 
-5. Place the certificate `/apps/remix/resources/certificate.p12` (If the path does not exist, it needs to be created)
+5. Place the certificate `/apps/web/resources/certificate.p12` (If the path does not exist, it needs to be created)
 
 ## Docker
 

apps/documentation/pages/developers/contributing/contributing-translations.mdx

@@ -25,7 +25,7 @@ The translation files are organized into folders represented by their respective
 Each PO file contains translations which look like this:
 
 ```po
-#: apps/remix/app/(signing)/sign/[token]/no-longer-available.tsx:61
+#: apps/web/src/app/(signing)/sign/[token]/no-longer-available.tsx:61
 msgid "Want to send slick signing links like this one? <0>Check out Documenso.</0>"
 msgstr "Möchten Sie auffällige Signatur-Links wie diesen senden? <0>Überprüfen Sie Documenso.</0>"
 ```

apps/documentation/pages/developers/self-hosting/how-to.mdx

@@ -54,7 +54,7 @@ Install the project dependencies as follows:
 
 ```bash
 npm i
-npm run build
+npm run build:web
 npm run prisma:migrate-deploy
 ```
 
@@ -69,7 +69,7 @@ npm run start
 This will start the server on `localhost:3000`. Any reverse proxy can handle the front end and SSL termination.
 
 <Callout type="info">
- If you want to run with another port than `3000`, you can start the application with `next -p <ANY PORT>` from the `apps/remix` folder.
+ If you want to run with another port than `3000`, you can start the application with `next -p <ANY PORT>` from the `apps/web` folder.
 </Callout>
 
 </Steps>
@@ -249,7 +249,7 @@ After=network.target
 Environment=PATH=/path/to/your/node/binaries
 Type=simple
 User=www-data
-WorkingDirectory=/var/www/documenso/apps/remix
+WorkingDirectory=/var/www/documenso/apps/web
 ExecStart=/usr/bin/next start -p 3500
 TimeoutSec=15
 Restart=always

apps/remix/app/components/dialogs/admin-document-delete-dialog.tsx

@@ -34,7 +34,7 @@ export const AdminDocumentDeleteDialog = ({ document }: AdminDocumentDeleteDialo
   const [reason, setReason] = useState('');
 
   const { mutateAsync: deleteDocument, isPending: isDeletingDocument } =
-    trpc.admin.document.delete.useMutation();
+    trpc.admin.deleteDocument.useMutation();
 
   const handleDeleteDocument = async () => {
     try {

apps/remix/app/components/dialogs/admin-user-delete-dialog.tsx

@@ -3,12 +3,12 @@ import { useState } from 'react';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
+import type { User } from '@prisma/client';
 import { useNavigate } from 'react-router';
 import { match } from 'ts-pattern';
 
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { trpc } from '@documenso/trpc/react';
-import type { TGetUserResponse } from '@documenso/trpc/server/admin-router/get-user.types';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
 import {
@@ -25,7 +25,7 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 
 export type AdminUserDeleteDialogProps = {
   className?: string;
-  user: TGetUserResponse;
+  user: User;
 };
 
 export const AdminUserDeleteDialog = ({ className, user }: AdminUserDeleteDialogProps) => {
@@ -35,7 +35,7 @@ export const AdminUserDeleteDialog = ({ className, user }: AdminUserDeleteDialog
   const [email, setEmail] = useState('');
 
   const { mutateAsync: deleteUser, isPending: isDeletingUser } =
-    trpc.admin.user.delete.useMutation();
+    trpc.admin.deleteUser.useMutation();
 
   const onDeleteAccount = async () => {
     try {

apps/remix/app/components/dialogs/admin-user-disable-dialog.tsx

@@ -3,11 +3,11 @@ import { useState } from 'react';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
+import type { User } from '@prisma/client';
 import { match } from 'ts-pattern';
 
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { trpc } from '@documenso/trpc/react';
-import type { TGetUserResponse } from '@documenso/trpc/server/admin-router/get-user.types';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
 import {
@@ -24,7 +24,7 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 
 export type AdminUserDisableDialogProps = {
   className?: string;
-  userToDisable: TGetUserResponse;
+  userToDisable: User;
 };
 
 export const AdminUserDisableDialog = ({
@@ -37,7 +37,7 @@ export const AdminUserDisableDialog = ({
   const [email, setEmail] = useState('');
 
   const { mutateAsync: disableUser, isPending: isDisablingUser } =
-    trpc.admin.user.disable.useMutation();
+    trpc.admin.disableUser.useMutation();
 
   const onDisableAccount = async () => {
     try {

apps/remix/app/components/dialogs/admin-user-enable-dialog.tsx

@@ -3,11 +3,11 @@ import { useState } from 'react';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
+import type { User } from '@prisma/client';
 import { match } from 'ts-pattern';
 
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { trpc } from '@documenso/trpc/react';
-import type { TGetUserResponse } from '@documenso/trpc/server/admin-router/get-user.types';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
 import {
@@ -24,7 +24,7 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 
 export type AdminUserEnableDialogProps = {
   className?: string;
-  userToEnable: TGetUserResponse;
+  userToEnable: User;
 };
 
 export const AdminUserEnableDialog = ({ className, userToEnable }: AdminUserEnableDialogProps) => {
@@ -34,7 +34,7 @@ export const AdminUserEnableDialog = ({ className, userToEnable }: AdminUserEnab
   const [email, setEmail] = useState('');
 
   const { mutateAsync: enableUser, isPending: isEnablingUser } =
-    trpc.admin.user.enable.useMutation();
+    trpc.admin.enableUser.useMutation();
 
   const onEnableAccount = async () => {
     try {

apps/remix/app/components/dialogs/admin-user-reset-two-factor-dialog.tsx

@@ -3,12 +3,12 @@ import { useState } from 'react';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
+import type { User } from '@prisma/client';
 import { useRevalidator } from 'react-router';
 import { match } from 'ts-pattern';
 
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { trpc } from '@documenso/trpc/react';
-import type { TGetUserResponse } from '@documenso/trpc/server/admin-router/get-user.types';
 import { Alert, AlertDescription, AlertTitle } from '@documenso/ui/primitives/alert';
 import { Button } from '@documenso/ui/primitives/button';
 import {
@@ -25,7 +25,7 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 
 export type AdminUserResetTwoFactorDialogProps = {
   className?: string;
-  user: TGetUserResponse;
+  user: User;
 };
 
 export const AdminUserResetTwoFactorDialog = ({

apps/remix/app/components/dialogs/document-delete-dialog.tsx

@@ -49,7 +49,7 @@ export const DocumentDeleteDialog = ({
   const [inputValue, setInputValue] = useState('');
   const [isDeleteEnabled, setIsDeleteEnabled] = useState(status === DocumentStatus.DRAFT);
 
-  const { mutateAsync: deleteDocument, isPending } = trpcReact.document.delete.useMutation({
+  const { mutateAsync: deleteDocument, isPending } = trpcReact.document.deleteDocument.useMutation({
     onSuccess: async () => {
       void refreshLimits();
 

apps/remix/app/components/dialogs/document-duplicate-dialog.tsx

@@ -36,12 +36,11 @@ export const DocumentDuplicateDialog = ({
 
   const team = useCurrentTeam();
 
-  const { data: document, isLoading } = trpcReact.document.get.useQuery(
+  const { data: document, isLoading } = trpcReact.document.getDocumentById.useQuery(
     {
       documentId: id,
     },
     {
-      queryHash: `document-duplicate-dialog-${id}`,
       enabled: open === true,
     },
   );
@@ -56,7 +55,7 @@ export const DocumentDuplicateDialog = ({
   const documentsPath = formatDocumentsPath(team.url);
 
   const { mutateAsync: duplicateDocument, isPending: isDuplicateLoading } =
-    trpcReact.document.duplicate.useMutation({
+    trpcReact.document.duplicateDocument.useMutation({
       onSuccess: async ({ documentId }) => {
         toast({
           title: _(msg`Document Duplicated`),

apps/remix/app/components/dialogs/document-resend-dialog.tsx

@@ -71,7 +71,7 @@ export const DocumentResendDialog = ({ document, recipients }: DocumentResendDia
     document.status !== 'PENDING' ||
     !recipients.some((r) => r.signingStatus === SigningStatus.NOT_SIGNED);
 
-  const { mutateAsync: resendDocument } = trpcReact.document.redistribute.useMutation();
+  const { mutateAsync: resendDocument } = trpcReact.document.resendDocument.useMutation();
 
   const form = useForm<TResendDocumentFormSchema>({
     resolver: zodResolver(ZResendDocumentFormSchema),

apps/remix/app/components/dialogs/passkey-create-dialog.tsx

@@ -65,9 +65,9 @@ export const PasskeyCreateDialog = ({ trigger, onSuccess, ...props }: PasskeyCre
   });
 
   const { mutateAsync: createPasskeyRegistrationOptions, isPending } =
-    trpc.auth.passkey.createRegistrationOptions.useMutation();
+    trpc.auth.createPasskeyRegistrationOptions.useMutation();
 
-  const { mutateAsync: createPasskey } = trpc.auth.passkey.create.useMutation();
+  const { mutateAsync: createPasskey } = trpc.auth.createPasskey.useMutation();
 
   const onFormSubmit = async ({ passkeyName }: TCreatePasskeyFormSchema) => {
     setFormError(null);

apps/remix/app/components/dialogs/token-delete-dialog.tsx

@@ -56,7 +56,7 @@ export default function TokenDeleteDialog({ token, onDelete, children }: TokenDe
 
   type TDeleteTokenByIdMutationSchema = z.infer<typeof ZTokenDeleteDialogSchema>;
 
-  const { mutateAsync: deleteTokenMutation } = trpc.apiToken.delete.useMutation({
+  const { mutateAsync: deleteTokenMutation } = trpc.apiToken.deleteTokenById.useMutation({
     onSuccess() {
       onDelete?.();
     },

apps/remix/app/components/embed/authoring/configure-fields-view.tsx

@@ -172,8 +172,6 @@ export const ConfigureFieldsView = ({
     name: 'fields',
   });
 
-  const highestPageNumber = Math.max(...localFields.map((field) => field.pageNumber));
-
   const onFieldCopy = useCallback(
     (event?: KeyboardEvent | null, options?: { duplicate?: boolean; duplicateAll?: boolean }) => {
       const { duplicate = false, duplicateAll = false } = options ?? {};
@@ -542,9 +540,7 @@ export const ConfigureFieldsView = ({
                 <div>
                   <PDFViewer documentData={normalizedDocumentData} />
 
-                  <ElementVisible
-                    target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPageNumber}"]`}
-                  >
+                  <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>
                     {localFields.map((field, index) => {
                       const recipientIndex = recipients.findIndex(
                         (r) => r.id === field.recipientId,

apps/remix/app/components/embed/embed-direct-template-client-page.tsx

@@ -57,7 +57,7 @@ export const EmbedDirectTemplateClientPage = ({
   token,
   updatedAt,
   documentData,
-  recipient: _recipient,
+  recipient,
   fields,
   metadata,
   hidePoweredBy = false,
@@ -91,12 +91,8 @@ export const EmbedDirectTemplateClientPage = ({
     localFields.filter((field) => field.inserted),
   ];
 
-  const highestPendingPageNumber = Math.max(...pendingFields.map((field) => field.page));
-
   const hasSignatureField = localFields.some((field) => field.type === FieldType.SIGNATURE);
 
-  const signatureValid = !hasSignatureField || (signature && signature.trim() !== '');
-
   const { mutateAsync: createDocumentFromDirectTemplate, isPending: isSubmitting } =
     trpc.template.createDocumentFromDirectTemplate.useMutation();
 
@@ -347,34 +343,19 @@ export const EmbedDirectTemplateClientPage = ({
                   <Trans>Sign document</Trans>
                 </h3>
 
-                {isExpanded ? (
-                  <Button
-                    variant="outline"
-                    className="h-8 w-8 p-0 md:hidden"
-                    onClick={() => setIsExpanded(false)}
-                  >
-                    <LucideChevronDown className="text-muted-foreground h-5 w-5" />
-                  </Button>
-                ) : pendingFields.length > 0 ? (
-                  <Button
-                    variant="outline"
-                    className="h-8 w-8 p-0 md:hidden"
-                    onClick={() => setIsExpanded(true)}
-                  >
-                    <LucideChevronUp className="text-muted-foreground h-5 w-5" />
-                  </Button>
-                ) : (
-                  <Button
-                    variant="default"
-                    size="sm"
-                    className="md:hidden"
-                    disabled={isThrottled || (hasSignatureField && !signatureValid)}
-                    loading={isSubmitting}
-                    onClick={() => throttledOnCompleteClick()}
-                  >
-                    <Trans>Complete</Trans>
-                  </Button>
-                )}
+                <Button variant="outline" className="h-8 w-8 p-0 md:hidden">
+                  {isExpanded ? (
+                    <LucideChevronDown
+                      className="text-muted-foreground h-5 w-5"
+                      onClick={() => setIsExpanded(false)}
+                    />
+                  ) : (
+                    <LucideChevronUp
+                      className="text-muted-foreground h-5 w-5"
+                      onClick={() => setIsExpanded(true)}
+                    />
+                  )}
+                </Button>
               </div>
             </div>
 
@@ -461,9 +442,7 @@ export const EmbedDirectTemplateClientPage = ({
           </div>
         </div>
 
-        <ElementVisible
-          target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPendingPageNumber}"]`}
-        >
+        <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>
           {showPendingFieldTooltip && pendingFields.length > 0 && (
             <FieldToolTip key={pendingFields[0].id} field={pendingFields[0]} color="warning">
               <Trans>Click to insert field</Trans>

apps/remix/app/components/embed/embed-document-fields.tsx

@@ -50,10 +50,8 @@ export const EmbedDocumentFields = ({
   onSignField,
   onUnsignField,
 }: EmbedDocumentFieldsProps) => {
-  const highestPageNumber = Math.max(...fields.map((field) => field.page));
-
   return (
-    <ElementVisible target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPageNumber}"]`}>
+    <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>
       {fields.map((field) =>
         match(field.type)
           .with(FieldType.SIGNATURE, () => (

apps/remix/app/components/embed/embed-document-signing-page.tsx

@@ -89,7 +89,7 @@ export const EmbedSignDocumentClientPage = ({
   const [isExpanded, setIsExpanded] = useState(false);
   const [isNameLocked, setIsNameLocked] = useState(false);
   const [showPendingFieldTooltip, setShowPendingFieldTooltip] = useState(false);
-  const [_showOtherRecipientsCompletedFields, setShowOtherRecipientsCompletedFields] =
+  const [showOtherRecipientsCompletedFields, setShowOtherRecipientsCompletedFields] =
     useState(false);
 
   const [allowDocumentRejection, setAllowDocumentRejection] = useState(false);
@@ -106,8 +106,6 @@ export const EmbedSignDocumentClientPage = ({
     fields.filter((field) => field.inserted),
   ];
 
-  const highestPendingPageNumber = Math.max(...pendingFields.map((field) => field.page));
-
   const { mutateAsync: completeDocumentWithToken, isPending: isSubmitting } =
     trpc.recipient.completeDocumentWithToken.useMutation();
 
@@ -118,8 +116,6 @@ export const EmbedSignDocumentClientPage = ({
 
   const hasSignatureField = fields.some((field) => field.type === FieldType.SIGNATURE);
 
-  const signatureValid = !hasSignatureField || (signature && signature.trim() !== '');
-
   const assistantSignersId = useId();
 
   const onNextFieldClick = () => {
@@ -309,36 +305,19 @@ export const EmbedSignDocumentClientPage = ({
                     )}
                   </h3>
 
-                  {isExpanded ? (
-                    <Button
-                      variant="outline"
-                      className="bg-background dark:bg-foreground h-8 w-8 p-0 md:hidden"
-                      onClick={() => setIsExpanded(false)}
-                    >
-                      <LucideChevronDown className="text-muted-foreground dark:text-background h-5 w-5" />
-                    </Button>
-                  ) : pendingFields.length > 0 ? (
-                    <Button
-                      variant="outline"
-                      className="bg-background dark:bg-foreground h-8 w-8 p-0 md:hidden"
-                      onClick={() => setIsExpanded(true)}
-                    >
-                      <LucideChevronUp className="text-muted-foreground dark:text-background h-5 w-5" />
-                    </Button>
-                  ) : (
-                    <Button
-                      variant="default"
-                      size="sm"
-                      className="md:hidden"
-                      disabled={
-                        isThrottled || (!isAssistantMode && hasSignatureField && !signatureValid)
-                      }
-                      loading={isSubmitting}
-                      onClick={() => throttledOnCompleteClick()}
-                    >
-                      <Trans>Complete</Trans>
-                    </Button>
-                  )}
+                  <Button variant="outline" className="h-8 w-8 p-0 md:hidden">
+                    {isExpanded ? (
+                      <LucideChevronDown
+                        className="text-muted-foreground h-5 w-5"
+                        onClick={() => setIsExpanded(false)}
+                      />
+                    ) : (
+                      <LucideChevronUp
+                        className="text-muted-foreground h-5 w-5"
+                        onClick={() => setIsExpanded(true)}
+                      />
+                    )}
+                  </Button>
                 </div>
               </div>
 
@@ -486,9 +465,7 @@ export const EmbedSignDocumentClientPage = ({
             </div>
           </div>
 
-          <ElementVisible
-            target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPendingPageNumber}"]`}
-          >
+          <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>
             {showPendingFieldTooltip && pendingFields.length > 0 && (
               <FieldToolTip key={pendingFields[0].id} field={pendingFields[0]} color="warning">
                 <Trans>Click to insert field</Trans>

apps/remix/app/components/embed/multisign/multi-sign-document-signing-view.tsx

@@ -92,8 +92,6 @@ export const MultiSignDocumentSigningView = ({
       [],
   ];
 
-  const highestPendingPageNumber = Math.max(...pendingFields.map((field) => field.page));
-
   const uninsertedFields = document?.fields.filter((field) => !field.inserted) ?? [];
 
   const onSignField = async (payload: TSignFieldWithTokenMutationSchema) => {
@@ -359,9 +357,7 @@ export const MultiSignDocumentSigningView = ({
               </div>
 
               {hasDocumentLoaded && (
-                <ElementVisible
-                  target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPendingPageNumber}"]`}
-                >
+                <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>
                   {showPendingFieldTooltip && pendingFields.length > 0 && (
                     <FieldToolTip
                       key={pendingFields[0].id}

apps/remix/app/components/forms/signin.tsx

@@ -114,7 +114,7 @@ export const SignInForm = ({
   }, [returnTo]);
 
   const { mutateAsync: createPasskeySigninOptions } =
-    trpc.auth.passkey.createSigninOptions.useMutation();
+    trpc.auth.createPasskeySigninOptions.useMutation();
 
   const form = useForm<TSignInFormSchema>({
     values: {

apps/remix/app/components/forms/token.tsx

@@ -13,7 +13,7 @@ import type { z } from 'zod';
 import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { trpc } from '@documenso/trpc/react';
-import { ZCreateApiTokenRequestSchema } from '@documenso/trpc/server/api-token-router/create-api-token.types';
+import { ZCreateTokenMutationSchema } from '@documenso/trpc/server/api-token-router/schema';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
@@ -47,7 +47,7 @@ export const EXPIRATION_DATES = {
   ONE_YEAR: msg`12 months`,
 } as const;
 
-const ZCreateTokenFormSchema = ZCreateApiTokenRequestSchema.pick({
+const ZCreateTokenFormSchema = ZCreateTokenMutationSchema.pick({
   tokenName: true,
   expirationDate: true,
 });
@@ -75,7 +75,7 @@ export const ApiTokenForm = ({ className, tokens }: ApiTokenFormProps) => {
   const [newlyCreatedToken, setNewlyCreatedToken] = useState<NewlyCreatedToken | null>();
   const [noExpirationDate, setNoExpirationDate] = useState(false);
 
-  const { mutateAsync: createTokenMutation } = trpc.apiToken.create.useMutation({
+  const { mutateAsync: createTokenMutation } = trpc.apiToken.createToken.useMutation({
     onSuccess(data) {
       setNewlyCreatedToken(data);
     },

apps/remix/app/components/general/app-command-menu.tsx

@@ -64,7 +64,7 @@ export function AppCommandMenu({ open, onOpenChange }: AppCommandMenuProps) {
   const [pages, setPages] = useState<string[]>([]);
 
   const { data: searchDocumentsData, isPending: isSearchingDocuments } =
-    trpcReact.document.search.useQuery(
+    trpcReact.document.searchDocuments.useQuery(
       {
         query: search,
       },

apps/remix/app/components/general/direct-template/direct-template-signing-form.tsx

@@ -79,8 +79,6 @@ export const DirectTemplateSigningForm = ({
   const [validateUninsertedFields, setValidateUninsertedFields] = useState(false);
   const [isSubmitting, setIsSubmitting] = useState(false);
 
-  const highestPageNumber = Math.max(...localFields.map((field) => field.page));
-
   const fieldsRequiringValidation = useMemo(() => {
     return localFields.filter((field) => isFieldUnsignedAndRequired(field));
   }, [localFields]);
@@ -223,9 +221,7 @@ export const DirectTemplateSigningForm = ({
       <DocumentFlowFormContainerHeader title={flowStep.title} description={flowStep.description} />
 
       <DocumentFlowFormContainerContent>
-        <ElementVisible
-          target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPageNumber}"]`}
-        >
+        <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>
           {validateUninsertedFields && uninsertedFields[0] && (
             <FieldToolTip key={uninsertedFields[0].id} field={uninsertedFields[0]} color="warning">
               <Trans>Click to insert field</Trans>

apps/remix/app/components/general/document-signing/document-signing-auth-passkey.tsx

@@ -77,7 +77,7 @@ export const DocumentSigningAuthPasskey = ({
   });
 
   const { mutateAsync: createPasskeyAuthenticationOptions } =
-    trpc.auth.passkey.createAuthenticationOptions.useMutation();
+    trpc.auth.createPasskeyAuthenticationOptions.useMutation();
 
   const [formErrorCode, setFormErrorCode] = useState<string | null>(null);
 

apps/remix/app/components/general/document-signing/document-signing-auth-provider.tsx

@@ -93,7 +93,7 @@ export const DocumentSigningAuthProvider = ({
     [documentAuthOptions, recipient],
   );
 
-  const passkeyQuery = trpc.auth.passkey.find.useQuery(
+  const passkeyQuery = trpc.auth.findPasskeys.useQuery(
     {
       perPage: MAXIMUM_PASSKEYS,
     },

apps/remix/app/components/general/document-signing/document-signing-form.tsx

@@ -7,11 +7,14 @@ import { type Field, FieldType, type Recipient, RecipientRole } from '@prisma/cl
 import { Controller, useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router';
 
+import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
+import { useOptionalSession } from '@documenso/lib/client-only/providers/session';
 import type { DocumentAndSender } from '@documenso/lib/server-only/document/get-document-by-token';
 import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import { isFieldUnsignedAndRequired } from '@documenso/lib/utils/advanced-fields-helpers';
-import { sortFieldsByPosition } from '@documenso/lib/utils/fields';
+import { sortFieldsByPosition, validateFieldsInserted } from '@documenso/lib/utils/fields';
 import type { RecipientWithFields } from '@documenso/prisma/types/recipient-with-fields';
+import { trpc } from '@documenso/trpc/react';
 import { FieldToolTip } from '@documenso/ui/components/field/field-tooltip';
 import { Button } from '@documenso/ui/primitives/button';
 import { Input } from '@documenso/ui/primitives/input';
@@ -31,33 +34,29 @@ export type DocumentSigningFormProps = {
   document: DocumentAndSender;
   recipient: Recipient;
   fields: Field[];
+  redirectUrl?: string | null;
   isRecipientsTurn: boolean;
   allRecipients?: RecipientWithFields[];
   setSelectedSignerId?: (id: number | null) => void;
-  completeDocument: (
-    authOptions?: TRecipientActionAuth,
-    nextSigner?: { email: string; name: string },
-  ) => Promise<void>;
-  isSubmitting: boolean;
-  fieldsValidated: () => void;
-  nextRecipient?: RecipientWithFields;
 };
 
 export const DocumentSigningForm = ({
   document,
   recipient,
   fields,
+  redirectUrl,
   isRecipientsTurn,
   allRecipients = [],
   setSelectedSignerId,
-  completeDocument,
-  isSubmitting,
-  fieldsValidated,
-  nextRecipient,
 }: DocumentSigningFormProps) => {
+  const { sessionData } = useOptionalSession();
+  const user = sessionData?.user;
+
   const { _ } = useLingui();
   const { toast } = useToast();
+
   const navigate = useNavigate();
+  const analytics = useAnalytics();
 
   const assistantSignersId = useId();
 
@@ -67,12 +66,21 @@ export const DocumentSigningForm = ({
   const [isConfirmationDialogOpen, setIsConfirmationDialogOpen] = useState(false);
   const [isAssistantSubmitting, setIsAssistantSubmitting] = useState(false);
 
+  const {
+    mutateAsync: completeDocumentWithToken,
+    isPending,
+    isSuccess,
+  } = trpc.recipient.completeDocumentWithToken.useMutation();
+
   const assistantForm = useForm<{ selectedSignerId: number | undefined }>({
     defaultValues: {
       selectedSignerId: undefined,
     },
   });
 
+  // Keep the loading state going if successful since the redirect may take some time.
+  const isSubmitting = isPending || isSuccess;
+
   const fieldsRequiringValidation = useMemo(
     () => fields.filter(isFieldUnsignedAndRequired),
     [fields],
@@ -88,9 +96,9 @@ export const DocumentSigningForm = ({
     return fieldsRequiringValidation.filter((field) => field.recipientId === recipient.id);
   }, [fieldsRequiringValidation, recipient]);
 
-  const localFieldsValidated = () => {
+  const fieldsValidated = () => {
     setValidateUninsertedFields(true);
-    fieldsValidated();
+    validateFieldsInserted(fieldsRequiringValidation);
   };
 
   const onAssistantFormSubmit = () => {
@@ -118,6 +126,55 @@ export const DocumentSigningForm = ({
     }
   };
 
+  const completeDocument = async (
+    authOptions?: TRecipientActionAuth,
+    nextSigner?: { email: string; name: string },
+  ) => {
+    const payload = {
+      token: recipient.token,
+      documentId: document.id,
+      authOptions,
+      ...(nextSigner?.email && nextSigner?.name ? { nextSigner } : {}),
+    };
+
+    await completeDocumentWithToken(payload);
+
+    analytics.capture('App: Recipient has completed signing', {
+      signerId: recipient.id,
+      documentId: document.id,
+      timestamp: new Date().toISOString(),
+    });
+
+    if (redirectUrl) {
+      window.location.href = redirectUrl;
+    } else {
+      await navigate(`/sign/${recipient.token}/complete`);
+    }
+  };
+
+  const nextRecipient = useMemo(() => {
+    if (
+      !document.documentMeta?.signingOrder ||
+      document.documentMeta.signingOrder !== 'SEQUENTIAL'
+    ) {
+      return undefined;
+    }
+
+    const sortedRecipients = allRecipients.sort((a, b) => {
+      // Sort by signingOrder first (nulls last), then by id
+      if (a.signingOrder === null && b.signingOrder === null) return a.id - b.id;
+      if (a.signingOrder === null) return 1;
+      if (b.signingOrder === null) return -1;
+      if (a.signingOrder === b.signingOrder) return a.id - b.id;
+      return a.signingOrder - b.signingOrder;
+    });
+
+    const currentIndex = sortedRecipients.findIndex((r) => r.id === recipient.id);
+    return currentIndex !== -1 && currentIndex < sortedRecipients.length - 1
+      ? sortedRecipients[currentIndex + 1]
+      : undefined;
+  }, [document.documentMeta?.signingOrder, allRecipients, recipient.id]);
+
   return (
     <div className="flex h-full flex-col">
       {validateUninsertedFields && uninsertedFields[0] && (
@@ -148,7 +205,7 @@ export const DocumentSigningForm = ({
                     isSubmitting={isSubmitting}
                     documentTitle={document.title}
                     fields={fields}
-                    fieldsValidated={localFieldsValidated}
+                    fieldsValidated={fieldsValidated}
                     onSignatureComplete={async (nextSigner) => {
                       await completeDocument(undefined, nextSigner);
                     }}
@@ -307,7 +364,7 @@ export const DocumentSigningForm = ({
                   isSubmitting={isSubmitting || isAssistantSubmitting}
                   documentTitle={document.title}
                   fields={fields}
-                  fieldsValidated={localFieldsValidated}
+                  fieldsValidated={fieldsValidated}
                   disabled={!isRecipientsTurn}
                   onSignatureComplete={async (nextSigner) => {
                     await completeDocument(undefined, nextSigner);

apps/remix/app/components/general/document-signing/document-signing-page-view.tsx

@@ -1,18 +1,15 @@
-import { useMemo, useState } from 'react';
+import { useState } from 'react';
 
 import { Trans } from '@lingui/react/macro';
 import type { Field } from '@prisma/client';
 import { FieldType, RecipientRole } from '@prisma/client';
 import { LucideChevronDown, LucideChevronUp } from 'lucide-react';
-import { useNavigate } from 'react-router';
-import { P, match } from 'ts-pattern';
+import { match } from 'ts-pattern';
 
-import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';
 import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
 import { DEFAULT_DOCUMENT_TIME_ZONE } from '@documenso/lib/constants/time-zones';
 import type { DocumentAndSender } from '@documenso/lib/server-only/document/get-document-by-token';
-import type { TRecipientActionAuth } from '@documenso/lib/types/document-auth';
 import {
   ZCheckboxFieldMeta,
   ZDropdownFieldMeta,
@@ -21,11 +18,8 @@ import {
   ZTextFieldMeta,
 } from '@documenso/lib/types/field-meta';
 import type { CompletedField } from '@documenso/lib/types/fields';
-import { isFieldUnsignedAndRequired } from '@documenso/lib/utils/advanced-fields-helpers';
-import { validateFieldsInserted } from '@documenso/lib/utils/fields';
 import type { FieldWithSignatureAndFieldMeta } from '@documenso/prisma/types/field-with-signature-and-fieldmeta';
 import type { RecipientWithFields } from '@documenso/prisma/types/recipient-with-fields';
-import { trpc } from '@documenso/trpc/react';
 import { DocumentReadOnlyFields } from '@documenso/ui/components/document/document-read-only-fields';
 import { Button } from '@documenso/ui/primitives/button';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
@@ -46,7 +40,6 @@ import { DocumentSigningRejectDialog } from '~/components/general/document-signi
 import { DocumentSigningSignatureField } from '~/components/general/document-signing/document-signing-signature-field';
 import { DocumentSigningTextField } from '~/components/general/document-signing/document-signing-text-field';
 
-import { DocumentSigningCompleteDialog } from './document-signing-complete-dialog';
 import { DocumentSigningRecipientProvider } from './document-signing-recipient-provider';
 
 export type DocumentSigningPageViewProps = {
@@ -70,56 +63,9 @@ export const DocumentSigningPageView = ({
 }: DocumentSigningPageViewProps) => {
   const { documentData, documentMeta } = document;
 
-  const navigate = useNavigate();
-  const analytics = useAnalytics();
-
   const [selectedSignerId, setSelectedSignerId] = useState<number | null>(allRecipients?.[0]?.id);
   const [isExpanded, setIsExpanded] = useState(false);
 
-  const {
-    mutateAsync: completeDocumentWithToken,
-    isPending,
-    isSuccess,
-  } = trpc.recipient.completeDocumentWithToken.useMutation();
-
-  // Keep the loading state going if successful since the redirect may take some time.
-  const isSubmitting = isPending || isSuccess;
-
-  const fieldsRequiringValidation = useMemo(
-    () => fields.filter(isFieldUnsignedAndRequired),
-    [fields],
-  );
-
-  const fieldsValidated = () => {
-    validateFieldsInserted(fieldsRequiringValidation);
-  };
-
-  const completeDocument = async (
-    authOptions?: TRecipientActionAuth,
-    nextSigner?: { email: string; name: string },
-  ) => {
-    const payload = {
-      token: recipient.token,
-      documentId: document.id,
-      authOptions,
-      ...(nextSigner?.email && nextSigner?.name ? { nextSigner } : {}),
-    };
-
-    await completeDocumentWithToken(payload);
-
-    analytics.capture('App: Recipient has completed signing', {
-      signerId: recipient.id,
-      documentId: document.id,
-      timestamp: new Date().toISOString(),
-    });
-
-    if (documentMeta?.redirectUrl) {
-      window.location.href = documentMeta.redirectUrl;
-    } else {
-      await navigate(`/sign/${recipient.token}/complete`);
-    }
-  };
-
   let senderName = document.user.name ?? '';
   let senderEmail = `(${document.user.email})`;
 
@@ -132,31 +78,6 @@ export const DocumentSigningPageView = ({
   const targetSigner =
     recipient.role === RecipientRole.ASSISTANT && selectedSigner ? selectedSigner : null;
 
-  const nextRecipient = useMemo(() => {
-    if (!documentMeta?.signingOrder || documentMeta.signingOrder !== 'SEQUENTIAL') {
-      return undefined;
-    }
-
-    const sortedRecipients = allRecipients.sort((a, b) => {
-      // Sort by signingOrder first (nulls last), then by id
-      if (a.signingOrder === null && b.signingOrder === null) return a.id - b.id;
-      if (a.signingOrder === null) return 1;
-      if (b.signingOrder === null) return -1;
-      if (a.signingOrder === b.signingOrder) return a.id - b.id;
-      return a.signingOrder - b.signingOrder;
-    });
-
-    const currentIndex = sortedRecipients.findIndex((r) => r.id === recipient.id);
-    return currentIndex !== -1 && currentIndex < sortedRecipients.length - 1
-      ? sortedRecipients[currentIndex + 1]
-      : undefined;
-  }, [document.documentMeta?.signingOrder, allRecipients, recipient.id]);
-
-  const highestPageNumber = Math.max(...fields.map((field) => field.page));
-
-  const pendingFields = fieldsRequiringValidation.filter((field) => !field.inserted);
-  const hasPendingFields = pendingFields.length > 0;
-
   return (
     <DocumentSigningRecipientProvider recipient={recipient} targetSigner={targetSigner}>
       <div className="mx-auto w-full max-w-screen-xl sm:px-6">
@@ -242,55 +163,19 @@ export const DocumentSigningPageView = ({
                     .otherwise(() => null)}
                 </h3>
 
-                {match({ hasPendingFields, isExpanded, role: recipient.role })
-                  .with(
-                    {
-                      hasPendingFields: false,
-                      role: P.not(RecipientRole.ASSISTANT),
-                      isExpanded: false,
-                    },
-                    () => (
-                      <div className="md:hidden">
-                        <DocumentSigningCompleteDialog
-                          isSubmitting={isSubmitting}
-                          documentTitle={document.title}
-                          fields={fields}
-                          fieldsValidated={fieldsValidated}
-                          disabled={!isRecipientsTurn}
-                          onSignatureComplete={async (nextSigner) => {
-                            await completeDocument(undefined, nextSigner);
-                          }}
-                          role={recipient.role}
-                          allowDictateNextSigner={
-                            nextRecipient && documentMeta?.allowDictateNextSigner
-                          }
-                          defaultNextSigner={
-                            nextRecipient
-                              ? { name: nextRecipient.name, email: nextRecipient.email }
-                              : undefined
-                          }
-                        />
-                      </div>
-                    ),
-                  )
-                  .with({ isExpanded: true }, () => (
-                    <Button
-                      variant="outline"
-                      className="bg-background dark:bg-foreground h-8 w-8 p-0 md:hidden"
+                <Button variant="outline" className="h-8 w-8 p-0 md:hidden">
+                  {isExpanded ? (
+                    <LucideChevronDown
+                      className="text-muted-foreground h-5 w-5"
                       onClick={() => setIsExpanded(false)}
-                    >
-                      <LucideChevronDown className="text-muted-foreground dark:text-background h-5 w-5" />
-                    </Button>
-                  ))
-                  .otherwise(() => (
-                    <Button
-                      variant="outline"
-                      className="bg-background dark:bg-foreground h-8 w-8 p-0 md:hidden"
+                    />
+                  ) : (
+                    <LucideChevronUp
+                      className="text-muted-foreground h-5 w-5"
                       onClick={() => setIsExpanded(true)}
-                    >
-                      <LucideChevronUp className="text-muted-foreground dark:text-background h-5 w-5" />
-                    </Button>
-                  ))}
+                    />
+                  )}
+                </Button>
               </div>
 
               <div className="hidden group-data-[expanded]/document-widget:block md:block">
@@ -319,13 +204,10 @@ export const DocumentSigningPageView = ({
                   document={document}
                   recipient={recipient}
                   fields={fields}
+                  redirectUrl={documentMeta?.redirectUrl}
                   isRecipientsTurn={isRecipientsTurn}
                   allRecipients={allRecipients}
                   setSelectedSignerId={setSelectedSignerId}
-                  completeDocument={completeDocument}
-                  isSubmitting={isSubmitting}
-                  fieldsValidated={fieldsValidated}
-                  nextRecipient={nextRecipient}
                 />
               </div>
             </div>
@@ -342,9 +224,7 @@ export const DocumentSigningPageView = ({
           <DocumentSigningAutoSign recipient={recipient} fields={fields} />
         )}
 
-        <ElementVisible
-          target={`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${highestPageNumber}"]`}
-        >
+        <ElementVisible target={PDF_VIEWER_PAGE_SELECTOR}>
           {fields
             .filter(
               (field) =>

apps/remix/app/components/general/document/document-audit-log-download-button.tsx

@@ -21,7 +21,7 @@ export const DocumentAuditLogDownloadButton = ({
   const { _ } = useLingui();
 
   const { mutateAsync: downloadAuditLogs, isPending } =
-    trpc.document.auditLog.download.useMutation();
+    trpc.document.downloadAuditLogs.useMutation();
 
   const onDownloadAuditLogsClick = async () => {
     try {

apps/remix/app/components/general/document/document-drop-zone-wrapper.tsx

@@ -49,7 +49,7 @@ export const DocumentDropZoneWrapper = ({ children, className }: DocumentDropZon
 
   const { quota, remaining, refreshLimits } = useLimits();
 
-  const { mutateAsync: createDocument } = trpc.document.create.useMutation();
+  const { mutateAsync: createDocument } = trpc.document.createDocument.useMutation();
 
   const isUploadDisabled = remaining.documents === 0 || !user.emailVerified;
 

apps/remix/app/components/general/document/document-edit-form.tsx

@@ -59,22 +59,23 @@ export const DocumentEditForm = ({
 
   const utils = trpc.useUtils();
 
-  const { data: document, refetch: refetchDocument } = trpc.document.get.useQuery(
-    {
-      documentId: initialDocument.id,
-    },
-    {
-      initialData: initialDocument,
-      ...SKIP_QUERY_BATCH_META,
-    },
-  );
+  const { data: document, refetch: refetchDocument } =
+    trpc.document.getDocumentWithDetailsById.useQuery(
+      {
+        documentId: initialDocument.id,
+      },
+      {
+        initialData: initialDocument,
+        ...SKIP_QUERY_BATCH_META,
+      },
+    );
 
   const { recipients, fields } = document;
 
-  const { mutateAsync: updateDocument } = trpc.document.update.useMutation({
+  const { mutateAsync: updateDocument } = trpc.document.updateDocument.useMutation({
     ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
     onSuccess: (newData) => {
-      utils.document.get.setData(
+      utils.document.getDocumentWithDetailsById.setData(
         {
           documentId: initialDocument.id,
         },
@@ -83,10 +84,23 @@ export const DocumentEditForm = ({
     },
   });
 
+  const { mutateAsync: setSigningOrderForDocument } =
+    trpc.document.setSigningOrderForDocument.useMutation({
+      ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
+      onSuccess: (newData) => {
+        utils.document.getDocumentWithDetailsById.setData(
+          {
+            documentId: initialDocument.id,
+          },
+          (oldData) => ({ ...(oldData || initialDocument), ...newData, id: Number(newData.id) }),
+        );
+      },
+    });
+
   const { mutateAsync: addFields } = trpc.field.addFields.useMutation({
     ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
     onSuccess: ({ fields: newFields }) => {
-      utils.document.get.setData(
+      utils.document.getDocumentWithDetailsById.setData(
         {
           documentId: initialDocument.id,
         },
@@ -98,7 +112,7 @@ export const DocumentEditForm = ({
   const { mutateAsync: setRecipients } = trpc.recipient.setDocumentRecipients.useMutation({
     ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
     onSuccess: ({ recipients: newRecipients }) => {
-      utils.document.get.setData(
+      utils.document.getDocumentWithDetailsById.setData(
         {
           documentId: initialDocument.id,
         },
@@ -107,10 +121,10 @@ export const DocumentEditForm = ({
     },
   });
 
-  const { mutateAsync: sendDocument } = trpc.document.distribute.useMutation({
+  const { mutateAsync: sendDocument } = trpc.document.sendDocument.useMutation({
     ...DO_NOT_INVALIDATE_QUERY_ON_MUTATION,
     onSuccess: (newData) => {
-      utils.document.get.setData(
+      utils.document.getDocumentWithDetailsById.setData(
         {
           documentId: initialDocument.id,
         },
@@ -159,37 +173,34 @@ export const DocumentEditForm = ({
     return initialStep;
   });
 
-  const saveSettingsData = async (data: TAddSettingsFormSchema) => {
-    const { timezone, dateFormat, redirectUrl, language, signatureTypes } = data.meta;
-
-    const parsedGlobalAccessAuth = z
-      .array(ZDocumentAccessAuthTypesSchema)
-      .safeParse(data.globalAccessAuth);
-
-    return updateDocument({
-      documentId: document.id,
-      data: {
-        title: data.title,
-        externalId: data.externalId || null,
-        visibility: data.visibility,
-        globalAccessAuth: parsedGlobalAccessAuth.success ? parsedGlobalAccessAuth.data : [],
-        globalActionAuth: data.globalActionAuth ?? [],
-      },
-      meta: {
-        timezone,
-        dateFormat,
-        redirectUrl,
-        language: isValidLanguageCode(language) ? language : undefined,
-        typedSignatureEnabled: signatureTypes.includes(DocumentSignatureType.TYPE),
-        uploadSignatureEnabled: signatureTypes.includes(DocumentSignatureType.UPLOAD),
-        drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
-      },
-    });
-  };
-
   const onAddSettingsFormSubmit = async (data: TAddSettingsFormSchema) => {
     try {
-      await saveSettingsData(data);
+      const { timezone, dateFormat, redirectUrl, language, signatureTypes } = data.meta;
+
+      const parsedGlobalAccessAuth = z
+        .array(ZDocumentAccessAuthTypesSchema)
+        .safeParse(data.globalAccessAuth);
+
+      await updateDocument({
+        documentId: document.id,
+        data: {
+          title: data.title,
+          externalId: data.externalId || null,
+          visibility: data.visibility,
+          globalAccessAuth: parsedGlobalAccessAuth.success ? parsedGlobalAccessAuth.data : [],
+          globalActionAuth: data.globalActionAuth ?? [],
+        },
+        meta: {
+          timezone,
+          dateFormat,
+          redirectUrl,
+          language: isValidLanguageCode(language) ? language : undefined,
+          typedSignatureEnabled: signatureTypes.includes(DocumentSignatureType.TYPE),
+          uploadSignatureEnabled: signatureTypes.includes(DocumentSignatureType.UPLOAD),
+          drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
+        },
+      });
+
       setStep('signers');
     } catch (err) {
       console.error(err);
@@ -202,58 +213,30 @@ export const DocumentEditForm = ({
     }
   };
 
-  const onAddSettingsFormAutoSave = async (data: TAddSettingsFormSchema) => {
-    try {
-      await saveSettingsData(data);
-    } catch (err) {
-      console.error(err);
-
-      toast({
-        title: _(msg`Error`),
-        description: _(msg`An error occurred while auto-saving the document settings.`),
-        variant: 'destructive',
-      });
-    }
-  };
-
-  const saveSignersData = async (data: TAddSignersFormSchema) => {
-    return Promise.all([
-      updateDocument({
-        documentId: document.id,
-        meta: {
-          allowDictateNextSigner: data.allowDictateNextSigner,
-          signingOrder: data.signingOrder,
-        },
-      }),
-
-      setRecipients({
-        documentId: document.id,
-        recipients: data.signers.map((signer) => ({
-          ...signer,
-          // Explicitly set to null to indicate we want to remove auth if required.
-          actionAuth: signer.actionAuth ?? [],
-        })),
-      }),
-    ]);
-  };
-
-  const onAddSignersFormAutoSave = async (data: TAddSignersFormSchema) => {
-    try {
-      await saveSignersData(data);
-    } catch (err) {
-      console.error(err);
-
-      toast({
-        title: _(msg`Error`),
-        description: _(msg`An error occurred while adding signers.`),
-        variant: 'destructive',
-      });
-    }
-  };
-
   const onAddSignersFormSubmit = async (data: TAddSignersFormSchema) => {
     try {
-      await saveSignersData(data);
+      await Promise.all([
+        setSigningOrderForDocument({
+          documentId: document.id,
+          signingOrder: data.signingOrder,
+        }),
+
+        updateDocument({
+          documentId: document.id,
+          meta: {
+            allowDictateNextSigner: data.allowDictateNextSigner,
+          },
+        }),
+
+        setRecipients({
+          documentId: document.id,
+          recipients: data.signers.map((signer) => ({
+            ...signer,
+            // Explicitly set to null to indicate we want to remove auth if required.
+            actionAuth: signer.actionAuth ?? [],
+          })),
+        }),
+      ]);
 
       setStep('fields');
     } catch (err) {
@@ -267,16 +250,12 @@ export const DocumentEditForm = ({
     }
   };
 
-  const saveFieldsData = async (data: TAddFieldsFormSchema) => {
-    return addFields({
-      documentId: document.id,
-      fields: data.fields,
-    });
-  };
-
   const onAddFieldsFormSubmit = async (data: TAddFieldsFormSchema) => {
     try {
-      await saveFieldsData(data);
+      await addFields({
+        documentId: document.id,
+        fields: data.fields,
+      });
 
       // Clear all field data from localStorage
       for (let i = 0; i < localStorage.length; i++) {
@@ -298,60 +277,24 @@ export const DocumentEditForm = ({
     }
   };
 
-  const onAddFieldsFormAutoSave = async (data: TAddFieldsFormSchema) => {
-    try {
-      await saveFieldsData(data);
-      // Don't clear localStorage on auto-save, only on explicit submit
-    } catch (err) {
-      console.error(err);
-
-      toast({
-        title: _(msg`Error`),
-        description: _(msg`An error occurred while auto-saving the fields.`),
-        variant: 'destructive',
-      });
-    }
-  };
-
-  const saveSubjectData = async (data: TAddSubjectFormSchema) => {
-    const { subject, message, distributionMethod, emailId, emailReplyTo, emailSettings } =
-      data.meta;
-
-    return updateDocument({
-      documentId: document.id,
-      meta: {
-        subject,
-        message,
-        distributionMethod,
-        emailId,
-        emailReplyTo,
-        emailSettings: emailSettings,
-      },
-    });
-  };
-
-  const sendDocumentWithSubject = async (data: TAddSubjectFormSchema) => {
-    const { subject, message, distributionMethod, emailId, emailReplyTo, emailSettings } =
-      data.meta;
-
-    return sendDocument({
-      documentId: document.id,
-      meta: {
-        subject,
-        message,
-        distributionMethod,
-        emailId,
-        emailReplyTo: emailReplyTo || null,
-        emailSettings,
-      },
-    });
-  };
-
   const onAddSubjectFormSubmit = async (data: TAddSubjectFormSchema) => {
-    try {
-      await sendDocumentWithSubject(data);
+    const { subject, message, distributionMethod, emailId, emailReplyTo, emailSettings } =
+      data.meta;
 
-      if (data.meta.distributionMethod === DocumentDistributionMethod.EMAIL) {
+    try {
+      await sendDocument({
+        documentId: document.id,
+        meta: {
+          subject,
+          message,
+          distributionMethod,
+          emailId,
+          emailReplyTo: emailReplyTo || null,
+          emailSettings: emailSettings,
+        },
+      });
+
+      if (distributionMethod === DocumentDistributionMethod.EMAIL) {
         toast({
           title: _(msg`Document sent`),
           description: _(msg`Your document has been sent successfully.`),
@@ -379,21 +322,6 @@ export const DocumentEditForm = ({
     }
   };
 
-  const onAddSubjectFormAutoSave = async (data: TAddSubjectFormSchema) => {
-    try {
-      // Save form data without sending the document
-      await saveSubjectData(data);
-    } catch (err) {
-      console.error(err);
-
-      toast({
-        title: _(msg`Error`),
-        description: _(msg`An error occurred while auto-saving the subject form.`),
-        variant: 'destructive',
-      });
-    }
-  };
-
   const currentDocumentFlow = documentFlow[step];
 
   /**
@@ -439,28 +367,25 @@ export const DocumentEditForm = ({
               fields={fields}
               isDocumentPdfLoaded={isDocumentPdfLoaded}
               onSubmit={onAddSettingsFormSubmit}
-              onAutoSave={onAddSettingsFormAutoSave}
             />
 
             <AddSignersFormPartial
-              key={document.id}
+              key={recipients.length}
               documentFlow={documentFlow.signers}
               recipients={recipients}
               signingOrder={document.documentMeta?.signingOrder}
               allowDictateNextSigner={document.documentMeta?.allowDictateNextSigner}
               fields={fields}
               onSubmit={onAddSignersFormSubmit}
-              onAutoSave={onAddSignersFormAutoSave}
               isDocumentPdfLoaded={isDocumentPdfLoaded}
             />
 
             <AddFieldsFormPartial
-              key={document.id}
+              key={fields.length}
               documentFlow={documentFlow.fields}
               recipients={recipients}
               fields={fields}
               onSubmit={onAddFieldsFormSubmit}
-              onAutoSave={onAddFieldsFormAutoSave}
               isDocumentPdfLoaded={isDocumentPdfLoaded}
               teamId={team.id}
             />
@@ -472,7 +397,6 @@ export const DocumentEditForm = ({
               recipients={recipients}
               fields={fields}
               onSubmit={onAddSubjectFormSubmit}
-              onAutoSave={onAddSubjectFormAutoSave}
               isDocumentPdfLoaded={isDocumentPdfLoaded}
             />
           </Stepper>

apps/remix/app/components/general/document/document-page-view-button.tsx

@@ -42,7 +42,7 @@ export const DocumentPageViewButton = ({ document }: DocumentPageViewButtonProps
 
   const onDownloadClick = async () => {
     try {
-      const documentWithData = await trpcClient.document.get.query(
+      const documentWithData = await trpcClient.document.getDocumentById.query(
         {
           documentId: document.id,
         },

apps/remix/app/components/general/document/document-page-view-dropdown.tsx

@@ -71,7 +71,7 @@ export const DocumentPageViewDropdown = ({ document }: DocumentPageViewDropdownP
 
   const onDownloadClick = async () => {
     try {
-      const documentWithData = await trpcClient.document.get.query(
+      const documentWithData = await trpcClient.document.getDocumentById.query(
         {
           documentId: document.id,
         },
@@ -100,7 +100,7 @@ export const DocumentPageViewDropdown = ({ document }: DocumentPageViewDropdownP
 
   const onDownloadOriginalClick = async () => {
     try {
-      const documentWithData = await trpcClient.document.get.query(
+      const documentWithData = await trpcClient.document.getDocumentById.query(
         {
           documentId: document.id,
         },

apps/remix/app/components/general/document/document-page-view-recent-activity.tsx

@@ -32,7 +32,7 @@ export const DocumentPageViewRecentActivity = ({
     hasNextPage,
     fetchNextPage,
     isFetchingNextPage,
-  } = trpc.document.auditLog.find.useInfiniteQuery(
+  } = trpc.document.findDocumentAuditLogs.useInfiniteQuery(
     {
       documentId,
       filterForRecentActivity: true,

apps/remix/app/components/general/document/document-upload.tsx

@@ -52,7 +52,7 @@ export const DocumentUploadDropzone = ({ className }: DocumentUploadDropzoneProp
 
   const [isLoading, setIsLoading] = useState(false);
 
-  const { mutateAsync: createDocument } = trpc.document.create.useMutation();
+  const { mutateAsync: createDocument } = trpc.document.createDocument.useMutation();
 
   const disabledMessage = useMemo(() => {
     if (organisation.subscription && remaining.documents === 0) {

apps/remix/app/components/general/legacy-field-warning-popover.tsx

@@ -28,7 +28,7 @@ export const LegacyFieldWarningPopover = ({
   const { mutateAsync: updateTemplate, isPending: isUpdatingTemplate } =
     trpc.template.updateTemplate.useMutation();
   const { mutateAsync: updateDocument, isPending: isUpdatingDocument } =
-    trpc.document.update.useMutation();
+    trpc.document.updateDocument.useMutation();
 
   const onUpdateFieldsClick = async () => {
     if (type === 'document') {

apps/remix/app/components/general/period-selector.tsx

@@ -1,70 +0,0 @@
-import { useMemo } from 'react';
-
-import { Trans } from '@lingui/react/macro';
-import { useLocation, useNavigate, useSearchParams } from 'react-router';
-
-import type { PeriodSelectorValue } from '@documenso/lib/server-only/document/find-documents';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@documenso/ui/primitives/select';
-
-const isPeriodSelectorValue = (value: unknown): value is PeriodSelectorValue => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  return ['', '7d', '14d', '30d'].includes(value as string);
-};
-
-export const PeriodSelector = () => {
-  const { pathname } = useLocation();
-  const [searchParams] = useSearchParams();
-
-  const navigate = useNavigate();
-
-  const period = useMemo(() => {
-    const p = searchParams?.get('period') ?? 'all';
-
-    return isPeriodSelectorValue(p) ? p : 'all';
-  }, [searchParams]);
-
-  const onPeriodChange = (newPeriod: string) => {
-    if (!pathname) {
-      return;
-    }
-
-    const params = new URLSearchParams(searchParams?.toString());
-
-    params.set('period', newPeriod);
-
-    if (newPeriod === '' || newPeriod === 'all') {
-      params.delete('period');
-    }
-
-    void navigate(`${pathname}?${params.toString()}`, { preventScrollReset: true });
-  };
-
-  return (
-    <Select defaultValue={period} onValueChange={onPeriodChange}>
-      <SelectTrigger className="text-muted-foreground max-w-[200px]">
-        <SelectValue />
-      </SelectTrigger>
-
-      <SelectContent position="popper">
-        <SelectItem value="all">
-          <Trans>All Time</Trans>
-        </SelectItem>
-        <SelectItem value="7d">
-          <Trans>Last 7 days</Trans>
-        </SelectItem>
-        <SelectItem value="14d">
-          <Trans>Last 14 days</Trans>
-        </SelectItem>
-        <SelectItem value="30d">
-          <Trans>Last 30 days</Trans>
-        </SelectItem>
-      </SelectContent>
-    </Select>
-  );
-};

apps/remix/app/components/general/template/template-edit-form.tsx

@@ -124,36 +124,32 @@ export const TemplateEditForm = ({
     },
   });
 
-  const saveSettingsData = async (data: TAddTemplateSettingsFormSchema) => {
+  const onAddSettingsFormSubmit = async (data: TAddTemplateSettingsFormSchema) => {
     const { signatureTypes } = data.meta;
 
     const parsedGlobalAccessAuth = z
       .array(ZDocumentAccessAuthTypesSchema)
       .safeParse(data.globalAccessAuth);
 
-    return updateTemplateSettings({
-      templateId: template.id,
-      data: {
-        title: data.title,
-        externalId: data.externalId || null,
-        visibility: data.visibility,
-        globalAccessAuth: parsedGlobalAccessAuth.success ? parsedGlobalAccessAuth.data : [],
-        globalActionAuth: data.globalActionAuth ?? [],
-      },
-      meta: {
-        ...data.meta,
-        emailReplyTo: data.meta.emailReplyTo || null,
-        typedSignatureEnabled: signatureTypes.includes(DocumentSignatureType.TYPE),
-        uploadSignatureEnabled: signatureTypes.includes(DocumentSignatureType.UPLOAD),
-        drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
-        language: isValidLanguageCode(data.meta.language) ? data.meta.language : undefined,
-      },
-    });
-  };
-
-  const onAddSettingsFormSubmit = async (data: TAddTemplateSettingsFormSchema) => {
     try {
-      await saveSettingsData(data);
+      await updateTemplateSettings({
+        templateId: template.id,
+        data: {
+          title: data.title,
+          externalId: data.externalId || null,
+          visibility: data.visibility,
+          globalAccessAuth: parsedGlobalAccessAuth.success ? parsedGlobalAccessAuth.data : [],
+          globalActionAuth: data.globalActionAuth ?? [],
+        },
+        meta: {
+          ...data.meta,
+          emailReplyTo: data.meta.emailReplyTo || null,
+          typedSignatureEnabled: signatureTypes.includes(DocumentSignatureType.TYPE),
+          uploadSignatureEnabled: signatureTypes.includes(DocumentSignatureType.UPLOAD),
+          drawSignatureEnabled: signatureTypes.includes(DocumentSignatureType.DRAW),
+          language: isValidLanguageCode(data.meta.language) ? data.meta.language : undefined,
+        },
+      });
 
       setStep('signers');
     } catch (err) {
@@ -167,42 +163,24 @@ export const TemplateEditForm = ({
     }
   };
 
-  const onAddSettingsFormAutoSave = async (data: TAddTemplateSettingsFormSchema) => {
-    try {
-      await saveSettingsData(data);
-    } catch (err) {
-      console.error(err);
-
-      toast({
-        title: _(msg`Error`),
-        description: _(msg`An error occurred while auto-saving the template settings.`),
-        variant: 'destructive',
-      });
-    }
-  };
-
-  const saveTemplatePlaceholderData = async (data: TAddTemplatePlacholderRecipientsFormSchema) => {
-    return Promise.all([
-      updateTemplateSettings({
-        templateId: template.id,
-        meta: {
-          signingOrder: data.signingOrder,
-          allowDictateNextSigner: data.allowDictateNextSigner,
-        },
-      }),
-
-      setRecipients({
-        templateId: template.id,
-        recipients: data.signers,
-      }),
-    ]);
-  };
-
   const onAddTemplatePlaceholderFormSubmit = async (
     data: TAddTemplatePlacholderRecipientsFormSchema,
   ) => {
     try {
-      await saveTemplatePlaceholderData(data);
+      await Promise.all([
+        updateTemplateSettings({
+          templateId: template.id,
+          meta: {
+            signingOrder: data.signingOrder,
+            allowDictateNextSigner: data.allowDictateNextSigner,
+          },
+        }),
+
+        setRecipients({
+          templateId: template.id,
+          recipients: data.signers,
+        }),
+      ]);
 
       setStep('fields');
     } catch (err) {
@@ -214,46 +192,12 @@ export const TemplateEditForm = ({
     }
   };
 
-  const onAddTemplatePlaceholderFormAutoSave = async (
-    data: TAddTemplatePlacholderRecipientsFormSchema,
-  ) => {
-    try {
-      await saveTemplatePlaceholderData(data);
-    } catch (err) {
-      console.error(err);
-
-      toast({
-        title: _(msg`Error`),
-        description: _(msg`An error occurred while auto-saving the template placeholders.`),
-        variant: 'destructive',
-      });
-    }
-  };
-
-  const saveFieldsData = async (data: TAddTemplateFieldsFormSchema) => {
-    return addTemplateFields({
-      templateId: template.id,
-      fields: data.fields,
-    });
-  };
-
-  const onAddFieldsFormAutoSave = async (data: TAddTemplateFieldsFormSchema) => {
-    try {
-      await saveFieldsData(data);
-    } catch (err) {
-      console.error(err);
-
-      toast({
-        title: _(msg`Error`),
-        description: _(msg`An error occurred while auto-saving the template fields.`),
-        variant: 'destructive',
-      });
-    }
-  };
-
   const onAddFieldsFormSubmit = async (data: TAddTemplateFieldsFormSchema) => {
     try {
-      await saveFieldsData(data);
+      await addTemplateFields({
+        templateId: template.id,
+        fields: data.fields,
+      });
 
       // Clear all field data from localStorage
       for (let i = 0; i < localStorage.length; i++) {
@@ -326,12 +270,11 @@ export const TemplateEditForm = ({
               recipients={recipients}
               fields={fields}
               onSubmit={onAddSettingsFormSubmit}
-              onAutoSave={onAddSettingsFormAutoSave}
               isDocumentPdfLoaded={isDocumentPdfLoaded}
             />
 
             <AddTemplatePlaceholderRecipientsFormPartial
-              key={template.id}
+              key={recipients.length}
               documentFlow={documentFlow.signers}
               recipients={recipients}
               fields={fields}
@@ -339,17 +282,15 @@ export const TemplateEditForm = ({
               allowDictateNextSigner={template.templateMeta?.allowDictateNextSigner}
               templateDirectLink={template.directLink}
               onSubmit={onAddTemplatePlaceholderFormSubmit}
-              onAutoSave={onAddTemplatePlaceholderFormAutoSave}
               isDocumentPdfLoaded={isDocumentPdfLoaded}
             />
 
             <AddTemplateFieldsFormPartial
-              key={template.id}
+              key={fields.length}
               documentFlow={documentFlow.fields}
               recipients={recipients}
               fields={fields}
               onSubmit={onAddFieldsFormSubmit}
-              onAutoSave={onAddFieldsFormAutoSave}
               teamId={team?.id}
             />
           </Stepper>

apps/remix/app/components/general/template/template-page-view-documents-table.tsx

@@ -1,80 +1,136 @@
-import { useMemo } from 'react';
+import { useMemo, useTransition } from 'react';
 
+import { i18n } from '@lingui/core';
 import type { MessageDescriptor } from '@lingui/core';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
-import { DocumentSource, DocumentStatus as DocumentStatusEnum } from '@prisma/client';
-import { InfoIcon } from 'lucide-react';
+import { DocumentSource } from '@prisma/client';
+import { InfoIcon, Loader } from 'lucide-react';
 import { DateTime } from 'luxon';
 import { useSearchParams } from 'react-router';
-import { z } from 'zod';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import { ZUrlSearchParamsSchema } from '@documenso/lib/types/search-params';
+import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
 import { trpc } from '@documenso/trpc/react';
+import type { TFindDocumentsInternalResponse } from '@documenso/trpc/server/document-router/schema';
 import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
-import { DataTable } from '@documenso/ui/primitives/data-table';
 import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
-import { SelectItem } from '@documenso/ui/primitives/select';
+import { DataTable } from '@documenso/ui/primitives/data-table/data-table';
+import {
+  type TimePeriod,
+  isDateInPeriod,
+  timePeriods,
+} from '@documenso/ui/primitives/data-table/utils/time-filters';
 import { Skeleton } from '@documenso/ui/primitives/skeleton';
 import { TableCell } from '@documenso/ui/primitives/table';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
 
-import { SearchParamSelector } from '~/components/forms/search-param-selector';
-import { DocumentSearch } from '~/components/general/document/document-search';
-import { DocumentStatus } from '~/components/general/document/document-status';
+import { DocumentStatus as DocumentStatusComponent } from '~/components/general/document/document-status';
 import { StackAvatarsWithTooltip } from '~/components/general/stack-avatars-with-tooltip';
 import { DocumentsTableActionButton } from '~/components/tables/documents-table-action-button';
 import { DocumentsTableActionDropdown } from '~/components/tables/documents-table-action-dropdown';
 import { DataTableTitle } from '~/components/tables/documents-table-title';
+import { TemplateDocumentsTableEmptyState } from '~/components/tables/template-documents-table-empty-state';
 import { useCurrentTeam } from '~/providers/team';
 
-import { PeriodSelector } from '../period-selector';
-
 const DOCUMENT_SOURCE_LABELS: { [key in DocumentSource]: MessageDescriptor } = {
   DOCUMENT: msg`Document`,
   TEMPLATE: msg`Template`,
   TEMPLATE_DIRECT_LINK: msg`Direct link`,
 };
 
-const ZDocumentSearchParamsSchema = ZUrlSearchParamsSchema.extend({
-  source: z
-    .nativeEnum(DocumentSource)
-    .optional()
-    .catch(() => undefined),
-  status: z
-    .nativeEnum(DocumentStatusEnum)
-    .optional()
-    .catch(() => undefined),
-});
-
 type TemplatePageViewDocumentsTableProps = {
   templateId: number;
 };
 
+type DocumentsTableRow = TFindDocumentsInternalResponse['data'][number];
+
 export const TemplatePageViewDocumentsTable = ({
   templateId,
 }: TemplatePageViewDocumentsTableProps) => {
-  const { _, i18n } = useLingui();
-
+  const { _ } = useLingui();
   const [searchParams] = useSearchParams();
+  const [isPending, startTransition] = useTransition();
   const updateSearchParams = useUpdateSearchParams();
 
   const team = useCurrentTeam();
 
-  const parsedSearchParams = ZDocumentSearchParamsSchema.parse(
-    Object.fromEntries(searchParams ?? []),
-  );
+  const createFilterHandler = (paramName: string, isSingleValue = false) => {
+    return (values: string[]) => {
+      startTransition(() => {
+        if (values.length === 0) {
+          updateSearchParams({ [paramName]: undefined, page: undefined });
+        } else {
+          const value = isSingleValue ? values[0] : values.join(',');
+          updateSearchParams({ [paramName]: value, page: undefined });
+        }
+      });
+    };
+  };
 
-  const { data, isLoading, isLoadingError } = trpc.document.find.useQuery(
+  const getFilterValues = (paramName: string, isSingleValue = false): string[] => {
+    const value = searchParams.get(paramName);
+    if (!value) return [];
+    return isSingleValue ? [value] : value.split(',').filter(Boolean);
+  };
+
+  const handleStatusFilterChange = createFilterHandler('status');
+  const handleTimePeriodFilterChange = createFilterHandler('period', true);
+  const handleSourceFilterChange = createFilterHandler('source');
+
+  const selectedStatusValues = getFilterValues('status');
+  const selectedTimePeriodValues = getFilterValues('period', true);
+  const selectedSourceValues = getFilterValues('source');
+
+  const isStatusFiltered = selectedStatusValues.length > 0;
+  const isTimePeriodFiltered = selectedTimePeriodValues.length > 0;
+  const isSourceFiltered = selectedSourceValues.length > 0;
+
+  const handleResetFilters = () => {
+    startTransition(() => {
+      updateSearchParams({
+        status: undefined,
+        source: undefined,
+        period: undefined,
+        page: undefined,
+      });
+    });
+  };
+
+  const sourceParam = searchParams.get('source');
+  const statusParam = searchParams.get('status');
+  const periodParam = searchParams.get('period');
+
+  // Parse status parameter to handle multiple values
+  const parsedStatus = statusParam
+    ? statusParam
+        .split(',')
+        .map((s) => s.trim())
+        .filter(Boolean)
+        .filter((status) =>
+          Object.values(ExtendedDocumentStatus).includes(status as ExtendedDocumentStatus),
+        )
+        .map((status) => status as ExtendedDocumentStatus)
+    : undefined;
+
+  const parsedPeriod =
+    periodParam && timePeriods.includes(periodParam as TimePeriod)
+      ? (periodParam as TimePeriod)
+      : undefined;
+
+  const { data, isLoading, isLoadingError } = trpc.document.findDocumentsInternal.useQuery(
     {
       templateId,
-      page: parsedSearchParams.page,
-      perPage: parsedSearchParams.perPage,
-      query: parsedSearchParams.query,
-      source: parsedSearchParams.source,
-      status: parsedSearchParams.status,
+      page: Number(searchParams.get('page')) || 1,
+      perPage: Number(searchParams.get('perPage')) || 10,
+      query: searchParams.get('query') || undefined,
+      source:
+        sourceParam && Object.values(DocumentSource).includes(sourceParam as DocumentSource)
+          ? (sourceParam as DocumentSource)
+          : undefined,
+      status: parsedStatus,
+      period: parsedPeriod,
     },
     {
       placeholderData: (previousData) => previousData,
@@ -82,9 +138,11 @@ export const TemplatePageViewDocumentsTable = ({
   );
 
   const onPaginationChange = (page: number, perPage: number) => {
-    updateSearchParams({
-      page,
-      perPage,
+    startTransition(() => {
+      updateSearchParams({
+        page,
+        perPage,
+      });
     });
   };
 
@@ -95,6 +153,13 @@ export const TemplatePageViewDocumentsTable = ({
     totalPages: 1,
   };
 
+  const getEmptyStateStatus = (): ExtendedDocumentStatus => {
+    if (selectedStatusValues.length > 0) {
+      return selectedStatusValues[0] as ExtendedDocumentStatus;
+    }
+    return ExtendedDocumentStatus.ALL;
+  };
+
   const columns = useMemo(() => {
     return [
       {
@@ -102,12 +167,21 @@ export const TemplatePageViewDocumentsTable = ({
         accessorKey: 'createdAt',
         cell: ({ row }) =>
           i18n.date(row.original.createdAt, { ...DateTime.DATETIME_SHORT, hourCycle: 'h12' }),
+        filterFn: (row, id, value) => {
+          const createdAt = row.getValue(id) as Date;
+          if (!value || !Array.isArray(value) || value.length === 0) {
+            return true;
+          }
+
+          const period = value[0] as TimePeriod;
+          return isDateInPeriod(createdAt, period);
+        },
       },
       {
         header: _(msg`Title`),
+        accessorKey: 'title',
         cell: ({ row }) => <DataTableTitle row={row.original} teamUrl={team?.url} />,
       },
-
       {
         header: _(msg`Recipient`),
         accessorKey: 'recipient',
@@ -121,8 +195,14 @@ export const TemplatePageViewDocumentsTable = ({
       {
         header: _(msg`Status`),
         accessorKey: 'status',
-        cell: ({ row }) => <DocumentStatus status={row.getValue('status')} />,
+        cell: ({ row }) => <DocumentStatusComponent status={row.original.status} />,
         size: 140,
+        filterFn: (row, id, value) => {
+          if (!value || !Array.isArray(value) || value.length === 0) {
+            return true;
+          }
+          return value.includes(row.getValue(id));
+        },
       },
       {
         header: () => (
@@ -161,79 +241,51 @@ export const TemplatePageViewDocumentsTable = ({
             </Tooltip>
           </div>
         ),
-        accessorKey: 'type',
+        accessorKey: 'source',
         cell: ({ row }) => (
           <div className="flex flex-row items-center">
-            {_(DOCUMENT_SOURCE_LABELS[row.original.source])}
+            {_(DOCUMENT_SOURCE_LABELS[row.original.source as DocumentSource])}
           </div>
         ),
+        filterFn: (row, id, value) => {
+          if (!value || !Array.isArray(value) || value.length === 0) {
+            return true;
+          }
+          return value.includes(row.getValue(id));
+        },
       },
       {
-        id: 'actions',
         header: _(msg`Actions`),
         cell: ({ row }) => (
-          <div className="flex items-center space-x-2">
+          <div className="flex items-center gap-x-4">
             <DocumentsTableActionButton row={row.original} />
-
             <DocumentsTableActionDropdown row={row.original} />
           </div>
         ),
       },
-    ] satisfies DataTableColumnDef<(typeof results)['data'][number]>[];
-  }, []);
+    ] satisfies DataTableColumnDef<DocumentsTableRow>[];
+  }, [_, team?.url]);
 
   return (
-    <div>
-      <div className="mb-4 flex flex-row space-x-4">
-        <DocumentSearch />
-
-        <SearchParamSelector
-          paramKey="status"
-          isValueValid={(value) =>
-            [...DocumentStatusEnum.COMPLETED].includes(value as unknown as string)
-          }
-        >
-          <SelectItem value="all">
-            <Trans>Any Status</Trans>
-          </SelectItem>
-          <SelectItem value={DocumentStatusEnum.COMPLETED}>
-            <Trans>Completed</Trans>
-          </SelectItem>
-          <SelectItem value={DocumentStatusEnum.PENDING}>
-            <Trans>Pending</Trans>
-          </SelectItem>
-          <SelectItem value={DocumentStatusEnum.DRAFT}>
-            <Trans>Draft</Trans>
-          </SelectItem>
-        </SearchParamSelector>
-
-        <SearchParamSelector
-          paramKey="source"
-          isValueValid={(value) =>
-            [...DocumentSource.TEMPLATE].includes(value as unknown as string)
-          }
-        >
-          <SelectItem value="all">
-            <Trans>Any Source</Trans>
-          </SelectItem>
-          <SelectItem value={DocumentSource.TEMPLATE}>
-            <Trans>Template</Trans>
-          </SelectItem>
-          <SelectItem value={DocumentSource.TEMPLATE_DIRECT_LINK}>
-            <Trans>Direct Link</Trans>
-          </SelectItem>
-        </SearchParamSelector>
-
-        <PeriodSelector />
-      </div>
-
+    <div className="relative">
       <DataTable
-        columns={columns}
         data={results.data}
+        columns={columns}
         perPage={results.perPage}
         currentPage={results.currentPage}
         totalPages={results.totalPages}
         onPaginationChange={onPaginationChange}
+        stats={data?.stats}
+        onStatusFilterChange={handleStatusFilterChange}
+        selectedStatusValues={selectedStatusValues}
+        onTimePeriodFilterChange={handleTimePeriodFilterChange}
+        selectedTimePeriodValues={selectedTimePeriodValues}
+        onSourceFilterChange={handleSourceFilterChange}
+        selectedSourceValues={selectedSourceValues}
+        onResetFilters={handleResetFilters}
+        isStatusFiltered={isStatusFiltered}
+        isTimePeriodFiltered={isTimePeriodFiltered}
+        isSourceFiltered={isSourceFiltered}
         error={{
           enable: isLoadingError,
         }}
@@ -265,9 +317,19 @@ export const TemplatePageViewDocumentsTable = ({
             </>
           ),
         }}
+        emptyState={{
+          enable: !isLoading && !isLoadingError,
+          component: <TemplateDocumentsTableEmptyState status={getEmptyStateStatus()} />,
+        }}
       >
         {(table) => <DataTablePagination additionalInformation="VisibleCount" table={table} />}
       </DataTable>
+
+      {isPending && (
+        <div className="bg-background/50 absolute inset-0 flex items-center justify-center">
+          <Loader className="text-muted-foreground h-8 w-8 animate-spin" />
+        </div>
+      )}
     </div>
   );
 };

apps/remix/app/components/general/template/template-page-view-recent-activity.tsx

@@ -18,7 +18,7 @@ export const TemplatePageViewRecentActivity = ({
   templateId,
   documentRootPath,
 }: TemplatePageViewRecentActivityProps) => {
-  const { data, isLoading, isLoadingError, refetch } = trpc.document.find.useQuery({
+  const { data, isLoading, isLoadingError, refetch } = trpc.document.findDocuments.useQuery({
     templateId,
     orderByColumn: 'createdAt',
     orderByDirection: 'asc',

apps/remix/app/components/tables/admin-document-recipient-item-table.tsx

@@ -52,7 +52,7 @@ export const AdminDocumentRecipientItemTable = ({ recipient }: RecipientItemProp
     },
   });
 
-  const { mutateAsync: updateRecipient } = trpc.admin.recipient.update.useMutation();
+  const { mutateAsync: updateRecipient } = trpc.admin.updateRecipient.useMutation();
 
   const columns = useMemo(() => {
     return [

apps/remix/app/components/tables/document-logs-table.tsx

@@ -34,7 +34,7 @@ export const DocumentLogsTable = ({ documentId }: DocumentLogsTableProps) => {
 
   const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
 
-  const { data, isLoading, isLoadingError } = trpc.document.auditLog.find.useQuery(
+  const { data, isLoading, isLoadingError } = trpc.document.findDocumentAuditLogs.useQuery(
     {
       documentId,
       page: parsedSearchParams.page,

apps/remix/app/components/tables/documents-table-action-button.tsx

@@ -45,7 +45,7 @@ export const DocumentsTableActionButton = ({ row }: DocumentsTableActionButtonPr
   const onDownloadClick = async () => {
     try {
       const document = !recipient
-        ? await trpcClient.document.get.query(
+        ? await trpcClient.document.getDocumentById.query(
             {
               documentId: row.id,
             },

apps/remix/app/components/tables/documents-table-action-dropdown.tsx

@@ -77,7 +77,7 @@ export const DocumentsTableActionDropdown = ({
   const onDownloadClick = async () => {
     try {
       const document = !recipient
-        ? await trpcClient.document.get.query({
+        ? await trpcClient.document.getDocumentById.query({
             documentId: row.id,
           })
         : await trpcClient.document.getDocumentByToken.query({
@@ -103,7 +103,7 @@ export const DocumentsTableActionDropdown = ({
   const onDownloadOriginalClick = async () => {
     try {
       const document = !recipient
-        ? await trpcClient.document.get.query({
+        ? await trpcClient.document.getDocumentById.query({
             documentId: row.id,
           })
         : await trpcClient.document.getDocumentByToken.query({

apps/remix/app/components/tables/documents-table-empty-state.tsx

@@ -1,6 +1,6 @@
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
-import { Bird, CheckCircle2 } from 'lucide-react';
+import { Bird, CheckCircle2, XCircle } from 'lucide-react';
 import { match } from 'ts-pattern';
 
 import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
@@ -25,6 +25,21 @@ export const DocumentsTableEmptyState = ({ status }: DocumentsTableEmptyStatePro
       message: msg`There are no active drafts at the current moment. You can upload a document to start drafting.`,
       icon: CheckCircle2,
     }))
+    .with(ExtendedDocumentStatus.PENDING, () => ({
+      title: msg`No pending documents`,
+      message: msg`There are no pending documents at the moment. Documents awaiting signatures will appear here.`,
+      icon: CheckCircle2,
+    }))
+    .with(ExtendedDocumentStatus.REJECTED, () => ({
+      title: msg`No rejected documents`,
+      message: msg`There are no rejected documents. Documents that have been declined will appear here.`,
+      icon: XCircle,
+    }))
+    .with(ExtendedDocumentStatus.INBOX, () => ({
+      title: msg`Your inbox is empty`,
+      message: msg`There are no documents waiting for your action. Documents requiring your signature will appear here.`,
+      icon: CheckCircle2,
+    }))
     .with(ExtendedDocumentStatus.ALL, () => ({
       title: msg`We're all empty`,
       message: msg`You have not yet created or received any documents. To create a document please upload one.`,
@@ -38,7 +53,7 @@ export const DocumentsTableEmptyState = ({ status }: DocumentsTableEmptyStatePro
 
   return (
     <div
-      className="text-muted-foreground/60 flex h-60 flex-col items-center justify-center gap-y-4"
+      className="text-muted-foreground/60 mt-12 flex h-60 flex-col items-center justify-center gap-y-4"
       data-testid="empty-document-state"
     >
       <Icon className="h-12 w-12" strokeWidth={1.5} />

apps/remix/app/components/tables/documents-table.tsx

@@ -1,51 +1,100 @@
 import { useMemo, useTransition } from 'react';
 
+import { i18n } from '@lingui/core';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Loader } from 'lucide-react';
 import { DateTime } from 'luxon';
-import { Link } from 'react-router';
+import { Link, useSearchParams } from 'react-router';
 import { match } from 'ts-pattern';
 
 import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
 import { useSession } from '@documenso/lib/client-only/providers/session';
 import { isDocumentCompleted } from '@documenso/lib/utils/document';
 import { formatDocumentsPath } from '@documenso/lib/utils/teams';
-import type { TFindDocumentsResponse } from '@documenso/trpc/server/document-router/find-documents.types';
+import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
+import type { TFindDocumentsInternalResponse } from '@documenso/trpc/server/document-router/schema';
 import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
-import { DataTable } from '@documenso/ui/primitives/data-table';
 import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
+import { DataTable } from '@documenso/ui/primitives/data-table/data-table';
+import {
+  type TimePeriod,
+  isDateInPeriod,
+} from '@documenso/ui/primitives/data-table/utils/time-filters';
 import { Skeleton } from '@documenso/ui/primitives/skeleton';
 import { TableCell } from '@documenso/ui/primitives/table';
 
 import { DocumentStatus } from '~/components/general/document/document-status';
+import { StackAvatarsWithTooltip } from '~/components/general/stack-avatars-with-tooltip';
 import { useCurrentTeam } from '~/providers/team';
 
-import { StackAvatarsWithTooltip } from '../general/stack-avatars-with-tooltip';
 import { DocumentsTableActionButton } from './documents-table-action-button';
 import { DocumentsTableActionDropdown } from './documents-table-action-dropdown';
+import { DocumentsTableEmptyState } from './documents-table-empty-state';
 
-export type DocumentsTableProps = {
-  data?: TFindDocumentsResponse;
+export type DataTableProps = {
+  data?: TFindDocumentsInternalResponse;
   isLoading?: boolean;
   isLoadingError?: boolean;
   onMoveDocument?: (documentId: number) => void;
 };
 
-type DocumentsTableRow = TFindDocumentsResponse['data'][number];
+type DocumentsTableRow = TFindDocumentsInternalResponse['data'][number];
 
-export const DocumentsTable = ({
+export function DocumentsDataTable({
   data,
   isLoading,
   isLoadingError,
   onMoveDocument,
-}: DocumentsTableProps) => {
-  const { _, i18n } = useLingui();
-
+}: DataTableProps) {
+  const { _ } = useLingui();
   const team = useCurrentTeam();
-  const [isPending, startTransition] = useTransition();
 
+  const [isPending, startTransition] = useTransition();
   const updateSearchParams = useUpdateSearchParams();
+  const [searchParams] = useSearchParams();
+
+  const handleStatusFilterChange = (values: string[]) => {
+    startTransition(() => {
+      if (values.length === 0) {
+        updateSearchParams({ status: undefined, page: undefined });
+      } else {
+        updateSearchParams({ status: values.join(','), page: undefined });
+      }
+    });
+  };
+
+  const currentStatus = searchParams.get('status');
+  const selectedStatusValues = currentStatus ? currentStatus.split(',').filter(Boolean) : [];
+
+  const handleResetFilters = () => {
+    startTransition(() => {
+      updateSearchParams({ status: undefined, period: undefined, page: undefined });
+    });
+  };
+
+  const isStatusFiltered = selectedStatusValues.length > 0;
+
+  const handleTimePeriodFilterChange = (values: string[]) => {
+    startTransition(() => {
+      if (values.length === 0) {
+        updateSearchParams({ period: undefined, page: undefined });
+      } else {
+        updateSearchParams({ period: values[0], page: undefined });
+      }
+    });
+  };
+
+  const currentPeriod = searchParams.get('period');
+  const selectedTimePeriodValues = currentPeriod ? [currentPeriod] : [];
+  const isTimePeriodFiltered = selectedTimePeriodValues.length > 0;
+
+  const handleSourceFilterChange = (values: string[]) => {
+    // Documents table doesn't have source filtering
+  };
+
+  const selectedSourceValues: string[] = [];
+  const isSourceFiltered = false;
 
   const columns = useMemo(() => {
     return [
@@ -54,9 +103,19 @@ export const DocumentsTable = ({
         accessorKey: 'createdAt',
         cell: ({ row }) =>
           i18n.date(row.original.createdAt, { ...DateTime.DATETIME_SHORT, hourCycle: 'h12' }),
+        filterFn: (row, id, value) => {
+          const createdAt = row.getValue(id) as Date;
+          if (!value || !Array.isArray(value) || value.length === 0) {
+            return true;
+          }
+
+          const period = value[0] as TimePeriod;
+          return isDateInPeriod(createdAt, period);
+        },
       },
       {
         header: _(msg`Title`),
+        accessorKey: 'title',
         cell: ({ row }) => <DataTableTitle row={row.original} teamUrl={team?.url} />,
       },
       {
@@ -79,6 +138,12 @@ export const DocumentsTable = ({
         accessorKey: 'status',
         cell: ({ row }) => <DocumentStatus status={row.original.status} />,
         size: 140,
+        filterFn: (row, id, value) => {
+          if (!value || !Array.isArray(value) || value.length === 0) {
+            return true;
+          }
+          return value.includes(row.getValue(id));
+        },
       },
       {
         header: _(msg`Actions`),
@@ -112,18 +177,34 @@ export const DocumentsTable = ({
     totalPages: 1,
   };
 
+  const getEmptyStateStatus = (): ExtendedDocumentStatus => {
+    if (selectedStatusValues.length > 0) {
+      return selectedStatusValues[0] as ExtendedDocumentStatus;
+    }
+    return ExtendedDocumentStatus.ALL;
+  };
+
   return (
     <div className="relative">
       <DataTable
-        columns={columns}
         data={results.data}
+        columns={columns}
         perPage={results.perPage}
         currentPage={results.currentPage}
         totalPages={results.totalPages}
         onPaginationChange={onPaginationChange}
-        columnVisibility={{
-          sender: team !== undefined,
-        }}
+        stats={data?.stats}
+        onStatusFilterChange={handleStatusFilterChange}
+        selectedStatusValues={selectedStatusValues}
+        onTimePeriodFilterChange={handleTimePeriodFilterChange}
+        selectedTimePeriodValues={selectedTimePeriodValues}
+        onSourceFilterChange={handleSourceFilterChange}
+        selectedSourceValues={selectedSourceValues}
+        onResetFilters={handleResetFilters}
+        isStatusFiltered={isStatusFiltered}
+        isTimePeriodFiltered={isTimePeriodFiltered}
+        isSourceFiltered={isSourceFiltered}
+        showSourceFilter={false}
         error={{
           enable: isLoadingError || false,
         }}
@@ -152,6 +233,10 @@ export const DocumentsTable = ({
             </>
           ),
         }}
+        emptyState={{
+          enable: !isLoading && !isLoadingError,
+          component: <DocumentsTableEmptyState status={getEmptyStateStatus()} />,
+        }}
       >
         {(table) => <DataTablePagination additionalInformation="VisibleCount" table={table} />}
       </DataTable>
@@ -163,14 +248,14 @@ export const DocumentsTable = ({
       )}
     </div>
   );
-};
+}
 
 type DataTableTitleProps = {
   row: DocumentsTableRow;
   teamUrl: string;
 };
 
-const DataTableTitle = ({ row, teamUrl }: DataTableTitleProps) => {
+export const DataTableTitle = ({ row, teamUrl }: DataTableTitleProps) => {
   const { user } = useSession();
 
   const recipient = row.recipients.find((recipient) => recipient.email === user.email);

apps/remix/app/components/tables/inbox-table.tsx

@@ -17,6 +17,7 @@ import { isDocumentCompleted } from '@documenso/lib/utils/document';
 import { trpc as trpcClient } from '@documenso/trpc/client';
 import { trpc } from '@documenso/trpc/react';
 import type { TFindInboxResponse } from '@documenso/trpc/server/document-router/find-inbox.types';
+import type { TFindDocumentsResponse } from '@documenso/trpc/server/document-router/schema';
 import { Button } from '@documenso/ui/primitives/button';
 import type { DataTableColumnDef } from '@documenso/ui/primitives/data-table';
 import { DataTable } from '@documenso/ui/primitives/data-table';
@@ -31,12 +32,12 @@ import { useOptionalCurrentTeam } from '~/providers/team';
 import { StackAvatarsWithTooltip } from '../general/stack-avatars-with-tooltip';
 
 export type DocumentsTableProps = {
-  data?: TFindInboxResponse;
+  data?: TFindDocumentsResponse;
   isLoading?: boolean;
   isLoadingError?: boolean;
 };
 
-type DocumentsTableRow = TFindInboxResponse['data'][number];
+type DocumentsTableRow = TFindDocumentsResponse['data'][number];
 
 export const InboxTable = () => {
   const { _, i18n } = useLingui();

apps/remix/app/components/tables/settings-security-passkey-table-actions.tsx

@@ -62,7 +62,7 @@ export const SettingsSecurityPasskeyTableActions = ({
   });
 
   const { mutateAsync: updatePasskey, isPending: isUpdatingPasskey } =
-    trpc.auth.passkey.update.useMutation({
+    trpc.auth.updatePasskey.useMutation({
       onSuccess: () => {
         toast({
           title: _(msg`Success`),
@@ -84,7 +84,7 @@ export const SettingsSecurityPasskeyTableActions = ({
     });
 
   const { mutateAsync: deletePasskey, isPending: isDeletingPasskey } =
-    trpc.auth.passkey.delete.useMutation({
+    trpc.auth.deletePasskey.useMutation({
       onSuccess: () => {
         toast({
           title: _(msg`Success`),

apps/remix/app/components/tables/settings-security-passkey-table.tsx

@@ -26,7 +26,7 @@ export const SettingsSecurityPasskeyTable = () => {
 
   const parsedSearchParams = ZUrlSearchParamsSchema.parse(Object.fromEntries(searchParams ?? []));
 
-  const { data, isLoading, isLoadingError } = trpc.auth.passkey.find.useQuery(
+  const { data, isLoading, isLoadingError } = trpc.auth.findPasskeys.useQuery(
     {
       page: parsedSearchParams.page,
       perPage: parsedSearchParams.perPage,

apps/remix/app/components/tables/template-documents-table-empty-state.tsx

@@ -0,0 +1,70 @@
+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
+import { Bird, CheckCircle2 } from 'lucide-react';
+import { match } from 'ts-pattern';
+
+import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
+
+export type TemplateDocumentsTableEmptyStateProps = { status: ExtendedDocumentStatus };
+
+export const TemplateDocumentsTableEmptyState = ({
+  status,
+}: TemplateDocumentsTableEmptyStateProps) => {
+  const { _ } = useLingui();
+
+  const {
+    title,
+    message,
+    icon: Icon,
+  } = match(status)
+    .with(ExtendedDocumentStatus.COMPLETED, () => ({
+      title: msg`No completed documents`,
+      message: msg`No documents created from this template have been completed yet. Completed documents will appear here once all recipients have signed.`,
+      icon: CheckCircle2,
+    }))
+    .with(ExtendedDocumentStatus.DRAFT, () => ({
+      title: msg`No draft documents`,
+      message: msg`There are no draft documents created from this template. Use this template to create a new document.`,
+      icon: CheckCircle2,
+    }))
+    .with(ExtendedDocumentStatus.PENDING, () => ({
+      title: msg`No pending documents`,
+      message: msg`There are no pending documents created from this template. Documents awaiting signatures will appear here.`,
+      icon: CheckCircle2,
+    }))
+    .with(ExtendedDocumentStatus.REJECTED, () => ({
+      title: msg`No rejected documents`,
+      message: msg`No documents created from this template have been rejected. Documents that have been declined will appear here.`,
+      icon: CheckCircle2,
+    }))
+    .with(ExtendedDocumentStatus.INBOX, () => ({
+      title: msg`No documents in inbox`,
+      message: msg`There are no documents from this template waiting for your action. Documents requiring your signature will appear here.`,
+      icon: CheckCircle2,
+    }))
+    .with(ExtendedDocumentStatus.ALL, () => ({
+      title: msg`No documents yet`,
+      message: msg`No documents have been created from this template yet. Use this template to create your first document.`,
+      icon: Bird,
+    }))
+    .otherwise(() => ({
+      title: msg`No documents found`,
+      message: msg`No documents created from this template match the current filters. Try adjusting your search criteria.`,
+      icon: CheckCircle2,
+    }));
+
+  return (
+    <div
+      className="text-muted-foreground/60 mt-12 flex h-60 flex-col items-center justify-center gap-y-4"
+      data-testid="empty-template-document-state"
+    >
+      <Icon className="h-12 w-12" strokeWidth={1.5} />
+
+      <div className="text-center">
+        <h3 className="text-lg font-semibold">{_(title)}</h3>
+
+        <p className="mt-2 max-w-[60ch]">{_(message)}</p>
+      </div>
+    </div>
+  );
+};

apps/remix/app/routes/_authenticated+/admin+/documents.$id.tsx

@@ -48,7 +48,7 @@ export default function AdminDocumentDetailsPage({ loaderData }: Route.Component
   const { toast } = useToast();
 
   const { mutate: resealDocument, isPending: isResealDocumentLoading } =
-    trpc.admin.document.reseal.useMutation({
+    trpc.admin.resealDocument.useMutation({
       onSuccess: () => {
         toast({
           title: _(msg`Success`),

apps/remix/app/routes/_authenticated+/admin+/documents._index.tsx

@@ -33,7 +33,7 @@ export default function AdminDocumentsPage() {
   const perPage = searchParams?.get?.('perPage') ? Number(searchParams.get('perPage')) : undefined;
 
   const { data: findDocumentsData, isPending: isFindDocumentsLoading } =
-    trpc.admin.document.find.useQuery(
+    trpc.admin.findDocuments.useQuery(
       {
         query: debouncedTerm,
         page: page || 1,

apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx

@@ -2,14 +2,14 @@ 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 { User } from '@prisma/client';
 import { useForm } from 'react-hook-form';
 import { useRevalidator } from 'react-router';
 import { Link } from 'react-router';
 import type { z } from 'zod';
 
 import { trpc } from '@documenso/trpc/react';
-import type { TGetUserResponse } from '@documenso/trpc/server/admin-router/get-user.types';
-import { ZUpdateUserRequestSchema } from '@documenso/trpc/server/admin-router/update-user.types';
+import { ZAdminUpdateProfileMutationSchema } from '@documenso/trpc/server/admin-router/schema';
 import { Button } from '@documenso/ui/primitives/button';
 import {
   Form,
@@ -33,12 +33,12 @@ import { AdminOrganisationsTable } from '~/components/tables/admin-organisations
 
 import { MultiSelectRoleCombobox } from '../../../components/general/multiselect-role-combobox';
 
-const ZUserFormSchema = ZUpdateUserRequestSchema.omit({ id: true });
+const ZUserFormSchema = ZAdminUpdateProfileMutationSchema.omit({ id: true });
 
 type TUserFormSchema = z.infer<typeof ZUserFormSchema>;
 
 export default function UserPage({ params }: { params: { id: number } }) {
-  const { data: user, isLoading: isLoadingUser } = trpc.admin.user.get.useQuery(
+  const { data: user, isLoading: isLoadingUser } = trpc.profile.getUser.useQuery(
     {
       id: Number(params.id),
     },
@@ -78,14 +78,14 @@ export default function UserPage({ params }: { params: { id: number } }) {
   return <AdminUserPage user={user} />;
 }
 
-const AdminUserPage = ({ user }: { user: TGetUserResponse }) => {
+const AdminUserPage = ({ user }: { user: User }) => {
   const { _ } = useLingui();
   const { toast } = useToast();
   const { revalidate } = useRevalidator();
 
   const roles = user.roles ?? [];
 
-  const { mutateAsync: updateUserMutation } = trpc.admin.user.update.useMutation();
+  const { mutateAsync: updateUserMutation } = trpc.admin.updateUser.useMutation();
 
   const form = useForm<TUserFormSchema>({
     resolver: zodResolver(ZUserFormSchema),

apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id._index.tsx

@@ -67,7 +67,6 @@ export async function loader({ params, request }: Route.LoaderArgs) {
   const documentVisibility = document?.visibility;
   const currentTeamMemberRole = team.currentTeamRole;
   const isRecipient = document?.recipients.find((recipient) => recipient.email === user.email);
-
   let canAccessDocument = true;
 
   if (!isRecipient && document?.userId !== user.id) {

apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents.$id.logs.tsx

@@ -50,6 +50,10 @@ export async function loader({ params, request }: Route.LoaderArgs) {
     throw redirect(documentRootPath);
   }
 
+  if (document.folderId) {
+    throw redirect(documentRootPath);
+  }
+
   const recipients = await getRecipientsForDocument({
     documentId,
     userId: user.id,
@@ -64,13 +68,13 @@ export async function loader({ params, request }: Route.LoaderArgs) {
 
   return {
     document,
-    recipients,
     documentRootPath,
+    recipients,
   };
 }
 
 export default function DocumentsLogsPage({ loaderData }: Route.ComponentProps) {
-  const { document, recipients, documentRootPath } = loaderData;
+  const { document, documentRootPath, recipients } = loaderData;
 
   const { _, i18n } = useLingui();
 

apps/remix/app/routes/_authenticated+/t.$teamUrl+/documents._index.tsx

@@ -1,31 +1,21 @@
-import { useEffect, useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
 
 import { Trans } from '@lingui/react/macro';
-import { FolderType, OrganisationType } from '@prisma/client';
+import { FolderType } from '@prisma/client';
 import { useParams, useSearchParams } from 'react-router';
-import { Link } from 'react-router';
 import { z } from 'zod';
 
-import { useCurrentOrganisation } from '@documenso/lib/client-only/providers/organisation';
 import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
 import { parseToIntegerArray } from '@documenso/lib/utils/params';
-import { formatDocumentsPath } from '@documenso/lib/utils/teams';
-import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
+import type { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
 import { trpc } from '@documenso/trpc/react';
-import type { TFindDocumentsInternalResponse } from '@documenso/trpc/server/document-router/find-documents-internal.types';
-import { ZFindDocumentsInternalRequestSchema } from '@documenso/trpc/server/document-router/find-documents-internal.types';
+import { ZFindDocumentsInternalRequestSchema } from '@documenso/trpc/server/document-router/schema';
 import { Avatar, AvatarFallback, AvatarImage } from '@documenso/ui/primitives/avatar';
-import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
 
 import { DocumentMoveToFolderDialog } from '~/components/dialogs/document-move-to-folder-dialog';
 import { DocumentDropZoneWrapper } from '~/components/general/document/document-drop-zone-wrapper';
-import { DocumentSearch } from '~/components/general/document/document-search';
-import { DocumentStatus } from '~/components/general/document/document-status';
 import { FolderGrid } from '~/components/general/folder/folder-grid';
-import { PeriodSelector } from '~/components/general/period-selector';
-import { DocumentsTable } from '~/components/tables/documents-table';
-import { DocumentsTableEmptyState } from '~/components/tables/documents-table-empty-state';
-import { DocumentsTableSenderFilter } from '~/components/tables/documents-table-sender-filter';
+import { DocumentsDataTable } from '~/components/tables/documents-table';
 import { useCurrentTeam } from '~/providers/team';
 import { appMetaTags } from '~/utils/meta';
 
@@ -34,17 +24,26 @@ export function meta() {
 }
 
 const ZSearchParamsSchema = ZFindDocumentsInternalRequestSchema.pick({
-  status: true,
   period: true,
   page: true,
   perPage: true,
   query: true,
 }).extend({
   senderIds: z.string().transform(parseToIntegerArray).optional().catch([]),
+  status: z
+    .string()
+    .transform(
+      (val) =>
+        val
+          .split(',')
+          .map((s) => s.trim())
+          .filter(Boolean) as ExtendedDocumentStatus[],
+    )
+    .optional()
+    .catch(undefined),
 });
 
 export default function DocumentsPage() {
-  const organisation = useCurrentOrganisation();
   const team = useCurrentTeam();
 
   const { folderId } = useParams();
@@ -53,15 +52,6 @@ export default function DocumentsPage() {
   const [isMovingDocument, setIsMovingDocument] = useState(false);
   const [documentToMove, setDocumentToMove] = useState<number | null>(null);
 
-  const [stats, setStats] = useState<TFindDocumentsInternalResponse['stats']>({
-    [ExtendedDocumentStatus.DRAFT]: 0,
-    [ExtendedDocumentStatus.PENDING]: 0,
-    [ExtendedDocumentStatus.COMPLETED]: 0,
-    [ExtendedDocumentStatus.REJECTED]: 0,
-    [ExtendedDocumentStatus.INBOX]: 0,
-    [ExtendedDocumentStatus.ALL]: 0,
-  });
-
   const findDocumentSearchParams = useMemo(
     () => ZSearchParamsSchema.safeParse(Object.fromEntries(searchParams.entries())).data || {},
     [searchParams],
@@ -72,42 +62,6 @@ export default function DocumentsPage() {
     folderId,
   });
 
-  const getTabHref = (value: keyof typeof ExtendedDocumentStatus) => {
-    const params = new URLSearchParams(searchParams);
-
-    params.set('status', value);
-
-    if (value === ExtendedDocumentStatus.ALL) {
-      params.delete('status');
-    }
-
-    if (value === ExtendedDocumentStatus.INBOX && organisation.type === OrganisationType.PERSONAL) {
-      params.delete('status');
-    }
-
-    if (params.has('page')) {
-      params.delete('page');
-    }
-
-    let path = formatDocumentsPath(team.url);
-
-    if (folderId) {
-      path += `/f/${folderId}`;
-    }
-
-    if (params.toString()) {
-      path += `?${params.toString()}`;
-    }
-
-    return path;
-  };
-
-  useEffect(() => {
-    if (data?.stats) {
-      setStats(data.stats);
-    }
-  }, [data?.stats]);
-
   return (
     <DocumentDropZoneWrapper>
       <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">
@@ -126,72 +80,18 @@ export default function DocumentsPage() {
               <Trans>Documents</Trans>
             </h2>
           </div>
-
-          <div className="-m-1 flex flex-wrap gap-x-4 gap-y-6 overflow-hidden p-1">
-            <Tabs value={findDocumentSearchParams.status || 'ALL'} className="overflow-x-auto">
-              <TabsList>
-                {[
-                  ExtendedDocumentStatus.INBOX,
-                  ExtendedDocumentStatus.PENDING,
-                  ExtendedDocumentStatus.COMPLETED,
-                  ExtendedDocumentStatus.DRAFT,
-                  ExtendedDocumentStatus.ALL,
-                ]
-                  .filter((value) => {
-                    if (organisation.type === OrganisationType.PERSONAL) {
-                      return value !== ExtendedDocumentStatus.INBOX;
-                    }
-
-                    return true;
-                  })
-                  .map((value) => (
-                    <TabsTrigger
-                      key={value}
-                      className="hover:text-foreground min-w-[60px]"
-                      value={value}
-                      asChild
-                    >
-                      <Link to={getTabHref(value)} preventScrollReset>
-                        <DocumentStatus status={value} />
-
-                        {value !== ExtendedDocumentStatus.ALL && (
-                          <span className="ml-1 inline-block opacity-50">{stats[value]}</span>
-                        )}
-                      </Link>
-                    </TabsTrigger>
-                  ))}
-              </TabsList>
-            </Tabs>
-
-            {team && <DocumentsTableSenderFilter teamId={team.id} />}
-
-            <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">
-              <PeriodSelector />
-            </div>
-            <div className="flex w-48 flex-wrap items-center justify-between gap-x-2 gap-y-4">
-              <DocumentSearch initialValue={findDocumentSearchParams.query} />
-            </div>
-          </div>
         </div>
 
         <div className="mt-8">
-          <div>
-            {data && data.count === 0 ? (
-              <DocumentsTableEmptyState
-                status={findDocumentSearchParams.status || ExtendedDocumentStatus.ALL}
-              />
-            ) : (
-              <DocumentsTable
-                data={data}
-                isLoading={isLoading}
-                isLoadingError={isLoadingError}
-                onMoveDocument={(documentId) => {
-                  setDocumentToMove(documentId);
-                  setIsMovingDocument(true);
-                }}
-              />
-            )}
-          </div>
+          <DocumentsDataTable
+            data={data}
+            isLoading={isLoading}
+            isLoadingError={isLoadingError}
+            onMoveDocument={(documentId) => {
+              setDocumentToMove(documentId);
+              setIsMovingDocument(true);
+            }}
+          />
         </div>
 
         {documentToMove && (

apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.tokens.tsx

@@ -21,7 +21,7 @@ export function meta() {
 export default function ApiTokensPage() {
   const { i18n } = useLingui();
 
-  const { data: tokens } = trpc.apiToken.getMany.useQuery();
+  const { data: tokens } = trpc.apiToken.getTokens.useQuery();
 
   const team = useOptionalCurrentTeam();
 

apps/remix/app/routes/_authenticated+/t.$teamUrl+/templates._index.tsx

@@ -1,8 +1,8 @@
 import { Trans } from '@lingui/react/macro';
+import { FolderType } from '@prisma/client';
 import { Bird } from 'lucide-react';
 import { useParams, useSearchParams } from 'react-router';
 
-import { FolderType } from '@documenso/lib/types/folder-type';
 import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
 import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';
 import { trpc } from '@documenso/trpc/react';
@@ -19,10 +19,10 @@ export function meta() {
 }
 
 export default function TemplatesPage() {
-  const team = useCurrentTeam();
-
-  const { folderId } = useParams();
   const [searchParams] = useSearchParams();
+  const { folderId } = useParams();
+
+  const team = useCurrentTeam();
 
   const page = Number(searchParams.get('page')) || 1;
   const perPage = Number(searchParams.get('perPage')) || 10;

apps/remix/app/routes/_internal+/[__htmltopdf]+/audit-log.tsx

@@ -1,5 +1,6 @@
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
 import { DateTime } from 'luxon';
 import { redirect } from 'react-router';
 
@@ -90,19 +91,25 @@ export default function AuditLog({ loaderData }: Route.ComponentProps) {
       <Card>
         <CardContent className="grid grid-cols-2 gap-4 p-6 text-sm print:text-xs">
           <p>
-            <span className="font-medium">{_(msg`Document ID`)}</span>
+            <span className="font-medium">
+              <Trans>Document ID</Trans>
+            </span>
 
             <span className="mt-1 block break-words">{document.id}</span>
           </p>
 
           <p>
-            <span className="font-medium">{_(msg`Enclosed Document`)}</span>
+            <span className="font-medium">
+              <Trans>Enclosed Document</Trans>
+            </span>
 
             <span className="mt-1 block break-words">{document.title}</span>
           </p>
 
           <p>
-            <span className="font-medium">{_(msg`Status`)}</span>
+            <span className="font-medium">
+              <Trans>Status</Trans>
+            </span>
 
             <span className="mt-1 block">
               {_(
@@ -112,7 +119,9 @@ export default function AuditLog({ loaderData }: Route.ComponentProps) {
           </p>
 
           <p>
-            <span className="font-medium">{_(msg`Owner`)}</span>
+            <span className="font-medium">
+              <Trans>Owner</Trans>
+            </span>
 
             <span className="mt-1 block break-words">
               {document.user.name} ({document.user.email})
@@ -120,7 +129,9 @@ export default function AuditLog({ loaderData }: Route.ComponentProps) {
           </p>
 
           <p>
-            <span className="font-medium">{_(msg`Created At`)}</span>
+            <span className="font-medium">
+              <Trans>Created At</Trans>
+            </span>
 
             <span className="mt-1 block">
               {DateTime.fromJSDate(document.createdAt)
@@ -130,7 +141,9 @@ export default function AuditLog({ loaderData }: Route.ComponentProps) {
           </p>
 
           <p>
-            <span className="font-medium">{_(msg`Last Updated`)}</span>
+            <span className="font-medium">
+              <Trans>Last Updated</Trans>
+            </span>
 
             <span className="mt-1 block">
               {DateTime.fromJSDate(document.updatedAt)
@@ -140,7 +153,9 @@ export default function AuditLog({ loaderData }: Route.ComponentProps) {
           </p>
 
           <p>
-            <span className="font-medium">{_(msg`Time Zone`)}</span>
+            <span className="font-medium">
+              <Trans>Time Zone</Trans>
+            </span>
 
             <span className="mt-1 block break-words">
               {document.documentMeta?.timezone ?? 'N/A'}
@@ -148,7 +163,9 @@ export default function AuditLog({ loaderData }: Route.ComponentProps) {
           </p>
 
           <div>
-            <p className="font-medium">{_(msg`Recipients`)}</p>
+            <p className="font-medium">
+              <Trans>Recipients</Trans>
+            </p>
 
             <ul className="mt-1 list-inside list-disc">
               {document.recipients.map((recipient) => (

apps/remix/app/routes/_internal+/[__htmltopdf]+/certificate.tsx

@@ -1,5 +1,6 @@
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
+import { Trans } from '@lingui/react/macro';
 import { FieldType, SigningStatus } from '@prisma/client';
 import { DateTime } from 'luxon';
 import { redirect } from 'react-router';
@@ -199,7 +200,9 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)
   return (
     <div className="print-provider pointer-events-none mx-auto max-w-screen-md">
       <div className="flex items-center">
-        <h1 className="my-8 text-2xl font-bold">{_(msg`Signing Certificate`)}</h1>
+        <h1 className="my-8 text-2xl font-bold">
+          <Trans>Signing Certificate</Trans>
+        </h1>
       </div>
 
       <Card>
@@ -207,9 +210,15 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)
           <Table overflowHidden>
             <TableHeader>
               <TableRow>
-                <TableHead>{_(msg`Signer Events`)}</TableHead>
-                <TableHead>{_(msg`Signature`)}</TableHead>
-                <TableHead>{_(msg`Details`)}</TableHead>
+                <TableHead>
+                  <Trans>Signer Events</Trans>
+                </TableHead>
+                <TableHead>
+                  <Trans>Signature</Trans>
+                </TableHead>
+                <TableHead>
+                  <Trans>Details</Trans>
+                </TableHead>
                 {/* <TableHead>Security</TableHead> */}
               </TableRow>
             </TableHeader>
@@ -229,7 +238,9 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)
                       </p>
 
                       <p className="text-muted-foreground mt-2 text-sm print:text-xs">
-                        <span className="font-medium">{_(msg`Authentication Level`)}:</span>{' '}
+                        <span className="font-medium">
+                          <Trans>Authentication Level</Trans>:
+                        </span>{' '}
                         <span className="block">{getAuthenticationLevel(recipient.id)}</span>
                       </p>
                     </TableCell>
@@ -259,7 +270,9 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)
                           </div>
 
                           <p className="text-muted-foreground mt-2 text-sm print:text-xs">
-                            <span className="font-medium">{_(msg`Signature ID`)}:</span>{' '}
+                            <span className="font-medium">
+                              <Trans>Signature ID</Trans>:
+                            </span>{' '}
                             <span className="block font-mono uppercase">
                               {signature.secondaryId}
                             </span>
@@ -270,14 +283,18 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)
                       )}
 
                       <p className="text-muted-foreground mt-2 text-sm print:text-xs">
-                        <span className="font-medium">{_(msg`IP Address`)}:</span>{' '}
+                        <span className="font-medium">
+                          <Trans>IP Address</Trans>:
+                        </span>{' '}
                         <span className="inline-block">
                           {logs.DOCUMENT_RECIPIENT_COMPLETED[0]?.ipAddress ?? _(msg`Unknown`)}
                         </span>
                       </p>
 
                       <p className="text-muted-foreground mt-1 text-sm print:text-xs">
-                        <span className="font-medium">{_(msg`Device`)}:</span>{' '}
+                        <span className="font-medium">
+                          <Trans>Device</Trans>:
+                        </span>{' '}
                         <span className="inline-block">
                           {getDevice(logs.DOCUMENT_RECIPIENT_COMPLETED[0]?.userAgent)}
                         </span>
@@ -287,7 +304,9 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)
                     <TableCell truncate={false} className="w-[min-content] align-top">
                       <div className="space-y-1">
                         <p className="text-muted-foreground text-sm print:text-xs">
-                          <span className="font-medium">{_(msg`Sent`)}:</span>{' '}
+                          <span className="font-medium">
+                            <Trans>Sent</Trans>:
+                          </span>{' '}
                           <span className="inline-block">
                             {logs.EMAIL_SENT[0]
                               ? DateTime.fromJSDate(logs.EMAIL_SENT[0].createdAt)
@@ -298,7 +317,9 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)
                         </p>
 
                         <p className="text-muted-foreground text-sm print:text-xs">
-                          <span className="font-medium">{_(msg`Viewed`)}:</span>{' '}
+                          <span className="font-medium">
+                            <Trans>Viewed</Trans>:
+                          </span>{' '}
                           <span className="inline-block">
                             {logs.DOCUMENT_OPENED[0]
                               ? DateTime.fromJSDate(logs.DOCUMENT_OPENED[0].createdAt)
@@ -310,7 +331,9 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)
 
                         {logs.DOCUMENT_RECIPIENT_REJECTED[0] ? (
                           <p className="text-muted-foreground text-sm print:text-xs">
-                            <span className="font-medium">{_(msg`Rejected`)}:</span>{' '}
+                            <span className="font-medium">
+                              <Trans>Rejected</Trans>:
+                            </span>{' '}
                             <span className="inline-block">
                               {logs.DOCUMENT_RECIPIENT_REJECTED[0]
                                 ? DateTime.fromJSDate(logs.DOCUMENT_RECIPIENT_REJECTED[0].createdAt)
@@ -321,7 +344,9 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)
                           </p>
                         ) : (
                           <p className="text-muted-foreground text-sm print:text-xs">
-                            <span className="font-medium">{_(msg`Signed`)}:</span>{' '}
+                            <span className="font-medium">
+                              <Trans>Signed</Trans>:
+                            </span>{' '}
                             <span className="inline-block">
                               {logs.DOCUMENT_RECIPIENT_COMPLETED[0]
                                 ? DateTime.fromJSDate(
@@ -335,7 +360,9 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)
                         )}
 
                         <p className="text-muted-foreground text-sm print:text-xs">
-                          <span className="font-medium">{_(msg`Reason`)}:</span>{' '}
+                          <span className="font-medium">
+                            <Trans>Reason</Trans>:
+                          </span>{' '}
                           <span className="inline-block">
                             {recipient.signingStatus === SigningStatus.REJECTED
                               ? recipient.rejectionReason
@@ -371,7 +398,7 @@ export default function SigningCertificate({ loaderData }: Route.ComponentProps)
 
           <div className="flex items-end justify-end gap-x-4">
             <p className="flex-shrink-0 text-sm font-medium print:text-xs">
-              {_(msg`Signing certificate provided by`)}:
+              <Trans>Signing certificate provided by</Trans>:
             </p>
             <BrandingLogo className="max-h-6 print:max-h-4" />
           </div>

apps/remix/app/routes/_unauthenticated+/organisation.invite.$token.tsx

@@ -45,9 +45,6 @@ export async function loader({ params, request }: Route.LoaderArgs) {
         mode: 'insensitive',
       },
     },
-    select: {
-      id: true,
-    },
   });
 
   // Directly convert the team member invite to a team member if they already have an account.

apps/remix/app/routes/embed+/v1+/authoring+/document.create.tsx

@@ -1,5 +1,6 @@
 import { useLayoutEffect, useState } from 'react';
 
+import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { useNavigate } from 'react-router';
 
@@ -51,8 +52,8 @@ export default function EmbeddingAuthoringDocumentCreatePage() {
       if (!configuration || !configuration.documentData) {
         toast({
           variant: 'destructive',
-          title: _('Error'),
-          description: _('Please configure the document first'),
+          title: _(msg`Error`),
+          description: _(msg`Please configure the document first`),
         });
 
         return;
@@ -103,8 +104,8 @@ export default function EmbeddingAuthoringDocumentCreatePage() {
       });
 
       toast({
-        title: _('Success'),
-        description: _('Document created successfully'),
+        title: _(msg`Success`),
+        description: _(msg`Document created successfully`),
       });
 
       // Send a message to the parent window with the document details
@@ -130,8 +131,8 @@ export default function EmbeddingAuthoringDocumentCreatePage() {
 
       toast({
         variant: 'destructive',
-        title: _('Error'),
-        description: _('Failed to create document'),
+        title: _(msg`Error`),
+        description: _(msg`Failed to create document`),
       });
     }
   };

apps/remix/app/routes/embed+/v1+/authoring+/template.create.tsx

@@ -1,5 +1,6 @@
 import { useLayoutEffect, useState } from 'react';
 
+import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { useNavigate } from 'react-router';
 
@@ -49,8 +50,8 @@ export default function EmbeddingAuthoringTemplateCreatePage() {
       if (!configuration || !configuration.documentData) {
         toast({
           variant: 'destructive',
-          title: _('Error'),
-          description: _('Please configure the template first'),
+          title: _(msg`Error`),
+          description: _(msg`Please configure the template first`),
         });
 
         return;
@@ -93,8 +94,8 @@ export default function EmbeddingAuthoringTemplateCreatePage() {
       });
 
       toast({
-        title: _('Success'),
-        description: _('Template created successfully'),
+        title: _(msg`Success`),
+        description: _(msg`Template created successfully`),
       });
 
       // Send a message to the parent window with the template details
@@ -120,8 +121,8 @@ export default function EmbeddingAuthoringTemplateCreatePage() {
 
       toast({
         variant: 'destructive',
-        title: _('Error'),
-        description: _('Failed to create template'),
+        title: _(msg`Error`),
+        description: _(msg`Failed to create template`),
       });
     }
   };

apps/remix/package.json

@@ -101,5 +101,5 @@
     "vite-plugin-babel-macros": "^1.0.6",
     "vite-tsconfig-paths": "^5.1.4"
   },
-  "version": "1.12.2-rc.6"
+  "version": "1.12.2-rc.4"
 }

docker/testing/compose.yml

@@ -51,4 +51,4 @@ services:
     ports:
       - 3000:3000
     volumes:
-      - ../../apps/remix/example/cert.p12:/opt/documenso/cert.p12
+      - ../../apps/web/example/cert.p12:/opt/documenso/cert.p12

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@documenso/root",
-  "version": "1.12.2-rc.6",
+  "version": "1.12.2-rc.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@documenso/root",
-      "version": "1.12.2-rc.6",
+      "version": "1.12.2-rc.4",
       "workspaces": [
         "apps/*",
         "packages/*"
@@ -89,7 +89,7 @@
     },
     "apps/remix": {
       "name": "@documenso/remix",
-      "version": "1.12.2-rc.6",
+      "version": "1.12.2-rc.4",
       "dependencies": {
         "@documenso/api": "*",
         "@documenso/assets": "*",

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "1.12.2-rc.6",
+  "version": "1.12.2-rc.4",
   "scripts": {
     "build": "turbo run build",
     "dev": "turbo run dev --filter=@documenso/remix",

packages/api/v1/implementation.ts

@@ -34,7 +34,6 @@ import { createTemplate } from '@documenso/lib/server-only/template/create-templ
 import { deleteTemplate } from '@documenso/lib/server-only/template/delete-template';
 import { findTemplates } from '@documenso/lib/server-only/template/find-templates';
 import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
-import { ZRecipientAuthOptionsSchema } from '@documenso/lib/types/document-auth';
 import { extractDerivedDocumentEmailSettings } from '@documenso/lib/types/document-email';
 import {
   ZCheckboxFieldMeta,
@@ -981,12 +980,10 @@ export const ApiContractV1Implementation = tsr.router(ApiContractV1, {
         userId: user.id,
         teamId: team?.id,
         recipients: [
-          ...recipients.map((recipient) => ({
-            email: recipient.email,
-            name: recipient.name,
-            role: recipient.role,
-            signingOrder: recipient.signingOrder,
-            actionAuth: ZRecipientAuthOptionsSchema.parse(recipient.authOptions)?.actionAuth ?? [],
+          ...recipients.map(({ email, name }) => ({
+            email,
+            name,
+            role,
           })),
           {
             email,

packages/api/v1/schema.ts

@@ -33,7 +33,7 @@ export const ZNoBodyMutationSchema = null;
  */
 export const ZGetDocumentsQuerySchema = z.object({
   page: z.coerce.number().min(1).optional().default(1),
-  perPage: z.coerce.number().min(1).optional().default(10),
+  perPage: z.coerce.number().min(1).optional().default(1),
 });
 
 export type TGetDocumentsQuerySchema = z.infer<typeof ZGetDocumentsQuerySchema>;
@@ -637,5 +637,5 @@ export const ZSuccessfulGetTemplatesResponseSchema = z.object({
 
 export const ZGetTemplatesQuerySchema = z.object({
   page: z.coerce.number().min(1).optional().default(1),
-  perPage: z.coerce.number().min(1).optional().default(10),
+  perPage: z.coerce.number().min(1).optional().default(1),
 });

packages/app-tests/e2e/document-flow/autosave-fields-step.spec.ts

@@ -1,293 +0,0 @@
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
-
-import { getFieldsForDocument } from '@documenso/lib/server-only/field/get-fields-for-document';
-import { seedBlankDocument } from '@documenso/prisma/seed/documents';
-import { seedUser } from '@documenso/prisma/seed/users';
-
-import { apiSignin } from '../fixtures/authentication';
-
-const setupDocumentAndNavigateToFieldsStep = async (page: Page) => {
-  const { user, team } = await seedUser();
-  const document = await seedBlankDocument(user, team.id);
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: `/documents/${document.id}/edit`,
-  });
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  await page.getByPlaceholder('Email').fill('recipient1@documenso.com');
-  await page.getByPlaceholder('Name').fill('Recipient 1');
-
-  await page.getByRole('button', { name: 'Add signer' }).click();
-
-  await page.getByPlaceholder('Email').nth(1).fill('recipient2@documenso.com');
-  await page.getByPlaceholder('Name').nth(1).fill('Recipient 2');
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  return { user, team, document };
-};
-
-const triggerAutosave = async (page: Page) => {
-  await page.locator('#document-flow-form-container').click();
-  await page.locator('#document-flow-form-container').blur();
-
-  await page.waitForTimeout(5000);
-};
-
-test.describe('AutoSave Fields Step', () => {
-  test('should autosave the fields without advanced settings', async ({ page }) => {
-    const { user, document, team } = await setupDocumentAndNavigateToFieldsStep(page);
-
-    await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
-
-    await page.getByRole('button', { name: 'Signature' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 100,
-      },
-    });
-
-    await page.getByRole('button', { name: 'Text' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 200,
-      },
-    });
-
-    await page.getByTestId('field-advanced-settings-footer').waitFor({ state: 'visible' });
-
-    await page
-      .getByTestId('field-advanced-settings-footer')
-      .getByRole('button', { name: 'Cancel' })
-      .click();
-
-    await triggerAutosave(page);
-
-    await page.getByRole('combobox').click();
-    await page.getByRole('option', { name: 'Recipient 2 (recipient2@documenso.com)' }).click();
-
-    await page.getByRole('button', { name: 'Signature' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 500,
-      },
-    });
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedFields = await getFieldsForDocument({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedFields.length).toBe(3);
-      expect(retrievedFields[0].type).toBe('SIGNATURE');
-      expect(retrievedFields[1].type).toBe('TEXT');
-      expect(retrievedFields[2].type).toBe('SIGNATURE');
-    }).toPass();
-  });
-
-  test('should autosave the field deletion', async ({ page }) => {
-    const { user, document, team } = await setupDocumentAndNavigateToFieldsStep(page);
-
-    await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
-
-    await page.getByRole('button', { name: 'Signature' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 100,
-      },
-    });
-
-    await page.getByRole('button', { name: 'Text' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 200,
-      },
-    });
-
-    await page.getByTestId('field-advanced-settings-footer').waitFor({ state: 'visible' });
-
-    await page
-      .getByTestId('field-advanced-settings-footer')
-      .getByRole('button', { name: 'Cancel' })
-      .click();
-
-    await triggerAutosave(page);
-
-    await page.getByRole('combobox').click();
-    await page.getByRole('option', { name: 'Recipient 2 (recipient2@documenso.com)' }).click();
-
-    await page.getByRole('button', { name: 'Signature' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 500,
-      },
-    });
-
-    await triggerAutosave(page);
-
-    await page.getByRole('combobox').click();
-    await page.getByRole('option', { name: 'Recipient 1 (recipient1@documenso.com)' }).click();
-
-    await page.getByText('Text').nth(1).click();
-    await page.getByRole('button', { name: 'Remove' }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedFields = await getFieldsForDocument({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedFields.length).toBe(2);
-      expect(retrievedFields[0].type).toBe('SIGNATURE');
-      expect(retrievedFields[1].type).toBe('SIGNATURE');
-    }).toPass();
-  });
-
-  test('should autosave the field duplication', async ({ page }) => {
-    const { user, document, team } = await setupDocumentAndNavigateToFieldsStep(page);
-
-    await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
-
-    await page.getByRole('button', { name: 'Signature' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 100,
-      },
-    });
-
-    await page.getByRole('button', { name: 'Text' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 200,
-      },
-    });
-
-    await page.getByTestId('field-advanced-settings-footer').waitFor({ state: 'visible' });
-
-    await page
-      .getByTestId('field-advanced-settings-footer')
-      .getByRole('button', { name: 'Cancel' })
-      .click();
-
-    await triggerAutosave(page);
-
-    await page.getByRole('combobox').click();
-    await page.getByRole('option', { name: 'Recipient 2 (recipient2@documenso.com)' }).click();
-
-    await page.getByRole('button', { name: 'Signature' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 500,
-      },
-    });
-
-    await triggerAutosave(page);
-
-    await page.getByRole('combobox').click();
-    await page.getByRole('option', { name: 'Recipient 1 (recipient1@documenso.com)' }).click();
-
-    await page.getByText('Signature').nth(1).click();
-    await page.getByRole('button', { name: 'Duplicate', exact: true }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedFields = await getFieldsForDocument({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedFields.length).toBe(4);
-      expect(retrievedFields[0].type).toBe('SIGNATURE');
-      expect(retrievedFields[1].type).toBe('TEXT');
-      expect(retrievedFields[2].type).toBe('SIGNATURE');
-      expect(retrievedFields[3].type).toBe('SIGNATURE');
-    }).toPass();
-  });
-
-  test('should autosave the fields with advanced settings', async ({ page }) => {
-    const { user, document, team } = await setupDocumentAndNavigateToFieldsStep(page);
-
-    await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
-
-    await page.getByRole('button', { name: 'Signature' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 100,
-      },
-    });
-
-    await page.getByRole('button', { name: 'Text' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 200,
-      },
-    });
-
-    await page.getByRole('textbox', { name: 'Field label' }).fill('Test Field');
-    await page.getByRole('textbox', { name: 'Field placeholder' }).fill('Test Placeholder');
-    await page.getByRole('textbox', { name: 'Add text to the field' }).fill('Test Text');
-
-    await page
-      .getByTestId('field-advanced-settings-footer')
-      .getByRole('button', { name: 'Save' })
-      .click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedFields = await getFieldsForDocument({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedFields.length).toBe(2);
-      expect(retrievedFields[0].type).toBe('SIGNATURE');
-      expect(retrievedFields[1].type).toBe('TEXT');
-
-      const textField = retrievedFields[1];
-      expect(textField.fieldMeta).toBeDefined();
-
-      if (
-        textField.fieldMeta &&
-        typeof textField.fieldMeta === 'object' &&
-        'type' in textField.fieldMeta
-      ) {
-        expect(textField.fieldMeta.type).toBe('text');
-        expect(textField.fieldMeta.label).toBe('Test Field');
-        expect(textField.fieldMeta.placeholder).toBe('Test Placeholder');
-
-        if (textField.fieldMeta.type === 'text') {
-          expect(textField.fieldMeta.text).toBe('Test Text');
-        }
-      } else {
-        throw new Error('fieldMeta should be defined and contain advanced settings');
-      }
-    }).toPass();
-  });
-});

packages/app-tests/e2e/document-flow/autosave-settings-step.spec.ts

@@ -1,243 +0,0 @@
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
-
-import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
-import { seedBlankDocument } from '@documenso/prisma/seed/documents';
-import { seedUser } from '@documenso/prisma/seed/users';
-
-import { apiSignin } from '../fixtures/authentication';
-
-test.describe.configure({ mode: 'parallel', timeout: 60000 });
-
-const setupDocument = async (page: Page) => {
-  const { user, team } = await seedUser();
-
-  const document = await seedBlankDocument(user, team.id);
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: `/documents/${document.id}/edit`,
-  });
-
-  return { user, team, document };
-};
-
-const triggerAutosave = async (page: Page) => {
-  await page.locator('#document-flow-form-container').click();
-  await page.locator('#document-flow-form-container').blur();
-
-  await page.waitForTimeout(5000);
-};
-
-test.describe('AutoSave Settings Step', () => {
-  test('should autosave the title change', async ({ page }) => {
-    const { user, document, team } = await setupDocument(page);
-
-    const newDocumentTitle = 'New Document Title';
-
-    await page.getByRole('textbox', { name: 'Title *' }).fill(newDocumentTitle);
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrieved = await getDocumentById({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      await expect(page.getByRole('textbox', { name: 'Title *' })).toHaveValue(retrieved.title);
-    }).toPass();
-  });
-
-  test('should autosave the language change', async ({ page }) => {
-    const { user, document, team } = await setupDocument(page);
-
-    const newDocumentLanguage = 'French';
-    const expectedLanguageCode = 'fr';
-
-    await page.getByRole('combobox').first().click();
-    await page.getByRole('option', { name: newDocumentLanguage }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrieved = await getDocumentById({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrieved.documentMeta?.language).toBe(expectedLanguageCode);
-    }).toPass();
-  });
-
-  test('should autosave the document access change', async ({ page }) => {
-    const { user, document, team } = await setupDocument(page);
-
-    const access = 'Require account';
-    const accessValue = 'ACCOUNT';
-
-    await page.getByRole('combobox').nth(1).click();
-    await page.getByRole('option', { name: access }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrieved = await getDocumentById({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrieved.authOptions?.globalAccessAuth).toContain(accessValue);
-    }).toPass();
-  });
-
-  test('should autosave the external ID change', async ({ page }) => {
-    const { user, document, team } = await setupDocument(page);
-
-    const newExternalId = '1234567890';
-
-    await page.getByRole('button', { name: 'Advanced Options' }).click();
-
-    await page.getByRole('textbox', { name: 'External ID' }).fill(newExternalId);
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrieved = await getDocumentById({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrieved.externalId).toBe(newExternalId);
-    }).toPass();
-  });
-
-  test('should autosave the allowed signature types change', async ({ page }) => {
-    const { user, document, team } = await setupDocument(page);
-
-    await page.getByRole('button', { name: 'Advanced Options' }).click();
-
-    await page.getByRole('combobox').nth(3).click();
-    await page.getByRole('option', { name: 'Draw' }).click();
-    await page.getByRole('option', { name: 'Type' }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrieved = await getDocumentById({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrieved.documentMeta?.drawSignatureEnabled).toBe(false);
-      expect(retrieved.documentMeta?.typedSignatureEnabled).toBe(false);
-      expect(retrieved.documentMeta?.uploadSignatureEnabled).toBe(true);
-    }).toPass();
-  });
-
-  test('should autosave the date format change', async ({ page }) => {
-    const { user, document, team } = await setupDocument(page);
-
-    await page.getByRole('button', { name: 'Advanced Options' }).click();
-
-    await page.getByRole('combobox').nth(4).click();
-    await page.getByRole('option', { name: 'ISO 8601', exact: true }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrieved = await getDocumentById({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrieved.documentMeta?.dateFormat).toBe("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
-    }).toPass();
-  });
-
-  test('should autosave the timezone change', async ({ page }) => {
-    const { user, document, team } = await setupDocument(page);
-
-    await page.getByRole('button', { name: 'Advanced Options' }).click();
-
-    await page.getByRole('combobox').nth(5).click();
-    await page.getByRole('option', { name: 'Europe/London' }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrieved = await getDocumentById({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrieved.documentMeta?.timezone).toBe('Europe/London');
-    }).toPass();
-  });
-
-  test('should autosave the redirect URL change', async ({ page }) => {
-    const { user, document, team } = await setupDocument(page);
-
-    const newRedirectUrl = 'https://documenso.com/test/';
-
-    await page.getByRole('button', { name: 'Advanced Options' }).click();
-
-    await page.getByRole('textbox', { name: 'Redirect URL' }).fill(newRedirectUrl);
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrieved = await getDocumentById({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrieved.documentMeta?.redirectUrl).toBe(newRedirectUrl);
-    }).toPass();
-  });
-
-  test('should autosave multiple field changes together', async ({ page }) => {
-    const { user, document, team } = await setupDocument(page);
-
-    const newTitle = 'Updated Document Title';
-    await page.getByRole('textbox', { name: 'Title *' }).fill(newTitle);
-
-    await page.getByRole('combobox').first().click();
-    await page.getByRole('option', { name: 'German' }).click();
-
-    await page.getByRole('combobox').nth(1).click();
-    await page.getByRole('option', { name: 'Require account' }).click();
-
-    await page.getByRole('button', { name: 'Advanced Options' }).click();
-    const newExternalId = 'MULTI-TEST-123';
-    await page.getByRole('textbox', { name: 'External ID' }).fill(newExternalId);
-
-    await page.getByRole('combobox').nth(5).click();
-    await page.getByRole('option', { name: 'Europe/Berlin' }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrieved = await getDocumentById({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrieved.title).toBe(newTitle);
-      expect(retrieved.documentMeta?.language).toBe('de');
-      expect(retrieved.authOptions?.globalAccessAuth).toContain('ACCOUNT');
-      expect(retrieved.externalId).toBe(newExternalId);
-      expect(retrieved.documentMeta?.timezone).toBe('Europe/Berlin');
-    }).toPass();
-  });
-});

packages/app-tests/e2e/document-flow/autosave-signers-step.spec.ts

@@ -1,168 +0,0 @@
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
-
-import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
-import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
-import { seedBlankDocument } from '@documenso/prisma/seed/documents';
-import { seedUser } from '@documenso/prisma/seed/users';
-
-import { apiSignin } from '../fixtures/authentication';
-
-test.describe.configure({ mode: 'parallel', timeout: 60000 });
-
-const setupDocumentAndNavigateToSignersStep = async (page: Page) => {
-  const { user, team } = await seedUser();
-  const document = await seedBlankDocument(user, team.id);
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: `/documents/${document.id}/edit`,
-  });
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  return { user, team, document };
-};
-
-const triggerAutosave = async (page: Page) => {
-  await page.locator('#document-flow-form-container').click();
-  await page.locator('#document-flow-form-container').blur();
-
-  await page.waitForTimeout(5000);
-};
-
-const addSignerAndSave = async (page: Page) => {
-  await page.getByPlaceholder('Email').fill('recipient1@documenso.com');
-  await page.getByPlaceholder('Name').fill('Recipient 1');
-
-  await triggerAutosave(page);
-};
-
-test.describe('AutoSave Signers Step', () => {
-  test('should autosave the signers addition', async ({ page }) => {
-    const { user, document, team } = await setupDocumentAndNavigateToSignersStep(page);
-
-    await addSignerAndSave(page);
-
-    await expect(async () => {
-      const retrievedRecipients = await getRecipientsForDocument({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedRecipients.length).toBe(1);
-      expect(retrievedRecipients[0].email).toBe('recipient1@documenso.com');
-      expect(retrievedRecipients[0].name).toBe('Recipient 1');
-    }).toPass();
-  });
-
-  test('should autosave the signer deletion', async ({ page }) => {
-    const { user, document, team } = await setupDocumentAndNavigateToSignersStep(page);
-
-    await addSignerAndSave(page);
-
-    await page.getByRole('button', { name: 'Add myself' }).click();
-    await triggerAutosave(page);
-
-    await page.getByTestId('remove-signer-button').first().click();
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedRecipients = await getRecipientsForDocument({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedRecipients.length).toBe(1);
-      expect(retrievedRecipients[0].email).toBe(user.email);
-      expect(retrievedRecipients[0].name).toBe(user.name);
-    }).toPass();
-  });
-
-  test('should autosave the signer update', async ({ page }) => {
-    const { user, document, team } = await setupDocumentAndNavigateToSignersStep(page);
-
-    await addSignerAndSave(page);
-
-    await page.getByPlaceholder('Name').fill('Documenso Manager');
-    await page.getByPlaceholder('Email').fill('manager@documenso.com');
-
-    await triggerAutosave(page);
-
-    await page.getByRole('combobox').click();
-    await page.getByRole('option', { name: 'Receives copy' }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedRecipients = await getRecipientsForDocument({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedRecipients.length).toBe(1);
-      expect(retrievedRecipients[0].email).toBe('manager@documenso.com');
-      expect(retrievedRecipients[0].name).toBe('Documenso Manager');
-      expect(retrievedRecipients[0].role).toBe('CC');
-    }).toPass();
-  });
-
-  test('should autosave the signing order change', async ({ page }) => {
-    const { user, document, team } = await setupDocumentAndNavigateToSignersStep(page);
-
-    await addSignerAndSave(page);
-
-    await page.getByRole('button', { name: 'Add signer' }).click();
-
-    await page.getByTestId('signer-email-input').nth(1).fill('recipient2@documenso.com');
-    await page.getByLabel('Name').nth(1).fill('Recipient 2');
-
-    await page.getByRole('button', { name: 'Add Signer' }).click();
-
-    await page.getByTestId('signer-email-input').nth(2).fill('recipient3@documenso.com');
-    await page.getByLabel('Name').nth(2).fill('Recipient 3');
-
-    await triggerAutosave(page);
-
-    await page.getByLabel('Enable signing order').check();
-    await page.getByLabel('Allow signers to dictate next signer').check();
-    await triggerAutosave(page);
-
-    await page.getByTestId('signing-order-input').nth(0).fill('3');
-    await page.getByTestId('signing-order-input').nth(0).blur();
-    await triggerAutosave(page);
-
-    await page.getByTestId('signing-order-input').nth(1).fill('1');
-    await page.getByTestId('signing-order-input').nth(1).blur();
-    await triggerAutosave(page);
-
-    await page.getByTestId('signing-order-input').nth(2).fill('2');
-    await page.getByTestId('signing-order-input').nth(2).blur();
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedDocumentData = await getDocumentById({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      const retrievedRecipients = await getRecipientsForDocument({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedDocumentData.documentMeta?.signingOrder).toBe('SEQUENTIAL');
-      expect(retrievedDocumentData.documentMeta?.allowDictateNextSigner).toBe(true);
-      expect(retrievedRecipients.length).toBe(3);
-      expect(retrievedRecipients[0].signingOrder).toBe(2);
-      expect(retrievedRecipients[1].signingOrder).toBe(3);
-      expect(retrievedRecipients[2].signingOrder).toBe(1);
-    }).toPass();
-  });
-});

packages/app-tests/e2e/document-flow/autosave-subject-step.spec.ts

@@ -1,200 +0,0 @@
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
-
-import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
-import { seedBlankDocument } from '@documenso/prisma/seed/documents';
-import { seedUser } from '@documenso/prisma/seed/users';
-
-import { apiSignin } from '../fixtures/authentication';
-
-test.describe.configure({ mode: 'parallel', timeout: 60000 });
-
-export const setupDocumentAndNavigateToSubjectStep = async (page: Page) => {
-  const { user, team } = await seedUser();
-  const document = await seedBlankDocument(user, team.id);
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: `/documents/${document.id}/edit`,
-  });
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  await page.getByPlaceholder('Email').fill('recipient1@documenso.com');
-  await page.getByPlaceholder('Name').fill('Recipient 1');
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  await page.getByRole('button', { name: 'Signature' }).click();
-  await page.locator('canvas').click({
-    position: {
-      x: 100,
-      y: 100,
-    },
-  });
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  await expect(page.getByRole('heading', { name: 'Distribute Document' })).toBeVisible();
-
-  return { user, team, document };
-};
-
-export const triggerAutosave = async (page: Page) => {
-  await page.locator('#document-flow-form-container').click();
-  await page.locator('#document-flow-form-container').blur();
-
-  await page.waitForTimeout(5000);
-};
-
-test.describe('AutoSave Subject Step', () => {
-  test('should autosave the subject field', async ({ page }) => {
-    const { user, document, team } = await setupDocumentAndNavigateToSubjectStep(page);
-
-    const subject = 'Hello world!';
-
-    await page.getByRole('textbox', { name: 'Subject (Optional)' }).fill(subject);
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedDocumentData = await getDocumentById({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      await expect(page.getByRole('textbox', { name: 'Subject (Optional)' })).toHaveValue(
-        retrievedDocumentData.documentMeta?.subject ?? '',
-      );
-    }).toPass();
-  });
-
-  test('should autosave the message field', async ({ page }) => {
-    const { user, document, team } = await setupDocumentAndNavigateToSubjectStep(page);
-
-    const message = 'Please review and sign this important document. Thank you!';
-
-    await page.getByRole('textbox', { name: 'Message (Optional)' }).fill(message);
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedDocumentData = await getDocumentById({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      await expect(page.getByRole('textbox', { name: 'Message (Optional)' })).toHaveValue(
-        retrievedDocumentData.documentMeta?.message ?? '',
-      );
-    }).toPass();
-  });
-
-  test('should autosave the email settings checkboxes', async ({ page }) => {
-    const { user, document, team } = await setupDocumentAndNavigateToSubjectStep(page);
-
-    // Toggle some email settings checkboxes (randomly - some checked, some unchecked)
-    await page.getByText('Send recipient signed email').click();
-    await page.getByText('Send recipient removed email').click();
-    await page.getByText('Send document completed email', { exact: true }).click();
-    await page.getByText('Send document deleted email').click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedDocumentData = await getDocumentById({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      const emailSettings = retrievedDocumentData.documentMeta?.emailSettings;
-
-      await expect(page.getByText('Send recipient signed email')).toBeChecked({
-        checked: emailSettings?.recipientSigned,
-      });
-      await expect(page.getByText('Send recipient removed email')).toBeChecked({
-        checked: emailSettings?.recipientRemoved,
-      });
-      await expect(page.getByText('Send document completed email', { exact: true })).toBeChecked({
-        checked: emailSettings?.documentCompleted,
-      });
-      await expect(page.getByText('Send document deleted email')).toBeChecked({
-        checked: emailSettings?.documentDeleted,
-      });
-
-      await expect(page.getByText('Send recipient signing request email')).toBeChecked({
-        checked: emailSettings?.recipientSigningRequest,
-      });
-      await expect(page.getByText('Send document pending email')).toBeChecked({
-        checked: emailSettings?.documentPending,
-      });
-      await expect(page.getByText('Send document completed email to the owner')).toBeChecked({
-        checked: emailSettings?.ownerDocumentCompleted,
-      });
-    }).toPass();
-  });
-
-  test('should autosave all fields and settings together', async ({ page }) => {
-    const { user, document, team } = await setupDocumentAndNavigateToSubjectStep(page);
-
-    const subject = 'Combined Test Subject - Please Sign';
-    const message =
-      'This is a comprehensive test message for autosave functionality. Please review and sign at your earliest convenience.';
-
-    await page.getByRole('textbox', { name: 'Subject (Optional)' }).fill(subject);
-    await page.getByRole('textbox', { name: 'Message (Optional)' }).fill(message);
-
-    await page.getByText('Send recipient signed email').click();
-    await page.getByText('Send recipient removed email').click();
-    await page.getByText('Send document completed email', { exact: true }).click();
-    await page.getByText('Send document deleted email').click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedDocumentData = await getDocumentById({
-        documentId: document.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedDocumentData.documentMeta?.subject).toBe(subject);
-      expect(retrievedDocumentData.documentMeta?.message).toBe(message);
-      expect(retrievedDocumentData.documentMeta?.emailSettings).toBeDefined();
-
-      await expect(page.getByRole('textbox', { name: 'Subject (Optional)' })).toHaveValue(
-        retrievedDocumentData.documentMeta?.subject ?? '',
-      );
-      await expect(page.getByRole('textbox', { name: 'Message (Optional)' })).toHaveValue(
-        retrievedDocumentData.documentMeta?.message ?? '',
-      );
-
-      await expect(page.getByText('Send recipient signed email')).toBeChecked({
-        checked: retrievedDocumentData.documentMeta?.emailSettings?.recipientSigned,
-      });
-      await expect(page.getByText('Send recipient removed email')).toBeChecked({
-        checked: retrievedDocumentData.documentMeta?.emailSettings?.recipientRemoved,
-      });
-      await expect(page.getByText('Send document completed email', { exact: true })).toBeChecked({
-        checked: retrievedDocumentData.documentMeta?.emailSettings?.documentCompleted,
-      });
-      await expect(page.getByText('Send document deleted email')).toBeChecked({
-        checked: retrievedDocumentData.documentMeta?.emailSettings?.documentDeleted,
-      });
-
-      await expect(page.getByText('Send recipient signing request email')).toBeChecked({
-        checked: retrievedDocumentData.documentMeta?.emailSettings?.recipientSigningRequest,
-      });
-      await expect(page.getByText('Send document pending email')).toBeChecked({
-        checked: retrievedDocumentData.documentMeta?.emailSettings?.documentPending,
-      });
-      await expect(page.getByText('Send document completed email to the owner')).toBeChecked({
-        checked: retrievedDocumentData.documentMeta?.emailSettings?.ownerDocumentCompleted,
-      });
-    }).toPass();
-  });
-});

packages/app-tests/e2e/document-flow/stepper-component.spec.ts

@@ -534,6 +534,9 @@ test('[DOCUMENT_FLOW]: should be able to create and sign a document with 3 recip
   await page.getByLabel('Title').fill(documentTitle);
   await page.getByRole('button', { name: 'Continue' }).click();
 
+  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
+  await page.getByLabel('Enable signing order').check();
+
   for (let i = 1; i <= 3; i++) {
     if (i > 1) {
       await page.getByRole('button', { name: 'Add Signer' }).click();
@@ -555,9 +558,6 @@ test('[DOCUMENT_FLOW]: should be able to create and sign a document with 3 recip
       .fill(`User ${i}`);
   }
 
-  await expect(page.getByRole('heading', { name: 'Add Signers' })).toBeVisible();
-  await page.getByLabel('Enable signing order').check();
-
   await page.getByRole('button', { name: 'Continue' }).click();
 
   await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();

packages/app-tests/e2e/templates-flow/template-autosave-fields-step.spec.ts

@@ -1,304 +0,0 @@
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
-
-import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
-import { seedBlankTemplate } from '@documenso/prisma/seed/templates';
-import { seedUser } from '@documenso/prisma/seed/users';
-
-import { apiSignin } from '../fixtures/authentication';
-
-const setupTemplateAndNavigateToFieldsStep = async (page: Page) => {
-  const { user, team } = await seedUser();
-  const template = await seedBlankTemplate(user, team.id);
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: `/templates/${template.id}/edit`,
-  });
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  await page.getByPlaceholder('Email').fill('recipient1@documenso.com');
-  await page.getByPlaceholder('Name').fill('Recipient 1');
-
-  await page.getByRole('button', { name: 'Add Placeholder Recipient' }).click();
-
-  await page.getByPlaceholder('Email').nth(1).fill('recipient2@documenso.com');
-  await page.getByPlaceholder('Name').nth(1).fill('Recipient 2');
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  return { user, team, template };
-};
-
-const triggerAutosave = async (page: Page) => {
-  await page.locator('#document-flow-form-container').click();
-  await page.locator('#document-flow-form-container').blur();
-
-  await page.waitForTimeout(5000);
-};
-
-test.describe('AutoSave Fields Step', () => {
-  test('should autosave the fields without advanced settings', async ({ page }) => {
-    const { user, template, team } = await setupTemplateAndNavigateToFieldsStep(page);
-
-    await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
-
-    await page.getByRole('button', { name: 'Signature' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 100,
-      },
-    });
-
-    await page.getByRole('button', { name: 'Text' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 200,
-      },
-    });
-
-    await page.getByTestId('field-advanced-settings-footer').waitFor({ state: 'visible' });
-
-    await page
-      .getByTestId('field-advanced-settings-footer')
-      .getByRole('button', { name: 'Cancel' })
-      .click();
-
-    await triggerAutosave(page);
-
-    await page.getByRole('combobox').click();
-    await page.getByRole('option', { name: 'Recipient 2 (recipient2@documenso.com)' }).click();
-
-    await page.getByRole('button', { name: 'Signature' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 500,
-      },
-    });
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedFields = await getTemplateById({
-        id: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      const fields = retrievedFields.fields;
-
-      expect(fields.length).toBe(3);
-      expect(fields[0].type).toBe('SIGNATURE');
-      expect(fields[1].type).toBe('TEXT');
-      expect(fields[2].type).toBe('SIGNATURE');
-    }).toPass();
-  });
-
-  test('should autosave the field deletion', async ({ page }) => {
-    const { user, template, team } = await setupTemplateAndNavigateToFieldsStep(page);
-
-    await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
-
-    await page.getByRole('button', { name: 'Signature' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 100,
-      },
-    });
-
-    await page.getByRole('button', { name: 'Text' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 200,
-      },
-    });
-
-    await page.getByTestId('field-advanced-settings-footer').waitFor({ state: 'visible' });
-
-    await page
-      .getByTestId('field-advanced-settings-footer')
-      .getByRole('button', { name: 'Cancel' })
-      .click();
-
-    await triggerAutosave(page);
-
-    await page.getByRole('combobox').click();
-    await page.getByRole('option', { name: 'Recipient 2 (recipient2@documenso.com)' }).click();
-
-    await page.getByRole('button', { name: 'Signature' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 500,
-      },
-    });
-
-    await triggerAutosave(page);
-
-    await page.getByRole('combobox').click();
-    await page.getByRole('option', { name: 'Recipient 1 (recipient1@documenso.com)' }).click();
-
-    await page.getByText('Text').nth(1).click();
-    await page.getByRole('button', { name: 'Remove' }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedFields = await getTemplateById({
-        id: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      const fields = retrievedFields.fields;
-
-      expect(fields.length).toBe(2);
-      expect(fields[0].type).toBe('SIGNATURE');
-      expect(fields[1].type).toBe('SIGNATURE');
-    }).toPass();
-  });
-
-  test('should autosave the field duplication', async ({ page }) => {
-    const { user, template, team } = await setupTemplateAndNavigateToFieldsStep(page);
-
-    await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
-
-    await page.getByRole('button', { name: 'Signature' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 100,
-      },
-    });
-
-    await page.getByRole('button', { name: 'Text' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 200,
-      },
-    });
-
-    await page.getByTestId('field-advanced-settings-footer').waitFor({ state: 'visible' });
-
-    await page
-      .getByTestId('field-advanced-settings-footer')
-      .getByRole('button', { name: 'Cancel' })
-      .click();
-
-    await triggerAutosave(page);
-
-    await page.getByRole('combobox').click();
-    await page.getByRole('option', { name: 'Recipient 2 (recipient2@documenso.com)' }).click();
-
-    await page.getByRole('button', { name: 'Signature' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 500,
-      },
-    });
-
-    await triggerAutosave(page);
-
-    await page.getByRole('combobox').click();
-    await page.getByRole('option', { name: 'Recipient 1 (recipient1@documenso.com)' }).click();
-
-    await page.getByText('Signature').nth(1).click();
-    await page.getByRole('button', { name: 'Duplicate', exact: true }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedFields = await getTemplateById({
-        id: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      const fields = retrievedFields.fields;
-
-      expect(fields.length).toBe(4);
-      expect(fields[0].type).toBe('SIGNATURE');
-      expect(fields[1].type).toBe('TEXT');
-      expect(fields[2].type).toBe('SIGNATURE');
-      expect(fields[3].type).toBe('SIGNATURE');
-    }).toPass();
-  });
-
-  test('should autosave the fields with advanced settings', async ({ page }) => {
-    const { user, template, team } = await setupTemplateAndNavigateToFieldsStep(page);
-
-    await expect(page.getByRole('heading', { name: 'Add Fields' })).toBeVisible();
-
-    await page.getByRole('button', { name: 'Signature' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 100,
-      },
-    });
-
-    await page.getByRole('button', { name: 'Text' }).click();
-    await page.locator('canvas').click({
-      position: {
-        x: 100,
-        y: 200,
-      },
-    });
-
-    await page.getByRole('textbox', { name: 'Field label' }).fill('Test Field');
-    await page.getByRole('textbox', { name: 'Field placeholder' }).fill('Test Placeholder');
-    await page.getByRole('textbox', { name: 'Add text to the field' }).fill('Test Text');
-
-    await page.getByTestId('field-advanced-settings-footer').waitFor({ state: 'visible' });
-
-    await page
-      .getByTestId('field-advanced-settings-footer')
-      .getByRole('button', { name: 'Save' })
-      .click();
-
-    await page.waitForTimeout(2500);
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedTemplate = await getTemplateById({
-        id: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      const fields = retrievedTemplate.fields;
-
-      expect(fields.length).toBe(2);
-      expect(fields[0].type).toBe('SIGNATURE');
-      expect(fields[1].type).toBe('TEXT');
-
-      const textField = fields[1];
-      expect(textField.fieldMeta).toBeDefined();
-
-      if (
-        textField.fieldMeta &&
-        typeof textField.fieldMeta === 'object' &&
-        'type' in textField.fieldMeta
-      ) {
-        expect(textField.fieldMeta.type).toBe('text');
-        expect(textField.fieldMeta.label).toBe('Test Field');
-        expect(textField.fieldMeta.placeholder).toBe('Test Placeholder');
-
-        if (textField.fieldMeta.type === 'text') {
-          expect(textField.fieldMeta.text).toBe('Test Text');
-        }
-      } else {
-        throw new Error('fieldMeta should be defined and contain advanced settings');
-      }
-    }).toPass();
-  });
-});

packages/app-tests/e2e/templates-flow/template-autosave-settings-step.spec.ts

@@ -1,244 +0,0 @@
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
-
-import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
-import { seedBlankTemplate } from '@documenso/prisma/seed/templates';
-import { seedUser } from '@documenso/prisma/seed/users';
-
-import { apiSignin } from '../fixtures/authentication';
-
-test.describe.configure({ mode: 'parallel', timeout: 60000 });
-
-const setupTemplate = async (page: Page) => {
-  const { user, team } = await seedUser();
-  const template = await seedBlankTemplate(user, team.id);
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: `/templates/${template.id}/edit`,
-  });
-
-  return { user, team, template };
-};
-
-const triggerAutosave = async (page: Page) => {
-  await page.locator('#document-flow-form-container').click();
-  await page.locator('#document-flow-form-container').blur();
-
-  await page.waitForTimeout(5000);
-};
-
-test.describe('AutoSave Settings Step - Templates', () => {
-  test('should autosave the title change', async ({ page }) => {
-    const { user, template, team } = await setupTemplate(page);
-
-    const newTemplateTitle = 'New Template Title';
-
-    await page.getByRole('textbox', { name: 'Title *' }).fill(newTemplateTitle);
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedTemplate = await getTemplateById({
-        id: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      await expect(page.getByRole('textbox', { name: 'Title *' })).toHaveValue(
-        retrievedTemplate.title,
-      );
-    }).toPass();
-  });
-
-  test('should autosave the language change', async ({ page }) => {
-    const { user, template, team } = await setupTemplate(page);
-
-    const newTemplateLanguage = 'French';
-    const expectedLanguageCode = 'fr';
-
-    await page.getByRole('combobox').first().click();
-    await page.getByRole('option', { name: newTemplateLanguage }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedTemplate = await getTemplateById({
-        id: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedTemplate.templateMeta?.language).toBe(expectedLanguageCode);
-    }).toPass();
-  });
-
-  test('should autosave the template access change', async ({ page }) => {
-    const { user, template, team } = await setupTemplate(page);
-
-    const access = 'Require account';
-    const accessValue = 'ACCOUNT';
-
-    await page.getByRole('combobox').nth(1).click();
-    await page.getByRole('option', { name: access }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedTemplate = await getTemplateById({
-        id: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedTemplate.authOptions?.globalAccessAuth).toContain(accessValue);
-    }).toPass();
-  });
-
-  test('should autosave the external ID change', async ({ page }) => {
-    const { user, template, team } = await setupTemplate(page);
-
-    const newExternalId = '1234567890';
-
-    await page.getByRole('button', { name: 'Advanced Options' }).click();
-
-    await page.getByRole('textbox', { name: 'External ID' }).fill(newExternalId);
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedTemplate = await getTemplateById({
-        id: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedTemplate.externalId).toBe(newExternalId);
-    }).toPass();
-  });
-
-  test('should autosave the allowed signature types change', async ({ page }) => {
-    const { user, template, team } = await setupTemplate(page);
-
-    await page.getByRole('button', { name: 'Advanced Options' }).click();
-
-    await page.getByRole('combobox').nth(4).click();
-    await page.getByRole('option', { name: 'Draw' }).click();
-    await page.getByRole('option', { name: 'Type' }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedTemplate = await getTemplateById({
-        id: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedTemplate.templateMeta?.drawSignatureEnabled).toBe(false);
-      expect(retrievedTemplate.templateMeta?.typedSignatureEnabled).toBe(false);
-      expect(retrievedTemplate.templateMeta?.uploadSignatureEnabled).toBe(true);
-    }).toPass();
-  });
-
-  test('should autosave the date format change', async ({ page }) => {
-    const { user, template, team } = await setupTemplate(page);
-
-    await page.getByRole('button', { name: 'Advanced Options' }).click();
-
-    await page.getByRole('combobox').nth(5).click();
-    await page.getByRole('option', { name: 'ISO 8601', exact: true }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedTemplate = await getTemplateById({
-        id: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedTemplate.templateMeta?.dateFormat).toBe("yyyy-MM-dd'T'HH:mm:ss.SSSXXX");
-    }).toPass();
-  });
-
-  test('should autosave the timezone change', async ({ page }) => {
-    const { user, template, team } = await setupTemplate(page);
-
-    await page.getByRole('button', { name: 'Advanced Options' }).click();
-
-    await page.getByRole('combobox').nth(6).click();
-    await page.getByRole('option', { name: 'Europe/London' }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedTemplate = await getTemplateById({
-        id: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedTemplate.templateMeta?.timezone).toBe('Europe/London');
-    }).toPass();
-  });
-
-  test('should autosave the redirect URL change', async ({ page }) => {
-    const { user, template, team } = await setupTemplate(page);
-
-    const newRedirectUrl = 'https://documenso.com/test/';
-
-    await page.getByRole('button', { name: 'Advanced Options' }).click();
-
-    await page.getByRole('textbox', { name: 'Redirect URL' }).fill(newRedirectUrl);
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedTemplate = await getTemplateById({
-        id: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedTemplate.templateMeta?.redirectUrl).toBe(newRedirectUrl);
-    }).toPass();
-  });
-
-  test('should autosave multiple field changes together', async ({ page }) => {
-    const { user, template, team } = await setupTemplate(page);
-
-    const newTitle = 'Updated Template Title';
-    await page.getByRole('textbox', { name: 'Title *' }).fill(newTitle);
-
-    await page.getByRole('combobox').first().click();
-    await page.getByRole('option', { name: 'German' }).click();
-
-    await page.getByRole('combobox').nth(1).click();
-    await page.getByRole('option', { name: 'Require account' }).click();
-
-    await page.getByRole('button', { name: 'Advanced Options' }).click();
-    const newExternalId = 'MULTI-TEST-123';
-    await page.getByRole('textbox', { name: 'External ID' }).fill(newExternalId);
-
-    await page.getByRole('combobox').nth(6).click();
-    await page.getByRole('option', { name: 'Europe/Berlin' }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedTemplate = await getTemplateById({
-        id: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedTemplate.title).toBe(newTitle);
-      expect(retrievedTemplate.templateMeta?.language).toBe('de');
-      expect(retrievedTemplate.authOptions?.globalAccessAuth).toContain('ACCOUNT');
-      expect(retrievedTemplate.externalId).toBe(newExternalId);
-      expect(retrievedTemplate.templateMeta?.timezone).toBe('Europe/Berlin');
-    }).toPass();
-  });
-});

packages/app-tests/e2e/templates-flow/template-autosave-signers-step.spec.ts

@@ -1,174 +0,0 @@
-import type { Page } from '@playwright/test';
-import { expect, test } from '@playwright/test';
-
-import { getRecipientsForTemplate } from '@documenso/lib/server-only/recipient/get-recipients-for-template';
-import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
-import { seedBlankTemplate } from '@documenso/prisma/seed/templates';
-import { seedUser } from '@documenso/prisma/seed/users';
-
-import { apiSignin } from '../fixtures/authentication';
-
-test.describe.configure({ mode: 'parallel', timeout: 60000 });
-
-const setupTemplateAndNavigateToSignersStep = async (page: Page) => {
-  const { user, team } = await seedUser();
-  const template = await seedBlankTemplate(user, team.id);
-
-  await apiSignin({
-    page,
-    email: user.email,
-    redirectPath: `/templates/${template.id}/edit`,
-  });
-
-  await page.getByRole('button', { name: 'Continue' }).click();
-
-  return { user, team, template };
-};
-
-const triggerAutosave = async (page: Page) => {
-  await page.locator('#document-flow-form-container').click();
-  await page.locator('#document-flow-form-container').blur();
-
-  await page.waitForTimeout(5000);
-};
-
-const addSignerAndSave = async (page: Page) => {
-  await page.getByPlaceholder('Email').fill('recipient1@documenso.com');
-  await page.getByPlaceholder('Name').fill('Recipient 1');
-
-  await triggerAutosave(page);
-};
-
-test.describe('AutoSave Signers Step - Templates', () => {
-  test('should autosave the signers addition', async ({ page }) => {
-    const { user, template, team } = await setupTemplateAndNavigateToSignersStep(page);
-
-    await addSignerAndSave(page);
-
-    await expect(async () => {
-      const retrievedRecipients = await getRecipientsForTemplate({
-        templateId: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedRecipients.length).toBe(1);
-      expect(retrievedRecipients[0].email).toBe('recipient1@documenso.com');
-      expect(retrievedRecipients[0].name).toBe('Recipient 1');
-    }).toPass();
-  });
-
-  test('should autosave the signer deletion', async ({ page }) => {
-    const { user, template, team } = await setupTemplateAndNavigateToSignersStep(page);
-
-    await addSignerAndSave(page);
-
-    await page.getByRole('button', { name: 'Add myself' }).click();
-    await triggerAutosave(page);
-
-    await page.getByTestId('remove-placeholder-recipient-button').first().click();
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedRecipients = await getRecipientsForTemplate({
-        templateId: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedRecipients.length).toBe(1);
-      expect(retrievedRecipients[0].email).toBe(user.email);
-      expect(retrievedRecipients[0].name).toBe(user.name);
-    }).toPass();
-  });
-
-  test('should autosave the signer update', async ({ page }) => {
-    const { user, template, team } = await setupTemplateAndNavigateToSignersStep(page);
-
-    await addSignerAndSave(page);
-
-    await page.getByPlaceholder('Name').fill('Documenso Manager');
-    await page.getByPlaceholder('Email').fill('manager@documenso.com');
-
-    await triggerAutosave(page);
-
-    await page.getByRole('combobox').click();
-    await page.getByRole('option', { name: 'Receives copy' }).click();
-
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedRecipients = await getRecipientsForTemplate({
-        templateId: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedRecipients.length).toBe(1);
-      expect(retrievedRecipients[0].email).toBe('manager@documenso.com');
-      expect(retrievedRecipients[0].name).toBe('Documenso Manager');
-      expect(retrievedRecipients[0].role).toBe('CC');
-    }).toPass();
-  });
-
-  test('should autosave the signing order change', async ({ page }) => {
-    const { user, template, team } = await setupTemplateAndNavigateToSignersStep(page);
-
-    await addSignerAndSave(page);
-
-    await page.getByRole('button', { name: 'Add placeholder recipient' }).click();
-
-    await page
-      .getByTestId('placeholder-recipient-email-input')
-      .nth(1)
-      .fill('recipient2@documenso.com');
-    await page.getByTestId('placeholder-recipient-name-input').nth(1).fill('Recipient 2');
-
-    await page.getByRole('button', { name: 'Add placeholder recipient' }).click();
-
-    await page
-      .getByTestId('placeholder-recipient-email-input')
-      .nth(2)
-      .fill('recipient3@documenso.com');
-    await page.getByTestId('placeholder-recipient-name-input').nth(2).fill('Recipient 3');
-
-    await triggerAutosave(page);
-
-    await page.getByLabel('Enable signing order').check();
-    await page.getByLabel('Allow signers to dictate next signer').check();
-    await triggerAutosave(page);
-
-    await page.getByTestId('placeholder-recipient-signing-order-input').nth(0).fill('3');
-    await page.getByTestId('placeholder-recipient-signing-order-input').nth(0).blur();
-    await triggerAutosave(page);
-
-    await page.getByTestId('placeholder-recipient-signing-order-input').nth(1).fill('1');
-    await page.getByTestId('placeholder-recipient-signing-order-input').nth(1).blur();
-    await triggerAutosave(page);
-
-    await page.getByTestId('placeholder-recipient-signing-order-input').nth(2).fill('2');
-    await page.getByTestId('placeholder-recipient-signing-order-input').nth(2).blur();
-    await triggerAutosave(page);
-
-    await expect(async () => {
-      const retrievedTemplate = await getTemplateById({
-        id: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      const retrievedRecipients = await getRecipientsForTemplate({
-        templateId: template.id,
-        userId: user.id,
-        teamId: team.id,
-      });
-
-      expect(retrievedTemplate.templateMeta?.signingOrder).toBe('SEQUENTIAL');
-      expect(retrievedTemplate.templateMeta?.allowDictateNextSigner).toBe(true);
-      expect(retrievedRecipients.length).toBe(3);
-      expect(retrievedRecipients[0].signingOrder).toBe(2);
-      expect(retrievedRecipients[1].signingOrder).toBe(3);
-      expect(retrievedRecipients[2].signingOrder).toBe(1);
-    }).toPass();
-  });
-});

packages/app-tests/playwright.config.ts

@@ -17,7 +17,7 @@ export default defineConfig({
   testDir: './e2e',
   /* Run tests in files in parallel */
   fullyParallel: false,
-  workers: 4,
+  workers: 1,
   maxFailures: process.env.CI ? 1 : undefined,
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: !!process.env.CI,

packages/auth/server/lib/utils/handle-oauth-callback-url.ts

@@ -92,11 +92,7 @@ export const handleOAuthCallbackUrl = async (options: HandleOAuthCallbackUrlOpti
       providerAccountId: sub,
     },
     include: {
-      user: {
-        select: {
-          id: true,
-        },
-      },
+      user: true,
     },
   });
 
@@ -111,10 +107,6 @@ export const handleOAuthCallbackUrl = async (options: HandleOAuthCallbackUrlOpti
     where: {
       email: email,
     },
-    select: {
-      id: true,
-      emailVerified: true,
-    },
   });
 
   // Handle existing user but no account.

packages/lib/client-only/hooks/use-autosave.ts

@@ -1,31 +0,0 @@
-import { useCallback, useEffect, useRef } from 'react';
-
-export const useAutoSave = <T>(onSave: (data: T) => Promise<void>) => {
-  const saveTimeoutRef = useRef<NodeJS.Timeout>();
-
-  const saveFormData = async (data: T) => {
-    try {
-      await onSave(data);
-    } catch (error) {
-      console.error('Auto-save failed:', error);
-    }
-  };
-
-  const scheduleSave = useCallback((data: T) => {
-    if (saveTimeoutRef.current) {
-      clearTimeout(saveTimeoutRef.current);
-    }
-
-    saveTimeoutRef.current = setTimeout(() => void saveFormData(data), 2000);
-  }, []);
-
-  useEffect(() => {
-    return () => {
-      if (saveTimeoutRef.current) {
-        clearTimeout(saveTimeoutRef.current);
-      }
-    };
-  }, []);
-
-  return { scheduleSave };
-};

packages/lib/jobs/definitions/emails/send-document-cancelled-emails.handler.ts

@@ -29,13 +29,7 @@ export const run = async ({
       id: documentId,
     },
     include: {
-      user: {
-        select: {
-          id: true,
-          email: true,
-          name: true,
-        },
-      },
+      user: true,
       documentMeta: true,
       recipients: true,
       team: {

packages/lib/jobs/definitions/emails/send-organisation-member-joined-email.handler.ts

@@ -39,13 +39,7 @@ export const run = async ({
           },
         },
         include: {
-          user: {
-            select: {
-              id: true,
-              email: true,
-              name: true,
-            },
-          },
+          user: true,
         },
       },
     },
@@ -57,13 +51,7 @@ export const run = async ({
       organisationId: payload.organisationId,
     },
     include: {
-      user: {
-        select: {
-          id: true,
-          email: true,
-          name: true,
-        },
-      },
+      user: true,
     },
   });
 

packages/lib/jobs/definitions/emails/send-organisation-member-left-email.handler.ts

@@ -39,13 +39,7 @@ export const run = async ({
           },
         },
         include: {
-          user: {
-            select: {
-              id: true,
-              email: true,
-              name: true,
-            },
-          },
+          user: true,
         },
       },
     },
@@ -55,11 +49,6 @@ export const run = async ({
     where: {
       id: payload.memberUserId,
     },
-    select: {
-      id: true,
-      email: true,
-      name: true,
-    },
   });
 
   const { branding, emailLanguage, senderEmail } = await getEmailContext({

packages/lib/jobs/definitions/emails/send-recipient-signed-email.handler.ts

@@ -38,13 +38,7 @@ export const run = async ({
           id: recipientId,
         },
       },
-      user: {
-        select: {
-          id: true,
-          email: true,
-          name: true,
-        },
-      },
+      user: true,
       documentMeta: true,
     },
   });

packages/lib/jobs/definitions/emails/send-rejection-emails.handler.ts

@@ -33,13 +33,7 @@ export const run = async ({
         id: documentId,
       },
       include: {
-        user: {
-          select: {
-            id: true,
-            email: true,
-            name: true,
-          },
-        },
+        user: true,
         documentMeta: true,
         team: {
           select: {

packages/lib/jobs/definitions/emails/send-signing-email.handler.ts

@@ -42,11 +42,6 @@ export const run = async ({
       where: {
         id: userId,
       },
-      select: {
-        id: true,
-        email: true,
-        name: true,
-      },
     }),
     prisma.document.findFirstOrThrow({
       where: {

packages/lib/server-only/admin/update-user.ts

@@ -10,7 +10,13 @@ export type UpdateUserOptions = {
 };
 
 export const updateUser = async ({ id, name, email, roles }: UpdateUserOptions) => {
-  await prisma.user.update({
+  await prisma.user.findFirstOrThrow({
+    where: {
+      id,
+    },
+  });
+
+  return await prisma.user.update({
     where: {
       id,
     },

packages/lib/server-only/document/create-document-v2.ts

@@ -15,7 +15,7 @@ import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-reques
 import { nanoid, prefixedId } from '@documenso/lib/universal/id';
 import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
 import { prisma } from '@documenso/prisma';
-import type { TCreateDocumentTemporaryRequest } from '@documenso/trpc/server/document-router/create-document-temporary.types';
+import type { TCreateDocumentV2Request } from '@documenso/trpc/server/document-router/schema';
 
 import type { TDocumentAccessAuthTypes, TDocumentActionAuthTypes } from '../../types/document-auth';
 import type { TDocumentFormValues } from '../../types/document-form-values';
@@ -45,7 +45,7 @@ export type CreateDocumentOptions = {
     globalAccessAuth?: TDocumentAccessAuthTypes[];
     globalActionAuth?: TDocumentActionAuthTypes[];
     formValues?: TDocumentFormValues;
-    recipients: TCreateDocumentTemporaryRequest['recipients'];
+    recipients: TCreateDocumentV2Request['recipients'];
     folderId?: string;
   };
   meta?: Partial<Omit<TemplateMeta, 'id' | 'templateId'>>;

packages/lib/server-only/document/duplicate-document-by-id.ts

@@ -35,7 +35,6 @@ export const duplicateDocument = async ({
     select: {
       title: true,
       userId: true,
-      teamId: true,
       documentData: {
         select: {
           data: true,
@@ -58,19 +57,12 @@ export const duplicateDocument = async ({
     },
   });
 
-  const currentUser = await prisma.user.findFirstOrThrow({
-    where: { id: userId },
-    select: { email: true },
-  });
-
   if (!document) {
     throw new AppError(AppErrorCode.NOT_FOUND, {
       message: 'Document not found',
     });
   }
 
-  const isDocumentOwner = userId === document.userId || teamId === document.teamId;
-
   const documentData = await prisma.documentData.create({
     data: {
       type: document.documentData.type,
@@ -108,38 +100,30 @@ export const duplicateDocument = async ({
     },
   });
 
-  const recipientsToCreate = document.recipients
-    .filter((recipient) => {
-      if (isDocumentOwner) {
-        return true;
-      }
-
-      return recipient.email === currentUser.email;
-    })
-    .map((recipient) => ({
-      documentId: createdDocument.id,
-      email: recipient.email,
-      name: recipient.name,
-      role: recipient.role,
-      signingOrder: recipient.signingOrder,
-      token: nanoid(),
-      fields: {
-        createMany: {
-          data: recipient.fields.map((field) => ({
-            documentId: createdDocument.id,
-            type: field.type,
-            page: field.page,
-            positionX: field.positionX,
-            positionY: field.positionY,
-            width: field.width,
-            height: field.height,
-            customText: '',
-            inserted: false,
-            fieldMeta: field.fieldMeta as PrismaJson.FieldMeta,
-          })),
-        },
+  const recipientsToCreate = document.recipients.map((recipient) => ({
+    documentId: createdDocument.id,
+    email: recipient.email,
+    name: recipient.name,
+    role: recipient.role,
+    signingOrder: recipient.signingOrder,
+    token: nanoid(),
+    fields: {
+      createMany: {
+        data: recipient.fields.map((field) => ({
+          documentId: createdDocument.id,
+          type: field.type,
+          page: field.page,
+          positionX: field.positionX,
+          positionY: field.positionY,
+          width: field.width,
+          height: field.height,
+          customText: '',
+          inserted: false,
+          fieldMeta: field.fieldMeta as PrismaJson.FieldMeta,
+        })),
       },
-    }));
+    },
+  }));
 
   const recipients: Recipient[] = [];
 

packages/lib/server-only/document/find-documents.ts

@@ -5,27 +5,26 @@ import { match } from 'ts-pattern';
 
 import { prisma } from '@documenso/prisma';
 import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
+import type { TimePeriod } from '@documenso/ui/primitives/data-table/utils/time-filters';
 
 import { DocumentVisibility } from '../../types/document-visibility';
 import { type FindResultResponse } from '../../types/search-params';
 import { maskRecipientTokensForDocument } from '../../utils/mask-recipient-tokens-for-document';
 import { getTeamById } from '../team/get-team';
 
-export type PeriodSelectorValue = '' | '7d' | '14d' | '30d';
-
 export type FindDocumentsOptions = {
   userId: number;
   teamId?: number;
   templateId?: number;
   source?: DocumentSource;
-  status?: ExtendedDocumentStatus;
+  status?: ExtendedDocumentStatus[];
   page?: number;
   perPage?: number;
   orderBy?: {
     column: keyof Omit<Document, 'document'>;
     direction: 'asc' | 'desc';
   };
-  period?: PeriodSelectorValue;
+  period?: TimePeriod;
   senderIds?: number[];
   query?: string;
   folderId?: string;
@@ -36,7 +35,7 @@ export const findDocuments = async ({
   teamId,
   templateId,
   source,
-  status = ExtendedDocumentStatus.ALL,
+  status = [ExtendedDocumentStatus.ALL],
   page = 1,
   perPage = 10,
   orderBy,
@@ -49,11 +48,6 @@ export const findDocuments = async ({
     where: {
       id: userId,
     },
-    select: {
-      id: true,
-      email: true,
-      name: true,
-    },
   });
 
   let team = null;
@@ -111,10 +105,30 @@ export const findDocuments = async ({
     },
   ];
 
-  let filters: Prisma.DocumentWhereInput | null = findDocumentsFilter(status, user, folderId);
+  let filters: Prisma.DocumentWhereInput | null = null;
+
+  if (status.length === 1) {
+    filters = findDocumentsFilter(status[0], user, folderId);
+  } else if (status.length > 1) {
+    const statusFilters = status
+      .map((s) => findDocumentsFilter(s, user, folderId))
+      .filter((filter): filter is Prisma.DocumentWhereInput => filter !== null);
+    if (statusFilters.length > 0) {
+      filters = { OR: statusFilters };
+    }
+  }
 
   if (team) {
-    filters = findTeamDocumentsFilter(status, team, visibilityFilters, folderId);
+    if (status.length === 1) {
+      filters = findTeamDocumentsFilter(status[0], team, visibilityFilters, folderId);
+    } else if (status.length > 1) {
+      const statusFilters = status
+        .map((s) => findTeamDocumentsFilter(s, team, visibilityFilters, folderId))
+        .filter((filter): filter is Prisma.DocumentWhereInput => filter !== null);
+      if (statusFilters.length > 0) {
+        filters = { OR: statusFilters };
+      }
+    }
   }
 
   if (filters === null) {
@@ -202,13 +216,73 @@ export const findDocuments = async ({
     AND: whereAndClause,
   };
 
-  if (period) {
-    const daysAgo = parseInt(period.replace(/d$/, ''), 10);
+  if (period && period !== 'all-time') {
+    const now = DateTime.now();
 
-    const startOfPeriod = DateTime.now().minus({ days: daysAgo }).startOf('day');
+    const { startDate, endDate } = match(period)
+      .with('today', () => ({
+        startDate: now.startOf('day'),
+        endDate: now.startOf('day').plus({ days: 1 }),
+      }))
+      .with('yesterday', () => {
+        const yesterday = now.minus({ days: 1 });
+        return {
+          startDate: yesterday.startOf('day'),
+          endDate: yesterday.startOf('day').plus({ days: 1 }),
+        };
+      })
+      .with('this-week', () => ({
+        startDate: now.startOf('week'),
+        endDate: now.startOf('week').plus({ weeks: 1 }),
+      }))
+      .with('last-week', () => {
+        const lastWeek = now.minus({ weeks: 1 });
+        return {
+          startDate: lastWeek.startOf('week'),
+          endDate: lastWeek.startOf('week').plus({ weeks: 1 }),
+        };
+      })
+      .with('this-month', () => ({
+        startDate: now.startOf('month'),
+        endDate: now.startOf('month').plus({ months: 1 }),
+      }))
+      .with('last-month', () => {
+        const lastMonth = now.minus({ months: 1 });
+        return {
+          startDate: lastMonth.startOf('month'),
+          endDate: lastMonth.startOf('month').plus({ months: 1 }),
+        };
+      })
+      .with('this-quarter', () => ({
+        startDate: now.startOf('quarter'),
+        endDate: now.startOf('quarter').plus({ quarters: 1 }),
+      }))
+      .with('last-quarter', () => {
+        const lastQuarter = now.minus({ quarters: 1 });
+        return {
+          startDate: lastQuarter.startOf('quarter'),
+          endDate: lastQuarter.startOf('quarter').plus({ quarters: 1 }),
+        };
+      })
+      .with('this-year', () => ({
+        startDate: now.startOf('year'),
+        endDate: now.startOf('year').plus({ years: 1 }),
+      }))
+      .with('last-year', () => {
+        const lastYear = now.minus({ years: 1 });
+        return {
+          startDate: lastYear.startOf('year'),
+          endDate: lastYear.startOf('year').plus({ years: 1 }),
+        };
+      })
+      .otherwise(() => ({
+        startDate: now.startOf('day'),
+        endDate: now.startOf('day').plus({ days: 1 }),
+      }));
 
     whereClause.createdAt = {
-      gte: startOfPeriod.toJSDate(),
+      gte: startDate.toJSDate(),
+      lt: endDate.toJSDate(),
     };
   }
 
@@ -272,7 +346,7 @@ export const findDocuments = async ({
 
 const findDocumentsFilter = (
   status: ExtendedDocumentStatus,
-  user: Pick<User, 'id' | 'email' | 'name'>,
+  user: User,
   folderId?: string | null,
 ) => {
   return match<ExtendedDocumentStatus, Prisma.DocumentWhereInput>(status)

packages/lib/server-only/document/get-document-by-token.ts

@@ -73,13 +73,7 @@ export const getDocumentAndSenderByToken = async ({
       },
     },
     include: {
-      user: {
-        select: {
-          id: true,
-          email: true,
-          name: true,
-        },
-      },
+      user: true,
       documentData: true,
       documentMeta: true,
       recipients: {
@@ -96,6 +90,9 @@ export const getDocumentAndSenderByToken = async ({
     },
   });
 
+  // eslint-disable-next-line no-unused-vars, @typescript-eslint/no-unused-vars
+  const { password: _password, ...user } = result.user;
+
   const recipient = result.recipients[0];
 
   // Sanity check, should not be possible.
@@ -123,11 +120,7 @@ export const getDocumentAndSenderByToken = async ({
 
   return {
     ...result,
-    user: {
-      id: result.user.id,
-      email: result.user.email,
-      name: result.user.name,
-    },
+    user,
   };
 };
 

packages/lib/server-only/document/get-document-with-details-by-id.ts

@@ -7,12 +7,14 @@ export type GetDocumentWithDetailsByIdOptions = {
   documentId: number;
   userId: number;
   teamId: number;
+  folderId?: string;
 };
 
 export const getDocumentWithDetailsById = async ({
   documentId,
   userId,
   teamId,
+  folderId,
 }: GetDocumentWithDetailsByIdOptions) => {
   const { documentWhereInput } = await getDocumentWhereInput({
     documentId,
@@ -23,6 +25,7 @@ export const getDocumentWithDetailsById = async ({
   const document = await prisma.document.findFirst({
     where: {
       ...documentWhereInput,
+      folderId,
     },
     include: {
       documentData: true,

packages/lib/server-only/document/get-stats.ts

@@ -1,19 +1,17 @@
-import { TeamMemberRole } from '@prisma/client';
 import type { Prisma, User } from '@prisma/client';
-import { SigningStatus } from '@prisma/client';
-import { DocumentVisibility } from '@prisma/client';
-import { DateTime } from 'luxon';
+import { DocumentVisibility, SigningStatus, TeamMemberRole } from '@prisma/client';
 import { match } from 'ts-pattern';
 
-import type { PeriodSelectorValue } from '@documenso/lib/server-only/document/find-documents';
 import { prisma } from '@documenso/prisma';
 import { isExtendedDocumentStatus } from '@documenso/prisma/guards/is-extended-document-status';
 import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
+import type { TimePeriod } from '@documenso/ui/primitives/data-table/utils/time-filters';
+import { getDateRangeForPeriod } from '@documenso/ui/primitives/data-table/utils/time-filters';
 
 export type GetStatsInput = {
   user: Pick<User, 'id' | 'email'>;
   team?: Omit<GetTeamCountsOption, 'createdAt'>;
-  period?: PeriodSelectorValue;
+  period?: TimePeriod;
   search?: string;
   folderId?: string;
 };
@@ -27,14 +25,15 @@ export const getStats = async ({
 }: GetStatsInput) => {
   let createdAt: Prisma.DocumentWhereInput['createdAt'];
 
-  if (period) {
-    const daysAgo = parseInt(period.replace(/d$/, ''), 10);
+  if (period && period !== 'all-time') {
+    const dateRange = getDateRangeForPeriod(period);
 
-    const startOfPeriod = DateTime.now().minus({ days: daysAgo }).startOf('day');
-
-    createdAt = {
-      gte: startOfPeriod.toJSDate(),
-    };
+    if (dateRange) {
+      createdAt = {
+        gte: dateRange.start.toJSDate(),
+        lte: dateRange.end.toJSDate(),
+      };
+    }
   }
 
   const [ownerCounts, notSignedCounts, hasSignedCounts] = await (options.team

packages/lib/server-only/document/reject-document-with-token.ts

@@ -28,7 +28,13 @@ export async function rejectDocumentWithToken({
       documentId,
     },
     include: {
-      document: true,
+      document: {
+        include: {
+          user: true,
+          recipients: true,
+          documentMeta: true,
+        },
+      },
     },
   });
 

packages/lib/server-only/document/send-completed-email.ts

@@ -33,13 +33,7 @@ export const sendCompletedEmail = async ({ documentId, requestMetadata }: SendDo
       documentData: true,
       documentMeta: true,
       recipients: true,
-      user: {
-        select: {
-          id: true,
-          email: true,
-          name: true,
-        },
-      },
+      user: true,
       team: {
         select: {
           id: true,

packages/lib/server-only/document/send-delete-email.ts

@@ -24,13 +24,7 @@ export const sendDeleteEmail = async ({ documentId, reason }: SendDeleteEmailOpt
       id: documentId,
     },
     include: {
-      user: {
-        select: {
-          id: true,
-          email: true,
-          name: true,
-        },
-      },
+      user: true,
       documentMeta: true,
     },
   });

packages/lib/server-only/document/send-document.tsx

@@ -148,6 +148,33 @@ export const sendDocument = async ({
   //   throw new Error('Some signers have not been assigned a signature field.');
   // }
 
+  const isRecipientSigningRequestEmailEnabled = extractDerivedDocumentEmailSettings(
+    document.documentMeta,
+  ).recipientSigningRequest;
+
+  // Only send email if one of the following is true:
+  // - It is explicitly set
+  // - The email is enabled for signing requests AND sendEmail is undefined
+  if (sendEmail || (isRecipientSigningRequestEmailEnabled && sendEmail === undefined)) {
+    await Promise.all(
+      recipientsToNotify.map(async (recipient) => {
+        if (recipient.sendStatus === SendStatus.SENT || recipient.role === RecipientRole.CC) {
+          return;
+        }
+
+        await jobs.triggerJob({
+          name: 'send.signing.requested.email',
+          payload: {
+            userId,
+            documentId,
+            recipientId: recipient.id,
+            requestMetadata: requestMetadata?.requestMetadata,
+          },
+        });
+      }),
+    );
+  }
+
   const allRecipientsHaveNoActionToTake = document.recipients.every(
     (recipient) =>
       recipient.role === RecipientRole.CC || recipient.signingStatus === SigningStatus.SIGNED,
@@ -200,33 +227,6 @@ export const sendDocument = async ({
     });
   });
 
-  const isRecipientSigningRequestEmailEnabled = extractDerivedDocumentEmailSettings(
-    document.documentMeta,
-  ).recipientSigningRequest;
-
-  // Only send email if one of the following is true:
-  // - It is explicitly set
-  // - The email is enabled for signing requests AND sendEmail is undefined
-  if (sendEmail || (isRecipientSigningRequestEmailEnabled && sendEmail === undefined)) {
-    await Promise.all(
-      recipientsToNotify.map(async (recipient) => {
-        if (recipient.sendStatus === SendStatus.SENT || recipient.role === RecipientRole.CC) {
-          return;
-        }
-
-        await jobs.triggerJob({
-          name: 'send.signing.requested.email',
-          payload: {
-            userId,
-            documentId,
-            recipientId: recipient.id,
-            requestMetadata: requestMetadata?.requestMetadata,
-          },
-        });
-      }),
-    );
-  }
-
   await triggerWebhook({
     event: WebhookTriggerEvents.DOCUMENT_SENT,
     data: ZWebhookDocumentSchema.parse(mapDocumentToWebhookDocumentPayload(updatedDocument)),

packages/lib/server-only/document/super-delete-document.ts

@@ -30,13 +30,7 @@ export const superDeleteDocument = async ({ id, requestMetadata }: SuperDeleteDo
     include: {
       recipients: true,
       documentMeta: true,
-      user: {
-        select: {
-          id: true,
-          email: true,
-          name: true,
-        },
-      },
+      user: true,
     },
   });
 

packages/lib/server-only/email/get-email-context.ts

@@ -1,5 +1,3 @@
-import { P, match } from 'ts-pattern';
-
 import type { BrandingSettings } from '@documenso/email/providers/branding';
 import { prisma } from '@documenso/prisma';
 import type {
@@ -106,12 +104,7 @@ export const getEmailContext = async (
   }
 
   const replyToEmail = meta?.emailReplyTo || emailContext.settings.emailReplyTo || undefined;
-
-  const senderEmailId = match(meta?.emailId)
-    .with(P.string, (emailId) => emailId) // Explicit string means to use the provided email ID.
-    .with(undefined, () => emailContext.settings.emailId) // Undefined means to use the inherited email ID.
-    .with(null, () => null) // Explicit null means to use the Documenso email.
-    .exhaustive();
+  const senderEmailId = meta?.emailId === null ? null : emailContext.settings.emailId;
 
   const foundSenderEmail = emailContext.allowedEmails.find((email) => email.id === senderEmailId);
 

packages/lib/server-only/public-api/delete-api-token-by-id.ts

@@ -25,7 +25,7 @@ export const deleteTokenById = async ({ id, userId, teamId }: DeleteTokenByIdOpt
     });
   }
 
-  await prisma.apiToken.delete({
+  return await prisma.apiToken.delete({
     where: {
       id,
       teamId,