Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 15 additions & 16 deletions apps/sim/app/api/workflows/[id]/deployed/route.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import { db, workflowDeploymentVersion } from '@sim/db'
import { createLogger } from '@sim/logger'
import { and, desc, eq } from 'drizzle-orm'
import type { NextRequest, NextResponse } from 'next/server'
import { verifyInternalToken } from '@/lib/auth/internal'
import { generateRequestId } from '@/lib/core/utils/request'
import { loadDeployedWorkflowState } from '@/lib/workflows/persistence/utils'
import { validateWorkflowPermissions } from '@/lib/workflows/utils'
import { createErrorResponse, createSuccessResponse } from '@/app/api/workflows/utils'

Expand Down Expand Up @@ -43,21 +42,21 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
logger.debug(`[${requestId}] Internal API call for deployed workflow: ${id}`)
}

const [active] = await db
.select({ state: workflowDeploymentVersion.state })
.from(workflowDeploymentVersion)
.where(
and(
eq(workflowDeploymentVersion.workflowId, id),
eq(workflowDeploymentVersion.isActive, true)
)
)
.orderBy(desc(workflowDeploymentVersion.createdAt))
.limit(1)
let deployedState = null
try {
const data = await loadDeployedWorkflowState(id)
deployedState = {
blocks: data.blocks,
edges: data.edges,
loops: data.loops,
parallels: data.parallels,
variables: data.variables,
}
} catch {
deployedState = null
}

const response = createSuccessResponse({
deployedState: active?.state || null,
})
const response = createSuccessResponse({ deployedState })
return addNoCacheHeaders(response)
} catch (error: any) {
logger.error(`[${requestId}] Error fetching deployed state: ${id}`, error)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import { useCredentialSets } from '@/hooks/queries/credential-sets'
import { useOAuthCredentials } from '@/hooks/queries/oauth-credentials'
import { useOrganizations } from '@/hooks/queries/organization'
import { useSubscriptionData } from '@/hooks/queries/subscription'
import { useCollaborativeWorkflow } from '@/hooks/use-collaborative-workflow'
import { useCredentialRefreshTriggers } from '@/hooks/use-credential-refresh-triggers'
import { getMissingRequiredScopes } from '@/hooks/use-oauth-scope-status'
import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
Expand Down Expand Up @@ -55,7 +54,6 @@ export function CredentialSelector({
const [isEditing, setIsEditing] = useState(false)
const { activeWorkflowId } = useWorkflowRegistry()
const [storeValue, setStoreValue] = useSubBlockValue<string | null>(blockId, subBlock.id)
const { collaborativeSetSubblockValue } = useCollaborativeWorkflow()

const requiredScopes = subBlock.requiredScopes || []
const label = subBlock.placeholder || 'Select credential'
Expand Down Expand Up @@ -136,11 +134,6 @@ export function CredentialSelector({
if (!response.ok || cancelled) return
const data = await response.json()
if (!cancelled && data.credential?.displayName) {
if (data.credential.id !== selectedId) {
collaborativeSetSubblockValue(blockId, subBlock.id, data.credential.id, {
skipDependsOn: true,
})
}
setInaccessibleCredentialName(data.credential.displayName)
}
} catch {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,6 @@ export function ToolCredentialSelector({
if (!response.ok || cancelled) return
const data = await response.json()
if (!cancelled && data.credential?.displayName) {
if (data.credential.id !== selectedId) {
onChangeRef.current(data.credential.id)
}
setInaccessibleCredentialName(data.credential.displayName)
}
} catch {
Expand Down
9 changes: 1 addition & 8 deletions apps/sim/hooks/use-collaborative-workflow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1232,12 +1232,7 @@ export function useCollaborativeWorkflow() {
)

const collaborativeSetSubblockValue = useCallback(
(
blockId: string,
subblockId: string,
value: any,
options?: { _visited?: Set<string>; skipDependsOn?: boolean }
) => {
(blockId: string, subblockId: string, value: any, options?: { _visited?: Set<string> }) => {
if (isApplyingRemoteChange.current) return

if (isBaselineDiffView) {
Expand All @@ -1263,8 +1258,6 @@ export function useCollaborativeWorkflow() {
})
}

if (options?.skipDependsOn) return

// Handle dependent subblock clearing (recursive calls)
try {
const visited = options?._visited || new Set<string>()
Expand Down
17 changes: 17 additions & 0 deletions apps/sim/lib/workflows/persistence/utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,9 @@ describe('Database Helpers', () => {
if (callCount === 3) {
return Promise.resolve(mockSubflowsFromDb)
}
if (callCount === 4) {
return { limit: vi.fn().mockResolvedValue([{ workspaceId: 'test-workspace-id' }]) }
}
return Promise.resolve([])
}),
}),
Expand Down Expand Up @@ -431,6 +434,8 @@ describe('Database Helpers', () => {
if (callCount === 1) return Promise.resolve(mockBlocksFromDb)
if (callCount === 2) return Promise.resolve(mockEdgesFromDb)
if (callCount === 3) return Promise.resolve(subflowsWithUnknownType)
if (callCount === 4)
return { limit: vi.fn().mockResolvedValue([{ workspaceId: 'test-workspace-id' }]) }
return Promise.resolve([])
}),
}),
Expand Down Expand Up @@ -469,6 +474,8 @@ describe('Database Helpers', () => {
if (callCount === 1) return Promise.resolve(malformedBlocks)
if (callCount === 2) return Promise.resolve([])
if (callCount === 3) return Promise.resolve([])
if (callCount === 4)
return { limit: vi.fn().mockResolvedValue([{ workspaceId: 'test-workspace-id' }]) }
return Promise.resolve([])
}),
}),
Expand Down Expand Up @@ -851,6 +858,8 @@ describe('Database Helpers', () => {
if (callCount === 1) return Promise.resolve(testBlocks)
if (callCount === 2) return Promise.resolve([])
if (callCount === 3) return Promise.resolve([])
if (callCount === 4)
return { limit: vi.fn().mockResolvedValue([{ workspaceId: 'test-workspace-id' }]) }
return Promise.resolve([])
}),
}),
Expand Down Expand Up @@ -888,6 +897,8 @@ describe('Database Helpers', () => {
where: vi.fn().mockImplementation(() => {
callCount++
if (callCount === 1) return Promise.resolve(blocksWithDefaultValues)
if (callCount === 4)
return { limit: vi.fn().mockResolvedValue([{ workspaceId: 'test-workspace-id' }]) }
return Promise.resolve([])
}),
}),
Expand Down Expand Up @@ -957,6 +968,8 @@ describe('Database Helpers', () => {
if (callCount === 1) return Promise.resolve([originalBlock, duplicatedBlock])
if (callCount === 2) return Promise.resolve([])
if (callCount === 3) return Promise.resolve([])
if (callCount === 4)
return { limit: vi.fn().mockResolvedValue([{ workspaceId: 'test-workspace-id' }]) }
return Promise.resolve([])
}),
}),
Expand Down Expand Up @@ -1053,6 +1066,8 @@ describe('Database Helpers', () => {
where: vi.fn().mockImplementation(() => {
callCount++
if (callCount === 1) return Promise.resolve([basicBlock, advancedBlock])
if (callCount === 4)
return { limit: vi.fn().mockResolvedValue([{ workspaceId: 'test-workspace-id' }]) }
return Promise.resolve([])
}),
}),
Expand Down Expand Up @@ -1137,6 +1152,8 @@ describe('Database Helpers', () => {
},
])
}
if (callCount === 4)
return { limit: vi.fn().mockResolvedValue([{ workspaceId: 'test-workspace-id' }]) }
return Promise.resolve([])
}),
}),
Expand Down
Loading