File tree Expand file tree Collapse file tree 2 files changed +13
-2
lines changed
app/workspace/[workspaceId]/w/[workflowId]/components/workflow-block Expand file tree Collapse file tree 2 files changed +13
-2
lines changed Original file line number Diff line number Diff line change @@ -534,7 +534,6 @@ const SubBlockRow = memo(function SubBlockRow({
534534 workspaceId
535535 )
536536
537- const credentialId = dependencyValues . credential
538537 const knowledgeBaseId = dependencyValues . knowledgeBaseId
539538
540539 const dropdownLabel = useMemo ( ( ) => {
@@ -576,6 +575,7 @@ const SubBlockRow = memo(function SubBlockRow({
576575 const collectionIdValue = resolveContextValue ( 'collectionId' )
577576 const spreadsheetIdValue = resolveContextValue ( 'spreadsheetId' )
578577 const fileIdValue = resolveContextValue ( 'fileId' )
578+ const credentialId = dependencyValues . credential ?? resolveContextValue ( 'oauthCredential' )
579579
580580 const { displayName : selectorDisplayName } = useSelectorDisplayName ( {
581581 subBlock,
Original file line number Diff line number Diff line change @@ -286,7 +286,18 @@ export function resolveDependencyValue(
286286 const mode = resolveCanonicalMode ( group , values , overrides )
287287 const canonicalResult =
288288 mode === 'advanced' ? ( advancedValue ?? basicValue ) : ( basicValue ?? advancedValue )
289- return canonicalResult ?? values [ dependencyKey ]
289+
290+ if ( canonicalResult != null ) return canonicalResult
291+
292+ for ( const [ memberId , memberCanonicalId ] of Object . entries (
293+ canonicalIndex . canonicalIdBySubBlockId
294+ ) ) {
295+ if ( memberCanonicalId === canonicalId && values [ memberId ] != null ) {
296+ return values [ memberId ]
297+ }
298+ }
299+
300+ return values [ dependencyKey ]
290301}
291302
292303/**
You can’t perform that action at this time.
0 commit comments