Merge pull request #552 from trycompai/lewis/comp-trust-fix

[dev] [carhartlewis] lewis/comp-trust-fix

Author: carhartlewis

CHANGELOG.md

@@ -1,3 +1,58 @@
+# [1.4.0](https://github.com/trycompai/comp/compare/v1.3.0...v1.4.0) (2025-05-10)
+
+
+### Features
+
+* **controls:** add Edit and Delete Control dialogs for enhanced control management; implement update and delete functionalities in actions ([c05ab4d](https://github.com/trycompai/comp/commit/c05ab4d9faf3654b1c22b479a101f2aac721df22))
+* **controls:** implement control template management features including creation, linking, and unlinking of requirements, policies, and tasks; enhance UI components for better user experience ([779e579](https://github.com/trycompai/comp/commit/779e579ddf5dd3ad86c20e97ecde735a6f7cdccb))
+* **controls:** implement linking and unlinking of policy and task templates to control templates; enhance ManageLinksDialog for improved user interaction ([05da639](https://github.com/trycompai/comp/commit/05da639ccf1cce77b79837ccea4c73bba523ed6e))
+* **loading:** add Loading component with skeleton placeholders for improved user experience; enhance PageLayout to support loading state ([166fa59](https://github.com/trycompai/comp/commit/166fa59d8f8f7ef535d86efeeb340a9aca4243fc))
+
+# [1.3.0](https://github.com/trycompai/comp/compare/v1.2.1...v1.3.0) (2025-05-09)
+
+
+### Features
+
+* **Providers:** introduce Providers component to wrap RootLayout with NuqsAdapter and Suspense for improved rendering ([aa66614](https://github.com/trycompai/comp/commit/aa666142f951fb062403caba75252a26a58e91bd))
+
+## [1.2.1](https://github.com/trycompai/comp/compare/v1.2.0...v1.2.1) (2025-05-09)
+
+
+### Bug Fixes
+
+* **layout:** correct NuqsAdapter placement in RootLayout component for proper rendering ([4d315a0](https://github.com/trycompai/comp/commit/4d315a0bb74a4e29cabf304649797c6fb8ac52b5))
+
+# [1.2.0](https://github.com/trycompai/comp/compare/v1.1.1...v1.2.0) (2025-05-09)
+
+
+### Bug Fixes
+
+* **CreateFrameworkDialog:** adjust form layout by reducing gap size and updating version input placeholder for clarity ([ff56470](https://github.com/trycompai/comp/commit/ff5647076d4a79c5564b69cf50bcc331eaf4bc45))
+
+
+### Features
+
+* add database migrations and update Prisma schema for framework editor ([3287353](https://github.com/trycompai/comp/commit/32873533a38e29fcec7d4102cb6d233fd70e0c56))
+* add RequirementBaseSchema for requirement validation; implement EditRequirementDialog for editing requirements with form handling and server action integration ([2e1e91e](https://github.com/trycompai/comp/commit/2e1e91e7679005c9d3719f18e144fa70f59f5b77))
+* enhance framework editor layout with Toolbar and MenuTabs components ([21566bb](https://github.com/trycompai/comp/commit/21566bb8adb44d1498c91a185e0084cdc98dfef4))
+* enhance framework-editor layout by restructuring RootLayout for full-height body and adding breadcrumbs to PageLayout for controls and policies pages; implement FrameworksClientPage for improved framework management ([2400d35](https://github.com/trycompai/comp/commit/2400d3588eff54a78c369dcddf50cd1037c6cc42))
+* enhance FrameworkRequirementsClientPage with requirement editing functionality; refactor columns to use dynamic column generation and improve DataTable integration for better user experience ([1db3b8f](https://github.com/trycompai/comp/commit/1db3b8f9019892b6bf090fa35dc1acb72da14e82))
+* fetch and display frameworks in framework-editor page ([b9db4b9](https://github.com/trycompai/comp/commit/b9db4b90b5374acf1e08865eb6b22fad2b8774e2))
+* **FrameworkRequirementsClientPage:** add delete functionality with confirmation dialog for framework deletion ([91a9b27](https://github.com/trycompai/comp/commit/91a9b27eaff58bc7be9ec3b8238983d48867fe7f))
+* implement add and delete requirement functionality with corresponding dialogs; enhance FrameworkRequirementsClientPage for better user experience and data management ([0efa400](https://github.com/trycompai/comp/commit/0efa400d7b5687e3d7993110a3c686e70dc29a8f))
+* implement DataTable component for enhanced data display and search functionality across controls, frameworks, policies, and tasks pages; update layout with NuqsAdapter and Toaster for improved user experience ([a74dfca](https://github.com/trycompai/comp/commit/a74dfca1aa63409ee07b42e45bedc9a10f0590f4))
+* implement delete framework functionality with confirmation dialog and server action integration ([5bdbeb1](https://github.com/trycompai/comp/commit/5bdbeb1554512009595e3b92da43dbe19f58b445))
+* implement FrameworkRequirementsClientPage and enhance framework data handling; update FrameworksClientPage to include counts for requirements and controls, and improve DataTable with row click functionality ([4151d8f](https://github.com/trycompai/comp/commit/4151d8f4554be8b028957a0679e8b00aef07401b))
+* introduce FrameworkBaseSchema for consistent framework validation; refactor framework actions and dialogs to utilize shared schema for improved maintainability ([066efcc](https://github.com/trycompai/comp/commit/066efcc49899d51cd1d1296a12c6f5419a182fec))
+* update framework-editor with new columns for DataTable across controls, frameworks, policies, and tasks pages; enhance data fetching and layout for improved user experience ([034f75e](https://github.com/trycompai/comp/commit/034f75e1ac374fd845d78cd9901769bac1f658f4))
+
+## [1.1.1](https://github.com/trycompai/comp/compare/v1.1.0...v1.1.1) (2025-05-09)
+
+
+### Bug Fixes
+
+* **organization:** enhance user name handling in createOrganizationAction and update newOrgSequence email content ([1f8a68a](https://github.com/trycompai/comp/commit/1f8a68a3d3223b5b8faec9872a1fe52d40b286bf))
+
 # [1.1.0](https://github.com/trycompai/comp/compare/v1.0.1...v1.1.0) (2025-05-09)
 
 

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/trust-portal/actions/trust-portal-switch.ts

@@ -29,15 +29,13 @@ export const trustPortalSwitchAction = authActionClient
 		}
 
 		try {
-			await db.$transaction(async () => {
-				await db.trust.upsert({
-					where: { organizationId: activeOrganizationId },
-					update: { status: enabled ? "published" : "draft" },
-					create: {
-						organizationId: activeOrganizationId,
-						status: enabled ? "published" : "draft",
-					},
-				});
+			await db.trust.upsert({
+				where: { organizationId: activeOrganizationId },
+				update: { status: enabled ? "published" : "draft" },
+				create: {
+					organizationId: activeOrganizationId,
+					status: enabled ? "published" : "draft",
+				},
 			});
 
 			revalidatePath("/settings/trust-portal");

apps/app/src/app/[locale]/(app)/(dashboard)/[orgId]/settings/trust-portal/page.tsx

@@ -1,8 +1,6 @@
 import { auth } from "@/utils/auth";
 import { headers } from "next/headers";
 import { cache } from "react";
-
-import { ApiKeysTable } from "@/components/tables/api-keys";
 import { getI18n } from "@/locales/server";
 import { db } from "@comp/db";
 import type { Metadata } from "next";
@@ -40,7 +38,6 @@ export async function generateMetadata({
 		title: "Trust Portal",
 	};
 }
-
 const getTrustPortal = cache(async () => {
 	const session = await auth.api.getSession({
 		headers: await headers(),

package.json

@@ -74,5 +74,5 @@
 		"use-debounce": "^10.0.4",
 		"zod": "^3.24.4"
 	},
-	"version": "1.1.0"
-}
+	"version": "1.4.0"
+}

packages/db/src/index.ts

@@ -2,11 +2,7 @@ import { PrismaClient } from "@prisma/client";
 
 const createPrismaClient = () => {
 	return new PrismaClient({
-		datasources: {
-			db: {
-				url: process.env.DATABASE_URL,
-			},
-		},
+		datasourceUrl: process.env.DATABASE_URL,
 		log: ["error", "warn"],
 	});
 };

turbo.json

@@ -55,7 +55,6 @@
         "^build",
         "^db:generate",
         "^auth:build",
-        "^trust:build",
         "clean-react"
       ],
       "outputs": [
@@ -64,15 +63,6 @@
         "next-env.d.ts"
       ]
     },
-    "trust:build": {
-      "cache": false,
-      "dependsOn": [
-        "^build"
-      ],
-      "env": [
-        "DATABASE_URL"
-      ]
-    },
     "db:generate": {
       "cache": false
     },