improvement(admin): uupdate defaults for better UX

Author: icecrasher321

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

@@ -27,6 +27,7 @@ export const POST = withRouteHandler(
       const data = await moveWorkspaceToOrganization({
         workspaceId: parsed.data.params.id,
         destinationOrganizationId: parsed.data.body.destinationOrganizationId,
+        expectedOwnerId: parsed.data.body.expectedOwnerId,
         adminEmail: request.headers.get('x-admin-email') ?? 'admin-api@sim.ai',
       })
       return NextResponse.json({ data })

apps/sim/lib/admin/dashboard-credit-grant.test.ts

@@ -57,6 +57,9 @@ vi.mock('@/lib/billing/organizations/seats', () => ({
 vi.mock('@/lib/billing/core/usage', () => ({
   syncUsageLimitsFromSubscription: mocks.syncUsageLimits,
 }))
+vi.mock('@/lib/workspaces/organization-workspaces', () => ({
+  ownedAttachableWorkspacesWhere: vi.fn(() => undefined),
+}))
 vi.mock('@/lib/workspaces/admin-move', () => ({
   moveWorkspaceToOrganization: mocks.moveWorkspace,
 }))
@@ -211,6 +214,9 @@ describe('addDashboardOrganizationMember', () => {
     resetDbChainMock()
     mocks.billingSubscriptions = []
     mocks.idempotencyCalls = []
+    mocks.ensureMembership.mockReset()
+    mocks.transferMembership.mockReset()
+    mocks.moveWorkspace.mockReset()
   })
 
   it('rejects an existing member inside the transaction before touching their cap', async () => {
@@ -239,7 +245,50 @@ describe('addDashboardOrganizationMember', () => {
     expect(mocks.recordAudit).not.toHaveBeenCalled()
   })
 
-  it('uses the canonical transfer service and reports each selected personal workspace move', async () => {
+  it('moves every selected workspace through the invitation-aware service after adding a member', async () => {
+    queueTableRows(workspace, [{ id: 'workspace-1' }, { id: 'workspace-2' }])
+    queueTableRows(subscription, [{ plan: 'enterprise' }])
+    mocks.ensureMembership.mockResolvedValue({
+      success: true,
+      memberId: 'member-new',
+      alreadyMember: false,
+      billingActions: { proUsageSnapshotted: false, proCancelledAtPeriodEnd: false },
+    })
+    mocks.moveWorkspace.mockResolvedValue({})
+
+    const result = await addDashboardOrganizationMember(
+      'org-1',
+      {
+        userId: 'user-1',
+        role: 'member',
+        personalWorkspaceIds: ['workspace-1', 'workspace-2'],
+      },
+      { id: 'admin-1', name: 'Admin', email: 'admin@sim.ai' }
+    )
+
+    expect(mocks.moveWorkspace).toHaveBeenNthCalledWith(1, {
+      workspaceId: 'workspace-1',
+      destinationOrganizationId: 'org-1',
+      adminEmail: 'admin@sim.ai',
+      expectedOwnerId: 'user-1',
+    })
+    expect(mocks.moveWorkspace).toHaveBeenNthCalledWith(2, {
+      workspaceId: 'workspace-2',
+      destinationOrganizationId: 'org-1',
+      adminEmail: 'admin@sim.ai',
+      expectedOwnerId: 'user-1',
+    })
+    expect(result).toEqual({
+      memberId: 'member-new',
+      transferredFromOrganizationId: null,
+      workspaceMoves: [
+        { workspaceId: 'workspace-1', success: true },
+        { workspaceId: 'workspace-2', success: true },
+      ],
+    })
+  })
+
+  it('uses the canonical transfer service and reports each selected workspace move', async () => {
     queueTableRows(workspace, [{ id: 'workspace-1' }, { id: 'workspace-2' }])
     queueTableRows(member, [{ id: 'member-old', organizationId: 'org-old' }])
     mocks.transferMembership.mockResolvedValue({
@@ -289,4 +338,36 @@ describe('addDashboardOrganizationMember', () => {
     expect(mocks.reconcileSeats).toHaveBeenCalledTimes(2)
     expect(mocks.recordAudit).toHaveBeenCalledTimes(2)
   })
+
+  it('uses the expected owner guard for an administrator-selected subset', async () => {
+    queueTableRows(workspace, [{ id: 'workspace-1' }, { id: 'workspace-2' }])
+    queueTableRows(member, [{ id: 'member-old', organizationId: 'org-old' }])
+    mocks.transferMembership.mockResolvedValue({
+      success: true,
+      memberId: 'member-new',
+      workspaceAccessRevoked: 0,
+      credentialMembershipsRevoked: 0,
+      pendingInvitationsCancelled: 0,
+      usageCaptured: 0,
+    })
+    mocks.moveWorkspace.mockResolvedValue({})
+
+    const result = await addDashboardOrganizationMember(
+      'org-new',
+      {
+        userId: 'user-1',
+        role: 'member',
+        personalWorkspaceIds: ['workspace-1'],
+      },
+      { id: 'admin-1', name: 'Admin', email: 'admin@sim.ai' }
+    )
+
+    expect(mocks.moveWorkspace).toHaveBeenCalledWith({
+      workspaceId: 'workspace-1',
+      destinationOrganizationId: 'org-new',
+      adminEmail: 'admin@sim.ai',
+      expectedOwnerId: 'user-1',
+    })
+    expect(result.workspaceMoves).toEqual([{ workspaceId: 'workspace-1', success: true }])
+  })
 })

apps/sim/lib/admin/dashboard.ts

@@ -12,19 +12,7 @@ import {
 } from '@sim/db/schema'
 import { getErrorMessage } from '@sim/utils/errors'
 import { generateId } from '@sim/utils/id'
-import {
-  and,
-  count,
-  countDistinct,
-  desc,
-  eq,
-  ilike,
-  inArray,
-  isNull,
-  ne,
-  or,
-  sql,
-} from 'drizzle-orm'
+import { and, count, countDistinct, desc, eq, ilike, inArray, isNull, or, sql } from 'drizzle-orm'
 import {
   getOrganizationUsageLimitFallbackDollars,
   getTeamOrganizationEconomics,
@@ -64,6 +52,7 @@ import { executeTransactionallyIdempotent } from '@/lib/core/idempotency/transac
 import { enqueueOutboxEvent } from '@/lib/core/outbox/service'
 import type { DbOrTx } from '@/lib/db/types'
 import { moveWorkspaceToOrganization } from '@/lib/workspaces/admin-move'
+import { ownedAttachableWorkspacesWhere } from '@/lib/workspaces/organization-workspaces'
 
 interface PaginationInput {
   search: string
@@ -317,7 +306,7 @@ async function getDashboardOrganizationSummary(organizationId: string) {
           member,
           and(eq(member.userId, permissions.userId), eq(member.organizationId, organizationId))
         )
-        .where(and(isNull(member.id), isNull(workspace.archivedAt))),
+        .where(isNull(member.id)),
       getLatestSubscription(organizationId),
       getLatestEnterpriseProvisionings([organizationId]),
     ])
@@ -398,13 +387,7 @@ export async function listDashboardOrganizations({ search, limit, offset }: Pagi
           eq(member.organizationId, workspace.organizationId)
         )
       )
-      .where(
-        and(
-          inArray(workspace.organizationId, organizationIds),
-          isNull(member.id),
-          isNull(workspace.archivedAt)
-        )
-      )
+      .where(and(inArray(workspace.organizationId, organizationIds), isNull(member.id)))
       .groupBy(workspace.organizationId),
     db
       .selectDistinctOn([subscription.referenceId])
@@ -496,7 +479,7 @@ export async function getDashboardOrganization(organizationId: string) {
           member,
           and(eq(member.userId, permissions.userId), eq(member.organizationId, organizationId))
         )
-        .where(and(isNull(member.id), isNull(workspace.archivedAt)))
+        .where(isNull(member.id))
         .groupBy(user.id, user.name, user.email)
         .orderBy(user.name),
       db
@@ -939,7 +922,7 @@ export async function getDashboardMemberTransferPreflight(
     db
       .select({ id: workspace.id, name: workspace.name, archivedAt: workspace.archivedAt })
       .from(workspace)
-      .where(and(eq(workspace.ownerId, userId), ne(workspace.workspaceMode, 'organization')))
+      .where(ownedAttachableWorkspacesWhere({ userId, includeArchived: true }))
       .orderBy(workspace.name, workspace.id),
   ])
   if (!destination) throw new Error('Destination organization not found')
@@ -985,22 +968,15 @@ export async function addDashboardOrganizationMember(
   actor: AdminMutationActor
 ) {
   const selectedWorkspaceIds = [...new Set(values.personalWorkspaceIds ?? [])]
-  if (selectedWorkspaceIds.length > 0) {
-    const selectable = await db
+  const attachableWorkspaceIds = (
+    await db
       .select({ id: workspace.id })
       .from(workspace)
-      .where(
-        and(
-          inArray(workspace.id, selectedWorkspaceIds),
-          eq(workspace.ownerId, values.userId),
-          ne(workspace.workspaceMode, 'organization')
-        )
-      )
-    if (selectable.length !== selectedWorkspaceIds.length) {
-      throw new Error('One or more selected personal workspaces can no longer be moved')
-    }
+      .where(ownedAttachableWorkspacesWhere({ userId: values.userId, includeArchived: true }))
+  ).map((row) => row.id)
+  if (selectedWorkspaceIds.some((id) => !attachableWorkspaceIds.includes(id))) {
+    throw new Error('One or more selected personal workspaces can no longer be moved')
   }
-
   const [existingMembership] = await db
     .select({ id: member.id, organizationId: member.organizationId })
     .from(member)
@@ -1095,6 +1071,7 @@ export async function addDashboardOrganizationMember(
         workspaceId,
         destinationOrganizationId: organizationId,
         adminEmail: actor.email ?? 'admin-api',
+        expectedOwnerId: values.userId,
       })
       workspaceMoves.push({ workspaceId, success: true })
     } catch (error) {

apps/sim/lib/api/contracts/v1/admin/dashboard-workspaces.ts

@@ -24,6 +24,7 @@ export const adminDashboardWorkspacePreflightQuerySchema = z.object({
 
 export const adminDashboardWorkspaceMoveBodySchema = z.object({
   destinationOrganizationId: z.string().min(1).max(200),
+  expectedOwnerId: z.string().min(1).max(200).optional(),
 })
 
 const adminDashboardWorkspaceCandidateSchema = z.object({
@@ -78,9 +79,7 @@ const adminDashboardWorkspacePreflightResponseSchema = z.object({
 })
 
 const adminDashboardWorkspaceMoveResponseSchema = z.object({
-  data: adminDashboardWorkspacePreflightSchema.extend({
-    invitationEmailFailures: z.array(z.string()),
-  }),
+  data: adminDashboardWorkspacePreflightSchema,
 })
 
 export const adminDashboardWorkspaceSearchContract = defineRouteContract({

apps/sim/lib/billing/validation/seat-management.ts

@@ -67,7 +67,7 @@ export async function countPendingSeatInvitations(
  * Resolves the organization's seat capacity, honouring an Enterprise seat
  * change that is still in flight to Stripe.
  */
-async function resolveSeatCapacity(
+export async function resolveSeatCapacity(
   organizationSubscription: { id: string; plan: string; metadata?: unknown } & Record<
     string,
     unknown

apps/sim/lib/invitations/send.ts

@@ -69,7 +69,7 @@ export interface CreatePendingInvitationResult {
  * person per organization, which is what makes coalescing mandatory rather
  * than optional.
  */
-const PENDING_INVITATION_UNIQUE_INDEX = 'invitation_pending_email_org_unique'
+export const PENDING_INVITATION_UNIQUE_INDEX = 'invitation_pending_email_org_unique'
 
 /**
  * Raised when the granted workspaces changed organization between the