Skip to content

Commit 8420066

Browse files
waleedlatif1claude
andcommitted
fix(google_drive): rename canonical params to avoid subBlock ID clash
`mimeType`, `query`, and `pageSize` canonical IDs collided with existing subBlock IDs in the same block (failing the canonical-param validation test). Drop the canonicalParamId from search/get_content single-input fields and route them to tool params explicitly in tools.config.params. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
1 parent 68e9fac commit 8420066

1 file changed

Lines changed: 14 additions & 5 deletions

File tree

apps/sim/blocks/blocks/google_drive.ts

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,6 @@ Return ONLY the message text - no subject line, no greetings/signatures, no extr
754754
id: 'getContentExportMimeType',
755755
title: 'Export Format',
756756
type: 'dropdown',
757-
canonicalParamId: 'mimeType',
758757
options: [
759758
{ label: 'Auto (best format for file type)', id: 'auto' },
760759
{ label: 'Plain Text (text/plain)', id: 'text/plain' },
@@ -860,7 +859,6 @@ Return ONLY the message text - no subject line, no greetings/signatures, no extr
860859
id: 'searchQuery',
861860
title: 'Search Query',
862861
type: 'long-input',
863-
canonicalParamId: 'query',
864862
placeholder:
865863
"Drive query syntax (e.g., fullText contains 'budget' and mimeType = 'application/pdf')",
866864
condition: { field: 'operation', value: 'search' },
@@ -890,7 +888,6 @@ Return ONLY the query string - no explanations, no quotes around the whole thing
890888
id: 'searchPageSize',
891889
title: 'Results Per Page',
892890
type: 'short-input',
893-
canonicalParamId: 'pageSize',
894891
placeholder: 'Number of results (default: 100, max: 100)',
895892
mode: 'advanced',
896893
condition: { field: 'operation', value: 'search' },
@@ -1016,6 +1013,10 @@ Return ONLY the query string - no explanations, no quotes around the whole thing
10161013
removeFromCurrent,
10171014
includeRevisions,
10181015
pageSize,
1016+
query,
1017+
searchQuery,
1018+
searchPageSize,
1019+
getContentExportMimeType,
10191020
...rest
10201021
} = params
10211022

@@ -1101,14 +1102,22 @@ Return ONLY the query string - no explanations, no quotes around the whole thing
11011102
const includeRevisionsValue =
11021103
includeRevisions === 'true' ? true : includeRevisions === 'false' ? false : undefined
11031104

1105+
const effectivePageSize = params.operation === 'search' ? searchPageSize : pageSize
1106+
const effectiveQuery = params.operation === 'search' ? searchQuery : query
1107+
const effectiveMimeType =
1108+
params.operation === 'get_content' ? getContentExportMimeType : mimeType
1109+
11041110
return {
11051111
oauthCredential,
11061112
folderId: effectiveFolderId,
11071113
fileId: effectiveFileId,
11081114
destinationFolderId: effectiveDestinationFolderId,
11091115
file: normalizedFile,
1110-
pageSize: pageSize ? Number.parseInt(pageSize as string, 10) : undefined,
1111-
mimeType: mimeType === 'auto' ? undefined : mimeType,
1116+
pageSize: effectivePageSize
1117+
? Number.parseInt(effectivePageSize as string, 10)
1118+
: undefined,
1119+
query: effectiveQuery,
1120+
mimeType: effectiveMimeType === 'auto' ? undefined : effectiveMimeType,
11121121
type: shareType, // Map shareType to type for share tool
11131122
starred: starredValue,
11141123
sendNotification: sendNotificationValue,

0 commit comments

Comments
 (0)