Merge branch 'main' into lewis/comp-onboarding-calendar

Author: carhartlewis

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

@@ -2,9 +2,7 @@ import type { TemplateControl, TemplateTask, TemplatePolicy } from "@comp/data";
 import { controls, tasks, frameworks, policies } from "@comp/data";
 import { db } from "@comp/db";
 import {
-	FrameworkId,
 	type PolicyStatus,
-	RequirementId,
 	TaskStatus,
 	TaskFrequency,
 	Departments,
@@ -36,7 +34,7 @@ export function getPolicyById(id: string): TemplatePolicy | undefined {
  * @returns Array of control templates relevant to the selected frameworks
  */
 export function getRelevantControls(
-	frameworkIds: FrameworkId[],
+	frameworkIds: string[],
 ): TemplateControl[] {
 	return controls.filter((control) =>
 		control.mappedRequirements.some((req) =>
@@ -62,7 +60,7 @@ export function getRelevantControls(
  */
 export async function createFrameworkInstance(
 	organizationId: string,
-	frameworkId: FrameworkId,
+	frameworkId: string,
 	txClient?: Prisma.TransactionClient,
 ) {
 	const prisma: Prisma.TransactionClient | PrismaClient = txClient ?? db;
@@ -80,7 +78,8 @@ export async function createFrameworkInstance(
 	}
 
 	// Verify the framework exists
-	const framework = frameworks[frameworkId as FrameworkId];
+	// @ts-expect-error
+	const framework = frameworks[frameworkId]; 
 
 	if (!framework) {
 		console.error(
@@ -99,7 +98,7 @@ export async function createFrameworkInstance(
 			where: {
 				organizationId_frameworkId: {
 					organizationId,
-					frameworkId: frameworkId as FrameworkId,
+					frameworkId,
 				},
 			},
 		},
@@ -113,13 +112,13 @@ export async function createFrameworkInstance(
 				},
 				data: {
 					organizationId,
-					frameworkId: frameworkId as FrameworkId,
+					frameworkId,
 				},
 			})
 		: await prisma.frameworkInstance.create({
 				data: {
 					organizationId,
-					frameworkId: frameworkId as FrameworkId,
+					frameworkId,
 				},
 			});
 
@@ -136,6 +135,8 @@ export async function createFrameworkInstance(
 		),
 	);
 
+	console.log("frameworkControls", frameworkControls);
+
 	// Prepare data for batch control creation
 	const controlsToCreate = frameworkControls.map((control) => ({
 		organizationId,
@@ -144,6 +145,8 @@ export async function createFrameworkInstance(
 		// We connect frameworkInstances later or handle differently if createMany doesn't support relation connection easily
 	}));
 
+	console.log("controlsToCreate", controlsToCreate);
+
 	// Batch create controls if there are any to create
 	if (controlsToCreate.length > 0) {
 		await prisma.control.createMany({
@@ -163,6 +166,8 @@ export async function createFrameworkInstance(
 			select: { id: true, name: true }, // Select only necessary fields
 		});
 
+		console.log("createdOrFoundDbControls", createdOrFoundDbControls);
+
 		// Connect the controls to the framework instance
 		if (createdOrFoundDbControls.length > 0) {
 			await prisma.frameworkInstance.update({
@@ -213,7 +218,7 @@ export async function createFrameworkInstance(
  * @returns The number of requirement maps created
  */
 export async function createRequirementMaps(
-	frameworkInstance: { id: string; frameworkId: FrameworkId },
+	frameworkInstance: { id: string; frameworkId: string },
 	controls: { id: string; name: string }[],
 	templateControls: TemplateControl[],
 	txClient?: Prisma.TransactionClient,
@@ -234,7 +239,7 @@ export async function createRequirementMaps(
 	const requirementMapsToCreate: {
 		controlId: string;
 		frameworkInstanceId: string;
-		requirementId: RequirementId;
+		requirementId: string;
 	}[] = [];
 
 	// For each template control
@@ -259,8 +264,7 @@ export async function createRequirementMaps(
 			requirementMapsToCreate.push({
 				controlId: control.id,
 				frameworkInstanceId: frameworkInstance.id,
-				requirementId:
-					`${frameworkInstance.frameworkId}_${requirement.requirementId}` as RequirementId,
+				requirementId: requirement.requirementId,
 			});
 		}
 	}

apps/app/src/actions/schema.ts

@@ -1,7 +1,6 @@
 import {
 	CommentEntityType,
 	Departments,
-	FrameworkId,
 	Frequency,
 	Impact,
 	Likelihood,
@@ -15,7 +14,7 @@ import { z } from "zod";
 export const organizationSchema = z.object({
 	name: z.string().min(1, "Organization name is required"),
 	frameworks: z
-		.array(z.nativeEnum(FrameworkId))
+		.array(z.string())
 		.min(1, "Please select at least one framework to get started with"),
 	website: z
 		.string()

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

@@ -1,4 +1,4 @@
-import type { FrameworkId, RequirementMap } from "@comp/db/types";
+import type { RequirementMap } from "@comp/db/types";
 import { TableCell, TableRow } from "@comp/ui/table";
 import { useRouter } from "next/navigation";
 import { useParams } from "next/navigation";
@@ -11,11 +11,10 @@ interface RequirementRowProps {
 export function RequirementRow({ requirement }: RequirementRowProps) {
 	const router = useRouter();
 	const params = useParams();
-	const [frameworkId, requirementId] = requirement.requirementId.split("_");
+	const requirementId = requirement.requirementId;
 	const orgId = params.orgId as string;
 
 	const requirementDetails = getRequirementDetails(
-		frameworkId as FrameworkId,
 		requirementId,
 	);
 

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

@@ -6,7 +6,6 @@ import { DataTableSortList } from "@/components/data-table/data-table-sort-list"
 import { useDataTable } from "@/hooks/use-data-table";
 import { useI18n } from "@/locales/client";
 import type {
-	FrameworkId,
 	FrameworkInstance,
 	RequirementMap,
 } from "@comp/db/types";
@@ -43,37 +42,23 @@ export function RequirementsTable({
 					/>
 				),
 				cell: ({ row }) => {
-					const [frameworkId, requirementId] =
-						row.original.requirementId.split("_");
-					const details = getRequirementDetails(
-						frameworkId as FrameworkId,
-						requirementId,
-					);
-
 					const frameworkDetails = getFrameworkDetails(
 						row.original.frameworkInstance.frameworkId,
 					);
+
 					return (
 						<span>
-							{frameworkDetails?.name} - {details?.name}
+							{frameworkDetails.name}
 						</span>
 					);
 				},
 				enableSorting: true,
 				sortingFn: (rowA, rowB, columnId) => {
-					const [frameworkIdA, requirementIdA] =
-						rowA.original.requirementId.split("_");
-					const [frameworkIdB, requirementIdB] =
-						rowB.original.requirementId.split("_");
-
-					const detailsA = getRequirementDetails(
-						frameworkIdA as FrameworkId,
-						requirementIdA,
-					);
-					const detailsB = getRequirementDetails(
-						frameworkIdB as FrameworkId,
-						requirementIdB,
-					);
+					const requirementIdA = rowA.original.requirementId;
+					const requirementIdB = rowB.original.requirementId;
+
+					const detailsA = getRequirementDetails(requirementIdA);
+					const detailsB = getRequirementDetails(requirementIdB);
 
 					const nameA = detailsA?.name || "";
 					const nameB = detailsB?.name || "";
@@ -90,12 +75,10 @@ export function RequirementsTable({
 					/>
 				),
 				cell: ({ row }) => {
-					const [frameworkId, requirementId] =
-						row.original.requirementId.split("_");
-					const details = getRequirementDetails(
-						frameworkId as FrameworkId,
-						requirementId,
-					);
+					const requirementId = row.original.requirementId;
+					const details = getRequirementDetails(requirementId);
+
+					console.log("details", requirementId);	
 					return (
 						<span className="text-muted-foreground">
 							{details?.description}
@@ -104,19 +87,11 @@ export function RequirementsTable({
 				},
 				enableSorting: true,
 				sortingFn: (rowA, rowB, columnId) => {
-					const [frameworkIdA, requirementIdA] =
-						rowA.original.requirementId.split("_");
-					const [frameworkIdB, requirementIdB] =
-						rowB.original.requirementId.split("_");
-
-					const detailsA = getRequirementDetails(
-						frameworkIdA as FrameworkId,
-						requirementIdA,
-					);
-					const detailsB = getRequirementDetails(
-						frameworkIdB as FrameworkId,
-						requirementIdB,
-					);
+					const requirementIdA = rowA.original.requirementId;
+					const requirementIdB = rowB.original.requirementId;
+
+					const detailsA = getRequirementDetails(requirementIdA);
+					const detailsB = getRequirementDetails(requirementIdB);
 
 					const descA = detailsA?.description || "";
 					const descB = detailsB?.description || "";
@@ -134,20 +109,14 @@ export function RequirementsTable({
 
 		const searchLower = searchTerm.toLowerCase();
 		return requirements.filter((req) => {
-			const [frameworkId, requirementId] = req.requirementId.split("_");
-			const details = getRequirementDetails(
-				frameworkId as FrameworkId,
-				requirementId,
-			);
+			const requirementId = req.requirementId;
+			const details = getRequirementDetails(requirementId);
 
 			// Search in ID, name, and description
 			return (
-				frameworkId.toLowerCase().includes(searchLower) ||
 				requirementId.toLowerCase().includes(searchLower) ||
 				details?.name?.toLowerCase().includes(searchLower) ||
-				false ||
-				details?.description?.toLowerCase().includes(searchLower) ||
-				false
+				details?.description?.toLowerCase().includes(searchLower)
 			);
 		});
 	}, [requirements, searchTerm]);
@@ -195,7 +164,7 @@ export function RequirementsTable({
 					table={table.table}
 					rowClickBasePath={`/${orgId}/frameworks`}
 					getRowId={(row) => {
-						const [_, requirementId] = row.requirementId.split("_");
+						const requirementId = row.requirementId;
 						return `${row.frameworkInstanceId}/requirements/${requirementId}`;
 					}}
 					tableId={"r"}

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/controls/components/controls-table-columns.tsx

@@ -76,7 +76,7 @@ export function getControlColumns(): ColumnDef<ControlWithRelations>[] {
 										className="text-xs"
 									>
 										{frameworkName}:{" "}
-										{req.requirementId.split("_").pop()}
+										{req.requirementId}
 									</Badge>
 								);
 							})

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

@@ -5,7 +5,6 @@ import { DataTableColumnHeader } from "@/components/data-table/data-table-column
 import { DataTableSortList } from "@/components/data-table/data-table-sort-list";
 import { useDataTable } from "@/hooks/use-data-table";
 import { useI18n } from "@/locales/client";
-import { FrameworkId } from "@comp/db/types";
 import { Card, CardContent, CardHeader, CardTitle } from "@comp/ui/card";
 import { Input } from "@comp/ui/input";
 import { ColumnDef } from "@tanstack/react-table";
@@ -26,7 +25,7 @@ export function FrameworkRequirements({
 	frameworkId,
 	frameworkInstanceWithControls,
 }: {
-	frameworkId: FrameworkId;
+	frameworkId: string;
 	frameworkInstanceWithControls: FrameworkInstanceWithControls;
 }) {
 	const t = useI18n();

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

@@ -2,39 +2,24 @@
 
 import { useI18n } from "@/locales/client";
 import type { Requirement } from "@comp/data";
-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 { Control, Task } from "@comp/db/types";
+import type { Control, RequirementMap, Task } from "@comp/db/types";
 
 interface RequirementControlsProps {
 	requirement: Requirement;
-	requirementKey: string;
-	frameworkInstanceWithControls: FrameworkInstanceWithControls;
 	tasks: (Task & { controls: Control[] })[];
+	relatedControls: (RequirementMap & { control: Control })[];
 }
 
 export function RequirementControls({
 	requirement,
-	requirementKey,
-	frameworkInstanceWithControls,
 	tasks,
+	relatedControls,
 }: RequirementControlsProps) {
 	const t = useI18n();
 
-	// Get the framework ID from the instance
-	const frameworkId =
-		frameworkInstanceWithControls.frameworkId as FrameworkId;
-	const compositeId = `${frameworkId}_${requirementKey}`;
-
-	// Filter controls that are mapped to this requirement using the composite ID
-	const requirementControls = frameworkInstanceWithControls.controls.filter(
-		(control) =>
-			control.requirementsMapped?.some(
-				(req) => req.requirementId === compositeId,
-			) ?? false,
-	);
 
 	return (
 		<div className="space-y-6">
@@ -62,12 +47,12 @@ export function RequirementControls({
 				<CardHeader>
 					<CardTitle>
 						{t("frameworks.controls.title")} (
-						{requirementControls.length})
+						{relatedControls.length})
 					</CardTitle>
 				</CardHeader>
 				<CardContent>
 					<RequirementControlsTable
-						controls={requirementControls}
+						controls={relatedControls.map((control) => control.control)}
 						tasks={tasks}
 					/>
 				</CardContent>