fix(admin): close dashboard recovery gaps

Author: icecrasher321

apps/sim/app/api/v1/admin/dashboard/organizations/[id]/members/preflight/route.ts

@@ -18,7 +18,11 @@ export const GET = withRouteHandler(
     if (!parsed.success) return parsed.response
     try {
       return singleResponse(
-        await getDashboardMemberTransferPreflight(parsed.data.params.id, parsed.data.query.userId)
+        await getDashboardMemberTransferPreflight(parsed.data.params.id, parsed.data.query.userId, {
+          search: parsed.data.query.search,
+          limit: parsed.data.query.limit,
+          offset: parsed.data.query.offset,
+        })
       )
     } catch (error) {
       return badRequestResponse(getErrorMessage(error, 'Failed to prepare member transfer'))

apps/sim/app/api/v1/admin/dashboard/workspaces/[id]/move/route.ts

@@ -38,6 +38,7 @@ export const POST = withRouteHandler(
         auditActor: actor,
         auditOperationId: parsed.data.body.operationId,
         operationCorrelationId: parsed.data.body.operationId,
+        durableOperationId: parsed.data.body.operationId,
       })
       const data = await toWorkspaceMoveOperationView(summary, parsed.data.body.operationId)
       return NextResponse.json({ data })

apps/sim/lib/admin/dashboard-organizations.test.ts

@@ -6,6 +6,7 @@ import {
   permissions,
   subscription,
   usageLog,
+  user,
   workspace,
 } from '@sim/db/schema'
 import { dbChainMockFns, queueTableRows, resetDbChainMock } from '@sim/testing'
@@ -17,6 +18,7 @@ const mocks = vi.hoisted(() => ({
   provisionings: new Map(),
   resolveMetadataIntent: vi.fn(),
   enqueueOutboxEvent: vi.fn(),
+  countPendingSeatInvitations: vi.fn(),
 }))
 
 vi.mock('@sim/audit', () => ({
@@ -64,19 +66,107 @@ vi.mock('@/lib/billing/organizations/membership', () => ({
   transferOrganizationOwnership: vi.fn(),
 }))
 vi.mock('@/lib/billing/organizations/seats', () => ({ reconcileOrganizationSeats: vi.fn() }))
+vi.mock('@/lib/billing/validation/seat-management', () => ({
+  countPendingSeatInvitations: mocks.countPendingSeatInvitations,
+}))
 vi.mock('@/lib/core/idempotency/transaction', () => ({
   executeTransactionallyIdempotent: vi.fn(),
 }))
 vi.mock('@/lib/core/outbox/service', () => ({ enqueueOutboxEvent: mocks.enqueueOutboxEvent }))
 
 import {
+  getDashboardMemberTransferPreflight,
   getDashboardOrganization,
   listDashboardOrganizations,
   toDashboardConfigurationUpdate,
   updateDashboardEnterpriseBillingTerms,
+  updateDashboardEnterpriseSeats,
   updateDashboardOrganizationLimits,
 } from '@/lib/admin/dashboard'
 
+describe('getDashboardMemberTransferPreflight', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    resetDbChainMock()
+  })
+
+  it('pages workspace choices and exposes an empty default selection above the exact cap', async () => {
+    queueTableRows(organization, [{ id: 'org-destination' }])
+    queueTableRows(user, [
+      {
+        id: 'user-1',
+        name: 'User',
+        email: 'user@example.com',
+        memberId: null,
+        role: null,
+        organizationId: null,
+        organizationName: null,
+      },
+    ])
+    queueTableRows(workspace, [{ value: 75 }])
+    queueTableRows(workspace, [
+      { id: 'workspace-51', name: 'Matching workspace', archivedAt: null },
+    ])
+    queueTableRows(workspace, [
+      {
+        id: 'workspace-1',
+        name: 'First eligible workspace',
+        archivedAt: null,
+        total: 1_205,
+      },
+    ])
+
+    const result = await getDashboardMemberTransferPreflight('org-destination', 'user-1', {
+      search: 'matching',
+      limit: 25,
+      offset: 50,
+    })
+
+    expect(result.personalWorkspaces).toEqual([
+      { id: 'workspace-51', name: 'Matching workspace', archived: false },
+    ])
+    expect(result.workspacePagination).toEqual({
+      total: 75,
+      limit: 25,
+      offset: 50,
+      hasMore: true,
+    })
+    expect(result.workspaceSelection).toEqual({
+      totalEligible: 1_205,
+      defaultSelectedIds: [],
+      defaultSelectedWorkspaces: [],
+      includesAllEligible: false,
+      limit: 1_000,
+    })
+    expect(dbChainMockFns.limit).toHaveBeenCalledWith(1_001)
+  })
+})
+
+describe('updateDashboardEnterpriseSeats', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    resetDbChainMock()
+  })
+
+  it('refuses to reduce capacity below members plus live pending seat reservations', async () => {
+    queueTableRows(subscription, [
+      { id: 'sub-1', plan: 'enterprise', status: 'active', metadata: { seats: 10 } },
+    ])
+    queueTableRows(member, [{ value: 5 }])
+    mocks.countPendingSeatInvitations.mockResolvedValue(2)
+
+    await expect(
+      updateDashboardEnterpriseSeats('org-1', 6, {
+        id: 'admin-1',
+        name: 'Admin',
+        email: 'admin@example.com',
+      })
+    ).rejects.toThrow('below 7 occupied or reserved seats')
+
+    expect(mocks.enqueueOutboxEvent).not.toHaveBeenCalled()
+  })
+})
+
 afterAll(() => {
   resetDbChainMock()
 })

apps/sim/lib/admin/dashboard.ts

@@ -72,6 +72,7 @@ import {
   isOrgScopedSubscription,
 } from '@/lib/billing/subscriptions/utils'
 import { toDecimal } from '@/lib/billing/utils/decimal'
+import { countPendingSeatInvitations } from '@/lib/billing/validation/seat-management'
 import { env } from '@/lib/core/config/env'
 import { executeTransactionallyIdempotent } from '@/lib/core/idempotency/transaction'
 import { enqueueOutboxEvent } from '@/lib/core/outbox/service'
@@ -84,6 +85,8 @@ interface PaginationInput {
   offset: number
 }
 
+const MAX_ADMIN_MEMBER_WORKSPACE_SELECTION = 1_000
+
 export interface AdminMutationActor {
   id: string | null
   name: string
@@ -1119,8 +1122,12 @@ export async function updateDashboardEnterpriseSeats(
       .select({ value: count() })
       .from(member)
       .where(eq(member.organizationId, organizationId))
-    if (seats < (memberCountRow?.value ?? 0)) {
-      throw new Error('Seat capacity cannot be below current internal membership')
+    const pendingSeats = await countPendingSeatInvitations(organizationId, tx)
+    const requiredSeats = (memberCountRow?.value ?? 0) + pendingSeats
+    if (seats < requiredSeats) {
+      throw new Error(
+        `Seat capacity cannot be below ${requiredSeats} occupied or reserved seats (${memberCountRow?.value ?? 0} members and ${pendingSeats} pending invitations)`
+      )
     }
     await enqueueEnterpriseMetadataIntent(tx, {
       subscriptionId: subscriptionRow.id,
@@ -1135,7 +1142,7 @@ export async function updateDashboardEnterpriseSeats(
     action: AuditAction.ORG_SEAT_PROVISIONED,
     resourceType: AuditResourceType.ORGANIZATION,
     resourceId: organizationId,
-    description: `Admin set Enterprise seat capacity to ${seats}`,
+    description: `Admin requested Enterprise seat capacity ${seats}`,
     metadata: { seats },
   })
 }
@@ -1346,7 +1353,7 @@ export async function updateDashboardOrganizationLimits(
   },
   actor: AdminMutationActor
 ) {
-  await db.transaction(async (tx) => {
+  const providerBacked = await db.transaction(async (tx) => {
     await acquireOrganizationMutationLock(tx, organizationId)
     const [org] = await tx
       .select()
@@ -1413,7 +1420,7 @@ export async function updateDashboardOrganizationLimits(
           }
         },
       })
-      return
+      return true
     }
 
     const [memberCountRow] = await tx
@@ -1447,6 +1454,7 @@ export async function updateDashboardOrganizationLimits(
         })
         .where(eq(subscription.id, subscriptionRow.id))
     }
+    return false
   })
   recordAudit({
     actorId: actor.id,
@@ -1455,7 +1463,9 @@ export async function updateDashboardOrganizationLimits(
     action: AuditAction.ORGANIZATION_UPDATED,
     resourceType: AuditResourceType.ORGANIZATION,
     resourceId: organizationId,
-    description: 'Admin updated organization limits',
+    description: providerBacked
+      ? 'Admin requested Enterprise organization-limit update'
+      : 'Admin updated organization limits',
     metadata: values,
   })
 }
@@ -1681,35 +1691,62 @@ export async function grantDashboardUserBalance(
 
 export async function getDashboardMemberTransferPreflight(
   destinationOrganizationId: string,
-  userId: string
+  userId: string,
+  workspacePage: PaginationInput = { search: '', limit: 50, offset: 0 }
 ) {
-  const [[destination], [target], personalWorkspaces] = await Promise.all([
-    db
-      .select({ id: organization.id })
-      .from(organization)
-      .where(eq(organization.id, destinationOrganizationId))
-      .limit(1),
-    db
-      .select({
-        id: user.id,
-        name: user.name,
-        email: user.email,
-        memberId: member.id,
-        role: member.role,
-        organizationId: member.organizationId,
-        organizationName: organization.name,
-      })
-      .from(user)
-      .leftJoin(member, eq(member.userId, user.id))
-      .leftJoin(organization, eq(organization.id, member.organizationId))
-      .where(eq(user.id, userId))
-      .limit(1),
-    db
-      .select({ id: workspace.id, name: workspace.name, archivedAt: workspace.archivedAt })
-      .from(workspace)
-      .where(ownedAttachableWorkspacesWhere({ userId, includeArchived: true }))
-      .orderBy(workspace.name, workspace.id),
-  ])
+  const search = workspacePage.search.trim()
+  const limit = Math.min(Math.max(workspacePage.limit, 1), 250)
+  const offset = Math.max(workspacePage.offset, 0)
+  const allPersonalWorkspacesWhere = ownedAttachableWorkspacesWhere({
+    userId,
+    includeArchived: true,
+  })
+  const matchingPersonalWorkspacesWhere = and(
+    allPersonalWorkspacesWhere,
+    search ? or(eq(workspace.id, search), ilike(workspace.name, `%${search}%`)) : undefined
+  )
+  const [[destination], [target], personalWorkspaceCount, personalWorkspaces, selectionRows] =
+    await Promise.all([
+      db
+        .select({ id: organization.id })
+        .from(organization)
+        .where(eq(organization.id, destinationOrganizationId))
+        .limit(1),
+      db
+        .select({
+          id: user.id,
+          name: user.name,
+          email: user.email,
+          memberId: member.id,
+          role: member.role,
+          organizationId: member.organizationId,
+          organizationName: organization.name,
+        })
+        .from(user)
+        .leftJoin(member, eq(member.userId, user.id))
+        .leftJoin(organization, eq(organization.id, member.organizationId))
+        .where(eq(user.id, userId))
+        .limit(1),
+      db.select({ value: count() }).from(workspace).where(matchingPersonalWorkspacesWhere),
+      db
+        .select({ id: workspace.id, name: workspace.name, archivedAt: workspace.archivedAt })
+        .from(workspace)
+        .where(matchingPersonalWorkspacesWhere)
+        .orderBy(workspace.name, workspace.id)
+        .limit(limit)
+        .offset(offset),
+      db
+        .select({
+          id: workspace.id,
+          name: workspace.name,
+          archivedAt: workspace.archivedAt,
+          total: sql<number>`count(*) over()`.mapWith(Number),
+        })
+        .from(workspace)
+        .where(allPersonalWorkspacesWhere)
+        .orderBy(workspace.id)
+        .limit(MAX_ADMIN_MEMBER_WORKSPACE_SELECTION + 1),
+    ])
   if (!destination) throw new Error('Destination organization not found')
   if (!target) throw new Error('User not found')
 
@@ -1724,6 +1761,9 @@ export async function getDashboardMemberTransferPreflight(
       : credentialDependencies.length > 0
         ? 'Reconnect or remove source-organization credentials owned by this user before transfer'
         : null
+  const matchingWorkspaceTotal = personalWorkspaceCount[0]?.value ?? 0
+  const totalEligibleWorkspaces = selectionRows[0]?.total ?? 0
+  const includesAllEligible = totalEligibleWorkspaces <= MAX_ADMIN_MEMBER_WORKSPACE_SELECTION
 
   return {
     user: { id: target.id, name: target.name, email: target.email },
@@ -1736,6 +1776,24 @@ export async function getDashboardMemberTransferPreflight(
       name: row.name,
       archived: row.archivedAt !== null,
     })),
+    workspacePagination: {
+      total: matchingWorkspaceTotal,
+      limit,
+      offset,
+      hasMore: offset + personalWorkspaces.length < matchingWorkspaceTotal,
+    },
+    workspaceSelection: {
+      totalEligible: totalEligibleWorkspaces,
+      defaultSelectedIds: includesAllEligible ? selectionRows.map((row) => row.id) : [],
+      defaultSelectedWorkspaces: includesAllEligible
+        ? selectionRows.map(({ total: _total, archivedAt, ...row }) => ({
+            ...row,
+            archived: archivedAt !== null,
+          }))
+        : [],
+      includesAllEligible,
+      limit: MAX_ADMIN_MEMBER_WORKSPACE_SELECTION,
+    },
     credentialDependencies,
     canAdd: reason === null,
     reason,

apps/sim/lib/admin/invitation-operation.test.ts

@@ -94,10 +94,7 @@ describe('Admin invitation operation', () => {
       expect.objectContaining({ email: 'a@example.com', source: 'admin', sequence: 0 }),
       expect.objectContaining({ email: 'b@example.com', source: 'admin', sequence: 1 }),
     ])
-    expect(mocks.recordAuditOnce).toHaveBeenCalledWith(
-      '11111111-1111-4111-8111-111111111111:requested',
-      expect.objectContaining({ resourceId: 'org-1' })
-    )
+    expect(mocks.recordAuditOnce).not.toHaveBeenCalled()
   })
 
   it('waits for every recipient before the parent operation completes', async () => {
@@ -130,5 +127,9 @@ describe('Admin invitation operation', () => {
       reason: 'Waiting for invitation recipients',
       consumeAttempt: false,
     })
+    expect(mocks.recordAuditOnce).toHaveBeenCalledWith(
+      '11111111-1111-4111-8111-111111111111:requested',
+      expect.objectContaining({ resourceId: 'org-1' })
+    )
   })
 })