Merge pull request #615 from trycompai/main

[comp] Production Deploy

Author: Marfuen

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

@@ -8,6 +8,7 @@ import { auth } from "@/utils/auth";
 import { headers } from "next/headers";
 import { PutObjectCommand, GetObjectCommand } from "@aws-sdk/client-s3";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
+import { revalidatePath } from "next/cache";
 
 function mapFileTypeToAttachmentType(fileType: string): AttachmentType {
 	const type = fileType.split("/")[0];
@@ -31,12 +32,20 @@ const uploadAttachmentSchema = z.object({
 	fileData: z.string(),
 	entityId: z.string(),
 	entityType: z.nativeEnum(AttachmentEntityType),
+	pathToRevalidate: z.string().optional(),
 });
 
 export const uploadFile = async (
 	input: z.infer<typeof uploadAttachmentSchema>,
 ) => {
-	const { fileName, fileType, fileData, entityId, entityType } = input;
+	const {
+		fileName,
+		fileType,
+		fileData,
+		entityId,
+		entityType,
+		pathToRevalidate,
+	} = input;
 	const session = await auth.api.getSession({ headers: await headers() });
 	const organizationId = session?.session.activeOrganizationId;
 
@@ -74,6 +83,16 @@ export const uploadFile = async (
 
 		await s3Client.send(putCommand);
 
+		console.log("Creating attachment...");
+		console.log({
+			name: fileName,
+			url: key,
+			type: mapFileTypeToAttachmentType(fileType),
+			entityId: entityId,
+			entityType: entityType,
+			organizationId: organizationId,
+		});
+
 		const attachment = await db.attachment.create({
 			data: {
 				name: fileName,
@@ -94,6 +113,10 @@ export const uploadFile = async (
 			expiresIn: 900,
 		});
 
+		if (pathToRevalidate) {
+			revalidatePath(pathToRevalidate);
+		}
+
 		return {
 			success: true,
 			data: {

…)/[orgId]/tasks/actions/createComment.ts …hboard)/[orgId]/actions/createComment.tsapps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tasks/actions/createComment.ts renamed to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/actions/createComment.ts apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tasks/actions/createComment.ts renamed to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/actions/createComment.ts

@@ -11,8 +11,10 @@ import { z } from "zod";
 const createCommentSchema = z
 	.object({
 		content: z.string(),
-		taskId: z.string(),
+		entityId: z.string(),
+		entityType: z.nativeEnum(CommentEntityType),
 		attachmentIds: z.array(z.string()).optional(),
+		pathToRevalidate: z.string().optional(),
 	})
 	.refine(
 		(data) =>
@@ -28,7 +30,8 @@ const createCommentSchema = z
 export const createComment = async (
 	input: z.infer<typeof createCommentSchema>,
 ) => {
-	const { content, taskId, attachmentIds } = input;
+	const { content, entityId, entityType, attachmentIds, pathToRevalidate } =
+		input;
 	const session = await auth.api.getSession({
 		headers: await headers(),
 	});
@@ -42,11 +45,11 @@ export const createComment = async (
 		};
 	}
 
-	if (!taskId) {
-		console.error("Task ID missing after validation in createComment");
+	if (!entityId) {
+		console.error("Entity ID missing after validation in createComment");
 		return {
 			success: false,
-			error: "Internal error: Task ID missing.",
+			error: "Internal error: Entity ID missing.",
 			data: null,
 		};
 	}
@@ -72,24 +75,32 @@ export const createComment = async (
 		// Wrap create and update in a transaction
 		const result = await db.$transaction(async (tx) => {
 			// 1. Create the comment within the transaction
+			console.log("Creating comment:", {
+				content,
+				entityId,
+				entityType,
+				memberId: member.id,
+				organizationId: orgId,
+			});
 			const comment = await tx.comment.create({
 				data: {
 					content: content ?? "",
-					entityId: taskId, // Use validated const
-					entityType: CommentEntityType.task,
+					entityId,
+					entityType,
 					authorId: member.id,
 					organizationId: orgId,
 				},
 			});
 
 			// 2. Link attachments if provided (using updateMany)
 			if (attachmentIds && attachmentIds.length > 0) {
+				console.log("Linking attachments to comment:", attachmentIds);
 				await tx.attachment.updateMany({
 					where: {
 						id: { in: attachmentIds },
 						organizationId: orgId,
-						entityType: AttachmentEntityType.comment,
-						entityId: taskId,
+						entityId,
+						entityType: entityType as AttachmentEntityType,
 					},
 					data: {
 						entityId: comment.id,
@@ -99,10 +110,11 @@ export const createComment = async (
 			}
 
 			return comment;
-		}); // End of transaction
+		});
 
-		// Revalidate outside the transaction
-		revalidatePath(`/${orgId}/tasks/${taskId}`);
+		if (pathToRevalidate) {
+			revalidatePath(pathToRevalidate);
+		}
 
 		return {
 			success: true,

…)/[orgId]/tasks/actions/deleteComment.ts …hboard)/[orgId]/actions/deleteComment.tsapps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tasks/actions/deleteComment.ts renamed to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/actions/deleteComment.ts apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tasks/actions/deleteComment.ts renamed to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/actions/deleteComment.ts

@@ -3,7 +3,7 @@
 import { GetObjectCommand } from "@aws-sdk/client-s3";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
 import { db } from "@comp/db";
-import { AttachmentEntityType, CommentEntityType } from "@comp/db/types";
+import { AttachmentEntityType } from "@comp/db/types";
 import { z } from "zod";
 import { s3Client, BUCKET_NAME, extractS3KeyFromUrl } from "@/app/s3";
 import { auth } from "@/utils/auth";
@@ -35,14 +35,13 @@ export const getCommentAttachmentUrl = async (
 			where: {
 				id: attachmentId,
 				organizationId: organizationId,
-				// No include needed here anymore
 			},
 		});
 
 		if (!attachment) {
 			return {
 				success: false,
-				error: "Attachment not found or access denied (1)",
+				error: "Attachment not found or access denied",
 			} as const;
 		}
 
@@ -64,10 +63,6 @@ export const getCommentAttachmentUrl = async (
 				id: attachment.entityId, // Use entityId from attachment
 				organizationId: organizationId, // Ensure comment is in the same org
 			},
-			select: {
-				entityId: true, // Parent (Task) ID
-				entityType: true, // Parent (Task) Type
-			},
 		});
 
 		if (!comment) {
@@ -82,39 +77,7 @@ export const getCommentAttachmentUrl = async (
 			} as const;
 		}
 
-		// 3. Verify parent entity is a task
-		if (comment.entityType !== CommentEntityType.task) {
-			console.error(
-				"Comment's parent entity is not a task",
-				attachmentId,
-				comment.entityType,
-			);
-			return {
-				success: false,
-				error: "Invalid attachment parent link",
-			} as const;
-		}
-
-		// 4. Verify user has access to the parent Task
-		const parentTask = await db.task.findFirst({
-			where: {
-				id: comment.entityId, // Use entityId from comment
-				organizationId: organizationId,
-			},
-			select: { id: true },
-		});
-		if (!parentTask) {
-			console.error(
-				"Parent task not found or access denied",
-				comment.entityId,
-			);
-			return {
-				success: false,
-				error: "Access denied to parent task",
-			} as const;
-		}
-
-		// 5. Extract S3 key
+		// 3. Extract S3 key
 		let key: string;
 		try {
 			key = extractS3KeyFromUrl(attachment.url);
@@ -130,7 +93,7 @@ export const getCommentAttachmentUrl = async (
 			} as const;
 		}
 
-		// 6. Generate Signed URL using shared client and bucket name
+		// 4. Generate Signed URL using shared client and bucket name
 		try {
 			const command = new GetObjectCommand({
 				Bucket: BUCKET_NAME!,

…tasks/actions/deleteCommentAttachment.ts …rgId]/actions/deleteCommentAttachment.tsapps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tasks/actions/deleteCommentAttachment.ts renamed to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/actions/deleteCommentAttachment.ts apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tasks/actions/deleteCommentAttachment.ts renamed to apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/actions/deleteCommentAttachment.ts

@@ -1,20 +1,22 @@
 "use client";
 
-import { Button } from "@comp/ui/button";
-import { Textarea } from "@comp/ui/textarea";
-import { ArrowUp, Loader2, Paperclip } from "lucide-react";
 import { uploadFile } from "@/actions/files/upload-file";
 import { authClient } from "@/utils/auth-client";
-import { AttachmentEntityType } from "@comp/db/types";
+import { AttachmentEntityType, CommentEntityType } from "@comp/db/types";
+import { Button } from "@comp/ui/button";
 import { Label } from "@comp/ui/label";
+import { Textarea } from "@comp/ui/textarea";
 import clsx from "clsx";
+import { ArrowUp, Loader2, Paperclip } from "lucide-react";
 import React, { useCallback, useRef, useState } from "react";
 import { toast } from "sonner";
+import { useParams, useRouter } from "next/navigation";
 import { createComment } from "../../actions/createComment";
-import { AttachmentItem } from "./AttachmentItem";
+import { AttachmentItem } from "../../tasks/[taskId]/components/AttachmentItem";
 
-interface TaskCommentFormProps {
-	taskId: string;
+interface CommentFormProps {
+	entityId: string;
+	entityType: CommentEntityType;
 }
 
 interface PendingAttachment {
@@ -24,31 +26,28 @@ interface PendingAttachment {
 	signedUrl: string | null;
 }
 
-function mapFileTypeToAttachmentType(fileType: string): string {
-	const type = fileType.split("/")[0];
-	switch (type) {
-		case "image":
-			return "image";
-		case "video":
-			return "video";
-		case "audio":
-			return "audio";
-		case "application":
-			if (fileType === "application/pdf") return "document"; // Specific PDF check
-			return "document";
-		default:
-			return "other";
-	}
-}
-
-export function TaskCommentForm({ taskId }: TaskCommentFormProps) {
+export function CommentForm({ entityId, entityType }: CommentFormProps) {
 	const session = authClient.useSession();
 	const [newComment, setNewComment] = useState("");
 	const [pendingAttachments, setPendingAttachments] = useState<
 		PendingAttachment[]
 	>([]);
 	const [isUploading, setIsUploading] = useState(false);
 	const fileInputRef = useRef<HTMLInputElement>(null);
+	const { orgId } = useParams<{ orgId: string }>();
+
+	let pathToRevalidate = "";
+	switch (entityType) {
+		case "task":
+			pathToRevalidate = `/${orgId}/tasks/${entityId}`;
+			break;
+		case "vendor":
+			pathToRevalidate = `/${orgId}/vendors/${entityId}`;
+			break;
+		case "risk":
+			pathToRevalidate = `/${orgId}/risks/${entityId}`;
+			break;
+	}
 
 	const triggerFileInput = () => {
 		fileInputRef.current?.click();
@@ -93,8 +92,9 @@ export function TaskCommentForm({ taskId }: TaskCommentFormProps) {
 							fileName: file.name,
 							fileType: file.type,
 							fileData: base64Data,
-							entityId: taskId,
-							entityType: AttachmentEntityType.comment,
+							entityId,
+							entityType: entityType as AttachmentEntityType,
+							pathToRevalidate,
 						});
 						if (error) {
 							console.error(
@@ -145,7 +145,7 @@ export function TaskCommentForm({ taskId }: TaskCommentFormProps) {
 				if (fileInputRef.current) fileInputRef.current.value = "";
 			})();
 		},
-		[taskId, pendingAttachments.length],
+		[entityId, entityType, pendingAttachments.length],
 	);
 
 	const handleRemovePendingAttachment = (attachmentIdToRemove: string) => {
@@ -194,8 +194,10 @@ export function TaskCommentForm({ taskId }: TaskCommentFormProps) {
 
 		const { success, data, error } = await createComment({
 			content: newComment,
-			taskId: taskId,
+			entityId,
+			entityType,
 			attachmentIds: pendingAttachments.map((att) => att.id),
+			pathToRevalidate,
 		});
 
 		if (success && data) {