From 4e30161c68e640f1c2e4ca79d16b69f12d631ab2 Mon Sep 17 00:00:00 2001 From: Waleed Latif Date: Thu, 5 Mar 2026 19:26:28 -0800 Subject: [PATCH] fix(selectors): rename advanced subBlock IDs to avoid canonicalParamId clashes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename all advanced-mode subBlock IDs that matched their canonicalParamId to use a `manual*` prefix, following the established convention (e.g., manualSiteId, manualCredential). This prevents ambiguity between subBlock IDs and canonical parameter names in the serialization layer. 25 renames across 14 blocks: baseId→manualBaseId, tableId→manualTableId, workspace→manualWorkspace, objectType→manualObjectType, etc. --- apps/sim/blocks/blocks/airtable.ts | 4 ++-- apps/sim/blocks/blocks/asana.ts | 4 ++-- apps/sim/blocks/blocks/attio.ts | 4 ++-- apps/sim/blocks/blocks/calcom.ts | 8 ++++---- apps/sim/blocks/blocks/confluence.ts | 2 +- apps/sim/blocks/blocks/google_bigquery.ts | 4 ++-- apps/sim/blocks/blocks/google_tasks.ts | 2 +- apps/sim/blocks/blocks/jira_service_management.ts | 4 ++-- apps/sim/blocks/blocks/microsoft_planner.ts | 4 ++-- apps/sim/blocks/blocks/notion.ts | 6 +++--- apps/sim/blocks/blocks/pipedrive.ts | 2 +- apps/sim/blocks/blocks/sharepoint.ts | 2 +- apps/sim/blocks/blocks/trello.ts | 2 +- apps/sim/blocks/blocks/zoom.ts | 2 +- apps/sim/lib/workflows/comparison/resolve-values.ts | 6 +++--- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/apps/sim/blocks/blocks/airtable.ts b/apps/sim/blocks/blocks/airtable.ts index f2b38efb30..c533b9084d 100644 --- a/apps/sim/blocks/blocks/airtable.ts +++ b/apps/sim/blocks/blocks/airtable.ts @@ -72,7 +72,7 @@ export const AirtableBlock: BlockConfig = { required: { field: 'operation', value: 'listBases', not: true }, }, { - id: 'baseId', + id: 'manualBaseId', title: 'Base ID', type: 'short-input', canonicalParamId: 'baseId', @@ -96,7 +96,7 @@ export const AirtableBlock: BlockConfig = { required: { field: 'operation', value: ['listBases', 'listTables'], not: true }, }, { - id: 'tableId', + id: 'manualTableId', title: 'Table ID', type: 'short-input', canonicalParamId: 'tableId', diff --git a/apps/sim/blocks/blocks/asana.ts b/apps/sim/blocks/blocks/asana.ts index 2541886459..c5b0fcc792 100644 --- a/apps/sim/blocks/blocks/asana.ts +++ b/apps/sim/blocks/blocks/asana.ts @@ -66,7 +66,7 @@ export const AsanaBlock: BlockConfig = { required: true, }, { - id: 'workspace', + id: 'manualWorkspace', title: 'Workspace GID', type: 'short-input', canonicalParamId: 'workspace', @@ -117,7 +117,7 @@ export const AsanaBlock: BlockConfig = { }, }, { - id: 'getTasks_workspace', + id: 'manualGetTasksWorkspace', title: 'Workspace GID', type: 'short-input', canonicalParamId: 'getTasks_workspace', diff --git a/apps/sim/blocks/blocks/attio.ts b/apps/sim/blocks/blocks/attio.ts index aebea95d36..20b8d277b2 100644 --- a/apps/sim/blocks/blocks/attio.ts +++ b/apps/sim/blocks/blocks/attio.ts @@ -121,7 +121,7 @@ export const AttioBlock: BlockConfig = { }, }, { - id: 'objectType', + id: 'manualObjectType', title: 'Object Type', type: 'short-input', canonicalParamId: 'objectType', @@ -597,7 +597,7 @@ Return ONLY the JSON array. No explanations, no markdown, no extra text. }, }, { - id: 'listIdOrSlug', + id: 'manualListIdOrSlug', title: 'List ID or Slug', type: 'short-input', canonicalParamId: 'listIdOrSlug', diff --git a/apps/sim/blocks/blocks/calcom.ts b/apps/sim/blocks/blocks/calcom.ts index b26280d73e..c55cd459f1 100644 --- a/apps/sim/blocks/blocks/calcom.ts +++ b/apps/sim/blocks/blocks/calcom.ts @@ -83,7 +83,7 @@ export const CalComBlock: BlockConfig = { required: { field: 'operation', value: 'calcom_create_booking' }, }, { - id: 'eventTypeId', + id: 'manualEventTypeId', title: 'Event Type ID', type: 'short-input', canonicalParamId: 'eventTypeId', @@ -301,7 +301,7 @@ Return ONLY the IANA timezone string - no explanations or quotes.`, }, }, { - id: 'eventTypeIdParam', + id: 'manualEventTypeIdParam', title: 'Event Type ID', type: 'short-input', canonicalParamId: 'eventTypeIdParam', @@ -422,7 +422,7 @@ Return ONLY the IANA timezone string - no explanations or quotes.`, }, }, { - id: 'eventTypeScheduleId', + id: 'manualEventTypeScheduleId', title: 'Schedule ID', type: 'short-input', canonicalParamId: 'eventTypeScheduleId', @@ -467,7 +467,7 @@ Return ONLY the IANA timezone string - no explanations or quotes.`, }, }, { - id: 'scheduleId', + id: 'manualScheduleId', title: 'Schedule ID', type: 'short-input', canonicalParamId: 'scheduleId', diff --git a/apps/sim/blocks/blocks/confluence.ts b/apps/sim/blocks/blocks/confluence.ts index 84574fdf01..c7d7f9d3f6 100644 --- a/apps/sim/blocks/blocks/confluence.ts +++ b/apps/sim/blocks/blocks/confluence.ts @@ -157,7 +157,7 @@ export const ConfluenceBlock: BlockConfig = { required: { field: 'operation', value: ['create', 'get_space'] }, }, { - id: 'spaceId', + id: 'manualSpaceId', title: 'Space ID', type: 'short-input', canonicalParamId: 'spaceId', diff --git a/apps/sim/blocks/blocks/google_bigquery.ts b/apps/sim/blocks/blocks/google_bigquery.ts index 1fdece8231..3c86dfaae8 100644 --- a/apps/sim/blocks/blocks/google_bigquery.ts +++ b/apps/sim/blocks/blocks/google_bigquery.ts @@ -124,7 +124,7 @@ Return ONLY the SQL query - no explanations, no quotes, no extra text.`, required: { field: 'operation', value: ['list_tables', 'get_table', 'insert_rows'] }, }, { - id: 'datasetId', + id: 'manualDatasetId', title: 'Dataset ID', type: 'short-input', canonicalParamId: 'datasetId', @@ -149,7 +149,7 @@ Return ONLY the SQL query - no explanations, no quotes, no extra text.`, required: { field: 'operation', value: ['get_table', 'insert_rows'] }, }, { - id: 'tableId', + id: 'manualTableId', title: 'Table ID', type: 'short-input', canonicalParamId: 'tableId', diff --git a/apps/sim/blocks/blocks/google_tasks.ts b/apps/sim/blocks/blocks/google_tasks.ts index 06b4b4ea4f..63f658ae1f 100644 --- a/apps/sim/blocks/blocks/google_tasks.ts +++ b/apps/sim/blocks/blocks/google_tasks.ts @@ -66,7 +66,7 @@ export const GoogleTasksBlock: BlockConfig = { condition: { field: 'operation', value: 'list_task_lists', not: true }, }, { - id: 'taskListId', + id: 'manualTaskListId', title: 'Task List ID', type: 'short-input', canonicalParamId: 'taskListId', diff --git a/apps/sim/blocks/blocks/jira_service_management.ts b/apps/sim/blocks/blocks/jira_service_management.ts index 916f0b2bd1..5ffa1739d0 100644 --- a/apps/sim/blocks/blocks/jira_service_management.ts +++ b/apps/sim/blocks/blocks/jira_service_management.ts @@ -146,7 +146,7 @@ export const JiraServiceManagementBlock: BlockConfig = { }, }, { - id: 'serviceDeskId', + id: 'manualServiceDeskId', title: 'Service Desk ID', type: 'short-input', canonicalParamId: 'serviceDeskId', @@ -195,7 +195,7 @@ export const JiraServiceManagementBlock: BlockConfig = { condition: { field: 'operation', value: ['create_request', 'get_request_type_fields'] }, }, { - id: 'requestTypeId', + id: 'manualRequestTypeId', title: 'Request Type ID', type: 'short-input', canonicalParamId: 'requestTypeId', diff --git a/apps/sim/blocks/blocks/microsoft_planner.ts b/apps/sim/blocks/blocks/microsoft_planner.ts index ab90c17923..5e1e0e6716 100644 --- a/apps/sim/blocks/blocks/microsoft_planner.ts +++ b/apps/sim/blocks/blocks/microsoft_planner.ts @@ -108,7 +108,7 @@ export const MicrosoftPlannerBlock: BlockConfig = { // Plan ID - advanced mode { - id: 'planId', + id: 'manualPlanId', title: 'Plan ID', type: 'short-input', canonicalParamId: 'planId', @@ -146,7 +146,7 @@ export const MicrosoftPlannerBlock: BlockConfig = { type: 'short-input', placeholder: 'Enter the task ID', condition: { field: 'operation', value: ['read_task'] }, - dependsOn: ['credential', 'planId'], + dependsOn: ['credential', 'manualPlanId'], mode: 'advanced', canonicalParamId: 'readTaskId', }, diff --git a/apps/sim/blocks/blocks/notion.ts b/apps/sim/blocks/blocks/notion.ts index 2b7c563c65..769dcf4893 100644 --- a/apps/sim/blocks/blocks/notion.ts +++ b/apps/sim/blocks/blocks/notion.ts @@ -69,7 +69,7 @@ export const NotionBlock: BlockConfig = { required: { field: 'operation', value: ['notion_read', 'notion_write'] }, }, { - id: 'pageId', + id: 'manualPageId', title: 'Page ID', type: 'short-input', canonicalParamId: 'pageId', @@ -100,7 +100,7 @@ export const NotionBlock: BlockConfig = { }, }, { - id: 'databaseId', + id: 'manualDatabaseId', title: 'Database ID', type: 'short-input', canonicalParamId: 'databaseId', @@ -137,7 +137,7 @@ export const NotionBlock: BlockConfig = { }, }, { - id: 'parentId', + id: 'manualParentId', title: 'Parent Page ID', type: 'short-input', canonicalParamId: 'parentId', diff --git a/apps/sim/blocks/blocks/pipedrive.ts b/apps/sim/blocks/blocks/pipedrive.ts index 55e5c331ff..ca12d425a2 100644 --- a/apps/sim/blocks/blocks/pipedrive.ts +++ b/apps/sim/blocks/blocks/pipedrive.ts @@ -114,7 +114,7 @@ export const PipedriveBlock: BlockConfig = { required: { field: 'operation', value: 'get_pipeline_deals' }, }, { - id: 'pipeline_id', + id: 'manualPipelineId', title: 'Pipeline ID', type: 'short-input', canonicalParamId: 'pipeline_id', diff --git a/apps/sim/blocks/blocks/sharepoint.ts b/apps/sim/blocks/blocks/sharepoint.ts index dcc02839d3..539b8571e9 100644 --- a/apps/sim/blocks/blocks/sharepoint.ts +++ b/apps/sim/blocks/blocks/sharepoint.ts @@ -126,7 +126,7 @@ export const SharepointBlock: BlockConfig = { condition: { field: 'operation', value: ['read_list', 'update_list', 'add_list_items'] }, }, { - id: 'listId', + id: 'manualListId', title: 'List ID', type: 'short-input', canonicalParamId: 'listId', diff --git a/apps/sim/blocks/blocks/trello.ts b/apps/sim/blocks/blocks/trello.ts index bff115ebdc..3e4c94bf09 100644 --- a/apps/sim/blocks/blocks/trello.ts +++ b/apps/sim/blocks/blocks/trello.ts @@ -84,7 +84,7 @@ export const TrelloBlock: BlockConfig = { }, }, { - id: 'boardId', + id: 'manualBoardId', title: 'Board ID', type: 'short-input', canonicalParamId: 'boardId', diff --git a/apps/sim/blocks/blocks/zoom.ts b/apps/sim/blocks/blocks/zoom.ts index 23b7dc70a8..01171057e7 100644 --- a/apps/sim/blocks/blocks/zoom.ts +++ b/apps/sim/blocks/blocks/zoom.ts @@ -104,7 +104,7 @@ export const ZoomBlock: BlockConfig = { }, }, { - id: 'meetingId', + id: 'manualMeetingId', title: 'Meeting ID', type: 'short-input', canonicalParamId: 'meetingId', diff --git a/apps/sim/lib/workflows/comparison/resolve-values.ts b/apps/sim/lib/workflows/comparison/resolve-values.ts index 9a041e7cc9..c7b56f4a4f 100644 --- a/apps/sim/lib/workflows/comparison/resolve-values.ts +++ b/apps/sim/lib/workflows/comparison/resolve-values.ts @@ -246,9 +246,9 @@ function extractExtendedContext( siteId: getStringValue('siteId'), collectionId: getStringValue('collectionId'), spreadsheetId: getStringValue('spreadsheetId') || getStringValue('fileId'), - baseId: getStringValue('baseId') || getStringValue('baseSelector'), - datasetId: getStringValue('datasetId') || getStringValue('datasetSelector'), - serviceDeskId: getStringValue('serviceDeskId') || getStringValue('serviceDeskSelector'), + baseId: getStringValue('manualBaseId') || getStringValue('baseSelector'), + datasetId: getStringValue('manualDatasetId') || getStringValue('datasetSelector'), + serviceDeskId: getStringValue('manualServiceDeskId') || getStringValue('serviceDeskSelector'), } }