opensource/sim
3
0
Fork 0
mirror of https://github.com/simstudioai/sim.git synced 2026-09-24 15:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Lint

Browse Source
This commit is contained in:
Siddharth Ganesan
2025-07-08 21:20:07 -07:00
parent 684a8020d4
commit 5dc3ba3379
3 changed files with 65 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/sim/app/api/workflows/[id]/state/route.ts
+17 -12
View File
@@ -87,7 +87,7 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
// Save to normalized tables
logger.info(`[${requestId}] Saving workflow ${workflowId} state to normalized tables`)
// Ensure all required fields are present for WorkflowState type
const workflowState = {
blocks: state.blocks,
@@ -101,7 +101,7 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
hasActiveSchedule: state.hasActiveSchedule || false,
hasActiveWebhook: state.hasActiveWebhook || false,
}
const saveResult = await saveWorkflowToNormalizedTables(workflowId, workflowState)
if (!saveResult.success) {
@@ -115,22 +115,24 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
// Update workflow's lastSynced timestamp
await db
.update(workflow)
.set({
.set({
lastSynced: new Date(),
updatedAt: new Date(),
state: saveResult.jsonBlob // Also update JSON blob for backward compatibility
state: saveResult.jsonBlob, // Also update JSON blob for backward compatibility
})
.where(eq(workflow.id, workflowId))
const elapsed = Date.now() - startTime
logger.info(`[${requestId}] Successfully saved workflow ${workflowId} state in ${elapsed}ms`)
return NextResponse.json({
success: true,
blocksCount: Object.keys(state.blocks).length,
edgesCount: state.edges.length
}, { status: 200 })
return NextResponse.json(
{
success: true,
blocksCount: Object.keys(state.blocks).length,
edgesCount: state.edges.length,
},
{ status: 200 }
)
} catch (error: any) {
const elapsed = Date.now() - startTime
if (error instanceof z.ZodError) {
@@ -143,7 +145,10 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
)
}
logger.error(`[${requestId}] Error saving workflow ${workflowId} state after ${elapsed}ms`, error)
logger.error(
`[${requestId}] Error saving workflow ${workflowId} state after ${elapsed}ms`,
error
)
return NextResponse.json({ error: 'Internal server error' }, { status: 500 })
}
}
}
apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/control-bar/components/import-controls/import-controls.tsx
+2 -5
View File
@@ -51,11 +51,8 @@ export function ImportControls({ disabled = false }: ImportControlsProps) {
// Stores and hooks
const { createWorkflow } = useWorkflowRegistry()
const {
collaborativeAddBlock,
collaborativeAddEdge,
collaborativeSetSubblockValue
} = useCollaborativeWorkflow()
const { collaborativeAddBlock, collaborativeAddEdge, collaborativeSetSubblockValue } =
useCollaborativeWorkflow()
const subBlockStore = useSubBlockStore()
const handleFileUpload = async (event: React.ChangeEvent<HTMLInputElement>) => {
apps/sim/stores/workflows/yaml/importer.ts
+46 -31
View File
@@ -367,8 +367,13 @@ export async function importWorkflowFromYaml(
return { success: false, errors, warnings }
}
logger.info(`Creating complete workflow state with ${blocks.length} blocks and ${edges.length} edges`)
logger.debug('Blocks to import:', blocks.map(b => `${b.id} (${b.type}): ${b.name}`))
logger.info(
`Creating complete workflow state with ${blocks.length} blocks and ${edges.length} edges`
)
logger.debug(
'Blocks to import:',
blocks.map((b) => `${b.id} (${b.type}): ${b.name}`)
)
// Get the existing workflow state (to preserve starter blocks if they exist)
const existingBlocks = workflowActions.getExistingBlocks()
@@ -397,39 +402,40 @@ export async function importWorkflowFromYaml(
// Handle starter block
let starterBlockId: string | null = null
const starterBlock = blocks.find(block => block.type === 'starter')
const starterBlock = blocks.find((block) => block.type === 'starter')
if (starterBlock) {
if (existingStarterBlocks.length > 0) {
// Use existing starter block
const existingStarter = existingStarterBlocks[0] as any
starterBlockId = existingStarter.id
yamlIdToActualId.set(starterBlock.id, existingStarter.id)
// Keep existing starter but update its inputs
completeBlocks[existingStarter.id] = {
...existingStarter,
// Update name if provided in YAML
name: starterBlock.name !== 'Start' ? starterBlock.name : existingStarter.name,
}
// Set starter block values
completeSubBlockValues[existingStarter.id] = {
...currentWorkflowState.blocks[existingStarter.id]?.subBlocks ?
Object.fromEntries(
Object.entries(currentWorkflowState.blocks[existingStarter.id].subBlocks).map(
([key, subBlock]: [string, any]) => [key, subBlock.value]
...(currentWorkflowState.blocks[existingStarter.id]?.subBlocks
? Object.fromEntries(
Object.entries(currentWorkflowState.blocks[existingStarter.id].subBlocks).map(
([key, subBlock]: [string, any]) => [key, subBlock.value]
)
)
) : {},
...starterBlock.inputs // Override with YAML values
: {}),
...starterBlock.inputs, // Override with YAML values
}
logger.debug(`Using existing starter block: ${existingStarter.id}`)
} else {
// Create new starter block
starterBlockId = crypto.randomUUID()
yamlIdToActualId.set(starterBlock.id, starterBlockId)
// Create complete starter block from block config
const blockConfig = getBlock('starter')
if (blockConfig) {
@@ -441,7 +447,7 @@ export async function importWorkflowFromYaml(
value: null,
}
})
completeBlocks[starterBlockId] = {
id: starterBlockId,
type: 'starter',
@@ -455,10 +461,10 @@ export async function importWorkflowFromYaml(
height: 0,
data: starterBlock.data || {},
}
// Set starter block values
completeSubBlockValues[starterBlockId] = { ...starterBlock.inputs }
logger.debug(`Created new starter block: ${starterBlockId}`)
}
}
@@ -477,7 +483,7 @@ export async function importWorkflowFromYaml(
// Create complete block from block config
const blockConfig = getBlock(block.type)
if (!blockConfig && (block.type === 'loop' || block.type === 'parallel')) {
// Handle loop/parallel blocks
completeBlocks[blockId] = {
@@ -493,7 +499,7 @@ export async function importWorkflowFromYaml(
height: 0,
data: block.data || {},
}
completeSubBlockValues[blockId] = { ...block.inputs }
blocksProcessed++
logger.debug(`Prepared ${block.type} block: ${blockId} -> ${block.name}`)
@@ -521,7 +527,7 @@ export async function importWorkflowFromYaml(
height: 0,
data: block.data || {},
}
// Set block input values
completeSubBlockValues[blockId] = { ...block.inputs }
blocksProcessed++
@@ -530,15 +536,17 @@ export async function importWorkflowFromYaml(
logger.warn(`No block config found for type: ${block.type} (block: ${block.id})`)
}
}
logger.info(`Processed ${blocksProcessed} non-starter blocks, total blocks in state: ${Object.keys(completeBlocks).length}`)
logger.info(
`Processed ${blocksProcessed} non-starter blocks, total blocks in state: ${Object.keys(completeBlocks).length}`
)
// Create complete edges using the ID mapping
const completeEdges: any[] = []
for (const edge of edges) {
const sourceId = yamlIdToActualId.get(edge.source)
const targetId = yamlIdToActualId.get(edge.target)
if (sourceId && targetId) {
completeEdges.push({
...edge,
@@ -553,16 +561,18 @@ export async function importWorkflowFromYaml(
// Create complete workflow state with values already set in subBlocks
logger.info('Creating complete workflow state with embedded values...')
// Merge subblock values directly into block subBlocks
for (const [blockId, blockData] of Object.entries(completeBlocks)) {
const blockValues = completeSubBlockValues[blockId] || {}
// Update subBlock values in place
for (const [subBlockId, subBlockData] of Object.entries(blockData.subBlocks || {})) {
if (blockValues[subBlockId] !== undefined && blockValues[subBlockId] !== null) {
(subBlockData as any).value = blockValues[subBlockId]
logger.debug(`Embedded value in block: ${blockId}.${subBlockId} = ${blockValues[subBlockId]}`)
;(subBlockData as any).value = blockValues[subBlockId]
logger.debug(
`Embedded value in block: ${blockId}.${subBlockId} = ${blockValues[subBlockId]}`
)
}
}
}
@@ -623,16 +633,21 @@ export async function importWorkflowFromYaml(
logger.info('Applying auto layout...')
workflowActions.applyAutoLayout()
const totalBlocksCreated = Object.keys(completeBlocks).length - (existingStarterBlocks.length > 0 ? 1 : 0)
logger.info(`Successfully imported workflow: ${totalBlocksCreated} blocks created, ${completeEdges.length} edges, values set for ${Object.keys(completeSubBlockValues).length} blocks`)
const totalBlocksCreated =
Object.keys(completeBlocks).length - (existingStarterBlocks.length > 0 ? 1 : 0)
logger.info(
`Successfully imported workflow: ${totalBlocksCreated} blocks created, ${completeEdges.length} edges, values set for ${Object.keys(completeSubBlockValues).length} blocks`
)
return {
success: true,
errors: [],
warnings,
summary: `Imported ${totalBlocksCreated} new blocks and ${completeEdges.length} connections. ${
existingStarterBlocks.length > 0 ? 'Updated existing starter block.' : 'Created new starter block.'
existingStarterBlocks.length > 0
? 'Updated existing starter block.'
: 'Created new starter block.'
}`,
}
} catch (error) {