fix tests plus more simplification

Author: icecrasher321

apps/sim/app/api/schedules/execute/route.test.ts

@@ -6,11 +6,6 @@
 import type { NextRequest } from 'next/server'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
-// Mock the preflight module before any imports to avoid cascade of db/schema imports
-vi.mock('@/lib/workflows/executor/preflight', () => ({
-  preflightWorkflowEnvVars: vi.fn().mockResolvedValue(undefined),
-}))
-
 function createMockRequest(): NextRequest {
   const mockHeaders = new Map([
     ['authorization', 'Bearer test-cron-secret'],

apps/sim/app/api/schedules/execute/route.ts

@@ -1,12 +1,11 @@
-import { db, workflow, workflowSchedule } from '@sim/db'
+import { db, workflowSchedule } from '@sim/db'
 import { createLogger } from '@sim/logger'
 import { tasks } from '@trigger.dev/sdk'
 import { and, eq, isNull, lt, lte, not, or } from 'drizzle-orm'
 import { type NextRequest, NextResponse } from 'next/server'
 import { verifyCronAuth } from '@/lib/auth/internal'
 import { isTriggerDevEnabled } from '@/lib/core/config/feature-flags'
 import { generateRequestId } from '@/lib/core/utils/request'
-import { preflightWorkflowEnvVars } from '@/lib/workflows/executor/preflight'
 import { executeScheduleJob } from '@/background/schedule-execution'
 
 export const dynamic = 'force-dynamic'
@@ -69,37 +68,6 @@ export async function GET(request: NextRequest) {
             failedCount: schedule.failedCount || 0,
             now: queueTime.toISOString(),
             scheduledFor: schedule.nextRunAt?.toISOString(),
-            preflighted: true,
-          }
-
-          const [workflowRecord] = await db
-            .select({ userId: workflow.userId, workspaceId: workflow.workspaceId })
-            .from(workflow)
-            .where(eq(workflow.id, schedule.workflowId))
-            .limit(1)
-
-          if (!workflowRecord?.userId || !workflowRecord.workspaceId) {
-            logger.warn(
-              `[${requestId}] Missing workflow metadata for preflight. Skipping execution.`,
-              { workflowId: schedule.workflowId }
-            )
-            return null
-          }
-
-          try {
-            await preflightWorkflowEnvVars({
-              workflowId: schedule.workflowId,
-              workspaceId: workflowRecord.workspaceId,
-              envUserId: workflowRecord.userId,
-              requestId,
-              useDraftState: false,
-            })
-          } catch (error) {
-            logger.error(
-              `[${requestId}] Env preflight failed for workflow ${schedule.workflowId}. Skipping execution.`,
-              { error: error instanceof Error ? error.message : String(error) }
-            )
-            return null
           }
 
           const handle = await tasks.trigger('schedule-execution', payload)

apps/sim/lib/execution/preprocessing.ts

@@ -124,7 +124,8 @@ export interface PreprocessExecutionOptions {
   workspaceId?: string // If known, used for billing resolution
   loggingSession?: LoggingSession // If provided, will be used for error logging
   isResumeContext?: boolean // If true, allows fallback billing on resolution failure (for paused workflow resumes)
-  useDraftState?: boolean // If true, use draft workflow state for preflight
+  /** @deprecated No longer used - preflight always uses deployed state */
+  useDraftState?: boolean
   envUserId?: string // Optional override for env var resolution user
 }
 
@@ -167,7 +168,6 @@ export async function preprocessExecution(
     workspaceId: providedWorkspaceId,
     loggingSession: providedLoggingSession,
     isResumeContext = false,
-    useDraftState = false,
     envUserId,
   } = options
 
@@ -491,7 +491,6 @@ export async function preprocessExecution(
         workspaceId,
         envUserId: resolvedEnvUserId,
         requestId,
-        useDraftState,
       })
     } catch (error) {
       const message = error instanceof Error ? error.message : 'Env var preflight failed'

apps/sim/lib/workflows/executor/preflight.ts

@@ -4,10 +4,7 @@ import {
   ensureEnvVarsDecryptable,
   getPersonalAndWorkspaceEnv,
 } from '@/lib/environment/utils'
-import {
-  loadDeployedWorkflowState,
-  loadWorkflowFromNormalizedTables,
-} from '@/lib/workflows/persistence/utils'
+import { loadDeployedWorkflowState } from '@/lib/workflows/persistence/utils'
 import { mergeSubblockState } from '@/stores/workflows/server-utils'
 
 const logger = createLogger('ExecutionPreflight')
@@ -17,22 +14,20 @@ export interface EnvVarPreflightOptions {
   workspaceId: string
   envUserId: string
   requestId?: string
-  useDraftState?: boolean
 }
 
 /**
  * Preflight env var checks to avoid scheduling executions that will fail.
+ * Always uses deployed workflow state since preflight is only done for async
+ * executions which always run on deployed state.
  */
 export async function preflightWorkflowEnvVars({
   workflowId,
   workspaceId,
   envUserId,
   requestId,
-  useDraftState = false,
 }: EnvVarPreflightOptions): Promise<void> {
-  const workflowData = useDraftState
-    ? await loadWorkflowFromNormalizedTables(workflowId)
-    : await loadDeployedWorkflowState(workflowId)
+  const workflowData = await loadDeployedWorkflowState(workflowId)
 
   if (!workflowData) {
     throw new Error('Workflow state not found')

apps/sim/socket/middleware/permissions.test.ts

@@ -208,7 +208,7 @@ describe('checkRolePermission', () => {
       { operation: 'toggle-enabled', adminAllowed: true, writeAllowed: true, readAllowed: false },
       { operation: 'update-parent', adminAllowed: true, writeAllowed: true, readAllowed: false },
       {
-        operation: 'update-advanced-mode',
+        operation: 'update-canonical-mode',
         adminAllowed: true,
         writeAllowed: true,
         readAllowed: false,

packages/testing/src/factories/permission.factory.ts

@@ -259,7 +259,7 @@ const BLOCK_OPERATIONS = {
   UPDATE_NAME: 'update-name',
   TOGGLE_ENABLED: 'toggle-enabled',
   UPDATE_PARENT: 'update-parent',
-  UPDATE_ADVANCED_MODE: 'update-advanced-mode',
+  UPDATE_CANONICAL_MODE: 'update-canonical-mode',
   TOGGLE_HANDLES: 'toggle-handles',
 } as const