From f38efa2a8630fceeae2409c9f124c9fcb637b141 Mon Sep 17 00:00:00 2001 From: waleed Date: Fri, 10 Apr 2026 13:22:56 -0700 Subject: [PATCH 1/2] fix(trigger): show selector display names on canvas for trigger file/sheet selectors --- .../components/workflow-block/workflow-block.tsx | 2 +- apps/sim/lib/workflows/subblocks/visibility.ts | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx index 8db6eabe3a1..6df9c6a5d72 100644 --- a/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx +++ b/apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block/workflow-block.tsx @@ -534,7 +534,6 @@ const SubBlockRow = memo(function SubBlockRow({ workspaceId ) - const credentialId = dependencyValues.credential const knowledgeBaseId = dependencyValues.knowledgeBaseId const dropdownLabel = useMemo(() => { @@ -576,6 +575,7 @@ const SubBlockRow = memo(function SubBlockRow({ const collectionIdValue = resolveContextValue('collectionId') const spreadsheetIdValue = resolveContextValue('spreadsheetId') const fileIdValue = resolveContextValue('fileId') + const credentialId = dependencyValues.credential ?? resolveContextValue('oauthCredential') const { displayName: selectorDisplayName } = useSelectorDisplayName({ subBlock, diff --git a/apps/sim/lib/workflows/subblocks/visibility.ts b/apps/sim/lib/workflows/subblocks/visibility.ts index 867f60f750e..cc6fd38e695 100644 --- a/apps/sim/lib/workflows/subblocks/visibility.ts +++ b/apps/sim/lib/workflows/subblocks/visibility.ts @@ -286,7 +286,18 @@ export function resolveDependencyValue( const mode = resolveCanonicalMode(group, values, overrides) const canonicalResult = mode === 'advanced' ? (advancedValue ?? basicValue) : (basicValue ?? advancedValue) - return canonicalResult ?? values[dependencyKey] + + if (canonicalResult != null) return canonicalResult + + for (const [memberId, memberCanonicalId] of Object.entries( + canonicalIndex.canonicalIdBySubBlockId + )) { + if (memberCanonicalId === canonicalId && values[memberId] != null) { + return values[memberId] + } + } + + return values[dependencyKey] } /** From 5d6bc8673f1fab735651e622b7da9000f3d8fc2a Mon Sep 17 00:00:00 2001 From: waleed Date: Fri, 10 Apr 2026 14:16:15 -0700 Subject: [PATCH 2/2] fix(trigger): use isNonEmptyValue in canonical member scan to match visibility contract --- apps/sim/lib/workflows/subblocks/visibility.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/sim/lib/workflows/subblocks/visibility.ts b/apps/sim/lib/workflows/subblocks/visibility.ts index cc6fd38e695..fd9eb85b74c 100644 --- a/apps/sim/lib/workflows/subblocks/visibility.ts +++ b/apps/sim/lib/workflows/subblocks/visibility.ts @@ -292,7 +292,7 @@ export function resolveDependencyValue( for (const [memberId, memberCanonicalId] of Object.entries( canonicalIndex.canonicalIdBySubBlockId )) { - if (memberCanonicalId === canonicalId && values[memberId] != null) { + if (memberCanonicalId === canonicalId && isNonEmptyValue(values[memberId])) { return values[memberId] } }