improvement(selectors): simplify selector context + add tests (#3453)

* improvement(selectors): simplify selectorContext + add tests

* fix resolve values fallback

* another workflowid pass through

Author: icecrasher321

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

@@ -2,6 +2,7 @@
 
 import { useMemo } from 'react'
 import { useParams } from 'next/navigation'
+import { SELECTOR_CONTEXT_FIELDS } from '@/lib/workflows/subblocks/context'
 import type { SubBlockConfig } from '@/blocks/types'
 import { extractEnvVarName, isEnvVarReference, isReference } from '@/executor/constants'
 import type { SelectorContext, SelectorKey } from '@/hooks/selectors/types'
@@ -14,8 +15,7 @@ import { useDependsOnGate } from './use-depends-on-gate'
  *
  * Builds a `SelectorContext` by mapping each `dependsOn` entry through the
  * canonical index to its `canonicalParamId`, which maps directly to
- * `SelectorContext` field names (e.g. `siteId`, `teamId`, `collectionId`).
- * The one special case is `oauthCredential` which maps to `credentialId`.
+ * `SelectorContext` field names (e.g. `siteId`, `teamId`, `oauthCredential`).
  *
  * @param blockId - The block containing the selector sub-block
  * @param subBlock - The sub-block config (must have `selectorKey` set)
@@ -70,11 +70,8 @@ export function useSelectorSetup(
       if (isReference(strValue)) continue
 
       const canonicalParamId = canonicalIndex.canonicalIdBySubBlockId[depKey] ?? depKey
-
-      if (canonicalParamId === 'oauthCredential') {
-        context.credentialId = strValue
-      } else if (canonicalParamId in CONTEXT_FIELD_SET) {
-        ;(context as Record<string, unknown>)[canonicalParamId] = strValue
+      if (SELECTOR_CONTEXT_FIELDS.has(canonicalParamId as keyof SelectorContext)) {
+        context[canonicalParamId as keyof SelectorContext] = strValue
       }
     }
 
@@ -89,19 +86,3 @@ export function useSelectorSetup(
     dependencyValues: resolvedDependencyValues,
   }
 }
-
-const CONTEXT_FIELD_SET: Record<string, true> = {
-  credentialId: true,
-  domain: true,
-  teamId: true,
-  projectId: true,
-  knowledgeBaseId: true,
-  planId: true,
-  siteId: true,
-  collectionId: true,
-  spreadsheetId: true,
-  fileId: true,
-  baseId: true,
-  datasetId: true,
-  serviceDeskId: true,
-}

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/sub-block.tsx

@@ -57,9 +57,9 @@ import { useWebhookManagement } from '@/hooks/use-webhook-management'
 const SLACK_OVERRIDES: SelectorOverrides = {
   transformContext: (context, deps) => {
     const authMethod = deps.authMethod as string
-    const credentialId =
+    const oauthCredential =
       authMethod === 'bot_token' ? String(deps.botToken ?? '') : String(deps.credential ?? '')
-    return { ...context, credentialId }
+    return { ...context, oauthCredential }
   },
 }
 

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx

@@ -578,7 +578,7 @@ const SubBlockRow = memo(function SubBlockRow({
     subBlock,
     value: rawValue,
     workflowId,
-    credentialId: typeof credentialId === 'string' ? credentialId : undefined,
+    oauthCredential: typeof credentialId === 'string' ? credentialId : undefined,
     knowledgeBaseId: typeof knowledgeBaseId === 'string' ? knowledgeBaseId : undefined,
     domain: domainValue,
     teamId: teamIdValue,

apps/sim/hooks/selectors/registry.ts

@@ -7,46 +7,16 @@ export interface SelectorResolution {
   allowSearch: boolean
 }
 
-export interface SelectorResolutionArgs {
-  workflowId?: string
-  credentialId?: string
-  domain?: string
-  projectId?: string
-  planId?: string
-  teamId?: string
-  knowledgeBaseId?: string
-  siteId?: string
-  collectionId?: string
-  spreadsheetId?: string
-  fileId?: string
-  baseId?: string
-  datasetId?: string
-  serviceDeskId?: string
-}
-
 export function resolveSelectorForSubBlock(
   subBlock: SubBlockConfig,
-  args: SelectorResolutionArgs
+  context: SelectorContext
 ): SelectorResolution | null {
   if (!subBlock.selectorKey) return null
   return {
     key: subBlock.selectorKey,
     context: {
-      workflowId: args.workflowId,
-      credentialId: args.credentialId,
-      domain: args.domain,
-      projectId: args.projectId,
-      planId: args.planId,
-      teamId: args.teamId,
-      knowledgeBaseId: args.knowledgeBaseId,
-      siteId: args.siteId,
-      collectionId: args.collectionId,
-      spreadsheetId: args.spreadsheetId,
-      fileId: args.fileId,
-      baseId: args.baseId,
-      datasetId: args.datasetId,
-      serviceDeskId: args.serviceDeskId,
-      mimeType: subBlock.mimeType,
+      ...context,
+      mimeType: subBlock.mimeType ?? context.mimeType,
     },
     allowSearch: subBlock.selectorAllowSearch ?? true,
   }

apps/sim/hooks/selectors/resolution.ts

@@ -61,7 +61,7 @@ export interface SelectorOption {
 export interface SelectorContext {
   workspaceId?: string
   workflowId?: string
-  credentialId?: string
+  oauthCredential?: string
   serviceId?: string
   domain?: string
   teamId?: string

apps/sim/hooks/selectors/types.ts

@@ -12,7 +12,7 @@ interface SelectorDisplayNameArgs {
   subBlock?: SubBlockConfig
   value: unknown
   workflowId?: string
-  credentialId?: string
+  oauthCredential?: string
   domain?: string
   projectId?: string
   planId?: string
@@ -31,7 +31,7 @@ export function useSelectorDisplayName({
   subBlock,
   value,
   workflowId,
-  credentialId,
+  oauthCredential,
   domain,
   projectId,
   planId,
@@ -51,7 +51,7 @@ export function useSelectorDisplayName({
     if (!subBlock || !detailId) return null
     return resolveSelectorForSubBlock(subBlock, {
       workflowId,
-      credentialId,
+      oauthCredential,
       domain,
       projectId,
       planId,
@@ -69,7 +69,7 @@ export function useSelectorDisplayName({
     subBlock,
     detailId,
     workflowId,
-    credentialId,
+    oauthCredential,
     domain,
     projectId,
     planId,

apps/sim/hooks/use-selector-display-name.ts

@@ -1,12 +1,13 @@
 import { createLogger } from '@sim/logger'
+import { buildSelectorContextFromBlock } from '@/lib/workflows/subblocks/context'
 import { getBlock } from '@/blocks/registry'
 import { SELECTOR_TYPES_HYDRATION_REQUIRED, type SubBlockConfig } from '@/blocks/types'
 import { CREDENTIAL_SET, isUuid } from '@/executor/constants'
 import { fetchCredentialSetById } from '@/hooks/queries/credential-sets'
 import { fetchOAuthCredentialDetail } from '@/hooks/queries/oauth-credentials'
 import { getSelectorDefinition } from '@/hooks/selectors/registry'
 import { resolveSelectorForSubBlock } from '@/hooks/selectors/resolution'
-import type { SelectorKey } from '@/hooks/selectors/types'
+import type { SelectorContext, SelectorKey } from '@/hooks/selectors/types'
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
 
 const logger = createLogger('ResolveValues')
@@ -39,24 +40,6 @@ interface ResolutionContext {
   blockId?: string
 }
 
-/**
- * Extended context extracted from block subBlocks for selector resolution
- */
-interface ExtendedSelectorContext {
-  credentialId?: string
-  domain?: string
-  projectId?: string
-  planId?: string
-  teamId?: string
-  knowledgeBaseId?: string
-  siteId?: string
-  collectionId?: string
-  spreadsheetId?: string
-  baseId?: string
-  datasetId?: string
-  serviceDeskId?: string
-}
-
 function getSemanticFallback(subBlockId: string, subBlockConfig?: SubBlockConfig): string {
   if (subBlockConfig?.title) {
     return subBlockConfig.title.toLowerCase()
@@ -150,26 +133,10 @@ async function resolveWorkflow(workflowId: string): Promise<string | null> {
 async function resolveSelectorValue(
   value: string,
   selectorKey: SelectorKey,
-  extendedContext: ExtendedSelectorContext,
-  workflowId: string
+  selectorContext: SelectorContext
 ): Promise<string | null> {
   try {
     const definition = getSelectorDefinition(selectorKey)
-    const selectorContext = {
-      workflowId,
-      credentialId: extendedContext.credentialId,
-      domain: extendedContext.domain,
-      projectId: extendedContext.projectId,
-      planId: extendedContext.planId,
-      teamId: extendedContext.teamId,
-      knowledgeBaseId: extendedContext.knowledgeBaseId,
-      siteId: extendedContext.siteId,
-      collectionId: extendedContext.collectionId,
-      spreadsheetId: extendedContext.spreadsheetId,
-      baseId: extendedContext.baseId,
-      datasetId: extendedContext.datasetId,
-      serviceDeskId: extendedContext.serviceDeskId,
-    }
 
     if (definition.fetchById) {
       const result = await definition.fetchById({
@@ -219,37 +186,14 @@ export function formatValueForDisplay(value: unknown): string {
   return String(value)
 }
 
-/**
- * Extracts extended context from a block's subBlocks for selector resolution.
- * This mirrors the context extraction done in the UI components.
- */
-function extractExtendedContext(
+function extractSelectorContext(
   blockId: string,
-  currentState: WorkflowState
-): ExtendedSelectorContext {
+  currentState: WorkflowState,
+  workflowId: string
+): SelectorContext {
   const block = currentState.blocks?.[blockId]
-  if (!block?.subBlocks) return {}
-
-  const getStringValue = (id: string): string | undefined => {
-    const subBlock = block.subBlocks[id] as { value?: unknown } | undefined
-    const val = subBlock?.value
-    return typeof val === 'string' ? val : undefined
-  }
-
-  return {
-    credentialId: getStringValue('credential'),
-    domain: getStringValue('domain'),
-    projectId: getStringValue('projectId'),
-    planId: getStringValue('planId'),
-    teamId: getStringValue('teamId'),
-    knowledgeBaseId: getStringValue('knowledgeBaseId'),
-    siteId: getStringValue('siteId'),
-    collectionId: getStringValue('collectionId'),
-    spreadsheetId: getStringValue('spreadsheetId') || getStringValue('fileId'),
-    baseId: getStringValue('baseId') || getStringValue('baseSelector'),
-    datasetId: getStringValue('datasetId') || getStringValue('datasetSelector'),
-    serviceDeskId: getStringValue('serviceDeskId') || getStringValue('serviceDeskSelector'),
-  }
+  if (!block?.subBlocks) return { workflowId }
+  return buildSelectorContextFromBlock(block.type, block.subBlocks, { workflowId })
 }
 
 /**
@@ -277,9 +221,9 @@ export async function resolveValueForDisplay(
   const subBlockConfig = blockConfig?.subBlocks.find((sb) => sb.id === context.subBlockId)
   const semanticFallback = getSemanticFallback(context.subBlockId, subBlockConfig)
 
-  const extendedContext = context.blockId
-    ? extractExtendedContext(context.blockId, context.currentState)
-    : {}
+  const selectorCtx = context.blockId
+    ? extractSelectorContext(context.blockId, context.currentState, context.workflowId)
+    : { workflowId: context.workflowId }
 
   // Credential fields (oauth-input or credential subBlockId)
   const isCredentialField =
@@ -311,29 +255,10 @@ export async function resolveValueForDisplay(
   // Selector types that require hydration (file-selector, sheet-selector, etc.)
   // These support external service IDs like Google Drive file IDs
   if (subBlockConfig && SELECTOR_TYPES_HYDRATION_REQUIRED.includes(subBlockConfig.type)) {
-    const resolution = resolveSelectorForSubBlock(subBlockConfig, {
-      workflowId: context.workflowId,
-      credentialId: extendedContext.credentialId,
-      domain: extendedContext.domain,
-      projectId: extendedContext.projectId,
-      planId: extendedContext.planId,
-      teamId: extendedContext.teamId,
-      knowledgeBaseId: extendedContext.knowledgeBaseId,
-      siteId: extendedContext.siteId,
-      collectionId: extendedContext.collectionId,
-      spreadsheetId: extendedContext.spreadsheetId,
-      baseId: extendedContext.baseId,
-      datasetId: extendedContext.datasetId,
-      serviceDeskId: extendedContext.serviceDeskId,
-    })
+    const resolution = resolveSelectorForSubBlock(subBlockConfig, selectorCtx)
 
     if (resolution?.key) {
-      const label = await resolveSelectorValue(
-        value,
-        resolution.key,
-        extendedContext,
-        context.workflowId
-      )
+      const label = await resolveSelectorValue(value, resolution.key, selectorCtx)
       if (label) {
         return { original: value, displayLabel: label, resolved: true }
       }