MS Outlook - include attachments in new email trigger

components/microsoft_outlook/actions/find-email/find-email.mjs

@@ -4,21 +4,15 @@
   key: "microsoft_outlook-find-email",
   name: "Find Email",
   description: "Search for an email in Microsoft Outlook. [See the documentation](https://learn.microsoft.com/en-us/graph/api/user-list-messages)",
-  version: "0.0.8",
+  version: "0.0.9",
   type: "action",
   props: {
     microsoftOutlook,
     info: {
       type: "alert",
       alertType: "info",
       content: "When you specify `$filter`, the service infers a sort order for the results. If you use both `$orderby` and `$filter` to get messages, because the server always infers a sort order for the results of a `$filter`, you must [specify properties in certain ways](https://learn.microsoft.com/en-us/graph/api/user-list-messages#using-filter-and-orderby-in-the-same-query).",
     },
-    search: {
-      type: "string",
-      label: "Search",
-      description: "Search for an email in Microsoft Outlook. Can search for specific message properties such as `to:example@example.com` or `subject:example`. If the property is excluded, the search targets the default propertes `from`, `subject`, and `body`. For example, `pizza` will search for messages with the word `pizza` in the subject, body, or from address, but `to:example@example.com` will only search for messages to `example@example.com`.",
-      optional: true,
-    },
     filter: {
       type: "string",
       label: "Filter",
@@ -44,7 +38,6 @@
       args: {
         $,
         params: {
-          "$search": this.search,
           "$filter": this.filter,
           "$orderby": this.orderBy,
         },

components/microsoft_outlook/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/microsoft_outlook",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "Pipedream Microsoft Outlook Components",
   "main": "microsoft_outlook.app.mjs",
   "keywords": [

components/microsoft_outlook/sources/common/common-new-email.mjs

@@ -54,5 +54,22 @@ export default {
       const draftsFolderId = this.db.get("draftsFolderId");
       return item.parentFolderId !== sentItemFolderId && item.parentFolderId !== draftsFolderId;
     },
+    async getMessageAttachments(message) {
+      const { value: attachments } = await this.microsoftOutlook.listAttachments({
+        messageId: message.id,
+      });
+      if (!attachments?.length) {
+        return [];
+      }
+      return attachments.map((attachment) => ({
+        ...attachment,
+        messageId: message.id,
+        messageSubject: message.subject,
+        messageSender: message.sender,
+        messageReceivedDateTime: message.receivedDateTime,
+        parentFolderId: message.parentFolderId,
+        contentBytes: undefined,
+      }));
+    },
   },
 };

components/microsoft_outlook/sources/new-attachment-received/new-attachment-received.mjs

@@ -5,7 +5,7 @@ export default {
   key: "microsoft_outlook-new-attachment-received",
   name: "New Attachment Received (Instant)",
   description: "Emit new event when a new email containing one or more attachments arrives in a specified Microsoft Outlook folder.",
-  version: "0.0.3",
+  version: "0.0.4",
   type: "source",
   dedupe: "unique",
   methods: {
@@ -36,23 +36,6 @@ export default {
       }
       return attachments;
     },
-    async getMessageAttachments(message) {
-      const { value: attachments } = await this.microsoftOutlook.listAttachments({
-        messageId: message.id,
-      });
-      if (!attachments?.length) {
-        return [];
-      }
-      return attachments.map((attachment) => ({
-        ...attachment,
-        messageId: message.id,
-        messageSubject: message.subject,
-        messageSender: message.sender,
-        messageReceivedDateTime: message.receivedDateTime,
-        parentFolderId: message.parentFolderId,
-        contentBytes: undefined,
-      }));
-    },
     emitEvent(item) {
       if (this.isRelevant(item)) {
         this.$emit(item, this.generateMeta(item));

components/microsoft_outlook/sources/new-email/new-email.mjs

@@ -7,7 +7,7 @@ export default {
   key: "microsoft_outlook-new-email",
   name: "New Email Event (Instant)",
   description: "Emit new event when an email is received in specified folders.",
-  version: "0.0.19",
+  version: "0.1.0",
   type: "source",
   dedupe: "unique",
   methods: {
@@ -66,6 +66,10 @@ export default {
               resource: folder,
               messageId: resourceId,
             });
+            if (item.hasAttachments) {
+              const attachments = await this.getMessageAttachments(item);
+              item.attachments = attachments;
+            }
             this.emitEvent(item);
           } catch {
             console.log(`Could not fetch message with ID: ${resourceId}`);