Merge branch 'wip/fx7-ci-unit' into wip/platform-org-wiring

Author: waleedlatif1

.github/workflows/platform-design.yml

@@ -35,13 +35,17 @@ on:
       - 'apps/sim/lib/toast/**'
       - 'apps/sim/lib/core/application/**'
       - 'apps/sim/lib/core/config/block-visibility.ts'
+      - 'apps/sim/lib/core/orchestration/types.ts'
       - 'apps/sim/lib/core/utils/deadline.ts'
+      - 'apps/sim/lib/catalog/application/**'
+      - 'apps/sim/lib/credentials/application/**'
       - 'apps/sim/lib/knowledge/application/**'
       - 'apps/sim/lib/knowledge/search/results.ts'
       - 'apps/sim/lib/users/application/**'
       - 'apps/sim/lib/workflows/application/**'
       - 'apps/sim/components/file-viewer/**'
       - 'apps/sim/components/dashboard-panel/**'
+      - 'apps/sim/components/find-bar/**'
       - 'apps/sim/hooks/sim-search/**'
       - 'apps/sim/ee/**'
       - 'apps/sim/hooks/mothership-chat/**'

apps/sim/app/api/mothership/events/route.test.ts

@@ -27,8 +27,9 @@ vi.mock('@/lib/mothership/chat/organization-chats', () => mothershipOrganization
 vi.mock('@/lib/mothership/chat-status', () => mothershipChatStatusMock)
 vi.mock('@/lib/workspaces/permissions/utils', () => permissionsMock)
 
-import { GET } from '@/app/api/mothership/events/route'
+import { GET as routeGET } from '@/app/api/mothership/events/route'
 
+const GET = (req: NextRequest) => routeGET(req, { params: Promise.resolve({}) })
 const authorize = mothershipOrganizationChatsMockFns.mockAuthorizeOrganizationChatEvents
 const subscribe = mothershipChatStatusMockFns.mockOnStatusChanged
 

apps/sim/lib/billing/core/inbox-entitlement.test.ts

@@ -33,6 +33,7 @@ beforeEach(() => {
     id: 'workspace-1',
     billedAccountUserId: 'payer-1',
     organizationId: null,
+    teamOrganizationId: null,
   })
   mockGetPersonalSubscription.mockResolvedValue(null)
   mockGetOrganizationSubscription.mockResolvedValue(null)
@@ -86,6 +87,7 @@ describe('Sim Mailer hosted entitlement', () => {
         id: 'workspace-1',
         billedAccountUserId: 'payer-1',
         organizationId: 'org-1',
+        teamOrganizationId: 'org-1',
       })
       dbChainMockFns.limit.mockResolvedValueOnce([{ plan, status: 'active' }])
       mockGetOrganizationSubscription.mockResolvedValue({ plan, status: 'active' })
@@ -140,6 +142,7 @@ describe('Sim Mailer cleanup uncertainty', () => {
       id: 'workspace-1',
       billedAccountUserId: 'payer-1',
       organizationId: 'org-1',
+      teamOrganizationId: 'org-1',
     })
     mockGetOrganizationSubscription.mockResolvedValue({ plan: 'team_25000', status: 'past_due' })
 

apps/sim/lib/billing/core/subscription.integration.ts

@@ -32,6 +32,7 @@ vi.mock('@/lib/workspaces/permissions/utils', () => ({
     id: 'fixture-workspace',
     billedAccountUserId: 'fixture-owner',
     organizationId: fixture.organizationId,
+    teamOrganizationId: fixture.organizationId,
   }),
 }))
 vi.mock('@/lib/billing/core/access', () => ({

apps/sim/lib/billing/organization.test.ts

@@ -24,6 +24,7 @@ import {
 } from '@sim/testing/mocks/organization-membership.mock'
 import { schemaMock } from '@sim/testing/mocks/schema.mock'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { DbTransaction } from '@/lib/db/types'
 
 const {
   mockCreateOrganizationWithOwner,
@@ -77,6 +78,8 @@ const { mockAcquireOrganizationMutationLock } = organizationMembershipMockFns
 const { mockAcquireUserBillingIdentityLock } = billingIdentityLockMockFns
 const BILLING_WEBHOOK = { type: 'system', name: 'Billing System' } as const
 const ACCEPTOR = { type: 'user', userId: 'acceptor-1' } as const
+/** The chain mock standing in for the acceptance transaction the Tx variant runs on. */
+const ACCEPTANCE_TX = dbChainMock.db as unknown as DbTransaction
 billingPlanHelpersMockFns.mockIsPaid.mockImplementation((plan) => plan !== 'free')
 
 function queueWhereResponses(responses: unknown[][]) {
@@ -175,7 +178,7 @@ describe('ensureOrganizationForTeamSubscription', () => {
     mockAttachOwnedWorkspacesToOrganizationTx.mockResolvedValueOnce({ usageLimitUserIds: [] })
 
     await ensureOrganizationForTeamSubscriptionTx(
-      dbChainMock.db,
+      ACCEPTANCE_TX,
       {
         id: 'sub-1',
         plan: 'team',
@@ -204,7 +207,7 @@ describe('ensureOrganizationForTeamSubscription', () => {
 
     await expect(
       ensureOrganizationForTeamSubscriptionTx(
-        dbChainMock.db,
+        ACCEPTANCE_TX,
         {
           id: 'sub-1',
           plan: 'team',
@@ -267,16 +270,13 @@ describe('syncSubscriptionUsageLimits', () => {
     mockGetOrganizationIdForSubscriptionReference.mockResolvedValue('org-1')
     mockGetPlanPricing.mockReturnValue({ basePrice: 25 })
 
-    await syncSubscriptionUsageLimits(
-      {
-        id: 'sub-1',
-        plan: 'team_6000',
-        referenceId: 'org-1',
-        status: 'active',
-        seats: 2,
-      },
-      BILLING_WEBHOOK
-    )
+    await syncSubscriptionUsageLimits({
+      id: 'sub-1',
+      plan: 'team_6000',
+      referenceId: 'org-1',
+      status: 'active',
+      seats: 2,
+    })
 
     const update = dbChainMockFns.set.mock.calls[0]?.[0]
     const expression = JSON.stringify(update?.orgUsageLimit)

apps/sim/lib/uploads/contexts/organization-logo/application.integration.ts

@@ -72,7 +72,7 @@ describe('organization logo concurrency and retention', () => {
   beforeAll(async () => {
     const connection = fixture.connection!
     await connection`CREATE SCHEMA ${connection(fixture.schema)}`
-    for (const table of ['user', 'member', 'organization', 'upload_session']) {
+    for (const table of ['user', 'member', 'organization', 'workspace', 'upload_session']) {
       await connection`CREATE TABLE ${connection(table)} (LIKE ${connection(`public.${table}`)} INCLUDING ALL)`
     }
     await db.insert(organization).values({

scripts/check-test-types.baseline.json

@@ -231,14 +231,10 @@
   "apps/sim/app/api/mothership/chats/read/route.test.ts": {
     "TS2554": 3
   },
-  "apps/sim/app/api/mothership/events/route.test.ts": {
-    "TS2554": 10
-  },
   "apps/sim/app/api/organizations/[id]/permission-groups/[groupId]/route.test.ts": {
     "TS2550": 2
   },
   "apps/sim/app/api/organizations/route.test.ts": {
-    "TS2554": 3,
     "TS2769": 1
   },
   "apps/sim/app/api/pinned-items/route.test.ts": {
@@ -458,9 +454,6 @@
     "TS2322": 1,
     "TS2554": 1
   },
-  "apps/sim/app/api/workspaces/route.test.ts": {
-    "TS2554": 2
-  },
   "apps/sim/background/async-execution-correlation.test.ts": {
     "TS2345": 2
   },
@@ -966,9 +959,6 @@
     "TS2345": 2,
     "TS2739": 16
   },
-  "apps/sim/lib/billing/organization.test.ts": {
-    "TS2345": 1
-  },
   "apps/sim/lib/billing/organizations/lock-order.test.ts": {
     "TS2345": 2,
     "TS2352": 1,