Merge branch 'main' into fix/bulk-contacts

apps/web/modules/ee/contacts/api/v2/management/contacts/bulk/lib/contact.ts

@@ -229,7 +229,8 @@ export const upsertBulkContacts = async (
 
   try {
     // Execute everything in ONE transaction
-    await prisma.$transaction(async (tx) => {
+    await prisma.$transaction(
+      async (tx) => {
         const attributeKeyMap = existingAttributeKeys.reduce<Record<string, string>>((acc, keyObj) => {
           acc[keyObj.key] = keyObj.id;
           return acc;
@@ -382,7 +383,9 @@ export const upsertBulkContacts = async (
         });
 
         contactAttributeCache.revalidate({ environmentId });
-    });
+      },
+      { timeout: 10 * 1000 } // 10 seconds timeout
+    );
 
     return ok({
       contactIdxWithConflictingUserIds,

apps/web/modules/ee/contacts/types/contact.ts

@@ -126,7 +126,7 @@ export const ZContactBulkUploadRequest = z.object({
   environmentId: z.string().cuid2(),
   contacts: z
     .array(ZContactBulkUploadContact)
-    .max(1000, { message: "Maximum 1000 contacts allowed at a time." })
+    .max(250, { message: "Maximum 250 contacts allowed at a time." })
     .superRefine((contacts, ctx) => {
       // Track all data in a single pass
       const seenEmails = new Set<string>();