updates

Author: michelle0927

components/gmail/actions/create-draft/create-draft.mjs

@@ -1,5 +1,6 @@
 import gmail from "../../gmail.app.mjs";
 import { ConfigurationError } from "@pipedream/platform";
+import utils from "../../common/utils.mjs";
 
 export default {
   key: "gmail-create-draft",
@@ -45,16 +46,16 @@ export default {
         "bodyType",
       ],
     },
-    attachmentFilename: {
+    attachmentFilenames: {
       propDefinition: [
         gmail,
-        "attachmentFilename",
+        "attachmentFilenames",
       ],
     },
-    attachmentUrlOrPath: {
+    attachmentUrlsOrPaths: {
       propDefinition: [
         gmail,
-        "attachmentUrlOrPath",
+        "attachmentUrlsOrPaths",
       ],
     },
     inReplyTo: {
@@ -74,9 +75,10 @@ export default {
     },
   },
   async run({ $ }) {
-    if ((this.attachmentFilename && ! this.attachmentUrlOrPath)
-      || (!this.attachmentFilename && this.attachmentUrlOrPath)) {
-      throw new ConfigurationError("Must specify both `Attachment Filename` and `Attachment URL or Path`");
+    this.attachmentFilenames = utils.parseArray(this.attachmentFilenames);
+    this.attachmentUrlsOrPaths = utils.parseArray(this.attachmentUrlsOrPaths);
+    if (this.attachmentFilenames?.length !== this.attachmentUrlsOrPaths?.length) {
+      throw new ConfigurationError("Must specify the same number of `Attachment Filenames` and `Attachment URLs or Paths`");
     }
     const opts = await this.gmail.getOptionsToSendEmail($, this);
     const response = await this.gmail.createDraft(opts);

components/gmail/actions/send-email/send-email.mjs

@@ -1,5 +1,6 @@
 import gmail from "../../gmail.app.mjs";
 import { ConfigurationError } from "@pipedream/platform";
+import utils from "../../common/utils.mjs";
 
 export default {
   key: "gmail-send-email",
@@ -63,16 +64,16 @@ export default {
         "bodyType",
       ],
     },
-    attachmentFilename: {
+    attachmentFilenames: {
       propDefinition: [
         gmail,
-        "attachmentFilename",
+        "attachmentFilenames",
       ],
     },
-    attachmentUrlOrPath: {
+    attachmentUrlsOrPaths: {
       propDefinition: [
         gmail,
-        "attachmentUrlOrPath",
+        "attachmentUrlsOrPaths",
       ],
     },
     inReplyTo: {
@@ -89,9 +90,10 @@ export default {
     },
   },
   async run({ $ }) {
-    if ((this.attachmentFilename && ! this.attachmentUrlOrPath)
-      || (!this.attachmentFilename && this.attachmentUrlOrPath)) {
-      throw new ConfigurationError("Must specify both `Attachment Filename` and `Attachment URL or Path`");
+    this.attachmentFilenames = utils.parseArray(this.attachmentFilenames);
+    this.attachmentUrlsOrPaths = utils.parseArray(this.attachmentUrlsOrPaths);
+    if (this.attachmentFilenames?.length !== this.attachmentUrlsOrPaths?.length) {
+      throw new ConfigurationError("Must specify the same number of `Attachment Filenames` and `Attachment URLs or Paths`");
     }
     const opts = await this.gmail.getOptionsToSendEmail($, this);
     const response = await this.gmail.sendEmail(opts);

components/gmail/common/utils.mjs

@@ -0,0 +1,12 @@
+function parseArray(arr) {
+  if (!arr) {
+    return undefined;
+  }
+  return typeof arr === "string"
+    ? JSON.parse(arr)
+    : arr;
+}
+
+export default {
+  parseArray,
+};

components/gmail/gmail.app.mjs

@@ -231,16 +231,16 @@ export default {
       default: "plaintext",
       options: Object.values(constants.BODY_TYPES),
     },
-    attachmentFilename: {
-      type: "string",
-      label: "Attachment Filename",
-      description: "The name of the file to attach. Must contain the file extension (e.g. `.jpeg`, `.txt`)",
+    attachmentFilenames: {
+      type: "string[]",
+      label: "Attachment Filenames",
+      description: "Array of the names of the files to attach. Must contain the file extension (e.g. `.jpeg`, `.txt`). Use in conjuction with `Attachment URLs or Paths`.",
       optional: true,
     },
-    attachmentUrlOrPath: {
-      type: "string",
-      label: "Attachment URL or Path",
-      description: "The URL of the download link for the file, or the local path (e.g. `/tmp/my-file.txt`).",
+    attachmentUrlsOrPaths: {
+      type: "string[]",
+      label: "Attachment URLs or Paths",
+      description: "Array of the URLs of the download links for the files, or the local paths (e.g. `/tmp/my-file.txt`). Use in conjuction with `Attachment Filenames`.",
       optional: true,
     },
     inReplyTo: {
@@ -308,13 +308,14 @@ export default {
         }
       }
 
-      if (props.attachmentFilename && props.attachmentUrlOrPath) {
-        opts.attachments = [
-          {
-            filename: props.attachmentFilename,
-            path: props.attachmentUrlOrPath,
-          },
-        ];
+      if (props.attachmentFilenames?.length && props.attachmentUrlsOrPaths?.length) {
+        opts.attachments = [];
+        for (let i = 0; i < props.attachmentFilenames.length; i++) {
+          opts.attachments.push({
+            filename: props.attachmentFilenames[i],
+            path: props.attachmentUrlsOrPaths[i],
+          });
+        }
       }
 
       if (props.bodyType === constants.BODY_TYPES.HTML) {

components/gmail/sources/new-email-received/new-email-received.mjs

@@ -394,7 +394,6 @@ export default {
     }
 
     if (this.triggerType === "webhook") {
-      this._setLastProcessedHistoryId(this.initialHistoryId);
       if (event.timestamp) {
         // event was triggered by timer
         const topicName = this._getTopicName();
@@ -405,6 +404,7 @@ export default {
         } else {
           // first run, no need to renew push notifications
           this._setTopicName(this.topic);
+          this._setLastProcessedHistoryId(this.initialHistoryId);
           return;
         }
       }