Merge branch 'main' into lewis/comp-tp-ui-fixes

Author: carhartlewis

apps/app/src/actions/organization/lib/utils.ts

@@ -6,7 +6,6 @@ import {
 	type PolicyStatus,
 	RequirementId,
 	TaskStatus,
-	TaskEntityType,
 	TaskFrequency,
 	Departments,
 	ArtifactType,
@@ -516,6 +515,8 @@ export async function createOrganizationTasks(
 		);
 	}
 
+	let tasksCreatedCount = 0;
+
 	for (const control of relevantControls) {
 		const dbControl = dbControls.get(control.name);
 		if (!dbControl) continue;
@@ -534,42 +535,44 @@ export async function createOrganizationTasks(
 				continue; // Skip if template doesn't exist
 			}
 
-			// Create one task per control that requires this type of task
-			tasksToCreateData.push({
-				organizationId,
-				title: taskTemplate.name, // Use template name
-				description: taskTemplate.description, // Use template desc
-				status: TaskStatus.todo,
-				entityId: dbControl.id, // Link to the Control ID
-				entityType: TaskEntityType.control,
-				frequency: taskTemplate.frequency ?? TaskFrequency.quarterly, // Use template freq
-				assigneeId: memberRecord?.id || null,
-				department: taskTemplate.department ?? Departments.none, // Use template department
-			});
+			try {
+				// Create one task per control that requires this type of task
+				await prisma.task.create({
+					data: {
+						organizationId,
+						title: taskTemplate.name, // Use template name
+						description: taskTemplate.description, // Use template desc
+						status: TaskStatus.todo,
+						// entityId: dbControl.id, // Link to the Control ID
+						// entityType: TaskEntityType.control,
+						controls: { connect: { id: dbControl.id } },
+						frequency: taskTemplate.frequency ?? TaskFrequency.quarterly, // Use template freq
+						assigneeId: memberRecord?.id || null,
+						department: taskTemplate.department ?? Departments.none, // Use template department
+					},
+				});
+				tasksCreatedCount++;
+			} catch (error) {
+				console.error(
+					`Error creating task for control ${control.name} with template ${taskTemplateId}`,
+					{ error },
+				);
+				// Continue with next task even if one fails
+				continue;
+			}
 		}
 	}
 
-	if (tasksToCreateData.length === 0) {
+	if (tasksCreatedCount === 0) {
 		console.info("No tasks required for the selected controls.");
 		return { tasksCreatedCount: 0 };
 	}
-	console.info("Tasks to be created", {
-		organizationId,
-		count: tasksToCreateData.length,
-	});
-	try {
-		await prisma.task.createMany({ data: tasksToCreateData });
-		console.info(
-			`Batch created ${tasksToCreateData.length} task records for org ${organizationId}`,
-		);
-	} catch (error) {
-		console.error(
-			`Error batch creating task records for org ${organizationId}`,
-			{ error },
-		);
-		throw new Error("Failed to create organization tasks");
-	}
-	return { tasksCreatedCount: tasksToCreateData.length };
+
+	console.info(
+		`Created ${tasksCreatedCount} task records for org ${organizationId}`,
+	);
+
+	return { tasksCreatedCount };
 }
 
 /**

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/controls/[controlId]/data/getControl.ts

@@ -30,6 +30,7 @@ export const getControl = async (id: string) => {
 					frameworkInstance: true,
 				},
 			},
+			tasks: true,
 		},
 	});
 

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/controls/[controlId]/data/getOrganizationControlProgress.ts

@@ -2,7 +2,6 @@
 
 import { auth } from "@/utils/auth";
 import { db } from "@comp/db";
-import { TaskEntityType } from "@comp/db/types";
 import { ArtifactType } from "@prisma/client";
 import { headers } from "next/headers";
 
@@ -48,6 +47,7 @@ export const getOrganizationControlProgress = async (controlId: string) => {
 					policy: true,
 				},
 			},
+			tasks: true,
 		},
 	});
 
@@ -58,14 +58,7 @@ export const getOrganizationControlProgress = async (controlId: string) => {
 	}
 
 	const artifacts = control.artifacts;
-	const tasks = await db.task.findMany({
-		where: {
-			organizationId: orgId,
-			entityId: controlId,
-			entityType: "control",
-		},
-	});
-
+	const tasks = control.tasks;
 	const progress: ControlProgressResponse = {
 		total: artifacts.length + tasks.length,
 		completed: 0,
@@ -107,28 +100,21 @@ export const getOrganizationControlProgress = async (controlId: string) => {
 
 	for (const task of tasks) {
 		// Initialize type counters if not exists
-		if (!progress.byType[task.entityType]) {
-			progress.byType[task.entityType] = {
+		if (!progress.byType["control"]) {
+			progress.byType["control"] = {
 				total: 0,
 				completed: 0,
 			};
 		}
 
-		progress.byType[task.entityType].total++;
+		progress.byType["control"].total++;
 
-		// Check completion based on task type
-		let isCompleted = false;
-		switch (task.entityType) {
-			case TaskEntityType.control:
-				isCompleted = task.status === "done";
-				break;
-			default:
-				isCompleted = false;
-		}
+		// Check completion based on task status (all tasks here are implicitly control-related)
+		const isCompleted = task.status === "done";
 
 		if (isCompleted) {
 			progress.completed++;
-			progress.byType[task.entityType].completed++;
+			progress.byType["control"].completed++;
 		}
 	}
 

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/controls/[controlId]/data/getRelatedTasks.ts

@@ -6,7 +6,6 @@ import { SingleControl } from "./components/SingleControl";
 import { getControl } from "./data/getControl";
 import { getOrganizationControlProgress } from "./data/getOrganizationControlProgress";
 import type { ControlProgressResponse } from "./data/getOrganizationControlProgress";
-import { getRelatedTasks } from "./data/getRelatedTasks";
 import { getRelatedArtifacts } from "./data/getRelatedArtifacts";
 
 interface ControlPageProps {
@@ -54,10 +53,6 @@ export default async function ControlPage({ params }: ControlPageProps) {
 		controlId: controlId,
 	});
 
-	const relatedTasks = await getRelatedTasks({
-		controlId: controlId,
-	});
-
 	return (
 		<PageWithBreadcrumb
 			breadcrumbs={[
@@ -69,7 +64,7 @@ export default async function ControlPage({ params }: ControlPageProps) {
 				control={control}
 				controlProgress={controlProgress}
 				relatedArtifacts={relatedArtifacts}
-				relatedTasks={relatedTasks}
+				relatedTasks={control.tasks}
 			/>
 		</PageWithBreadcrumb>
 	);

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/controls/[controlId]/page.tsx

@@ -6,11 +6,11 @@ import { Progress } from "@comp/ui/progress";
 import { getFrameworkDetails } from "../../lib/getFrameworkDetails";
 import { getControlStatus } from "../../lib/utils";
 import { FrameworkInstanceWithControls } from "../../types";
-import { Task } from "@comp/db/types";
+import { Control, Task } from "@comp/db/types";
 
 interface FrameworkOverviewProps {
 	frameworkInstanceWithControls: FrameworkInstanceWithControls;
-	tasks: Task[];
+	tasks: (Task & { controls: Control[] })[];
 }
 
 export function FrameworkOverview({

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkOverview.tsx

@@ -7,7 +7,7 @@ import { getFrameworkDetails } from "../lib/getFrameworkDetails";
 import { FrameworkOverview } from "./components/FrameworkOverview";
 import { FrameworkRequirements } from "./components/FrameworkRequirements";
 import { db } from "@comp/db";
-import { TaskEntityType } from "@comp/db/types";
+
 interface PageProps {
 	params: Promise<{
 		frameworkInstanceId: string;
@@ -48,7 +48,14 @@ export default async function FrameworkPage({ params }: PageProps) {
 	const tasks = await db.task.findMany({
 		where: {
 			organizationId,
-			entityType: TaskEntityType.control,
+			controls: {
+				some: {
+					id: frameworkInstanceWithControls.id,
+				},
+			},
+		},
+		include: {
+			controls: true,
 		},
 	});
 

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/page.tsx

@@ -6,13 +6,13 @@ import { FrameworkId } from "@comp/db/types";
 import { Card, CardContent, CardHeader, CardTitle } from "@comp/ui/card";
 import { FrameworkInstanceWithControls } from "../../../../types";
 import { RequirementControlsTable } from "./table/RequirementControlsTable";
-import type { Task } from "@comp/db/types";
+import type { Control, Task } from "@comp/db/types";
 
 interface RequirementControlsProps {
 	requirement: Requirement;
 	requirementKey: string;
 	frameworkInstanceWithControls: FrameworkInstanceWithControls;
-	tasks: Task[];
+	tasks: (Task & { controls: Control[] })[];
 }
 
 export function RequirementControls({

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/RequirementControls.tsx

@@ -27,7 +27,7 @@ interface RequirementControlsTableProps {
 			policy: Policy | null;
 		})[];
 	})[];
-	tasks: Task[];
+	tasks: (Task & { controls: Control[] })[];
 }
 
 export function RequirementControlsTable({

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/table/RequirementControlsTable.tsx

@@ -26,7 +26,7 @@ type OrganizationControlType = Control & {
 export function RequirementControlsTableColumns({
 	tasks,
 }: {
-	tasks: Task[];
+	tasks: (Task & { controls: Control[] })[];
 }): ColumnDef<OrganizationControlType>[] {
 	const t = useI18n();
 	const { orgId } = useParams<{ orgId: string }>();