ack PR comments

Author: waleedlatif1

apps/sim/blocks/blocks/imap.ts

@@ -21,7 +21,6 @@ export const ImapBlock: BlockConfig = {
     },
   },
   inputs: {
-    // Connection settings (stored in providerConfig)
     host: { type: 'string', description: 'IMAP server hostname' },
     port: { type: 'string', description: 'IMAP server port' },
     secure: { type: 'boolean', description: 'Use SSL/TLS encryption' },
@@ -34,7 +33,6 @@ export const ImapBlock: BlockConfig = {
     includeAttachments: { type: 'boolean', description: 'Include email attachments' },
   },
   outputs: {
-    // Trigger outputs (from email)
     messageId: { type: 'string', description: 'RFC Message-ID header' },
     subject: { type: 'string', description: 'Email subject line' },
     from: { type: 'string', description: 'Sender email address' },

apps/sim/blocks/registry.ts

@@ -196,8 +196,8 @@ export const registry: Record<string, BlockConfig> = {
   huggingface: HuggingFaceBlock,
   human_in_the_loop: HumanInTheLoopBlock,
   hunter: HunterBlock,
-  imap: ImapBlock,
   image_generator: ImageGeneratorBlock,
+  imap: ImapBlock,
   incidentio: IncidentioBlock,
   input_trigger: InputTriggerBlock,
   intercom: IntercomBlock,

apps/sim/lib/webhooks/imap-polling-service.ts

@@ -1,6 +1,7 @@
 import { db } from '@sim/db'
 import { webhook, workflow } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
+import type { InferSelectModel } from 'drizzle-orm'
 import { and, eq, sql } from 'drizzle-orm'
 import type { FetchMessageObject, MailboxLockObject } from 'imapflow'
 import { ImapFlow } from 'imapflow'
@@ -11,6 +12,8 @@ import { MAX_CONSECUTIVE_FAILURES } from '@/triggers/constants'
 
 const logger = createLogger('ImapPollingService')
 
+type WebhookRecord = InferSelectModel<typeof webhook>
+
 interface ImapWebhookConfig {
   host: string
   port: number
@@ -489,6 +492,27 @@ function extractAttachmentsFromSource(
   return attachments
 }
 
+/**
+ * Checks if a body structure contains attachments by examining disposition
+ */
+function hasAttachmentsInBodyStructure(structure: FetchMessageObject['bodyStructure']): boolean {
+  if (!structure) return false
+
+  if (structure.disposition === 'attachment') {
+    return true
+  }
+
+  if (structure.disposition === 'inline' && structure.dispositionParameters?.filename) {
+    return true
+  }
+
+  if (structure.childNodes && Array.isArray(structure.childNodes)) {
+    return structure.childNodes.some((child) => hasAttachmentsInBodyStructure(child))
+  }
+
+  return false
+}
+
 async function processEmails(
   emails: Array<{
     uid: number
@@ -497,7 +521,7 @@ async function processEmails(
     bodyStructure: FetchMessageObject['bodyStructure']
     source?: Buffer
   }>,
-  webhookData: any,
+  webhookData: WebhookRecord,
   config: ImapWebhookConfig,
   requestId: string
 ) {
@@ -539,9 +563,7 @@ async function processEmails(
               : { text: '', html: '' }
 
             let attachments: ImapAttachment[] = []
-            const hasAttachments = email.bodyStructure
-              ? JSON.stringify(email.bodyStructure).toLowerCase().includes('attachment')
-              : false
+            const hasAttachments = hasAttachmentsInBodyStructure(email.bodyStructure)
 
             if (config.includeAttachments && hasAttachments && email.source) {
               attachments = extractAttachmentsFromSource(email.source, email.bodyStructure)
@@ -573,7 +595,7 @@ async function processEmails(
               method: 'POST',
               headers: {
                 'Content-Type': 'application/json',
-                'X-Webhook-Secret': webhookData.secret || '',
+                'X-Webhook-Secret': '',
                 'User-Agent': 'Sim/1.0',
               },
               body: JSON.stringify(payload),

apps/sim/lib/workflows/comparison/compare.ts

@@ -1,5 +1,5 @@
 import type { WorkflowState } from '@/stores/workflows/workflow/types'
-import { TRIGGER_RUNTIME_SUBBLOCK_IDS } from '@/triggers/constants'
+import { SYSTEM_SUBBLOCK_IDS, TRIGGER_RUNTIME_SUBBLOCK_IDS } from '@/triggers/constants'
 import {
   normalizedStringify,
   normalizeEdge,
@@ -103,11 +103,13 @@ export function hasWorkflowChanged(
       subBlocks: undefined,
     }
 
-    // Get all subBlock IDs from both states, excluding runtime metadata
+    // Get all subBlock IDs from both states, excluding runtime metadata and UI-only elements
     const allSubBlockIds = [
       ...new Set([...Object.keys(currentSubBlocks), ...Object.keys(deployedSubBlocks)]),
     ]
-      .filter((id) => !TRIGGER_RUNTIME_SUBBLOCK_IDS.includes(id))
+      .filter(
+        (id) => !TRIGGER_RUNTIME_SUBBLOCK_IDS.includes(id) && !SYSTEM_SUBBLOCK_IDS.includes(id)
+      )
       .sort()
 
     // Normalize and compare each subBlock