Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(google-drive): add missing option to support team drives for duplicate file action #20

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/pieces/community/google-drive/package.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"name": "@activepieces/piece-google-drive",
"version": "0.5.19"
}
"version": "0.5.20"
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export const addPermission = createAction({
validators: [Validators.email],
description: 'The email address of the user to update permissions for',
required: true,
}),
}),
permission_name : Property.StaticDropdown({
displayName: 'Role',
description: 'The role to grant to user. See more at: https://developers.google.com/drive/api/guides/ref-roles',
Expand All @@ -46,7 +46,7 @@ export const addPermission = createAction({
label: 'Reader',
value: 'reader',
},

]
}
}),
Expand All @@ -55,7 +55,7 @@ export const addPermission = createAction({
description: 'Send an email to the user to notify them of the new permissions',
required: true,
}),

},

async run(context) {
Expand All @@ -73,7 +73,7 @@ export const addPermission = createAction({
fileId: fileId,
sendNotificationEmail: send_invitation_email
});

return result.data;
}
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { Property, createAction } from '@activepieces/pieces-framework';
import { google } from 'googleapis';
import { OAuth2Client } from 'googleapis-common';
import { googleDriveAuth } from '../../index';
import { common } from '../common';

export const duplicateFileAction = createAction({
displayName: 'Duplicate File',
Expand All @@ -24,6 +25,7 @@ export const duplicateFileAction = createAction({
description: 'The ID of the folder where the file will be duplicated',
required: true,
}),
include_team_drives: common.properties.include_team_drives,
},
async run(context) {
const authClient = new OAuth2Client();
Expand All @@ -39,6 +41,7 @@ export const duplicateFileAction = createAction({
fileId,
auth: authClient,
requestBody: { name: nameForNewFile, parents: [parentFolderId] },
supportsAllDrives: context.propsValue.include_team_drives,
});

if (response.status !== 200) {
Expand Down
245 changes: 136 additions & 109 deletions packages/pieces/community/google-drive/src/lib/common/index.ts
Original file line number Diff line number Diff line change
@@ -1,123 +1,150 @@
import { httpClient, HttpMethod, AuthenticationType, HttpRequest } from "@activepieces/pieces-common";
import { Property, OAuth2PropertyValue } from "@activepieces/pieces-framework";
import dayjs from "dayjs";
import {
httpClient,
HttpMethod,
AuthenticationType,
HttpRequest,
} from '@activepieces/pieces-common';
import { Property, OAuth2PropertyValue } from '@activepieces/pieces-framework';
import dayjs from 'dayjs';

export const common = {
properties: {
parentFolder: Property.Dropdown({
displayName: "Parent Folder",
required: false,
refreshers: ['include_team_drives'],
options: async ({ auth,include_team_drives }) => {
if (!auth) {
return {
disabled: true,
options: [],
placeholder: 'Please authenticate first'
}
}
const authProp: OAuth2PropertyValue = auth as OAuth2PropertyValue;
let folders : { id: string, name: string }[] = [];
let pageToken = null;
do{
const request: HttpRequest = {
method: HttpMethod.GET,
url: `https://www.googleapis.com/drive/v3/files`,
queryParams: {
q: "mimeType='application/vnd.google-apps.folder' and trashed = false",
includeItemsFromAllDrives: include_team_drives ? "true" : "false",
supportsAllDrives: "true"
},
authentication: {
type: AuthenticationType.BEARER_TOKEN,
token: authProp!['access_token'],
}
};
if(pageToken){
if(request.queryParams !== undefined){
request.queryParams['pageToken'] = pageToken;
}
}
try{
const response = await httpClient.sendRequest<{
files: { id: string, name: string }[],
nextPageToken: string
}>(request);
folders = folders.concat(response.body.files);
pageToken = response.body.nextPageToken;
}catch(e){
throw new Error(`Failed to get folders\nError:${e}`);
}
}while(pageToken);

return {
disabled: false,
options: folders.map((folder: { id: string, name: string }) => {
return {
label: folder.name,
value: folder.id
}
})
};
}
}),
include_team_drives: Property.Checkbox({
displayName: 'Include Team Drives',
description: 'Determines if folders from Team Drives should be included in the results.',
defaultValue: false,
required: false,
})
},

async getFiles(auth: OAuth2PropertyValue, search?: {
parent?: string,
createdTime?: string | number | Date,
createdTimeOp?: string
}, order?: string) {
const q: string[] = [];
if (search?.parent) q.push(`'${search.parent}' in parents`);
if (search?.createdTime) q.push(`createdTime ${search.createdTimeOp ?? '>'} '${dayjs(search.createdTime).format()}'`);
q.push(`trashed = false`)
const response = await httpClient.sendRequest<{ files: { id: string, name: string }[] }>({
properties: {
parentFolder: Property.Dropdown({
displayName: 'Parent Folder',
required: false,
refreshers: ['include_team_drives'],
options: async ({ auth, include_team_drives }) => {
if (!auth) {
return {
disabled: true,
options: [],
placeholder: 'Please authenticate first',
};
}
const authProp: OAuth2PropertyValue = auth as OAuth2PropertyValue;
let folders: { id: string; name: string }[] = [];
let pageToken = null;
do {
const request: HttpRequest = {
method: HttpMethod.GET,
url: `https://www.googleapis.com/drive/v3/files`,
queryParams: {
q: q.join(' and '),
fields: 'files(id, name, mimeType, webViewLink, kind)',
orderBy: order ?? 'createdTime asc'
q: "mimeType='application/vnd.google-apps.folder' and trashed = false",
includeItemsFromAllDrives: include_team_drives ? 'true' : 'false',
supportsAllDrives: 'true',
},
authentication: {
type: AuthenticationType.BEARER_TOKEN,
token: auth.access_token,
type: AuthenticationType.BEARER_TOKEN,
token: authProp!['access_token'],
},
};
if (pageToken) {
if (request.queryParams !== undefined) {
request.queryParams['pageToken'] = pageToken;
}
});
}
try {
const response = await httpClient.sendRequest<{
files: { id: string; name: string }[];
nextPageToken: string;
}>(request);
folders = folders.concat(response.body.files);
pageToken = response.body.nextPageToken;
} catch (e) {
throw new Error(`Failed to get folders\nError:${e}`);
}
} while (pageToken);

return {
disabled: false,
options: folders.map((folder: { id: string; name: string }) => {
return {
label: folder.name,
value: folder.id,
};
}),
};
},
}),
include_team_drives: Property.Checkbox({
displayName: 'Include Team Drives',
description:
'Determines if folders from Team Drives should be included in the results.',
defaultValue: false,
required: false,
}),
},

return response.body.files;
async getFiles(
auth: OAuth2PropertyValue,
search?: {
parent?: string;
createdTime?: string | number | Date;
createdTimeOp?: string;
},
order?: string
) {
const q: string[] = [];
if (search?.parent) q.push(`'${search.parent}' in parents`);
if (search?.createdTime)
q.push(
`createdTime ${search.createdTimeOp ?? '>'} '${dayjs(
search.createdTime
).format()}'`
);
q.push(`trashed = false`);
const response = await httpClient.sendRequest<{
files: { id: string; name: string }[];
}>({
method: HttpMethod.GET,
url: `https://www.googleapis.com/drive/v3/files`,
queryParams: {
q: q.join(' and '),
fields: 'files(id, name, mimeType, webViewLink, kind)',
orderBy: order ?? 'createdTime asc',
},
authentication: {
type: AuthenticationType.BEARER_TOKEN,
token: auth.access_token,
},
});

async getFolders(auth: OAuth2PropertyValue, search?: {
parent?: string,
createdTime?: string | number | Date,
createdTimeOp?: string
}, order?: string) {
const q: string[] = [`mimeType='application/vnd.google-apps.folder'`];
if (search?.parent) q.push(`'${search.parent}' in parents`);
if (search?.createdTime) q.push(`createdTime ${search.createdTimeOp ?? '>'} '${dayjs(search.createdTime).format()}'`);
q.push(`trashed = false`)
const response = await httpClient.sendRequest<{ files: { id: string, name: string }[] }>({
method: HttpMethod.GET,
url: `https://www.googleapis.com/drive/v3/files`,
queryParams: {
q: q.join(' and '),
orderBy: order ?? 'createdTime asc'
},
authentication: {
type: AuthenticationType.BEARER_TOKEN,
token: auth.access_token,
}
});
return response.body.files;
},

return response.body.files;
async getFolders(
auth: OAuth2PropertyValue,
search?: {
parent?: string;
createdTime?: string | number | Date;
createdTimeOp?: string;
},
order?: string
) {
const q: string[] = [`mimeType='application/vnd.google-apps.folder'`];
if (search?.parent) q.push(`'${search.parent}' in parents`);
if (search?.createdTime)
q.push(
`createdTime ${search.createdTimeOp ?? '>'} '${dayjs(
search.createdTime
).format()}'`
);
q.push(`trashed = false`);
const response = await httpClient.sendRequest<{
files: { id: string; name: string }[];
}>({
method: HttpMethod.GET,
url: `https://www.googleapis.com/drive/v3/files`,
queryParams: {
q: q.join(' and '),
orderBy: order ?? 'createdTime asc',
},
authentication: {
type: AuthenticationType.BEARER_TOKEN,
token: auth.access_token,
},
});

}
return response.body.files;
},
};
Loading