fix(tables): source workspaceId for column selector from route context

Author: TheodoreSpeaks

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/hooks/use-selector-setup.ts

@@ -31,6 +31,7 @@ export function useSelectorSetup(
   const params = useParams()
   const activeWorkflowId = useWorkflowRegistry((s) => s.activeWorkflowId)
   const workflowId = (params?.workflowId as string) || activeWorkflowId || ''
+  const workspaceId = (params?.workspaceId as string) || ''
 
   const { data: envVariables = {} } = usePersonalEnvironment()
 
@@ -63,6 +64,7 @@ export function useSelectorSetup(
   const selectorContext = useMemo<SelectorContext>(() => {
     const context: SelectorContext = {
       workflowId,
+      workspaceId: workspaceId || undefined,
       mimeType: subBlock.mimeType,
     }
 
@@ -87,6 +89,7 @@ export function useSelectorSetup(
     resolvedDependencyValues,
     canonicalIndex,
     workflowId,
+    workspaceId,
     subBlock.mimeType,
     impersonateUserEmail,
   ])

apps/sim/hooks/selectors/providers/sim/selectors.ts

@@ -14,7 +14,6 @@ import type {
   SelectorQueryArgs,
 } from '@/hooks/selectors/types'
 import type { WorkflowFolder } from '@/stores/folders/types'
-import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
 import type { WorkflowMetadata } from '@/stores/workflows/registry/types'
 
 /**
@@ -94,25 +93,24 @@ export const simSelectors = {
     getQueryKey: ({ context, search }: SelectorQueryArgs) => [
       ...selectorKeys.all,
       'table.columns',
+      context.workspaceId ?? 'none',
       context.tableId ?? 'none',
       search ?? '',
     ],
-    enabled: ({ context }) => Boolean(context.tableId),
+    enabled: ({ context }) => Boolean(context.workspaceId && context.tableId),
     fetchList: async ({ context }: SelectorQueryArgs): Promise<SelectorOption[]> => {
-      const workspaceId = useWorkflowRegistry.getState().hydration.workspaceId
-      if (!workspaceId || !context.tableId) return []
+      if (!context.workspaceId || !context.tableId) return []
       const table = await getQueryClient().ensureQueryData(
-        getTableDetailQueryOptions(workspaceId, context.tableId)
+        getTableDetailQueryOptions(context.workspaceId, context.tableId)
       )
       return (table.schema?.columns ?? [])
         .filter((col) => col.unique)
         .map((col) => ({ id: getColumnId(col), label: col.name }))
     },
     fetchById: async ({ context, detailId }: SelectorQueryArgs): Promise<SelectorOption | null> => {
-      const workspaceId = useWorkflowRegistry.getState().hydration.workspaceId
-      if (!detailId || !workspaceId || !context.tableId) return null
+      if (!detailId || !context.workspaceId || !context.tableId) return null
       const table = await getQueryClient().ensureQueryData(
-        getTableDetailQueryOptions(workspaceId, context.tableId)
+        getTableDetailQueryOptions(context.workspaceId, context.tableId)
       )
       const col = (table.schema?.columns ?? []).find((c) => getColumnId(c) === detailId)
       return col ? { id: getColumnId(col), label: col.name } : null