Merge pull request #638 from trycompai/main

claudfuen · web-flow · commit f8e97572257a · 2025-05-16T09:06:49.000-04:00
[comp] Production Deploy
diff --git a/apps/framework-editor/app/actions/admin/reset-data-action.ts b/apps/framework-editor/app/actions/admin/reset-data-action.ts
diff --git a/apps/framework-editor/app/components/Toolbar.tsx b/apps/framework-editor/app/components/Toolbar.tsx
diff --git a/apps/framework-editor/app/layout.tsx b/apps/framework-editor/app/layout.tsx
@@ -1,13 +1,12 @@
 import { Toaster } from '@comp/ui/toaster';
 import type { Metadata } from 'next';
+import { NuqsAdapter } from 'nuqs/adapters/next/app';
 import { type ReactNode } from 'react';
 import { MenuTabs } from './components/MenuTabs';
-import { NuqsAdapter } from 'nuqs/adapters/next/app';
-import Toolbar from './components/Toolbar';
 
 import "@comp/ui/globals.css";
+import 'react-datasheet-grid/dist/style.css';
 import '../styles/globals.css';
-import 'react-datasheet-grid/dist/style.css'
 
 export const metadata: Metadata = {
   title: 'Comp AI - Framework Editor',
@@ -24,7 +23,6 @@ export default function RootLayout({
         <body>
           <NuqsAdapter>
             <div className="flex flex-col w-screen p-4 gap-2 h-full">
-              <Toolbar/>
               <MenuTabs />
               {children}
               <Toaster />
diff --git a/apps/framework-editor/package.json b/apps/framework-editor/package.json
@@ -33,7 +33,7 @@
     "@radix-ui/react-separator": "1.1.1",
     "@radix-ui/react-slider": "1.2.2",
     "@radix-ui/react-slot": "1.1.1",
-    "@radix-ui/react-switch": "1.1.2",
+    "@radix-ui/react-switch": "1.2.4",
     "@radix-ui/react-tabs": "1.1.2",
     "@radix-ui/react-toast": "1.2.4",
     "@radix-ui/react-toggle": "1.1.1",
diff --git a/apps/trust/package.json b/apps/trust/package.json
@@ -33,7 +33,7 @@
     "@radix-ui/react-separator": "1.1.1",
     "@radix-ui/react-slider": "1.2.2",
     "@radix-ui/react-slot": "1.1.1",
-    "@radix-ui/react-switch": "1.1.2",
+    "@radix-ui/react-switch": "1.2.4",
     "@radix-ui/react-tabs": "1.1.2",
     "@radix-ui/react-toast": "1.2.4",
     "@radix-ui/react-toggle": "1.1.1",
diff --git a/packages/db/prisma/migrations/20250516125758_patch_framework_id_in_editor/migration.sql b/packages/db/prisma/migrations/20250516125758_patch_framework_id_in_editor/migration.sql
@@ -0,0 +1,6 @@
+-- Update all references to SOC 2 framework IDs to the new ID in framework editor tables
+-- Set new ID arbitrarily to frk_682734f304cbbfdb3a9d4f44
+
+UPDATE "FrameworkEditorFramework"
+SET "id" = 'frk_682734f304cbbfdb3a9d4f44'
+WHERE "id" = 'soc2';
diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -113,7 +113,7 @@
 		"@radix-ui/react-separator": "^1.1.0",
 		"@radix-ui/react-slider": "^1.2.1",
 		"@radix-ui/react-slot": "^1.1.0",
-		"@radix-ui/react-switch": "^1.1.1",
+		"@radix-ui/react-switch": "^1.2.4",
 		"@radix-ui/react-tabs": "^1.1.1",
 		"@radix-ui/react-toast": "^1.2.2",
 		"@radix-ui/react-tooltip": "^1.1.3",
