fix(jira): keep explicit assignee ahead of customFields and accept string includeAttachments

Author: waleedlatif1

apps/sim/blocks/blocks/jira.ts

@@ -1184,7 +1184,10 @@ Return ONLY the comment text - no explanations.`,
               ...baseParams,
               issueKey: effectiveIssueKey,
               ...(effectiveProjectId && { projectId: effectiveProjectId }),
-              includeAttachments: params.includeAttachments === true ? true : undefined,
+              includeAttachments:
+                params.includeAttachments === true || params.includeAttachments === 'true'
+                  ? true
+                  : undefined,
             }
           }
           case 'read-bulk': {
@@ -1266,7 +1269,10 @@ Return ONLY the comment text - no explanations.`,
             return {
               ...baseParams,
               issueKey: effectiveIssueKey,
-              includeAttachments: params.includeAttachments === true ? true : undefined,
+              includeAttachments:
+                params.includeAttachments === true || params.includeAttachments === 'true'
+                  ? true
+                  : undefined,
             }
           }
           case 'add_attachment': {

apps/sim/lib/internal/jira/operations.test.ts

@@ -104,6 +104,35 @@ describe('Jira operations', () => {
     expect(result.output).not.toHaveProperty('assigneeId')
   })
 
+  it('keeps the explicit assignee ahead of a customFields assignee on create', async () => {
+    mocks.request
+      .mockResolvedValueOnce({
+        ok: true,
+        status: 201,
+        statusText: 'Created',
+        text: '{"id":"100","key":"PROJ-1","self":"jira-self","fields":{"summary":"Created"}}',
+      })
+      .mockResolvedValueOnce({ ok: true, status: 204, statusText: 'No Content', text: '' })
+
+    await executeJiraWrite(
+      {
+        accessToken: 'token',
+        domain: 'example.atlassian.net',
+        projectId: 'PROJ',
+        summary: 'Created',
+        assignee: 'account-explicit',
+        customFields: { assignee: { accountId: 'account-other' }, customfield_10020: 5 },
+      },
+      context
+    )
+
+    const createBody = JSON.parse(String((mocks.request.mock.calls[0]?.[1] as RequestInit).body))
+    expect(createBody.fields).not.toHaveProperty('assignee')
+    expect(createBody.fields.customfield_10020).toBe(5)
+    const assignBody = JSON.parse(String((mocks.request.mock.calls[1]?.[1] as RequestInit).body))
+    expect(assignBody).toEqual({ accountId: 'account-explicit' })
+  })
+
   it('rejects unsafe attachment issue keys before file or provider work', async () => {
     await expect(
       executeJiraAddAttachment(

apps/sim/lib/internal/jira/operations.ts

@@ -105,10 +105,19 @@ function toParentReference(parent: NonNullable<JiraWriteInput['parent']>): unkno
   return /^\d+$/.test(parent) ? { id: parent } : { key: parent }
 }
 
-function putAdditionalFields(fields: JsonObject, customFields: JsonObject | undefined): void {
+/**
+ * Merges `customFields` under the explicit fields. `reserved` names fields an explicit
+ * param sets outside this body (the create flow assigns after creation), which
+ * `customFields` must not override either.
+ */
+function putAdditionalFields(
+  fields: JsonObject,
+  customFields: JsonObject | undefined,
+  reserved: string[] = []
+): void {
   if (!customFields) return
   for (const [fieldId, value] of Object.entries(customFields)) {
-    if (!(fieldId in fields)) fields[fieldId] = value
+    if (!(fieldId in fields) && !reserved.includes(fieldId)) fields[fieldId] = value
   }
 }
 
@@ -163,7 +172,7 @@ export async function executeJiraWrite(input: JiraWriteInput, context: JiraOpera
   putOptionalIssueFields(fields, input, false)
   if (input.parent) fields.parent = toParentReference(input.parent)
   if (input.reporter) fields.reporter = { accountId: input.reporter }
-  putAdditionalFields(fields, input.customFields)
+  putAdditionalFields(fields, input.customFields, input.assignee ? ['assignee'] : [])
 
   const response = await client.request(
     client.issuePath(),