Merge pull request #949 from trycompai/main

[comp] Production Deploy

Author: claudfuen

apps/app/package.json

@@ -30,13 +30,26 @@
     "@prisma/instrumentation": "6.6.0",
     "@react-email/components": "^0.0.41",
     "@react-email/render": "^1.1.2",
-    "@tailwindcss/postcss": "^4.1.10",
     "@tanstack/react-query": "^5.74.4",
     "@tanstack/react-table": "^8.21.3",
+    "@tiptap/extension-character-count": "^2.14.0",
+    "@tiptap/extension-code-block-lowlight": "^2.14.0",
+    "@tiptap/extension-color": "^2.14.0",
+    "@tiptap/extension-highlight": "^2.14.0",
+    "@tiptap/extension-horizontal-rule": "^2.14.0",
+    "@tiptap/extension-image": "^2.14.0",
+    "@tiptap/extension-link": "^2.14.0",
+    "@tiptap/extension-placeholder": "^2.14.0",
     "@tiptap/extension-table": "^2.11.7",
     "@tiptap/extension-table-cell": "^2.11.7",
     "@tiptap/extension-table-header": "^2.11.7",
     "@tiptap/extension-table-row": "^2.11.7",
+    "@tiptap/extension-task-item": "^2.14.0",
+    "@tiptap/extension-task-list": "^2.14.0",
+    "@tiptap/extension-text-align": "^2.14.0",
+    "@tiptap/extension-text-style": "^2.14.0",
+    "@tiptap/extension-underline": "^2.14.0",
+    "@tiptap/extension-youtube": "^2.14.0",
     "@tiptap/pm": "^2.11.7",
     "@tiptap/react": "^2.11.7",
     "@tiptap/starter-kit": "^2.11.7",
@@ -54,15 +67,13 @@
     "geist": "^1.3.1",
     "highlight.js": "^11.11.1",
     "immer": "^10.1.1",
-    "languine": "^3.1.4",
+    "lowlight": "^3.3.0",
     "marked": "^15.0.11",
     "motion": "^12.9.2",
-    "next": "15.4.0-canary.83",
-    "next-international": "^1.3.1",
+    "next": "15.4.0-canary.85",
     "next-intl": "^3.26.5",
     "next-safe-action": "^8.0.3",
     "next-themes": "^0.4.4",
-    "novel": "^1.0.2",
     "novu": "^2.6.6",
     "nuqs": "^2.4.3",
     "playwright-core": "^1.52.0",
@@ -90,11 +101,12 @@
     "zustand": "^5.0.3"
   },
   "devDependencies": {
+    "@tailwindcss/postcss": "^4.1.10",
     "@trigger.dev/build": "3.3.17",
     "@types/d3": "^7.4.3",
-    "@types/node": "^22.13.2",
+    "@types/node": "^24.0.3",
     "eslint": "^9",
-    "eslint-config-next": "15.4.0-canary.83",
+    "eslint-config-next": "15.4.0-canary.85",
     "fleetctl": "^4.68.1",
     "postcss": "^8.5.4",
     "react": "^19.1.0",

apps/app/src/actions/organization/accept-invitation.ts

@@ -4,7 +4,7 @@ import { db } from '@comp/db';
 import { revalidatePath, revalidateTag } from 'next/cache';
 import { Resend } from 'resend';
 import { z } from 'zod';
-import { authActionClient } from '../safe-action';
+import { authActionClientWithoutOrg } from '../safe-action';
 import type { ActionResponse } from '../types';
 
 async function validateInviteCode(inviteCode: string, invitedEmail: string) {
@@ -31,7 +31,7 @@ const completeInvitationSchema = z.object({
   inviteCode: z.string(),
 });
 
-export const completeInvitation = authActionClient
+export const completeInvitation = authActionClientWithoutOrg
   .metadata({
     name: 'complete-invitation',
     track: {

…ganization/create-organization-action.ts …zation/initialize-organization-action.tsapps/app/src/actions/organization/create-organization-action.ts renamed to apps/app/src/actions/organization/initialize-organization-action.ts apps/app/src/actions/organization/create-organization-action.ts renamed to apps/app/src/actions/organization/initialize-organization-action.ts

@@ -10,12 +10,12 @@ import { organizationSchema } from '../schema';
 import { createStripeCustomer } from './lib/create-stripe-customer';
 import { initializeOrganization } from './lib/initialize-organization';
 
-export const createOrganizationAction = authActionClient
+export const initializeOrganizationAction = authActionClient
   .inputSchema(organizationSchema)
   .metadata({
-    name: 'create-organization',
+    name: 'initialize-organization',
     track: {
-      event: 'create-organization',
+      event: 'initialize-organization',
       channel: 'server',
     },
   })

apps/app/src/actions/safe-action.ts

@@ -253,3 +253,89 @@ export const authWithOrgAccessClient = authActionClient.use(async ({ next, clien
     },
   });
 });
+
+// New action client that requires auth but not an active organization
+export const authActionClientWithoutOrg = actionClientWithMeta
+  .use(async ({ next, clientInput }) => {
+    const response = await auth.api.getSession({
+      headers: await headers(),
+    });
+
+    const { session, user } = response ?? {};
+
+    if (!session) {
+      throw new Error('Unauthorized');
+    }
+
+    const result = await next({
+      ctx: {
+        user: user,
+        session: session,
+      },
+    });
+
+    if (process.env.NODE_ENV === 'development') {
+      logger('Input ->', JSON.stringify(clientInput, null, 2));
+      logger('Result ->', JSON.stringify(result.data, null, 2));
+
+      // Also log validation errors if they exist
+      if (result.validationErrors) {
+        logger('Validation Errors ->', JSON.stringify(result.validationErrors, null, 2));
+      }
+
+      return result;
+    }
+
+    return result;
+  })
+  .use(async ({ next, metadata }) => {
+    const headersList = await headers();
+    let remaining: number | undefined;
+
+    if (ratelimit) {
+      const { success, remaining: rateLimitRemaining } = await ratelimit.limit(
+        `${headersList.get('x-forwarded-for')}-${metadata.name}`,
+      );
+
+      if (!success) {
+        throw new Error('Too many requests');
+      }
+
+      remaining = rateLimitRemaining;
+    }
+
+    return next({
+      ctx: {
+        ip: headersList.get('x-forwarded-for'),
+        userAgent: headersList.get('user-agent'),
+        ratelimit: {
+          remaining: remaining ?? 0,
+        },
+      },
+    });
+  })
+  .use(async ({ next, metadata, ctx }) => {
+    const session = await auth.api.getSession({
+      headers: await headers(),
+    });
+
+    if (!session) {
+      throw new Error('Unauthorized');
+    }
+
+    if (metadata.track) {
+      track(session.user.id, metadata.track.event, {
+        channel: metadata.track.channel,
+        email: session.user.email,
+        name: session.user.name,
+        // organizationId is optional here since there might not be one
+        organizationId: session.session.activeOrganizationId || undefined,
+      });
+    }
+
+    return next({
+      ctx: {
+        user: session.user,
+      },
+    });
+  });

apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/PolicyPage.tsx

@@ -1,5 +1,5 @@
 import { Control, Member, Policy, User } from '@comp/db/types';
-import { JSONContent } from 'novel';
+import type { JSONContent } from '@tiptap/react';
 import { Comments, CommentWithAuthor } from '../../../../../../components/comments/Comments';
 import { AuditLogWithRelations } from '../data';
 import { PolicyPageEditor } from '../editor/components/PolicyDetails';

apps/app/src/app/(app)/[orgId]/policies/[policyId]/components/RecentAuditLogs.tsx

@@ -197,7 +197,7 @@ export const RecentAuditLogs = ({ logs }: { logs: AuditLogWithRelations[] }) =>
               </div>
             </div>
           ) : (
-            <div className="flex flex-col items-center justify-center p-6 text-center">
+            <div className="flex flex-col items-center justify-center py-12 px-6 text-center">
               <ActivityIcon className="text-muted-foreground mb-2 h-8 w-8" />
               <p className="text-sm font-medium">No recent activity</p>
               <p className="text-muted-foreground text-xs">

apps/app/src/app/(app)/invite/[code]/page.tsx

@@ -0,0 +1,67 @@
+import { getOrganizations } from '@/data/getOrganizations';
+import { auth } from '@/utils/auth';
+import { db } from '@comp/db';
+import type { Organization } from '@comp/db/types';
+import { headers } from 'next/headers';
+import { notFound, redirect } from 'next/navigation';
+import { AcceptInvite } from '../../setup/components/accept-invite';
+import { SetupHeader } from '../../setup/components/SetupHeader';
+
+interface InvitePageProps {
+  params: Promise<{ code: string }>;
+}
+
+export default async function InvitePage({ params }: InvitePageProps) {
+  const { code } = await params;
+  const session = await auth.api.getSession({
+    headers: await headers(),
+  });
+
+  if (!session) {
+    // Redirect to auth with the invite code
+    return redirect(`/auth?inviteCode=${code}`);
+  }
+
+  // Fetch existing organizations
+  let organizations: Organization[] = [];
+  try {
+    const result = await getOrganizations();
+    organizations = result.organizations;
+  } catch (error) {
+    // If user has no organizations, continue with empty array
+    console.error('Failed to fetch organizations:', error);
+  }
+
+  // Check if this invitation exists and is valid for this user
+  const invitation = await db.invitation.findFirst({
+    where: {
+      id: code,
+      email: session.user.email,
+      status: 'pending',
+    },
+    include: {
+      organization: {
+        select: {
+          name: true,
+        },
+      },
+    },
+  });
+
+  if (!invitation) {
+    // Either invitation doesn't exist, already accepted, or not for this user
+    notFound();
+  }
+
+  return (
+    <div className="flex min-h-screen flex-col">
+      <SetupHeader user={session.user} existingOrganizations={organizations} />
+      <div className="flex flex-1 items-center justify-center p-4">
+        <AcceptInvite
+          inviteCode={invitation.id}
+          organizationName={invitation.organization.name || ''}
+        />
+      </div>
+    </div>
+  );
+}

apps/app/src/app/(app)/no-access/page.tsx

@@ -30,16 +30,6 @@ export default async function NoAccess() {
     },
   });
 
-  const frameworks = await db.frameworkEditorFramework.findMany({
-    select: {
-      id: true,
-      name: true,
-      description: true,
-      version: true,
-      visible: true,
-    },
-  });
-
   return (
     <div className="bg-foreground/05 flex h-screen flex-col items-center justify-center gap-4">
       <h1 className="text-2xl font-bold">Access Denied</h1>
@@ -54,11 +44,7 @@ export default async function NoAccess() {
         <p>Please select another organization or contact your organization administrator.</p>
       </div>
       <div>
-        <OrganizationSwitcher
-          organizations={organizations}
-          organization={currentOrg}
-          frameworks={frameworks}
-        />
+        <OrganizationSwitcher organizations={organizations} organization={currentOrg} />
       </div>
     </div>
   );