Merge remote-tracking branch 'origin/staging' into feat/table-views

# Conflicts:
#	packages/db/migrations/meta/0271_snapshot.json
#	packages/db/migrations/meta/_journal.json

Author: TheodoreSpeaks

apps/realtime/src/database/operations.ts

@@ -214,6 +214,8 @@ const socketDb = drizzle(
   instrumentPoolClient(
     postgres(connectionString, {
       prepare: false,
+      // See `packages/db/db.ts` — skips the per-connection pg_type roundtrip.
+      fetch_types: false,
       idle_timeout: 10,
       connect_timeout: 20,
       max: 10,

apps/sim/app/api/workspaces/[id]/files/route.test.ts

@@ -7,9 +7,9 @@ import { authMockFns, permissionsMock, permissionsMockFns, posthogServerMock } f
 import { NextRequest } from 'next/server'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-const { mockUploadWorkspaceFile, mockGetSharesForResources, mockRecordAudit } = vi.hoisted(() => ({
+const { mockUploadWorkspaceFile, mockGetWorkspaceShares, mockRecordAudit } = vi.hoisted(() => ({
   mockUploadWorkspaceFile: vi.fn(),
-  mockGetSharesForResources: vi.fn(),
+  mockGetWorkspaceShares: vi.fn(),
   mockRecordAudit: vi.fn(),
 }))
 
@@ -27,7 +27,7 @@ vi.mock('@/lib/uploads/shared/types', async (importOriginal) => {
 })
 
 vi.mock('@/lib/public-shares/share-manager', () => ({
-  getSharesForResources: mockGetSharesForResources,
+  getWorkspaceShares: mockGetWorkspaceShares,
 }))
 
 vi.mock('@/lib/posthog/server', () => posthogServerMock)
@@ -80,7 +80,7 @@ describe('workspace files upload route', () => {
     vi.clearAllMocks()
     authMockFns.mockGetSession.mockResolvedValue({ user: { id: 'user-1' } })
     permissionsMockFns.mockGetUserEntityPermissions.mockResolvedValue('write')
-    mockGetSharesForResources.mockResolvedValue(new Map())
+    mockGetWorkspaceShares.mockResolvedValue(new Map())
     mockUploadWorkspaceFile.mockResolvedValue({
       id: 'file-1',
       name: 'file.txt',

apps/sim/app/api/workspaces/[id]/files/route.ts

@@ -16,7 +16,7 @@ import {
 } from '@/lib/core/utils/stream-limits'
 import { withRouteHandler } from '@/lib/core/utils/with-route-handler'
 import { captureServerEvent } from '@/lib/posthog/server'
-import { getSharesForResources } from '@/lib/public-shares/share-manager'
+import { getWorkspaceShares } from '@/lib/public-shares/share-manager'
 import {
   FileConflictError,
   listWorkspaceFiles,
@@ -74,10 +74,7 @@ export const GET = withRouteHandler(
 
       const files = await listWorkspaceFiles(workspaceId, { scope })
 
-      const shares = await getSharesForResources(
-        'file',
-        files.map((file) => file.id)
-      )
+      const shares = await getWorkspaceShares('file', workspaceId)
       const filesWithShares = files.map((file) => ({
         ...file,
         share: shares.get(file.id) ?? null,

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/hooks/use-table.ts

@@ -32,6 +32,14 @@ interface UseTableParams {
   workspaceId: string
   tableId: string
   queryOptions: QueryOptions
+  /**
+   * Holds the rows query until the caller's filter/sort are settled. The wrapper
+   * resolves the active view asynchronously, so without this the first fetch runs
+   * against an empty filter and the grid paints the unfiltered set before
+   * refetching — a visible flash of the wrong rows on every load that adopts a
+   * default view or opens a `?table-view=` link.
+   */
+  rowsEnabled?: boolean
 }
 
 interface FetchNextPageResult {
@@ -88,7 +96,12 @@ export interface UseTableReturn {
  * stays in the `Table` component — moving it here would push every keystroke
  * through this hook's return value and re-render everything.
  */
-export function useTable({ workspaceId, tableId, queryOptions }: UseTableParams): UseTableReturn {
+export function useTable({
+  workspaceId,
+  tableId,
+  queryOptions,
+  rowsEnabled = true,
+}: UseTableParams): UseTableReturn {
   const queryClient = useQueryClient()
   const { data: tableData, isLoading: isLoadingTable } = useTableQuery(workspaceId, tableId)
 
@@ -115,7 +128,7 @@ export function useTable({ workspaceId, tableId, queryOptions }: UseTableParams)
     pageSize: TABLE_LIMITS.MAX_QUERY_LIMIT,
     filter,
     sort: queryOptions.sort,
-    enabled: Boolean(workspaceId && tableId),
+    enabled: Boolean(workspaceId && tableId) && rowsEnabled,
   })
 
   const rows = useMemo<TableRow[]>(

apps/sim/app/workspace/[workspaceId]/tables/[tableId]/table.tsx

@@ -358,6 +358,14 @@ export function Table({
     ((previousName: string, newName: string) => void) | null
   >(null)
 
+  // Declared before `useTable`: the rows query is gated on `viewsLoaded`, since a
+  // view owns the filter/sort the query runs with.
+  const { data: views = NO_VIEWS, isSuccess: viewsLoaded } = useTableViews({
+    workspaceId,
+    tableId,
+    enabled: viewsEnabled,
+  })
+
   // Single source of truth for `useTable` — drives both the grid render and
   // the wrapper's slideouts/modals. The grid receives the bundle as props.
   const {
@@ -373,12 +381,10 @@ export function Table({
     workspaceId,
     tableId,
     queryOptions,
-  })
-
-  const { data: views = NO_VIEWS, isSuccess: viewsLoaded } = useTableViews({
-    workspaceId,
-    tableId,
-    enabled: viewsEnabled,
+    // Without this the first fetch runs against an empty filter and the grid
+    // paints the unfiltered set before refetching. Gates only the first pass —
+    // `viewsLoaded` stays true after, so later filter edits fetch immediately.
+    rowsEnabled: !viewsEnabled || viewsLoaded,
   })
   const createViewMutation = useCreateTableView({ workspaceId, tableId })
   const updateViewMutation = useUpdateTableView({ workspaceId, tableId })
@@ -468,7 +474,14 @@ export function Table({
       // back to "All" without touching state, for the same reason. An explicit
       // `?sort=` alongside `?view=` also wins over the view's stored sort.
       seededViewIdRef.current = activeView?.id ?? null
-      if (activeView) applyViewConfig(activeView.config, localWork())
+      if (activeView) {
+        applyViewConfig(activeView.config, localWork())
+      } else {
+        // Nothing to apply, but the URL still names a view that no longer exists.
+        // Rewrite it so a stale bookmark can't be copied on, and so the param
+        // matches the All the UI is already showing.
+        setTableParams({ view: ALL_VIEW_PARAM })
+      }
       return
     }
 
@@ -590,13 +603,16 @@ export function Table({
   const handlePersistLayout = useCallback(
     (patch: TableMetadata) => {
       liveLayoutRef.current = { ...liveLayoutRef.current, ...patch }
-      if (!activeView) return
+      // The resize grip and drag handles stay live for read-only members, so
+      // without this a resize fires a write-gated PATCH and an error toast. Local
+      // layout still updates — only the persist is suppressed.
+      if (!activeView || !userPermissions.canEdit) return
       updateViewMutation.mutate(
         { viewId: activeView.id, configPatch: patch },
         { onError: (error) => toast.error(getErrorMessage(error, 'Failed to save layout')) }
       )
     },
-    [activeView]
+    [activeView, userPermissions.canEdit]
   )
 
   const handleSaveView = () => {

apps/sim/hooks/queries/workspace-files.ts

@@ -27,7 +27,7 @@ import { useFileContentSource } from '@/hooks/use-file-content-source'
 
 const logger = createLogger('WorkspaceFilesQuery')
 
-type WorkspaceFileQueryScope = 'active' | 'archived' | 'all'
+type WorkspaceFileQueryScope = 'active' | 'archived'
 
 /**
  * Query key factories for workspace files

apps/sim/lib/api/contracts/workspace-files.ts

@@ -3,7 +3,13 @@ import { inlineFileRefQuerySchema } from '@/lib/api/contracts/primitives'
 import { shareRecordSchema } from '@/lib/api/contracts/public-shares'
 import { defineRouteContract } from '@/lib/api/contracts/types'
 
-export const workspaceFileScopeSchema = z.enum(['active', 'archived', 'all'])
+/**
+ * Client-reachable listing scopes. `all` is deliberately excluded: it drops the
+ * `deleted_at` predicate, so it cannot use the partial index that serves the
+ * other two and degrades to a full workspace scan. No client requests it, and
+ * server-side callers reach that scope directly rather than over the wire.
+ */
+export const workspaceFileScopeSchema = z.enum(['active', 'archived'])
 
 export const workspaceFilesParamsSchema = z.object({
   id: z.string({ error: 'Workspace ID is required' }).min(1, 'Workspace ID is required'),

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

@@ -8,13 +8,15 @@ const {
   mockComputeDailyRefreshConsumed,
   mockEnsureUserStatsExists,
   mockGetBillingPeriodUsageCost,
+  mockGetBillingPeriodUsageCostWithSourceSubset,
   mockGetHighestPriorityPersonalSubscription,
   mockGetHighestPrioritySubscription,
   mockResolveBillingInterval,
 } = vi.hoisted(() => ({
   mockComputeDailyRefreshConsumed: vi.fn(),
   mockEnsureUserStatsExists: vi.fn(),
   mockGetBillingPeriodUsageCost: vi.fn(),
+  mockGetBillingPeriodUsageCostWithSourceSubset: vi.fn(),
   mockGetHighestPriorityPersonalSubscription: vi.fn(),
   mockGetHighestPrioritySubscription: vi.fn(),
   mockResolveBillingInterval: vi.fn(),
@@ -35,6 +37,7 @@ vi.mock('@/lib/billing/core/usage', () => ({
 vi.mock('@/lib/billing/core/usage-log', () => ({
   COPILOT_USAGE_SOURCES: ['copilot'],
   getBillingPeriodUsageCost: mockGetBillingPeriodUsageCost,
+  getBillingPeriodUsageCostWithSourceSubset: mockGetBillingPeriodUsageCostWithSourceSubset,
 }))
 
 vi.mock('@/lib/billing/credits/daily-refresh', () => ({
@@ -50,7 +53,7 @@ describe('getPersonalBillingSummary', () => {
     mockEnsureUserStatsExists.mockResolvedValue(undefined)
     mockResolveBillingInterval.mockReturnValue('year')
     mockComputeDailyRefreshConsumed.mockResolvedValue(3)
-    mockGetBillingPeriodUsageCost.mockResolvedValueOnce(2).mockResolvedValueOnce(1)
+    mockGetBillingPeriodUsageCostWithSourceSubset.mockResolvedValue({ total: 2, subset: 1 })
     mockGetHighestPriorityPersonalSubscription.mockResolvedValue({
       id: 'personal-sub',
       referenceId: 'viewer-a',

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

@@ -7,7 +7,11 @@ import {
   resolveBillingInterval,
 } from '@/lib/billing/core/subscription'
 import { ensureUserStatsExists } from '@/lib/billing/core/usage'
-import { COPILOT_USAGE_SOURCES, getBillingPeriodUsageCost } from '@/lib/billing/core/usage-log'
+import {
+  COPILOT_USAGE_SOURCES,
+  getBillingPeriodUsageCost,
+  getBillingPeriodUsageCostWithSourceSubset,
+} from '@/lib/billing/core/usage-log'
 import {
   computeDailyRefreshConsumed,
   getOrgMemberRefreshBounds,
@@ -429,15 +433,13 @@ export async function getPersonalBillingSummary(userId: string, executor: DbClie
       personalSubscription?.periodStart && personalSubscription.periodEnd
         ? { start: personalSubscription.periodStart, end: personalSubscription.periodEnd }
         : defaultBillingPeriod()
-    const [ledgerUsage, copilotLedgerUsage] = await Promise.all([
-      getBillingPeriodUsageCost({ type: 'user', id: userId }, billingPeriod, undefined, executor),
-      getBillingPeriodUsageCost(
+    const { total: ledgerUsage, subset: copilotLedgerUsage } =
+      await getBillingPeriodUsageCostWithSourceSubset(
         { type: 'user', id: userId },
         billingPeriod,
         COPILOT_USAGE_SOURCES,
         executor
-      ),
-    ])
+      )
 
     const hasPersonalUsageSnapshot =
       Boolean(personalSubscription) && isPro(plan) && stats.proPeriodCostSnapshotAt !== null

apps/sim/lib/billing/core/usage-log.ts

@@ -207,6 +207,40 @@ export async function getBillingPeriodUsageCost(
   return Number.parseFloat(row?.cost ?? '0')
 }
 
+/**
+ * Period total plus the portion attributable to `source`, in a single scan.
+ *
+ * Two separate aggregates over the identical row set double the work and, because
+ * they are separate statements, can observe different snapshots — which makes the
+ * subset exceeding the total representable. One statement rules that out.
+ */
+export async function getBillingPeriodUsageCostWithSourceSubset(
+  billingEntity: BillingEntity,
+  billingPeriod: { start: Date; end: Date },
+  source: UsageLogSource[],
+  executor: DbClient = db
+): Promise<{ total: number; subset: number }> {
+  const [row] = await executor
+    .select({
+      total: sql<string>`COALESCE(SUM(${usageLog.cost}), 0)`,
+      subset: sql<string>`COALESCE(SUM(${usageLog.cost}) FILTER (WHERE ${inArray(usageLog.source, source)}), 0)`,
+    })
+    .from(usageLog)
+    .where(
+      and(
+        eq(usageLog.billingEntityType, billingEntity.type),
+        eq(usageLog.billingEntityId, billingEntity.id),
+        eq(usageLog.billingPeriodStart, billingPeriod.start),
+        eq(usageLog.billingPeriodEnd, billingPeriod.end)
+      )
+    )
+
+  return {
+    total: Number.parseFloat(row?.total ?? '0'),
+    subset: Number.parseFloat(row?.subset ?? '0'),
+  }
+}
+
 export async function getBillingPeriodUsageCostByUser(
   billingEntity: BillingEntity,
   billingPeriod: { start: Date; end: Date },