Merge branch 'main' into fix/integrations-setup-cta

Author: tofikwest

apps/app/src/app/(app)/[orgId]/documents/[formType]/loading.tsx

@@ -0,0 +1,5 @@
+import { PageLayout } from '@trycompai/design-system';
+
+export default function Loading() {
+  return <PageLayout loading />;
+}

apps/app/src/app/(app)/[orgId]/documents/[formType]/page.tsx

@@ -2,7 +2,6 @@ import { CompanyFormPageClient } from '@/app/(app)/[orgId]/documents/components/
 import { Breadcrumb, PageLayout } from '@trycompai/design-system';
 import Link from 'next/link';
 import { notFound } from 'next/navigation';
-import { Suspense } from 'react';
 import { evidenceFormDefinitions, evidenceFormTypeSchema } from '../forms';
 import { auth } from '@/utils/auth';
 import { headers } from 'next/headers';
@@ -43,13 +42,11 @@ export default async function CompanyFormDetailPage({
           { label: formDefinition.title, isCurrent: true },
         ]}
       />
-      <Suspense>
-        <CompanyFormPageClient
-          organizationId={orgId}
-          formType={parsedType.data}
-          isPlatformAdmin={isPlatformAdmin}
-        />
-      </Suspense>
+      <CompanyFormPageClient
+        organizationId={orgId}
+        formType={parsedType.data}
+        isPlatformAdmin={isPlatformAdmin}
+      />
     </PageLayout>
   );
 }

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

@@ -426,19 +426,7 @@ export function CompanyFormPageClient({
               </InputGroup>
             </div>
 
-            {isLoading ? (
-              <Empty>
-                <EmptyMedia variant="icon">
-                  <Catalog />
-                </EmptyMedia>
-                <EmptyHeader>
-                  <EmptyTitle>No submissions yet</EmptyTitle>
-                  <EmptyDescription>
-                    Start by creating a new submission, click the New Submission button above.
-                  </EmptyDescription>
-                </EmptyHeader>
-              </Empty>
-            ) : !data || data.submissions.length === 0 ? (
+            {!data || data.submissions.length === 0 ? (
               <Empty>
                 <EmptyMedia variant="icon">
                   <Catalog />

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

@@ -16,6 +16,7 @@ import { api } from '@/lib/api-client';
 import { meetingFields } from '@trycompai/company';
 import { zodResolver } from '@hookform/resolvers/zod';
 import {
+  Alert,
   Button,
   Field,
   FieldError,
@@ -548,6 +549,13 @@ export function CompanySubmissionWizard({
                 {textareaFields.length === 0 && (
                   <Text variant="muted">No additional fields required for this step.</Text>
                 )}
+                {textareaFields.some((f) => f.placeholder) && (
+                  <Alert
+                    variant="warning"
+                    title="Reference only"
+                    description="The pre-filled content below is provided as a template. You must review and edit it to reflect your organization's actual information before submitting."
+                  />
+                )}
                 {textareaFields.map((field) => (
                   <Controller
                     key={field.key}
@@ -618,6 +626,13 @@ export function CompanySubmissionWizard({
                     )}
                   />
                 ))}
+                {extendedFields.some((f) => f.type === 'textarea' && f.placeholder) && (
+                  <Alert
+                    variant="warning"
+                    title="Reference only"
+                    description="The pre-filled content below is provided as a template. You must review and edit it to reflect your organization's actual information before submitting."
+                  />
+                )}
                 {extendedFields.map((field) => (
                   <Controller
                     key={field.key}

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

@@ -3,9 +3,21 @@
 import { useFindingActions, useFormTypeFindings, type Finding } from '@/hooks/use-findings-api';
 import { usePermissions } from '@/hooks/use-permissions';
 import { useActiveMember } from '@/utils/auth-client';
-import { Button } from '@trycompai/design-system';
 import { FindingStatus } from '@db';
-import { ChevronDown, ChevronUp, WarningAlt, WarningAltFilled } from '@trycompai/design-system/icons';
+import {
+  Button,
+  Empty,
+  EmptyDescription,
+  EmptyHeader,
+  EmptyMedia,
+  EmptyTitle,
+} from '@trycompai/design-system';
+import {
+  ChevronDown,
+  ChevronUp,
+  WarningAlt,
+  WarningAltFilled,
+} from '@trycompai/design-system/icons';
 import { useCallback, useMemo, useState } from 'react';
 import { toast } from 'sonner';
 import { CreateFindingButton } from '../../tasks/[taskId]/components/findings/CreateFindingButton';
@@ -153,33 +165,38 @@ export function DocumentFindingsSection({
       finding.status === FindingStatus.open || finding.status === FindingStatus.needs_revision,
   ).length;
 
-  if (allIsLoading) {
-    return (
-      <div className="flex items-center justify-center py-8">
-        <div className="h-6 w-6 animate-spin rounded-full border-2 border-muted-foreground border-t-transparent" />
-      </div>
-    );
-  }
-
   if (allError) {
     return (
-      <div className="flex items-center justify-center py-8 text-destructive">
-        <WarningAlt size={20} className="mr-2" />
-        <span>Failed to load findings</span>
-      </div>
+      <Empty>
+        <EmptyMedia variant="icon">
+          <WarningAlt size={32} />
+        </EmptyMedia>
+        <EmptyHeader>
+          <EmptyTitle>Failed to load findings</EmptyTitle>
+          <EmptyDescription>
+            Something went wrong. Please try refreshing the page.
+          </EmptyDescription>
+        </EmptyHeader>
+      </Empty>
     );
   }
 
-  if (sortedFindings.length === 0) {
+  if (allIsLoading || sortedFindings.length === 0) {
     return (
-      <div className="flex flex-col items-center justify-center py-12 text-muted-foreground">
-        <p className="text-sm">No findings for this document</p>
+      <Empty>
+        <EmptyMedia variant="icon">
+          <WarningAlt size={32} />
+        </EmptyMedia>
+        <EmptyHeader>
+          <EmptyTitle>No findings yet</EmptyTitle>
+          <EmptyDescription>
+            Findings will appear here when an auditor flags issues requiring attention.
+          </EmptyDescription>
+        </EmptyHeader>
         {canCreateFinding && (
-          <div className="mt-3">
-            <CreateFindingButton evidenceFormType={formType} onSuccess={mutateAll} />
-          </div>
+          <CreateFindingButton evidenceFormType={formType} onSuccess={mutateAll} />
         )}
-      </div>
+      </Empty>
     );
   }
 
@@ -216,14 +233,7 @@ export function DocumentFindingsSection({
       </div>
 
       <div className="p-5">
-        {sortedFindings.length === 0 ? (
-          <div className="flex flex-col items-center justify-center py-8 text-muted-foreground">
-            <WarningAltFilled size={40} className="mb-3 opacity-50" />
-            <p className="text-sm">No findings for this document</p>
-            {canCreateFinding && <p className="text-xs mt-1">Create a finding to flag an issue</p>}
-          </div>
-        ) : (
-          <div className="space-y-2">
+        <div className="space-y-2">
             {visibleFindings.map((finding: Finding) => (
               <FindingItem
                 key={finding.id}
@@ -242,12 +252,7 @@ export function DocumentFindingsSection({
 
             {sortedFindings.length > INITIAL_DISPLAY_COUNT && (
               <div className="mt-2 text-muted-foreground hover:text-foreground">
-                <Button
-                  variant="ghost"
-                  size="sm"
-                  width="full"
-                  onClick={() => setShowAll(!showAll)}
-                >
+                <Button variant="ghost" size="sm" width="full" onClick={() => setShowAll(!showAll)}>
                   {showAll ? (
                     <>
                       <ChevronUp size={16} className="mr-1.5" />
@@ -263,7 +268,6 @@ export function DocumentFindingsSection({
               </div>
             )}
           </div>
-        )}
       </div>
     </div>
   );

apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/SingleTask.tsx

@@ -172,6 +172,7 @@ export function SingleTask({
       await updateTask({
         status: updates.status,
         assigneeId: updates.assigneeId,
+        approverId: updates.approverId,
         frequency: updates.frequency,
         department: updates.department,
         reviewDate: updates.reviewDate ? String(updates.reviewDate) : undefined,

packages/device-agent/package.json

@@ -7,7 +7,7 @@
   "private": true,
   "main": "dist/main/index.js",
   "scripts": {
-    "postinstall": "node node_modules/electron/install.js || true",
+    "postinstall": "electron-builder install-app-deps",
     "dev": "electron-vite dev --watch",
     "build": "electron-vite build",
     "preview": "electron-vite preview",

packages/docs/openapi.json

@@ -16511,6 +16511,62 @@
         ]
       }
     },
+    "/v1/integrations/tasks/{taskId}/checks/disconnect": {
+      "post": {
+        "operationId": "TaskIntegrationsController_disconnectCheckFromTask_v1",
+        "parameters": [
+          {
+            "name": "taskId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "apikey": []
+          }
+        ],
+        "tags": [
+          "Integrations"
+        ]
+      }
+    },
+    "/v1/integrations/tasks/{taskId}/checks/reconnect": {
+      "post": {
+        "operationId": "TaskIntegrationsController_reconnectCheckToTask_v1",
+        "parameters": [
+          {
+            "name": "taskId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "201": {
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "apikey": []
+          }
+        ],
+        "tags": [
+          "Integrations"
+        ]
+      }
+    },
     "/v1/integrations/tasks/{taskId}/runs": {
       "get": {
         "operationId": "TaskIntegrationsController_getTaskCheckRuns_v1",
@@ -20018,6 +20074,38 @@
         ]
       }
     },
+    "/v1/email/unsubscribe": {
+      "post": {
+        "operationId": "UnsubscribeController_unsubscribe_v1",
+        "parameters": [
+          {
+            "name": "email",
+            "required": true,
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "token",
+            "required": true,
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          }
+        },
+        "summary": "One-click unsubscribe (RFC 8058)",
+        "tags": [
+          "Email - Unsubscribe"
+        ]
+      }
+    },
     "/v1/secrets": {
       "get": {
         "operationId": "SecretsController_listSecrets_v1",
@@ -20649,6 +20737,65 @@
         ]
       }
     },
+    "/v1/admin/organizations/activity": {
+      "get": {
+        "operationId": "AdminOrganizationsController_activity_v1",
+        "parameters": [
+          {
+            "name": "inactiveDays",
+            "required": false,
+            "in": "query",
+            "description": "Filter orgs with no session in N days (default: 90)",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "hasAccess",
+            "required": false,
+            "in": "query",
+            "description": "Filter by hasAccess (true/false)",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "onboarded",
+            "required": false,
+            "in": "query",
+            "description": "Filter by onboardingCompleted (true/false)",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "page",
+            "required": false,
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "required": false,
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": ""
+          }
+        },
+        "summary": "Organization activity report - shows last session per org (platform admin)",
+        "tags": [
+          "Admin - Organizations"
+        ]
+      }
+    },
     "/v1/admin/organizations/{id}": {
       "get": {
         "operationId": "AdminOrganizationsController_get_v1",

packages/integration-platform/src/manifests/github/checks/index.ts

@@ -6,3 +6,4 @@
 export { branchProtectionCheck } from './branch-protection';
 export { dependabotCheck } from './dependabot';
 export { sanitizedInputsCheck } from './sanitized-inputs';
+export { twoFactorAuthCheck } from './two-factor-auth';