fix(tables): make in-grid find id-native (scan/return JSONB keys as column ids)

Author: TheodoreSpeaks

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

@@ -762,13 +762,15 @@ export function TableGrid({
   const findMatches = useMemo<readonly TableFindMatch[]>(() => {
     const raw = findData?.matches
     if (!raw || raw.length === 0) return EMPTY_FIND_MATCHES
-    const colIndexByName = new Map(displayColumns.map((c, i) => [c.name, i]))
+    // `m.column` is the stable column id (the JSONB storage key); index display
+    // columns by their id so id-native tables resolve and stale/hidden columns drop.
+    const colIndexByKey = new Map(displayColumns.map((c, i) => [c.key, i]))
     return raw
-      .filter((m) => colIndexByName.has(m.column))
+      .filter((m) => colIndexByKey.has(m.column))
       .sort(
         (a, b) =>
           a.ordinal - b.ordinal ||
-          (colIndexByName.get(a.column) ?? 0) - (colIndexByName.get(b.column) ?? 0)
+          (colIndexByKey.get(a.column) ?? 0) - (colIndexByKey.get(b.column) ?? 0)
       )
   }, [findData, displayColumns])
 
@@ -809,7 +811,7 @@ export function TableGrid({
     if (!match) return
     const rowIndex = rows.findIndex((r) => r.id === match.rowId)
     if (rowIndex === -1) return
-    const colIndex = displayColumns.findIndex((c) => c.name === match.column)
+    const colIndex = displayColumns.findIndex((c) => c.key === match.column)
     pendingMatchRef.current = null
     if (colIndex === -1) return
     setEditingCell(null)

apps/sim/lib/api/contracts/tables.ts

@@ -523,6 +523,7 @@ export const findTableRowsQuerySchema = z.object({
 export const tableFindMatchSchema = z.object({
   ordinal: z.number().int(),
   rowId: z.string(),
+  /** Stable column id of the matching cell (JSONB storage key), not the display name. */
   column: z.string(),
 })
 

apps/sim/lib/table/service.ts

@@ -2429,6 +2429,7 @@ export interface FindRowMatch {
   /** 0-based index of the row in the filtered+sorted view (aligns with the list query). */
   ordinal: number
   rowId: string
+  /** Stable column id of the matching cell (the JSONB storage key), not the display name. */
   column: string
 }
 
@@ -2454,8 +2455,9 @@ export async function findRowMatches(
 ): Promise<{ matches: FindRowMatch[]; truncated: boolean }> {
   const tableName = USER_TABLE_ROWS_SQL_NAME
   const columns = table.schema.columns
-  const columnNames = columns.map((c) => c.name)
-  if (columnNames.length === 0) return { matches: [], truncated: false }
+  // Row data is keyed by stable column id, so scan/return JSONB keys as ids.
+  const columnIds = columns.map(getColumnId)
+  if (columnIds.length === 0) return { matches: [], truncated: false }
 
   const baseConditions = and(
     eq(userTableRows.tableId, table.id),
@@ -2484,7 +2486,7 @@ export async function findRowMatches(
     FROM ordered o
     CROSS JOIN LATERAL jsonb_each_text(o.data) kv
     WHERE kv.value ILIKE ${pattern}
-      AND ${inArray(sql`kv.key`, columnNames)}
+      AND ${inArray(sql`kv.key`, columnIds)}
     ORDER BY o.ordinal
     LIMIT ${FIND_MATCH_LIMIT + 1}
   `)