@pipedream/google_drive 0.7.3 → 0.8.0

package/actions/update-file/update-file.mjs

@@ -7,17 +7,21 @@ import {
 export default {
   key: "google_drive-update-file",
   name: "Update File",
-  description: "Update a file's metadata and/or content. [See the docs](https://developers.google.com/drive/api/v3/reference/files/update) for more information",
-  version: "0.1.4",
+  description: "Update a file's metadata and/or content. [See the documentation](https://developers.google.com/drive/api/v3/reference/files/update) for more information",
+  version: "0.1.5",
   type: "action",
   props: {
     googleDrive,
+    requiredPropsAlert: {
+      type: "alert",
+      alertType: "info",
+      content: "Either `File URL` and `File Path` should be specified.",
+    },
     drive: {
       propDefinition: [
         googleDrive,
         "watchedDrive",
       ],
-
       optional: true,
     },
     fileId: {
@@ -104,12 +108,10 @@ export default {
     },
     advanced: {
       type: "object",
-      label: "Advanced Options",
+      label: "Additional Options",
       optional: true,
       description: toSingleLineString(`
-        Specify less-common properties that you want to use. See [Files: update]
-        (https://developers.google.com/drive/api/v3/reference/files/update#request-body) for a list
-        of supported properties.
+        Any additional parameters to pass in the request. [See the documentation](https://developers.google.com/drive/api/v3/reference/files/update#request-body) for all available parameters.
       `),
     },
   },

package/actions/update-shared-drive/update-shared-drive.mjs

@@ -3,8 +3,8 @@ import googleDrive from "../../google_drive.app.mjs";
 export default {
   key: "google_drive-update-shared-drive",
   name: "Update Shared Drive",
-  description: "Update an existing shared drive. [See the docs](https://developers.google.com/drive/api/v3/reference/drives/update) for more information",
-  version: "0.1.4",
+  description: "Update an existing shared drive. [See the documentation](https://developers.google.com/drive/api/v3/reference/drives/update) for more information",
+  version: "0.1.5",
   type: "action",
   props: {
     googleDrive,
@@ -16,6 +16,7 @@ export default {
       description:
         "Select a [shared drive](https://support.google.com/a/users/answer/9310351) to update",
       default: "",
+      optional: false,
     },
     useDomainAdminAccess: {
       propDefinition: [
@@ -23,25 +24,24 @@ export default {
         "useDomainAdminAccess",
       ],
     },
+    themeId: {
+      propDefinition: [
+        googleDrive,
+        "themeId",
+      ],
+    },
     backgroundImageLink: {
       type: "string",
       label: "Background Image Link",
       description:
-        "A link to the new background image for the shared drive. Cannot be set if `Theme ID` is set in the same request.",
+        "A link to the new background image for the shared drive. Cannot be set if `Theme ID` is used (it already sets the background image).",
       optional: true,
     },
     colorRgb: {
       type: "string",
       label: "Color",
       description:
-        "The new color of this shared drive as an RGB hex string. Cannot be set if `Theme ID` is set in the same request.",
-      optional: true,
-    },
-    themeId: {
-      type: "string",
-      label: "Theme ID",
-      description:
-        "The ID of the theme from which the background image and color will be set. Cannot be set if `Color` or `Background Image Link` is set in the same request.",
+        "The new color of this shared drive as an RGB hex string. Cannot be set if `Theme ID` is used (it already sets the color).",
       optional: true,
     },
     restrictions: {

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

@@ -5,15 +5,21 @@ import {
   omitEmptyStringValues,
 } from "../../common/utils.mjs";
 import { GOOGLE_DRIVE_UPLOAD_TYPE_MULTIPART } from "../../common/constants.mjs";
+import { ConfigurationError } from "@pipedream/platform";
 
 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.6",
+  description: "Upload a file to Google Drive. [See the documentation](https://developers.google.com/drive/api/v3/manage-uploads) for more information",
+  version: "0.1.7",
   type: "action",
   props: {
     googleDrive,
+    infoAlert: {
+      type: "alert",
+      alertType: "info",
+      content: "Either `File URL` and `File Path` should be specified.",
+    },
     drive: {
       propDefinition: [
         googleDrive,
@@ -89,7 +95,7 @@ export default {
     } = this;
     let { uploadType } = this;
     if (!fileUrl && !filePath) {
-      throw new Error("One of File URL and File Path is required.");
+      throw new ConfigurationError("Either `File URL` and `File Path` should be specified.");
     }
     const driveId = this.googleDrive.getDriveId(this.drive);
 
@@ -98,7 +104,9 @@ export default {
     const file = await getFileStream({
       $,
       fileUrl,
-      filePath,
+      filePath: filePath.includes("tmp/")
+        ? filePath
+        : `/tmp/${filePath}`,
     });
     console.log(`Upload type: ${uploadType}.`);
 

package/common/commonSearchQuery.mjs

@@ -0,0 +1,48 @@
+import { ConfigurationError } from "@pipedream/platform";
+import googleDrive from "../google_drive.app.mjs";
+
+export default {
+  methods: {
+    getQuery(type, folderId) {
+      const {
+        searchQuery, nameSearchTerm,
+      } = this;
+      if (!searchQuery && !nameSearchTerm && !type) {
+        throw new ConfigurationError("You must specify a search query or name.");
+      }
+      let q = type
+        ? `mimeType = 'application/vnd.google-apps.${type}'`
+        : "";
+      if (searchQuery) {
+        q = (!q || searchQuery.includes(q))
+          ? searchQuery
+          : `${q} and ${searchQuery}`;
+      } else {
+        if (nameSearchTerm) {
+          const nameQuery = `name contains '${nameSearchTerm}'`;
+          q = q
+            ? `${q} and ${nameQuery}`
+            : nameQuery;
+        }
+        if (folderId) {
+          q = `${q} and "${folderId}" in parents`;
+        }
+      }
+      return q.trim();
+    },
+  },
+  props: {
+    nameSearchTerm: {
+      propDefinition: [
+        googleDrive,
+        "fileNameSearchTerm",
+      ],
+    },
+    searchQuery: {
+      propDefinition: [
+        googleDrive,
+        "searchQuery",
+      ],
+    },
+  },
+};

package/common/constants.mjs

@@ -163,14 +163,6 @@ const GOOGLE_DRIVE_ROLE_READER = "reader";
  * All of the available Google Drive roles granted by a permission as defined by the [Google
  * Drive API docs](https://developers.google.com/drive/api/v3/reference/permissions)
  */
-const GOOGLE_DRIVE_ROLES = [
-  GOOGLE_DRIVE_ROLE_OWNER,
-  GOOGLE_DRIVE_ROLE_ORGANIZER,
-  GOOGLE_DRIVE_ROLE_FILEORGANIZER,
-  GOOGLE_DRIVE_ROLE_WRITER,
-  GOOGLE_DRIVE_ROLE_COMMENTER,
-  GOOGLE_DRIVE_ROLE_READER,
-];
 
 const GOOGLE_DRIVE_ROLE_OPTIONS = [
   {
@@ -182,23 +174,20 @@ const GOOGLE_DRIVE_ROLE_OPTIONS = [
     value: GOOGLE_DRIVE_ROLE_COMMENTER,
   },
   {
-    label: "Reader - Can access, but can't change or share the file with others.",
+    label: "Viewer - Can access, but can't change or share the file with others.",
     value: GOOGLE_DRIVE_ROLE_READER,
   },
-  {
-    label: "(Advanced) File Owner - this will transfer ownership of the file.",
-    value: GOOGLE_DRIVE_ROLE_OWNER,
-  },
-  {
-    label: "(Advanced) File Organizar",
-    value: GOOGLE_DRIVE_ROLE_FILEORGANIZER,
-  },
-  {
-    label: "(Advanced) Organizar",
-    value: GOOGLE_DRIVE_ROLE_ORGANIZER,
-  },
 ];
 
+const GOOGLE_DRIVE_ROLE_OPTION_FILEORGANIZER = {
+  label: "(Advanced) Content Manager - add, edit, move, delete and share content",
+  value: GOOGLE_DRIVE_ROLE_FILEORGANIZER,
+};
+const GOOGLE_DRIVE_ROLE_OPTION_OWNER = {
+  label: "(Advanced) File Owner - this will transfer ownership of the file.",
+  value: GOOGLE_DRIVE_ROLE_OWNER,
+};
+
 const GOOGLE_DRIVE_GRANTEE_USER = "user";
 const GOOGLE_DRIVE_GRANTEE_GROUP = "group";
 const GOOGLE_DRIVE_GRANTEE_DOMAIN = "domain";
@@ -222,6 +211,20 @@ const GOOGLE_DRIVE_UPLOAD_TYPES = [
   GOOGLE_DRIVE_UPLOAD_TYPE_RESUMABLE,
   GOOGLE_DRIVE_UPLOAD_TYPE_MULTIPART,
 ];
+const GOOGLE_DRIVE_UPLOAD_TYPE_OPTIONS = [
+  {
+    label: "Simple upload. Upload the media only, without any metadata.",
+    value: GOOGLE_DRIVE_UPLOAD_TYPE_MEDIA,
+  },
+  {
+    label: "Resumable upload. Upload the file in a resumable fashion, using a series of at least two requests where the first request includes the metadata.",
+    value: GOOGLE_DRIVE_UPLOAD_TYPE_RESUMABLE,
+  },
+  {
+    label: "Multipart upload. Upload both the media and its metadata, in a single request.",
+    value: GOOGLE_DRIVE_UPLOAD_TYPE_MULTIPART,
+  },
+];
 
 export {
   GOOGLE_DRIVE_NOTIFICATION_SYNC,
@@ -241,6 +244,7 @@ export {
   GOOGLE_DRIVE_MIME_TYPE_PREFIX,
   GOOGLE_DRIVE_FOLDER_MIME_TYPE,
   GOOGLE_DRIVE_UPLOAD_TYPES,
+  GOOGLE_DRIVE_UPLOAD_TYPE_OPTIONS,
   // Google Drive Roles
   GOOGLE_DRIVE_ROLE_OWNER,
   GOOGLE_DRIVE_ROLE_ORGANIZER,
@@ -248,8 +252,9 @@ export {
   GOOGLE_DRIVE_ROLE_WRITER,
   GOOGLE_DRIVE_ROLE_COMMENTER,
   GOOGLE_DRIVE_ROLE_READER,
-  GOOGLE_DRIVE_ROLES,
   GOOGLE_DRIVE_ROLE_OPTIONS,
+  GOOGLE_DRIVE_ROLE_OPTION_FILEORGANIZER,
+  GOOGLE_DRIVE_ROLE_OPTION_OWNER,
   // Google Drive Grantee Types
   GOOGLE_DRIVE_GRANTEE_USER,
   GOOGLE_DRIVE_GRANTEE_GROUP,

package/google_drive.app.mjs

@@ -11,7 +11,7 @@ import {
   WEBHOOK_SUBSCRIPTION_EXPIRATION_TIME_MILLISECONDS,
   GOOGLE_DRIVE_FOLDER_MIME_TYPE,
   GOOGLE_DRIVE_GRANTEE_TYPES,
-  GOOGLE_DRIVE_UPLOAD_TYPES,
+  GOOGLE_DRIVE_UPLOAD_TYPE_OPTIONS,
   GOOGLE_DRIVE_UPDATE_TYPE_OPTIONS,
 } from "./common/constants.mjs";
 import googleMimeTypes from "./actions/google-mime-types.mjs";
@@ -40,6 +40,31 @@ export default {
         return this._listDriveOptions(nextPageToken);
       },
     },
+    sharedDrive: {
+      type: "string",
+      label: "Shared Drive",
+      description: "Select a [Shared Drive](https://support.google.com/a/users/answer/9310351) or leave blank to retrieve all available shared drives.",
+      optional: true,
+      async options({ prevContext }) {
+        const { nextPageToken } = prevContext;
+        return this._listDriveOptions(nextPageToken, false);
+      },
+    },
+    themeId: {
+      type: "string",
+      label: "Theme ID",
+      description: "The theme from which the background image and color will be set. Cannot be set if `Color` or `Background Image Link` are used.",
+      optional: true,
+      async options() {
+        const { driveThemes } = await this.getAbout("driveThemes");
+        return driveThemes?.map(({
+          id, colorRgb,
+        }) => ({
+          label: `${id} (${colorRgb})`,
+          value: id,
+        }));
+      },
+    },
     folderId: {
       type: "string",
       label: "Folder",
@@ -155,7 +180,13 @@ export default {
     fileNameSearchTerm: {
       type: "string",
       label: "Search Name",
-      description: "Enter the name of a file to search for.",
+      description: "Search for a file by name (equivalent to the query `name contains [value]`).",
+      optional: true,
+    },
+    searchQuery: {
+      type: "string",
+      label: "Search Query",
+      description: "Search for a file with a query. [See the documentation](https://developers.google.com/drive/api/guides/ref-search-terms) for more information. If specified, `Search Name` will be ignored.",
       optional: true,
     },
     mimeType: {
@@ -179,14 +210,8 @@ export default {
     uploadType: {
       type: "string",
       label: "Upload Type",
-      description: `The type of upload request to the /upload URI. If you are uploading data
-        (using an /upload URI), this field is required. If you are creating a metadata-only file,
-        this field is not required.
-        media - Simple upload. Upload the media only, without any metadata.
-        multipart - Multipart upload. Upload both the media and its metadata, in a single request.
-        resumable - Resumable upload. Upload the file in a resumable fashion, using a series of
-        at least two requests where the first request includes the metadata.`,
-      options: GOOGLE_DRIVE_UPLOAD_TYPES,
+      description: "The type of upload request to the /upload URI. Required if you are uploading data, but not if are creating a metadata-only file. [See the documentation](https://developers.google.com/drive/api/reference/rest/v2/files/update#path-parameters) for more information.",
+      options: GOOGLE_DRIVE_UPLOAD_TYPE_OPTIONS,
     },
     useDomainAdminAccess: {
       type: "boolean",
@@ -429,7 +454,7 @@ export default {
         pageToken = nextPageToken;
       }
     },
-    async _listDriveOptions(pageToken) {
+    async _listDriveOptions(pageToken, myDrive = true) {
       const {
         drives,
         nextPageToken,
@@ -440,14 +465,14 @@ export default {
       // only do this during the first page of options (i.e. when `pageToken` is
       // undefined).
       const options =
-        pageToken !== undefined
-          ? []
-          : [
+        myDrive && pageToken === undefined
+          ? [
             {
               label: "My Drive",
               value: MY_DRIVE_VALUE,
             },
-          ];
+          ]
+          : [];
       for (const d of drives) {
         options.push({
           label: d.name,
@@ -1239,7 +1264,7 @@ export default {
      */
     async createPermission(fileId, opts = {}) {
       const {
-        role = "reader",
+        role,
         type,
         domain,
         emailAddress,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pipedream/google_drive",
-  "version": "0.7.3",
+  "version": "0.8.0",
   "description": "Pipedream Google_drive Components",
   "main": "google_drive.app.mjs",
   "keywords": [

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

@@ -2,9 +2,8 @@ import cronParser from "cron-parser";
 import sampleEmit from "./test-event.mjs";
 import includes from "lodash/includes.js";
 import { v4 as uuid } from "uuid";
-
-import changesToSpecificFiles from "../changes-to-specific-files-shared-drive/changes-to-specific-files-shared-drive.mjs";
 import { MY_DRIVE_VALUE } from "../../common/constants.mjs";
+import changesToSpecificFiles from "../changes-to-specific-files-shared-drive/changes-to-specific-files-shared-drive.mjs";
 
 /**
  * This source uses the Google Drive API's
@@ -16,7 +15,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 when 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.2.0",
+  version: "0.2.1",
   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

@@ -27,7 +27,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 when a change is made to one of those files",
-  version: "0.2.0",
+  version: "0.2.1",
   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/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 when a new file is added in your linked Google Drive",
-  version: "0.1.7",
+  version: "0.1.8",
   type: "source",
   dedupe: "unique",
   props: {

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

@@ -17,7 +17,7 @@ export default {
   name: "New or Modified Comments (Instant)",
   description:
     "Emit new event when a file comment is created or modified in the selected Drive",
-  version: "0.1.7",
+  version: "0.1.8",
   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/new-or-modified-files/new-or-modified-files.mjs

@@ -24,7 +24,7 @@ export default {
   key: "google_drive-new-or-modified-files",
   name: "New or Modified Files (Instant)",
   description: "Emit new event when a file in the selected Drive is created, modified or trashed.",
-  version: "0.3.0",
+  version: "0.3.1",
   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/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 (Instant)",
   description: "Emit new event when a folder is created or modified in the selected Drive",
-  version: "0.1.5",
+  version: "0.1.6",
   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/new-shared-drive/new-shared-drive.mjs

@@ -5,7 +5,7 @@ export default {
   key: "google_drive-new-shared-drive",
   name: "New Shared Drive",
   description: "Emits a new event any time a shared drive is created.",
-  version: "0.1.4",
+  version: "0.1.5",
   type: "source",
   dedupe: "unique",
   props: {

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

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