chore: merge main into release for new releases

Author: tofikwest

apps/api/README.md

@@ -31,7 +31,7 @@
 $ npm install
 ```
 
-## Compile and run the project
+## Compile and run the project.
 
 ```bash
 # development

apps/api/src/evidence-forms/evidence-forms.controller.ts

@@ -147,6 +147,26 @@ export class EvidenceFormsController {
     });
   }
 
+  @Post(':formType/upload-submission')
+  @ApiOperation({
+    summary: 'Upload a file as an evidence submission',
+    description:
+      'Upload a PDF or image file and create a submission for the given form type, bypassing form-specific validation',
+  })
+  async uploadSubmission(
+    @OrganizationId() organizationId: string,
+    @AuthContext() authContext: AuthContextType,
+    @Param('formType') formType: string,
+    @Body() body: unknown,
+  ) {
+    return this.evidenceFormsService.uploadSubmission({
+      organizationId,
+      formType,
+      authContext,
+      payload: body,
+    });
+  }
+
   @Patch(':formType/submissions/:submissionId/review')
   @ApiOperation({
     summary: 'Review a submission',

apps/api/src/evidence-forms/evidence-forms.service.ts

@@ -34,6 +34,12 @@ const uploadSchema = z.object({
   fileData: z.string().min(1),
 });
 
+const uploadSubmissionBodySchema = z.object({
+  fileName: z.string().min(1),
+  fileType: z.string().min(1),
+  fileData: z.string().min(1),
+});
+
 const reviewSchema = z.object({
   action: z.enum(['approved', 'rejected']),
   reason: z.string().trim().optional(),
@@ -432,6 +438,77 @@ export class EvidenceFormsService {
     };
   }
 
+  async uploadSubmission(params: {
+    organizationId: string;
+    formType: string;
+    authContext: AuthContext;
+    payload: unknown;
+  }) {
+    const parsedType = evidenceFormTypeSchema.safeParse(params.formType);
+    if (!parsedType.success) {
+      throw new BadRequestException('Unsupported form type');
+    }
+
+    const userId = this.requireJwtUser(params.authContext);
+
+    const parsed = uploadSubmissionBodySchema.safeParse(params.payload);
+    if (!parsed.success) {
+      throw new BadRequestException(parsed.error.flatten());
+    }
+
+    if (parsed.data.fileData.length > MAX_UPLOAD_BASE64_LENGTH) {
+      throw new BadRequestException(
+        `File exceeds the ${MAX_UPLOAD_FILE_SIZE_BYTES / (1024 * 1024)}MB limit`,
+      );
+    }
+
+    const fileBuffer = this.decodeBase64File(parsed.data.fileData);
+    if (fileBuffer.length > MAX_UPLOAD_FILE_SIZE_BYTES) {
+      throw new BadRequestException(
+        `File exceeds the ${MAX_UPLOAD_FILE_SIZE_BYTES / (1024 * 1024)}MB limit`,
+      );
+    }
+
+    const fileKey = await this.attachmentsService.uploadToS3(
+      fileBuffer,
+      parsed.data.fileName,
+      parsed.data.fileType,
+      params.organizationId,
+      'evidence-forms',
+      parsedType.data,
+    );
+
+    const downloadUrl =
+      await this.attachmentsService.getPresignedDownloadUrl(fileKey);
+
+    return await db.evidenceSubmission
+      .create({
+        data: {
+          organizationId: params.organizationId,
+          formType: toDbEvidenceFormType(parsedType.data),
+          submittedById: userId,
+          data: {
+            submissionDate: new Date().toISOString(),
+            evidenceFile: {
+              fileName: parsed.data.fileName,
+              fileKey,
+              downloadUrl,
+            },
+          },
+        },
+        include: {
+          submittedBy: {
+            select: {
+              id: true,
+              name: true,
+              email: true,
+            },
+          },
+        },
+      })
+      .then(normalizeSubmissionFormType);
+  }
+
   async exportCsv(params: {
     organizationId: string;
     formType: string;

apps/app/src/app/(app)/[orgId]/documents/components/CompanyFormPageClient.tsx

@@ -29,12 +29,20 @@ import {
   TableRow,
   Text,
 } from '@trycompai/design-system';
-import { Add, Catalog, Download, Search } from '@trycompai/design-system/icons';
+import { Add, Catalog, Download, Search, Upload } from '@trycompai/design-system/icons';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@comp/ui/dialog';
 import Link from 'next/link';
 import { useRouter } from 'next/navigation';
-import { useMemo, useState } from 'react';
+import { useCallback, useMemo, useRef, useState } from 'react';
 import { toast } from 'sonner';
-import useSWR from 'swr';
+import useSWR, { useSWRConfig } from 'swr';
 import { DocumentFindingsSection } from './DocumentFindingsSection';
 import { StatusBadge, formatSubmissionDate } from './submission-utils';
 
@@ -84,6 +92,19 @@ function getMatrixRowCount(value: unknown): number {
   return value.filter((row) => row && typeof row === 'object').length;
 }
 
+function fileToBase64(file: File): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.onload = () => {
+      const result = reader.result as string;
+      const base64 = result.split(',')[1] ?? '';
+      resolve(base64);
+    };
+    reader.onerror = reject;
+    reader.readAsDataURL(file);
+  });
+}
+
 async function evidenceFormFetcher([endpoint, orgId]: readonly [
   string,
   string,
@@ -107,8 +128,13 @@ export function CompanyFormPageClient({
   isPlatformAdmin: boolean;
 }) {
   const router = useRouter();
+  const { mutate: globalMutate } = useSWRConfig();
   const [search, setSearch] = useState('');
   const [isExporting, setIsExporting] = useState(false);
+  const [isUploadOpen, setIsUploadOpen] = useState(false);
+  const [isUploading, setIsUploading] = useState(false);
+  const [selectedFile, setSelectedFile] = useState<File | null>(null);
+  const fileInputRef = useRef<HTMLInputElement>(null);
 
   const { data: activeMember } = useActiveMember();
   const memberRoles = activeMember?.role?.split(',').map((role: string) => role.trim()) || [];
@@ -248,6 +274,47 @@ export function CompanyFormPageClient({
     }
   };
 
+  const handleUploadEvidence = useCallback(async () => {
+    if (!selectedFile) return;
+
+    setIsUploading(true);
+    try {
+      const fileData = await fileToBase64(selectedFile);
+      const submitFormType = isMeeting ? MEETING_SUB_TYPES[0] : formType;
+
+      const response = await api.post(
+        `/v1/evidence-forms/${submitFormType}/upload-submission`,
+        {
+          fileName: selectedFile.name,
+          fileType: selectedFile.type || 'application/octet-stream',
+          fileData,
+        },
+        organizationId,
+      );
+
+      if (response.error) {
+        throw new Error(response.error);
+      }
+
+      toast.success('Evidence uploaded');
+      setIsUploadOpen(false);
+      setSelectedFile(null);
+      if (fileInputRef.current) fileInputRef.current.value = '';
+
+      if (isMeeting) {
+        for (const subType of MEETING_SUB_TYPES) {
+          globalMutate([`/v1/evidence-forms/${subType}${query}`, organizationId]);
+        }
+      } else {
+        globalMutate([`/v1/evidence-forms/${formType}${query}`, organizationId]);
+      }
+    } catch (error) {
+      toast.error(error instanceof Error ? error.message : 'Upload failed');
+    } finally {
+      setIsUploading(false);
+    }
+  }, [selectedFile, isMeeting, formType, organizationId, query, globalMutate]);
+
   return (
     <div className="space-y-6">
       <PageHeader
@@ -257,6 +324,14 @@ export function CompanyFormPageClient({
             <Link href={`/${organizationId}/documents/${formType}/new`}>
               <Button iconLeft={<Add size={16} />}>New Submission</Button>
             </Link>
+            <Button
+              type="button"
+              variant="secondary"
+              iconLeft={<Upload size={16} />}
+              onClick={() => setIsUploadOpen(true)}
+            >
+              Upload Evidence
+            </Button>
             <Button
               type="button"
               variant="secondary"
@@ -414,6 +489,58 @@ export function CompanyFormPageClient({
         isPlatformAdmin={isPlatformAdmin}
         isAdminOrOwner={isAdminOrOwner}
       />
+
+      <Dialog
+        open={isUploadOpen}
+        onOpenChange={(open) => {
+          setIsUploadOpen(open);
+          if (!open) {
+            setSelectedFile(null);
+            if (fileInputRef.current) fileInputRef.current.value = '';
+          }
+        }}
+      >
+        <DialogContent>
+          <DialogHeader>
+            <DialogTitle>Upload Evidence</DialogTitle>
+            <DialogDescription>
+              Upload a PDF or image as evidence for this document.
+            </DialogDescription>
+          </DialogHeader>
+          <div className="space-y-4">
+            <input
+              ref={fileInputRef}
+              type="file"
+              accept=".pdf,.png,.jpg,.jpeg"
+              onChange={(e) => setSelectedFile(e.target.files?.[0] ?? null)}
+              className="block w-full text-sm text-foreground file:mr-4 file:rounded-md file:border-0 file:bg-muted file:px-4 file:py-2 file:text-sm file:font-medium file:text-foreground hover:file:bg-muted/80 file:cursor-pointer cursor-pointer"
+            />
+            {selectedFile && (
+              <Text size="sm" variant="muted">
+                {selectedFile.name} ({(selectedFile.size / 1024).toFixed(1)} KB)
+              </Text>
+            )}
+          </div>
+          <DialogFooter>
+            <Button
+              type="button"
+              variant="secondary"
+              onClick={() => setIsUploadOpen(false)}
+              disabled={isUploading}
+            >
+              Cancel
+            </Button>
+            <Button
+              type="button"
+              onClick={handleUploadEvidence}
+              disabled={!selectedFile || isUploading}
+              loading={isUploading}
+            >
+              Upload
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
     </div>
   );
 }

apps/app/src/app/(app)/[orgId]/documents/components/CompanySubmissionDetailPageClient.tsx

@@ -289,6 +289,17 @@ export function CompanySubmissionDetailPageClient({
                 </div>
               </div>
             ))}
+            {Boolean(submission.data.evidenceFile) &&
+              !fields.some((f) => f.key === 'evidenceFile') && (
+                <div className="grid grid-cols-1 gap-2 p-4 lg:grid-cols-3">
+                  <div className="text-xs font-medium uppercase tracking-wider text-muted-foreground">
+                    Uploaded Evidence
+                  </div>
+                  <div className="lg:col-span-2 text-sm">
+                    {renderSubmissionValue(submission.data.evidenceFile)}
+                  </div>
+                </div>
+              )}
             {matrixFields.map((field) => {
               const rows = normalizeMatrixRows(submission.data[field.key]);
               return (

apps/app/src/app/(app)/[orgId]/frameworks/lib/getPeople.ts

@@ -2,10 +2,11 @@ import { trainingVideos } from '@/lib/data/training-videos';
 import { db } from '@db';
 
 export async function getPeopleScore(organizationId: string) {
-  // Get all active members (employees and contractors)
+  // Get all active members (employees and contractors); exclude inactive/deactivated
   const allMembers = await db.member.findMany({
     where: {
       organizationId,
+      isActive: true,
       deactivated: false,
     },
     include: {

apps/app/src/app/(app)/[orgId]/trust/portal-settings/actions/check-dns-record.ts

@@ -119,7 +119,8 @@ export const checkDnsRecordAction = authActionClient
       expectedVercelTxtValue ?? null,
     );
 
-    const isVerified = isCnameVerified && isTxtVerified && isVercelTxtVerified;
+    const requiresVercelTxt = isVercelDomain?.isVercelDomain === true;
+    const isVerified = isCnameVerified && isTxtVerified && (!requiresVercelTxt || isVercelTxtVerified);
 
     if (!isVerified) {
       return {

apps/portal/src/app/globals.css

@@ -0,0 +1,2 @@
+@import 'tailwindcss';
+@config '../../tailwind.config.ts';

apps/portal/src/app/layout.tsx

@@ -2,6 +2,7 @@ import { auth } from '@/app/lib/auth';
 import { env } from '@/env.mjs';
 import { initializeServer } from '@comp/analytics/server';
 import { cn } from '@comp/ui/cn';
+import './globals.css';
 import '@trycompai/design-system/globals.css';
 import { GeistMono } from 'geist/font/mono';
 import type { Metadata } from 'next';

apps/portal/tailwind.config.ts

@@ -0,0 +1,21 @@
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import type { Config } from 'tailwindcss';
+import uiConfig from '@trycompai/ui/tailwind.config';
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+/**
+ * Portal uses the same Tailwind theme as @comp/ui so that UI components
+ * (Dialog, Button, etc.) get correct utilities and design tokens.
+ * Content paths are resolved from this config file so they work regardless
+ * of cwd (e.g. when build runs from monorepo root).
+ */
+export default {
+  ...uiConfig,
+  content: [
+    path.join(__dirname, 'src', '**', '*.{ts,tsx}'),
+    path.join(__dirname, '..', '..', 'packages', 'ui', 'src', '**', '*.{ts,tsx}'),
+    path.join(__dirname, 'node_modules', '@trycompai', 'ui', 'src', '**', '*.{ts,tsx}'),
+  ],
+} satisfies Config;