address more comments

Author: icecrasher321

apps/sim/app/api/organizations/[id]/invitations/[invitationId]/route.ts

@@ -422,10 +422,20 @@ export async function PUT(
             // this transfer, pre-join bytes would be orphaned on the
             // user's row and subsequent decrements (deleting a pre-join
             // file after joining) would wrongly reduce the org pool.
+            //
+            // `.for('update')` acquires a row-level write lock on the
+            // user's `user_stats` row so a concurrent
+            // `incrementStorageUsage`/`decrementStorageUsage` (from
+            // another tab, a scheduled run, an API-key writer, etc.)
+            // blocks until this transaction commits — otherwise Postgres
+            // READ COMMITTED would let a write land between the snapshot
+            // SELECT and the zero UPDATE, silently dropping those bytes.
+            // Mirrors the bulk version in `syncSubscriptionUsageLimits`.
             const storageRows = await tx
               .select({ storageUsedBytes: userStats.storageUsedBytes })
               .from(userStats)
               .where(eq(userStats.userId, userId))
+              .for('update')
               .limit(1)
 
             const bytesToTransfer = storageRows[0]?.storageUsedBytes ?? 0

apps/sim/app/workspace/[workspaceId]/settings/components/subscription/subscription-permissions.ts

@@ -58,8 +58,14 @@ export function getSubscriptionPermissions(
     canEditUsageLimit: (isFree || (isPaid && !isEnterprise)) && orgAdminOrSolo,
     canCancelSubscription: isPaid && !isEnterprise && orgAdminOrSolo,
     showTeamMemberView: orgMemberOnly,
+    // Personal Pro can upgrade to team/enterprise. Any org admin/owner on
+    // a non-enterprise plan can upgrade to enterprise — covers team admins
+    // AND admins of `pro_*` plans attached to an org (previously missed by
+    // the narrower `isTeam && isTeamAdmin` check, which left pro-on-org
+    // admins with no upgrade path even though `getVisiblePlans` listed
+    // enterprise for them).
     showUpgradePlans:
-      (isFree || (isPro && !isOrgScoped) || (isTeam && isTeamAdmin)) && !isEnterprise,
+      (isFree || (isPro && !isOrgScoped) || (isOrgScoped && isTeamAdmin)) && !isEnterprise,
     isEnterpriseMember,
     canViewUsageInfo,
   }
@@ -70,7 +76,7 @@ export function getVisiblePlans(
   userRole: UserRole
 ): ('pro' | 'team' | 'enterprise')[] {
   const plans: ('pro' | 'team' | 'enterprise')[] = []
-  const { isFree, isPro, isTeam, isOrgScoped } = subscription
+  const { isFree, isPro, isEnterprise, isOrgScoped } = subscription
   const { isTeamAdmin } = userRole
 
   // Free users see all plans
@@ -81,13 +87,14 @@ export function getVisiblePlans(
   else if (isPro && !isOrgScoped) {
     plans.push('team', 'enterprise')
   }
-  // Team/org owners/admins: only enterprise (already on a team-level plan)
-  else if (isOrgScoped && isTeamAdmin && !isTeam) {
-    plans.push('enterprise')
-  } else if (isTeam && isTeamAdmin) {
+  // Org admin/owner on a non-enterprise plan: enterprise is the only
+  // remaining upgrade. Covers team admins and `pro_*`-on-org admins.
+  // Explicitly excludes enterprise admins (already on the top tier) so
+  // this stays consistent with `showUpgradePlans`.
+  else if (isOrgScoped && isTeamAdmin && !isEnterprise) {
     plans.push('enterprise')
   }
-  // Team/org members, Enterprise users see no plans
+  // Org members, Enterprise users see no plans
 
   return plans
 }