fix: merge conflicts

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

@@ -25,6 +25,7 @@ export type FindDocumentsOptions = {
   };
   period?: PeriodSelectorValue;
   senderIds?: number[];
+  search?: string;
 };
 
 export const findDocuments = async ({
@@ -37,6 +38,7 @@ export const findDocuments = async ({
   orderBy,
   period,
   senderIds,
+  search,
 }: FindDocumentsOptions) => {
   const { user, team } = await prisma.$transaction(async (tx) => {
     const user = await tx.user.findFirstOrThrow({
@@ -85,6 +87,14 @@ export const findDocuments = async ({
     }))
     .otherwise(() => undefined);
 
+  const searchFilter: Prisma.DocumentWhereInput = {
+    OR: [
+      { title: { contains: search, mode: 'insensitive' } },
+      { Recipient: { some: { name: { contains: search, mode: 'insensitive' } } } },
+      { Recipient: { some: { email: { contains: search, mode: 'insensitive' } } } },
+    ],
+  };
+
   const visibilityFilters = [
     match(teamMemberRole)
       .with(TeamMemberRole.ADMIN, () => ({
@@ -130,6 +140,7 @@ export const findDocuments = async ({
   const whereClause: Prisma.DocumentWhereInput = {
     ...termFilters,
     ...filters,
+    ...searchFilter,
   };
 
   if (period) {

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

@@ -15,9 +15,10 @@ export type GetStatsInput = {
   user: User;
   team?: Omit<GetTeamCountsOption, 'createdAt'>;
   period?: PeriodSelectorValue;
+  search?: string;
 };
 
-export const getStats = async ({ user, period, ...options }: GetStatsInput) => {
+export const getStats = async ({ user, period, search, ...options }: GetStatsInput) => {
   let createdAt: Prisma.DocumentWhereInput['createdAt'];
 
   if (period) {
@@ -31,8 +32,14 @@ export const getStats = async ({ user, period, ...options }: GetStatsInput) => {
   }
 
   const [ownerCounts, notSignedCounts, hasSignedCounts, deletedCounts] = await (options.team
-    ? getTeamCounts({ ...options.team, createdAt, currentUserEmail: user.email, userId: user.id })
-    : getCounts({ user, createdAt }));
+    ? getTeamCounts({
+        ...options.team,
+        createdAt,
+        currentUserEmail: user.email,
+        userId: user.id,
+        search,
+      })
+    : getCounts({ user, createdAt, search }));
 
   const stats: Record<ExtendedDocumentStatus, number> = {
     [ExtendedDocumentStatus.DRAFT]: 0,
@@ -77,9 +84,18 @@ export const getStats = async ({ user, period, ...options }: GetStatsInput) => {
 type GetCountsOption = {
   user: User;
   createdAt: Prisma.DocumentWhereInput['createdAt'];
+  search?: string;
 };
 
-const getCounts = async ({ user, createdAt }: GetCountsOption) => {
+const getCounts = async ({ user, createdAt, search }: GetCountsOption) => {
+  const searchFilter: Prisma.DocumentWhereInput = {
+    OR: [
+      { title: { contains: search, mode: 'insensitive' } },
+      { Recipient: { some: { name: { contains: search, mode: 'insensitive' } } } },
+      { Recipient: { some: { email: { contains: search, mode: 'insensitive' } } } },
+    ],
+  };
+
   return Promise.all([
     // Owner counts.
     prisma.document.groupBy({
@@ -92,6 +108,7 @@ const getCounts = async ({ user, createdAt }: GetCountsOption) => {
         createdAt,
         teamId: null,
         deletedAt: null,
+        AND: [searchFilter],
       },
     }),
     // Not signed counts.
@@ -110,6 +127,7 @@ const getCounts = async ({ user, createdAt }: GetCountsOption) => {
           },
         },
         createdAt,
+        AND: [searchFilter],
       },
     }),
     // Has signed counts.
@@ -147,6 +165,7 @@ const getCounts = async ({ user, createdAt }: GetCountsOption) => {
             },
           },
         ],
+        AND: [searchFilter],
       },
     }),
     // Deleted counts.
@@ -202,6 +221,7 @@ type GetTeamCountsOption = {
   userId: number;
   createdAt: Prisma.DocumentWhereInput['createdAt'];
   currentTeamMemberRole?: TeamMemberRole;
+  search?: string;
 };
 
 const getTeamCounts = async (options: GetTeamCountsOption) => {
@@ -212,6 +232,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
     senderIds = [],
     currentUserEmail,
     currentTeamMemberRole,
+    search,
   } = options;
 
   const userIdWhereClause: Prisma.DocumentWhereInput['userId'] =
@@ -221,6 +242,14 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
         }
       : undefined;
 
+  const searchFilter: Prisma.DocumentWhereInput = {
+    OR: [
+      { title: { contains: search, mode: 'insensitive' } },
+      { Recipient: { some: { name: { contains: search, mode: 'insensitive' } } } },
+      { Recipient: { some: { email: { contains: search, mode: 'insensitive' } } } },
+    ],
+  };
+
   const visibilityFilters = [
     ...match(currentTeamMemberRole)
       .with(TeamMemberRole.ADMIN, () => [
@@ -266,6 +295,7 @@ const getTeamCounts = async (options: GetTeamCountsOption) => {
       },
     ],
     deletedAt: null,
+    ...searchFilter,
   };
 
   const notSignedCountsWhereInput: Prisma.DocumentWhereInput = {

packages/lib/server-only/i18n/switch-i18n-language.ts

@@ -4,5 +4,8 @@ import { cookies } from 'next/headers';
 
 // eslint-disable-next-line @typescript-eslint/require-await
 export const switchI18NLanguage = async (lang: string) => {
-  cookies().set('language', lang);
+  // Two year expiry.
+  const maxAge = 60 * 60 * 24 * 365 * 2;
+
+  cookies().set('language', lang, { maxAge });
 };

packages/lib/server-only/template/create-document-from-template.ts

@@ -1,8 +1,9 @@
 import { nanoid } from '@documenso/lib/universal/id';
 import { prisma } from '@documenso/prisma';
-import type { DocumentSigningOrder, Field } from '@documenso/prisma/client';
 import {
+  DocumentSigningOrder,
   DocumentSource,
+  type Field,
   type Recipient,
   RecipientRole,
   SendStatus,
@@ -153,7 +154,7 @@ export const createDocumentFromTemplate = async ({
     const document = await tx.document.create({
       data: {
         source: DocumentSource.TEMPLATE,
-        externalId,
+        externalId: externalId || template.externalId,
         templateId: template.id,
         userId,
         teamId: template.teamId,
@@ -172,7 +173,9 @@ export const createDocumentFromTemplate = async ({
             dateFormat: override?.dateFormat || template.templateMeta?.dateFormat,
             redirectUrl: override?.redirectUrl || template.templateMeta?.redirectUrl,
             signingOrder:
-              override?.signingOrder || template.templateMeta?.signingOrder || undefined,
+              override?.signingOrder ||
+              template.templateMeta?.signingOrder ||
+              DocumentSigningOrder.PARALLEL,
           },
         },
         Recipient: {

packages/lib/server-only/template/update-template-settings.ts

@@ -100,7 +100,7 @@ export const updateTemplateSettings = async ({
     },
     data: {
       title: data.title,
-      externalId: data.externalId || null,
+      externalId: data.externalId,
       type: data.type,
       publicDescription: data.publicDescription,
       publicTitle: data.publicTitle,