merged improvement/connection into staging (#604)

* merged improvement/connection into staging

* fix: merge conflicts and improved block path calculation

* fix: removed migration

* fix: removed duplicate call

* fix: resolver and merge conflicts

* fix: knowledge base folder

* fix: settings modal

* fix: typeform block

* fix: parallel handler

* fix: stores index

* fix: tests

* fix: tag-dropdown

* improvement: start block input and tag dropdown

* fix block id resolution + missing bracket

* fix lint

* fix test

* works

* fix

* fix lint

* Revert "fix lint"

This reverts commit 433e2f9.

---------

Co-authored-by: Vikhyath Mondreti <vikhyathvikku@gmail.com>
Co-authored-by: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-MacBook-Air.local>

Author: 3 people

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

@@ -139,7 +139,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
       return createErrorResponse(validation.error.message, validation.error.status)
     }
 
-    // Get the workflow to find the user (removed deprecated state column)
+    // Get the workflow to find the user
     const workflowData = await db
       .select({
         userId: workflow.userId,

apps/sim/executor/handlers/workflow/workflow-handler.ts

@@ -159,15 +159,15 @@ export class WorkflowBlockHandler implements BlockHandler {
 
       logger.info(`Loaded child workflow: ${workflowData.name} (${workflowId})`)
 
-      // Extract the workflow state (API returns normalized data in state field)
+      // Extract the workflow state
       const workflowState = workflowData.state
 
       if (!workflowState || !workflowState.blocks) {
         logger.error(`Child workflow ${workflowId} has invalid state`)
         return null
       }
 
-      // Use blocks directly since API returns data from normalized tables
+      // Use blocks directly since DB format should match UI format
       const serializedWorkflow = this.serializer.serializeWorkflow(
         workflowState.blocks,
         workflowState.edges || [],

apps/sim/executor/index.ts

@@ -649,8 +649,13 @@ export class Executor {
           if (this.workflowInput && typeof this.workflowInput === 'object') {
             // Check if this is a chat workflow input (has both input and conversationId)
             if (
+<<<<<<< HEAD
               Object.hasOwn(this.workflowInput, 'input') &&
               Object.hasOwn(this.workflowInput, 'conversationId')
+=======
+              Object.prototype.hasOwnProperty.call(this.workflowInput, 'input') &&
+              Object.prototype.hasOwnProperty.call(this.workflowInput, 'conversationId')
+>>>>>>> 34b590a1 (merged improvement/connection into staging (#604))
             ) {
               // Chat workflow: extract input and conversationId to root level
               const starterOutput = {