@pipedream/google_drive 0.6.13 → 0.6.15

package/actions/upload-file/upload-file.mjs

@@ -10,7 +10,7 @@ export default {
   key: "google_drive-upload-file",
   name: "Upload File",
   description: "Copy an existing file to Google Drive. [See the docs](https://developers.google.com/drive/api/v3/manage-uploads) for more information",
-  version: "0.1.2",
+  version: "0.1.3",
   type: "action",
   props: {
     googleDrive,
@@ -69,26 +69,14 @@ export default {
       default: GOOGLE_DRIVE_UPLOAD_TYPE_MULTIPART,
       optional: true,
     },
-    replaceFile: {
-      type: "boolean",
-      label: "Replace File",
-      description: "Whether should replace file case it exists, default: `false`",
+    fileId: {
+      propDefinition: [
+        googleDrive,
+        "fileId",
+      ],
+      label: "File to replace",
+      description: "Id of the file to replace. Leave it empty to upload a new file.",
       optional: true,
-      default: false,
-    },
-  },
-  methods: {
-    async getFileIdForReplace(filename, parentId) {
-      if (this.replaceFile) {
-        const { files } = await this.googleDrive.listFilesInPage(null, {
-          q: `name = '${filename}' and '${parentId || "root"}' in parents and trashed = false`,
-          fields: "files/id,files/name,files/parents",
-        });
-        if (files.length) {
-          return files[0].id;
-        }
-      }
-      return null;
     },
   },
   async run({ $ }) {
@@ -106,7 +94,6 @@ export default {
     const driveId = this.googleDrive.getDriveId(this.drive);
 
     const filename = name || path.basename(fileUrl || filePath);
-    const fileId = await this.getFileIdForReplace(filename, parentId);
 
     const file = await getFileStream({
       $,
@@ -116,12 +103,12 @@ export default {
     console.log(`Upload type: ${uploadType}.`);
 
     let result = null;
-    if (fileId) {
-      await this.googleDrive.updateFileMedia(fileId, file, omitEmptyStringValues({
+    if (this.fileId) {
+      await this.googleDrive.updateFileMedia(this.fileId, file, omitEmptyStringValues({
         mimeType,
         uploadType,
       }));
-      result = await this.googleDrive.updateFile(fileId, omitEmptyStringValues({
+      result = await this.googleDrive.updateFile(this.fileId, omitEmptyStringValues({
         name: filename,
         mimeType,
         uploadType,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/google_drive",
-  "version": "0.6.13",
+  "version": "0.6.15",
   "description": "Pipedream Google_drive Components",
   "main": "google_drive.app.mjs",
   "keywords": [
@@ -12,6 +12,8 @@
   "dependencies": {
     "@googleapis/drive": "^2.3.0",
     "@pipedream/platform": "^1.4.0",
+    "cron-parser": "^4.9.0",
+    "lodash": "^4.17.21",
     "mime-db": "^1.51.0",
     "uuid": "^8.3.2"
   },

package/sources/changes-to-specific-files/changes-to-specific-files.mjs

@@ -17,7 +17,7 @@ export default {
   key: "google_drive-changes-to-specific-files",
   name: "Changes to Specific Files",
   description: "Watches for changes to specific files, emitting an event any time a change is made to one of those files. To watch for changes to [shared drive](https://support.google.com/a/users/answer/9310351) files, use the **Changes to Specific Files (Shared Drive)** source instead.",
-  version: "0.1.2",
+  version: "0.1.3",
   type: "source",
   // Dedupe events based on the "x-goog-message-number" header for the target channel:
   // https://developers.google.com/drive/api/v3/push#making-watch-requests

package/sources/changes-to-specific-files-shared-drive/changes-to-specific-files-shared-drive.mjs

@@ -26,7 +26,7 @@ export default {
   key: "google_drive-changes-to-specific-files-shared-drive",
   name: "Changes to Specific Files (Shared Drive)",
   description: "Watches for changes to specific files in a shared drive, emitting an event any time a change is made to one of those files",
-  version: "0.1.2",
+  version: "0.1.3",
   type: "source",
   // Dedupe events based on the "x-goog-message-number" header for the target channel:
   // https://developers.google.com/drive/api/v3/push#making-watch-requests
@@ -41,7 +41,7 @@ export default {
       default: [],
       options({ prevContext }) {
         const { nextPageToken } = prevContext;
-        return this.googleDrive.listFilesOptions(nextPageToken, this.getFilesOpts());
+        return this.googleDrive.listFilesOptions(nextPageToken, this.getListFilesOpts());
       },
     },
   },
@@ -51,14 +51,14 @@ export default {
       daysAgo.setDate(daysAgo.getDate() - 30);
       const timeString = daysAgo.toISOString();
 
-      const args = this.getFilesOpts({
+      const args = this.getListFilesOpts({
         q: `mimeType != "application/vnd.google-apps.folder" and modifiedTime > "${timeString}" and trashed = false`,
         fields: "files",
       });
 
-      const { data } = await this.googleDrive.drive().files.list(args);
+      const { files } = await this.googleDrive.listFilesInPage(null, args);
 
-      this.processChanges(data.files);
+      this.processChanges(files);
     },
     ...common.hooks,
   },

package/sources/common-webhook.mjs

@@ -3,6 +3,7 @@ import { v4 as uuid } from "uuid";
 
 import googleDrive from "../google_drive.app.mjs";
 import { WEBHOOK_SUBSCRIPTION_RENEWAL_SECONDS } from "../constants.mjs";
+import { getListFilesOpts } from "../common/utils.mjs";
 
 export default {
   props: {
@@ -96,20 +97,11 @@ export default {
     getDriveId(drive = this.drive) {
       return googleDrive.methods.getDriveId(drive);
     },
-    getFilesOpts(args = {}) {
-      const opts = {
+    getListFilesOpts(args = {}) {
+      return getListFilesOpts(this.drive, {
         q: "mimeType != 'application/vnd.google-apps.folder' and trashed = false",
         ...args,
-      };
-      return this.isMyDrive()
-        ? opts
-        : {
-          ...opts,
-          corpora: "drive",
-          driveId: this.getDriveId(),
-          includeItemsFromAllDrives: true,
-          supportsAllDrives: true,
-        };
+      });
     },
     /**
      * This method returns the types of updates/events from Google Drive that

package/sources/new-files-instant/new-files-instant.mjs

@@ -10,7 +10,7 @@ export default {
   key: "google_drive-new-files-instant",
   name: "New Files (Instant)",
   description: "Emit new event any time a new file is added in your linked Google Drive",
-  version: "0.1.3",
+  version: "0.1.4",
   type: "source",
   dedupe: "unique",
   props: {
@@ -46,14 +46,16 @@ export default {
       daysAgo.setDate(daysAgo.getDate() - 30);
       const timeString = daysAgo.toISOString();
 
-      const { data } = await this.googleDrive.drive().files.list({
+      const args = this.getListFilesOpts({
         q: `mimeType != "application/vnd.google-apps.folder" and createdTime > "${timeString}" and trashed = false`,
         orderBy: "createdTime desc",
         fields: "*",
         pageSize: 25,
       });
 
-      this.emitFiles(data.files);
+      const { files } = await this.googleDrive.listFilesInPage(null, args);
+
+      this.emitFiles(files);
     },
     ...common.hooks,
     async activate() {
@@ -98,19 +100,21 @@ export default {
       const lastFileCreatedTime = this._getLastFileCreatedTime();
       const timeString = new Date(lastFileCreatedTime).toISOString();
 
-      const { data } = await this.googleDrive.drive().files.list({
+      const args = this.getListFilesOpts({
         q: `mimeType != "application/vnd.google-apps.folder" and createdTime > "${timeString}" and trashed = false`,
         orderBy: "createdTime desc",
         fields: "*",
       });
 
-      if (!data.files?.length) {
+      const { files } = await this.googleDrive.listFilesInPage(null, args);
+
+      if (!files?.length) {
         return;
       }
 
-      this.emitFiles(data.files);
+      this.emitFiles(files);
 
-      this._setLastFileCreatedTime(Date.parse(data.files[0].createdTime));
+      this._setLastFileCreatedTime(Date.parse(files[0].createdTime));
     },
   },
   sampleEmit,

package/sources/new-or-modified-comments/new-or-modified-comments.mjs

@@ -17,8 +17,7 @@ export default {
   name: "New or Modified Comments",
   description:
     "Emits a new event any time a file comment is added, modified, or deleted in your linked Google Drive",
-  // version: "0.1.1",
-  version: "0.1.3",
+  version: "0.1.4",
   type: "source",
   // Dedupe events based on the "x-goog-message-number" header for the target channel:
   // https://developers.google.com/drive/api/v3/push#making-watch-requests
@@ -29,14 +28,14 @@ export default {
       daysAgo.setDate(daysAgo.getDate() - 30);
       const timeString = daysAgo.toISOString();
 
-      const args = this.getFilesOpts({
+      const args = this.getListFilesOpts({
         q: `mimeType != "application/vnd.google-apps.folder" and modifiedTime > "${timeString}" and trashed = false`,
         fields: "files",
       });
 
-      const { data } = await this.googleDrive.drive().files.list(args);
+      const { files } = await this.googleDrive.listFilesInPage(null, args);
 
-      await this.processChanges(data.files);
+      await this.processChanges(files);
     },
     async activate() {
       await common.hooks.activate.bind(this)();

package/sources/new-or-modified-files/new-or-modified-files.mjs

@@ -21,7 +21,7 @@ export default {
   key: "google_drive-new-or-modified-files",
   name: "New or Modified Files",
   description: "Emit new event any time any file in your linked Google Drive is added, modified, or deleted",
-  version: "0.1.2",
+  version: "0.1.3",
   type: "source",
   // Dedupe events based on the "x-goog-message-number" header for the target channel:
   // https://developers.google.com/drive/api/v3/push#making-watch-requests
@@ -32,12 +32,14 @@ export default {
       daysAgo.setDate(daysAgo.getDate() - 30);
       const timeString = daysAgo.toISOString();
 
-      const { data } = await this.googleDrive.drive().files.list({
+      const args = this.getListFilesOpts({
         q: `mimeType != "application/vnd.google-apps.folder" and modifiedTime > "${timeString}" and trashed = false`,
         fields: "files",
       });
 
-      await this.processChanges(data.files);
+      const { files } = await this.googleDrive.listFilesInPage(null, args);
+
+      await this.processChanges(files);
     },
     ...common.hooks,
   },

package/sources/new-or-modified-folders/new-or-modified-folders.mjs

@@ -20,7 +20,7 @@ export default {
   key: "google_drive-new-or-modified-folders",
   name: "New or Modified Folders",
   description: "Emit new event any time any folder in your linked Google Drive is added, modified, or deleted",
-  version: "0.1.1",
+  version: "0.1.2",
   type: "source",
   // Dedupe events based on the "x-goog-message-number" header for the target channel:
   // https://developers.google.com/drive/api/v3/push#making-watch-requests
@@ -31,12 +31,14 @@ export default {
       daysAgo.setDate(daysAgo.getDate() - 30);
       const timeString = daysAgo.toISOString();
 
-      const { data } = await this.googleDrive.drive().files.list({
+      const args = this.getListFilesOpts({
         q: `mimeType = "application/vnd.google-apps.folder" and modifiedTime > "${timeString}" and trashed = false`,
         fields: "files(id, mimeType)",
       });
 
-      await this.processChanges(data.files);
+      const { files } = await this.googleDrive.listFilesInPage(null, args);
+
+      await this.processChanges(files);
     },
     ...common.hooks,
   },

package/sources/new-spreadsheet/new-spreadsheet.mjs

@@ -6,7 +6,7 @@ export default {
   type: "source",
   name: "New Spreadsheet (Instant)",
   description: "Emit new event each time a new spreadsheet is created in a drive.",
-  version: "0.1.1",
+  version: "0.1.2",
   props: {
     googleDrive: newFilesInstant.props.googleDrive,
     db: newFilesInstant.props.db,