Skip to content

Commit cd1c531

Browse files
committed
fix tag dropdown merge conflict change
1 parent 601f58c commit cd1c531

File tree

1 file changed

+6
-2
lines changed
  • apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/editor/components/sub-block/components/tag-dropdown

1 file changed

+6
-2
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,16 @@ const getOutputTypeForPath = (
241241
const blockState = useWorkflowStore.getState().blocks[blockId]
242242
const subBlocks = mergedSubBlocksOverride ?? (blockState?.subBlocks || {})
243243
return getBlockOutputType(block.type, outputPath, subBlocks)
244-
} else if (blockConfig) {
244+
} else if (blockConfig?.tools?.config?.tool) {
245245
const blockState = useWorkflowStore.getState().blocks[blockId]
246246
const subBlocks = mergedSubBlocksOverride ?? (blockState?.subBlocks || {})
247247
return getToolOutputType(blockConfig, subBlocks, outputPath)
248248
}
249-
return 'any'
249+
250+
const subBlocks =
251+
mergedSubBlocksOverride ?? useWorkflowStore.getState().blocks[blockId]?.subBlocks
252+
const triggerMode = block?.triggerMode && blockConfig?.triggers?.enabled
253+
return getBlockOutputType(block?.type ?? '', outputPath, subBlocks, triggerMode)
250254
}
251255

252256
/**

0 commit comments

Comments
 (0)