Merge pull request #499 from trycompai/main

[comp] Production Deploy

Author: carhartlewis

apps/app/package.json

@@ -20,7 +20,7 @@
 		"@ai-sdk/provider": "^1.1.3",
 		"@ai-sdk/react": "^1.2.9",
 		"@aws-sdk/client-s3": "^3.796.0",
-		"@aws-sdk/s3-request-presigner": "^3.796.0",
+		"@aws-sdk/s3-request-presigner": "^3.800.0",
 		"@browserbasehq/sdk": "^2.5.0",
 		"@comp/data": "workspace:*",
 		"@comp/db": "workspace:*",

apps/app/src/actions/files/upload-file.ts

@@ -9,7 +9,6 @@ import { headers } from "next/headers";
 import { PutObjectCommand, GetObjectCommand } from "@aws-sdk/client-s3";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 
-// Helper to map MIME type to AttachmentType enum
 function mapFileTypeToAttachmentType(fileType: string): AttachmentType {
 	const type = fileType.split("/")[0];
 	switch (type) {
@@ -19,19 +18,17 @@ function mapFileTypeToAttachmentType(fileType: string): AttachmentType {
 			return AttachmentType.video;
 		case "audio":
 			return AttachmentType.audio;
-		// Add more specific checks if needed (e.g., application/pdf)
 		case "application":
 			return AttachmentType.document;
 		default:
 			return AttachmentType.other;
 	}
 }
 
-// Update schema to include base64 file data
 const uploadAttachmentSchema = z.object({
 	fileName: z.string(),
 	fileType: z.string(),
-	fileData: z.string(), // Base64 encoded file content
+	fileData: z.string(),
 	entityId: z.string(),
 	entityType: z.nativeEnum(AttachmentEntityType),
 });
@@ -52,10 +49,8 @@ export const uploadFile = async (
 	}
 
 	try {
-		// 1. Decode Base64 Data
 		const fileBuffer = Buffer.from(fileData, "base64");
 
-		// --- Add file size check ---
 		const MAX_FILE_SIZE_MB = 5;
 		const MAX_FILE_SIZE_BYTES = MAX_FILE_SIZE_MB * 1024 * 1024;
 		if (fileBuffer.length > MAX_FILE_SIZE_BYTES) {
@@ -65,51 +60,45 @@ export const uploadFile = async (
 				data: null,
 			};
 		}
-		// --- End file size check ---
 
-		// 2. Prepare S3 Key
 		const timestamp = Date.now();
 		const sanitizedFileName = fileName.replace(/[^a-zA-Z0-9.-]/g, "_");
 		const key = `${organizationId}/attachments/${entityType}/${entityId}/${timestamp}-${sanitizedFileName}`;
 
-		// 3. Upload directly to S3 using shared client and bucket name
 		const putCommand = new PutObjectCommand({
 			Bucket: BUCKET_NAME,
 			Key: key,
 			Body: fileBuffer,
 			ContentType: fileType,
 		});
-		await s3Client.send(putCommand);
 
-		// 4. S3 Key is now stored in the DB. No need to construct full public URL here.
+		await s3Client.send(putCommand);
 
-		// 5. Create Attachment Record in DB
 		const attachment = await db.attachment.create({
 			data: {
 				name: fileName,
-				url: key, // Store the S3 key in the 'url' field
+				url: key,
 				type: mapFileTypeToAttachmentType(fileType),
 				entityId: entityId,
 				entityType: entityType,
 				organizationId: organizationId,
 			},
 		});
 
-		// 6. Generate Pre-signed URL for immediate access
 		const getCommand = new GetObjectCommand({
 			Bucket: BUCKET_NAME,
 			Key: key,
 		});
+
 		const signedUrl = await getSignedUrl(s3Client, getCommand, {
-			expiresIn: 900, // Expires in 15 minutes
+			expiresIn: 900,
 		});
 
-		// 7. Return Success with Attachment Info AND Signed URL
 		return {
 			success: true,
 			data: {
-				...attachment, // Include all DB record fields
-				signedUrl: signedUrl, // Add the temporary signed URL
+				...attachment,
+				signedUrl,
 			},
 			error: null,
 		} as const;

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/implementation/components/Checklist.tsx

@@ -7,7 +7,7 @@ export function Checklist({ items }: { items: ChecklistItemProps[] }) {
 	return (
 		<div className="flex flex-col gap-4">
 			{items.map((item) => (
-				<ChecklistItem key={item.dbColumn} {...item} />
+				<ChecklistItem key={`checklist-${item.dbColumn}`} {...item} />
 			))}
 		</div>
 	);

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/components/create-vendor-form.tsx

@@ -46,7 +46,7 @@ import { searchGlobalVendorsAction } from "../actions/search-global-vendors-acti
 
 const createVendorSchema = z.object({
 	name: z.string().min(1, "Name is required"),
-	website: z.string().url("Must be a valid URL").optional(),
+	website: z.string().url("URL must be valid and start with https://").optional(),
 	description: z.string().optional(),
 	category: z.nativeEnum(VendorCategory),
 	status: z.nativeEnum(VendorStatus).default(VendorStatus.not_assessed),
@@ -245,7 +245,6 @@ export function CreateVendorForm({
 															placeholder={t(
 																"vendors.form.vendor_website_placeholder",
 															)}
-															type="url"
 														/>
 													</FormControl>
 													<FormMessage />

apps/app/src/components/main-menu.tsx

@@ -160,17 +160,6 @@ export function MainMenu({
 		},
 	];
 
-	if (session?.data?.user?.email?.endsWith("@trycomp.ai")) {
-		items.push({
-			id: "admin",
-			path: "/internal/admin",
-			name: t("sidebar.admin"),
-			disabled: false,
-			icon: Icons.AI,
-			protected: true,
-		});
-	}
-
 	// Helper function to check if a path is active
 	const isPathActive = (itemPath: string) => {
 		const normalizedItemPath = itemPath.replace(
@@ -213,7 +202,7 @@ export function MainMenu({
 							const isActive = isPathActive(item.path);
 							return (
 								<Item
-									key={item.id}
+									key={`${item.id}-${Math.random()}`}
 									organizationId={organizationId ?? ""}
 									item={item}
 									isActive={isActive}
@@ -275,7 +264,7 @@ const Item = ({
 									"hover:bg-accent hover:border-r-2 hover:border-r-primary/40",
 									"transition-all duration-300",
 									isActive &&
-										"bg-accent dark:bg-secondary border-border border-r-2 border-r-primary hover:border-r-primary",
+									"bg-accent dark:bg-secondary border-border border-r-2 border-r-primary hover:border-r-primary",
 								)}
 							>
 								<div
@@ -308,8 +297,8 @@ const Item = ({
 														className={cn(
 															"ml-1.5 text-[9px] px-1 py-0 h-auto",
 															badgeVariants[
-																item.badge
-																	.variant
+															item.badge
+																.variant
 															],
 														)}
 													>

apps/app/src/components/onboarding/FloatingOnboardingChecklist.tsx

@@ -113,7 +113,7 @@ export function FloatingOnboardingChecklist({
 						: (item.href ?? "#");
 					return (
 						<div
-							key={item.dbColumn}
+							key={`checklist-${item.dbColumn}`}
 							className="group flex items-center gap-3"
 						>
 							<Checkbox
@@ -139,9 +139,9 @@ export function FloatingOnboardingChecklist({
 								className={cn(
 									"flex-1 cursor-pointer text-sm font-medium hover:text-primary",
 									item.completed &&
-										"line-through text-muted-foreground hover:text-muted-foreground",
+									"line-through text-muted-foreground hover:text-muted-foreground",
 									isPending &&
-										"opacity-50 cursor-not-allowed",
+									"opacity-50 cursor-not-allowed",
 								)}
 								tabIndex={isPending ? -1 : 0}
 								aria-disabled={isPending}