feat(frameworks): include controls in task retrieval across various components

claudfuen · claudfuen · commit bfbad293ade9 · 2025-05-16T11:25:58.000-04:00
- Added an `include` clause to task retrieval functions to fetch associated controls, enhancing the data structure for tasks.
- Updated multiple components to accommodate the new task structure, ensuring they handle tasks with associated controls correctly.
- Adjusted type definitions to reflect the inclusion of controls in task data, improving type safety and consistency.
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkOverview.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkOverview.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({
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/page.tsx
@@ -54,6 +54,9 @@ export default async function FrameworkPage({ params }: PageProps) {
 				},
 			},
 		},
+		include: {
+			controls: true,
+		},
 	});
 
 	return (
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/RequirementControls.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/RequirementControls.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({
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/table/RequirementControlsTable.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/table/RequirementControlsTable.tsx
@@ -27,7 +27,7 @@ interface RequirementControlsTableProps {
 			policy: Policy | null;
 		})[];
 	})[];
-	tasks: Task[];
+	tasks: (Task & { controls: Control[] })[];
 }
 
 export function RequirementControlsTable({
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/table/RequirementControlsTableColumns.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/components/table/RequirementControlsTableColumns.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 }>();
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/[frameworkInstanceId]/requirements/[requirementKey]/page.tsx
@@ -75,6 +75,9 @@ export default async function RequirementPage({ params }: PageProps) {
 					},
 				},
 			},
+			include: {
+				controls: true,
+			},
 		})) || [];
 
 	return (
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/components/FrameworkCard.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/components/FrameworkCard.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useI18n } from "@/locales/client";
-import { Task } from "@comp/db/types";
+import { Task, Control } from "@comp/db/types";
 import { Badge } from "@comp/ui/badge";
 import {
 	Card,
@@ -21,7 +21,7 @@ import { FrameworkInstanceWithControls } from "../types";
 interface FrameworkCardProps {
 	frameworkInstance: FrameworkInstanceWithControls;
 	complianceScore: number;
-	tasks: Task[];
+	tasks: (Task & { controls: Control[] })[];
 }
 
 export function FrameworkCard({
@@ -75,8 +75,8 @@ export function FrameworkCard({
 	const notStartedControlsCount =
 		frameworkInstance.controls?.filter((control) => {
 			// If a control has no artifacts and no tasks, it's not started.
-			const controlTasks = tasks.filter(
-				(task) => task.entityId === control.id,
+			const controlTasks = tasks.filter((task) =>
+				task.controls.some((c) => c.id === control.id),
 			);
 
 			if (
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/components/FrameworkList.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/components/FrameworkList.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { Task } from "@comp/db/types";
+import { Control, Task } from "@comp/db/types";
 import { FrameworkCard } from "./FrameworkCard";
 import type { FrameworkInstanceWithComplianceScore } from "./types";
 
@@ -9,7 +9,7 @@ export function FrameworkList({
 	tasks,
 }: {
 	frameworksWithControlsAndComplianceScores: FrameworkInstanceWithComplianceScore[];
-	tasks: Task[];
+	tasks: (Task & { controls: Control[] })[];
 }) {
 	if (!frameworksWithControlsAndComplianceScores.length) return null;
 
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/components/FrameworksOverview.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/components/FrameworksOverview.tsx
@@ -1,11 +1,11 @@
-import { Task } from "@comp/db/types";
+import { Control, Task } from "@comp/db/types";
 import { getFrameworkWithComplianceScores } from "../data/getFrameworkWithComplianceScores";
 import type { FrameworkInstanceWithControls } from "../types";
 import { FrameworkList } from "./FrameworkList";
 
 export interface FrameworksOverviewProps {
 	frameworksWithControls: FrameworkInstanceWithControls[];
-	tasks: Task[];
+	tasks: (Task & { controls: Control[] })[];
 }
 
 export async function FrameworksOverview({
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/data/getFrameworkWithComplianceScores.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/data/getFrameworkWithComplianceScores.ts
@@ -1,16 +1,13 @@
 "use server";
 
 import {
+	Control,
 	type Artifact,
-	type Task,
 	type Policy,
-	TaskEntityType,
+	type Task,
 } from "@comp/db/types";
 import { FrameworkInstanceWithComplianceScore } from "../components/types";
 import { FrameworkInstanceWithControls } from "../types";
-import { db } from "@comp/db";
-import { headers } from "next/headers";
-import { auth } from "@/utils/auth";
 
 /**
  * Checks if a control is compliant based on its artifacts and tasks
@@ -62,7 +59,7 @@ export async function getFrameworkWithComplianceScores({
 	tasks,
 }: {
 	frameworksWithControls: FrameworkInstanceWithControls[];
-	tasks: Task[];
+	tasks: (Task & { controls: Control[] })[];
 }): Promise<FrameworkInstanceWithComplianceScore[]> {
 	// Calculate compliance for each framework
 	const frameworksWithComplianceScores = frameworksWithControls.map(
@@ -73,8 +70,8 @@ export async function getFrameworkWithComplianceScores({
 			// Calculate compliance percentage
 			const totalControls = controls.length;
 			const compliantControls = controls.filter((control) => {
-				const controlTasks = tasks.filter(
-					(task) => task.entityId === control.id,
+				const controlTasks = tasks.filter((task) =>
+					task.controls.some((c) => c.id === control.id),
 				);
 				return isControlCompliant(control.artifacts, controlTasks);
 			}).length;
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/lib/utils.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/lib/utils.ts
@@ -1,6 +1,6 @@
 import { StatusType } from "@/components/status-indicator";
 // Import base types explicitly
-import type { Artifact, Policy, PolicyStatus } from "@comp/db/types";
+import type { Artifact, Control, Policy, PolicyStatus } from "@comp/db/types";
 import { Task } from "@comp/db/types";
 
 // Define the expected artifact structure explicitly, allowing null status
@@ -11,10 +11,12 @@ type ArtifactWithRelations = Artifact & {
 // Function to determine control status based on artifacts
 export function getControlStatus(
 	artifacts: ArtifactWithRelations[], // Use the explicit type
-	tasks: Task[],
+	tasks: (Task & { controls: Control[] })[],
 	controlId: string,
 ): StatusType {
-	const controlTasks = tasks.filter((task) => task.entityId === controlId);
+	const controlTasks = tasks.filter((task) =>
+		task.controls.some((c) => c.id === controlId),
+	);
 
 	// All artifacts are draft or none
 	const allArtifactsDraft =
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/frameworks/page.tsx
@@ -63,6 +63,9 @@ const getControlTasks = async () => {
 				},
 			},
 		},
+		include: {
+			controls: true,
+		},
 	});
 
 	return tasks;
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/[taskId]/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/risk/[riskId]/tasks/[taskId]/page.tsx
@@ -39,8 +39,6 @@ const getTask = cache(async (riskId: string, taskId: string) => {
 
 	const task = await db.task.findUnique({
 		where: {
-			entityId: riskId,
-			entityType: "risk",
 			id: taskId,
 			organizationId: session.session.activeOrganizationId,
 		},
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tasks/actions/updateTaskOrder.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tasks/actions/updateTaskOrder.ts
@@ -2,7 +2,7 @@
 
 import { db } from "@comp/db";
 import { z } from "zod";
-import { TaskStatus, TaskEntityType } from "@comp/db/types";
+import { TaskStatus } from "@comp/db/types";
 import { revalidatePath } from "next/cache";
 import type { ActionResponse } from "@/types/actions";
 import { auth } from "@/utils/auth";
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tasks/components/TaskFilterHeader.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tasks/components/TaskFilterHeader.tsx
@@ -1,17 +1,8 @@
 "use client";
 
 import { Button } from "@comp/ui/button";
-import {
-	DropdownMenu,
-	DropdownMenuCheckboxItem,
-	DropdownMenuContent,
-	DropdownMenuLabel,
-	DropdownMenuSeparator,
-	DropdownMenuTrigger,
-} from "@comp/ui/dropdown-menu";
-import { TaskEntityType, TaskStatus } from "@comp/db/types";
-import { Check, Circle, Filter, List, Loader2 } from "lucide-react";
-import { parseAsArrayOf, parseAsStringLiteral, useQueryState } from "nuqs";
+import { Check, Circle, List, Loader2 } from "lucide-react";
+import { useQueryState } from "nuqs";
 
 // Configuration for task statuses and their display order.
 const statuses = [
@@ -21,23 +12,8 @@ const statuses = [
 ] as const;
 type StatusId = (typeof statuses)[number]["id"];
 
-// Allowed entity types for tasks.
-const possibleEntityTypes = [
-	TaskEntityType.control,
-	TaskEntityType.risk,
-	TaskEntityType.vendor,
-] as const;
-
-// Parser for handling comma-separated entity types in the URL query string.
-const entityTypesParser = parseAsArrayOf(
-	parseAsStringLiteral(possibleEntityTypes),
-	",",
-)
-	.withDefault([] as TaskEntityType[])
-	.withOptions({ shallow: false });
-
 /**
- * Renders the header section for filtering tasks by status and entity type.
+ * Renders the header section for filtering tasks by status.
  * Uses `nuqs` to manage filter state in the URL search parameters.
  */
 export function TaskFilterHeader() {
@@ -46,12 +22,6 @@ export function TaskFilterHeader() {
 		shallow: false, // Ensures full page reload on change to refetch server data.
 	});
 
-	// State for the entity type filter, synced with the 'entityTypes' URL query parameter.
-	const [entityTypes, setEntityTypes] = useQueryState(
-		"entityTypes",
-		entityTypesParser,
-	);
-
 	// Mapping of status IDs (and 'all') to their corresponding icons.
 	const statusIcons: Record<StatusId | "all", React.ElementType> = {
 		all: List,
@@ -68,27 +38,12 @@ export function TaskFilterHeader() {
 		return `${baseClasses} ${isActive ? "" : inactiveClasses}`.trim();
 	};
 
-	// Handler for updating the entity type filter based on checkbox changes.
-	const handleEntityTypeChange = (type: TaskEntityType, checked: boolean) => {
-		setEntityTypes((prev) => {
-			const currentTypes = prev ?? [];
-			if (checked) {
-				// Add the type if checked, ensuring uniqueness.
-				return Array.from(new Set([...currentTypes, type]));
-			}
-			// Remove the type if unchecked.
-			return currentTypes.filter((t) => t !== type);
-		});
-	};
-
-	// Check if any status or entity type filters are currently active.
-	const filtersActive =
-		statusFilter !== null || (entityTypes?.length ?? 0) > 0;
+	// Check if any status filters are currently active.
+	const filtersActive = statusFilter !== null;
 
 	// Handler to clear all active filters.
 	const clearFilters = () => {
 		setStatusFilter(null);
-		setEntityTypes([]); // Clear entity types using the setter with an empty array.
 	};
 
 	return (
@@ -122,43 +77,8 @@ export function TaskFilterHeader() {
 				})}
 			</div>
 
-			{/* Action Filters (Entity Type and Clear) */}
+			{/* Action Filters (Clear) */}
 			<div className="flex items-center py-2 space-x-2">
-				<DropdownMenu>
-					<DropdownMenuTrigger asChild>
-						<Button
-							variant="ghost"
-							size="sm"
-							className="flex items-center space-x-1.5 text-muted-foreground"
-						>
-							<Filter className="w-3.5 h-3.5" />
-							<span>Filter</span>
-							{/* Display badge indicating the number of active entity type filters. */}
-							{(entityTypes?.length ?? 0) > 0 && (
-								<span className="ml-1.5 rounded bg-secondary px-1.5 py-0.5 text-xs text-secondary-foreground">
-									{entityTypes!.length}
-								</span>
-							)}
-						</Button>
-					</DropdownMenuTrigger>
-					<DropdownMenuContent align="end">
-						<DropdownMenuLabel>Filter by Type</DropdownMenuLabel>
-						<DropdownMenuSeparator />
-						{possibleEntityTypes.map((type) => (
-							<DropdownMenuCheckboxItem
-								key={type}
-								checked={entityTypes?.includes(type) ?? false}
-								onCheckedChange={(checked) =>
-									handleEntityTypeChange(type, !!checked)
-								}
-								className="capitalize"
-							>
-								{type}
-							</DropdownMenuCheckboxItem>
-						))}
-					</DropdownMenuContent>
-				</DropdownMenu>
-
 				{/* Conditionally render the 'Clear filters' button only when filters are active. */}
 				{filtersActive && (
 					<Button
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tasks/page.tsx b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/tasks/page.tsx
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/schema.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/schema.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/task/create-task-action.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/task/create-task-action.ts
diff --git a/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/task/update-task-action.ts b/apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/vendors/[vendorId]/actions/task/update-task-action.ts

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ interface RequirementControlsTableProps {`
`27`	`27`	`policy: Policy \| null;`
`28`	`28`	`})[];`
`29`	`29`	`})[];`
`30`		`- tasks: Task[];`
	`30`	`+ tasks: (Task & { controls: Control[] })[];`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`export function RequirementControlsTable({`