pass workspace id in correctly

Author: icecrasher321

apps/sim/app/api/workflows/[id]/deployments/[version]/revert/route.ts

@@ -76,9 +76,13 @@ export async function POST(
       return createErrorResponse('Invalid deployed state structure', 500)
     }
 
+    if (!workflowRecord?.workspaceId) {
+      return createErrorResponse('Workflow has no workspace', 500)
+    }
+
     const { blocks: migratedBlocks } = await applyBlockMigrations(
       deployedState.blocks,
-      workflowRecord?.workspaceId ?? undefined
+      workflowRecord.workspaceId
     )
 
     const saveResult = await saveWorkflowToNormalizedTables(id, {

apps/sim/app/api/workflows/[id]/deployments/[version]/route.ts

@@ -53,7 +53,11 @@ export async function GET(
   const { id, version } = await params
 
   try {
-    const { error } = await validateWorkflowPermissions(id, requestId, 'read')
+    const { error, workflow: workflowRecord } = await validateWorkflowPermissions(
+      id,
+      requestId,
+      'read'
+    )
     if (error) {
       return createErrorResponse(error.message, error.status)
     }
@@ -78,9 +82,13 @@ export async function GET(
       return createErrorResponse('Deployment version not found', 404)
     }
 
+    if (!workflowRecord?.workspaceId) {
+      return createErrorResponse('Workflow has no workspace', 500)
+    }
+
     const state = row.state as { blocks?: Record<string, BlockState> }
     if (state.blocks) {
-      const { blocks } = await applyBlockMigrations(state.blocks)
+      const { blocks } = await applyBlockMigrations(state.blocks, workflowRecord.workspaceId)
       state.blocks = blocks
     }
 

apps/sim/lib/workflows/persistence/utils.ts

@@ -117,6 +117,10 @@ export async function loadDeployedWorkflowState(
       resolvedWorkspaceId = wfRow?.workspaceId ?? undefined
     }
 
+    if (!resolvedWorkspaceId) {
+      throw new Error(`Workflow ${workflowId} has no workspace`)
+    }
+
     const { blocks: migratedBlocks } = await applyBlockMigrations(
       state.blocks || {},
       resolvedWorkspaceId
@@ -139,7 +143,7 @@ export async function loadDeployedWorkflowState(
 
 interface MigrationContext {
   blocks: Record<string, BlockState>
-  workspaceId?: string
+  workspaceId: string
   migrated: boolean
 }
 
@@ -148,7 +152,7 @@ type BlockMigration = (ctx: MigrationContext) => MigrationContext | Promise<Migr
 function createMigrationPipeline(migrations: BlockMigration[]) {
   return async (
     blocks: Record<string, BlockState>,
-    workspaceId?: string
+    workspaceId: string
   ): Promise<{ blocks: Record<string, BlockState>; migrated: boolean }> => {
     let ctx: MigrationContext = { blocks, workspaceId, migrated: false }
     for (const migration of migrations) {
@@ -170,7 +174,6 @@ export const applyBlockMigrations = createMigrationPipeline([
   }),
 
   async (ctx) => {
-    if (!ctx.workspaceId) return ctx
     const { blocks, migrated } = await migrateCredentialIds(ctx.blocks, ctx.workspaceId)
     return { ...ctx, blocks, migrated: ctx.migrated || migrated }
   },
@@ -409,9 +412,13 @@ export async function loadWorkflowFromNormalizedTables(
       blocksMap[block.id] = assembled
     })
 
+    if (!workflowRow?.workspaceId) {
+      throw new Error(`Workflow ${workflowId} has no workspace`)
+    }
+
     const { blocks: finalBlocks, migrated } = await applyBlockMigrations(
       blocksMap,
-      workflowRow?.workspaceId ?? undefined
+      workflowRow.workspaceId
     )
 
     if (migrated) {