diff --git a/packages/backend/src/apps/google-drive/dynamic-data/list-folders/index.ts b/packages/backend/src/apps/google-drive/dynamic-data/list-folders/index.ts index e5ffc5c4..7d6a2906 100644 --- a/packages/backend/src/apps/google-drive/dynamic-data/list-folders/index.ts +++ b/packages/backend/src/apps/google-drive/dynamic-data/list-folders/index.ts @@ -11,13 +11,19 @@ export default { data: [], }; - const params = { + const params: Record = { q: `mimeType='application/vnd.google-apps.folder'`, orderBy: 'createdTime desc', pageToken: undefined as unknown as string, pageSize: 1000, + driveId: $.step.parameters.driveId, + supportsAllDrives: true, }; + if ($.step.parameters.driveId) { + params.includeItemsFromAllDrives = true; + } + do { const { data } = await $.http.get( `https://www.googleapis.com/drive/v3/files`, diff --git a/packages/backend/src/apps/google-drive/triggers/new-files-in-folder/index.ts b/packages/backend/src/apps/google-drive/triggers/new-files-in-folder/index.ts index 85c2dc56..2c02699a 100644 --- a/packages/backend/src/apps/google-drive/triggers/new-files-in-folder/index.ts +++ b/packages/backend/src/apps/google-drive/triggers/new-files-in-folder/index.ts @@ -32,6 +32,7 @@ export default defineTrigger({ key: 'folderId', type: 'dropdown' as const, required: false, + dependsOn: ['parameters.driveId'], description: 'Check a specific folder for new files. Please note: new files added to subfolders inside the folder you choose here will NOT trigger this flow. Defaults to the top-level folder if none is picked.', variables: false, @@ -43,6 +44,10 @@ export default defineTrigger({ name: 'key', value: 'listFolders', }, + { + name: 'parameters.driveId', + value: '{parameters.driveId}', + }, ], }, }, diff --git a/packages/backend/src/apps/google-drive/triggers/new-files-in-folder/new-files-in-folder.ts b/packages/backend/src/apps/google-drive/triggers/new-files-in-folder/new-files-in-folder.ts index c8465864..97152441 100644 --- a/packages/backend/src/apps/google-drive/triggers/new-files-in-folder/new-files-in-folder.ts +++ b/packages/backend/src/apps/google-drive/triggers/new-files-in-folder/new-files-in-folder.ts @@ -7,15 +7,20 @@ const newFilesInFolder = async ($: IGlobalVariable) => { } else { q += ` and parents in 'root'`; } - const params = { + const params: Record = { pageToken: undefined as unknown as string, orderBy: 'createdTime desc', fields: '*', pageSize: 1000, q, driveId: $.step.parameters.driveId, + supportsAllDrives: true, }; + if ($.step.parameters.driveId) { + params.includeItemsFromAllDrives = true; + } + do { const { data } = await $.http.get(`/v3/files`, { params }); params.pageToken = data.nextPageToken; diff --git a/packages/backend/src/apps/google-drive/triggers/new-files/new-files.ts b/packages/backend/src/apps/google-drive/triggers/new-files/new-files.ts index 82d8c074..911223f1 100644 --- a/packages/backend/src/apps/google-drive/triggers/new-files/new-files.ts +++ b/packages/backend/src/apps/google-drive/triggers/new-files/new-files.ts @@ -1,15 +1,20 @@ import { IGlobalVariable } from '@automatisch/types'; const newFiles = async ($: IGlobalVariable) => { - const params = { + const params: Record = { pageToken: undefined as unknown as string, orderBy: 'createdTime desc', fields: '*', pageSize: 1000, q: `mimeType!='application/vnd.google-apps.folder'`, driveId: $.step.parameters.driveId, + supportsAllDrives: true, }; + if ($.step.parameters.driveId) { + params.includeItemsFromAllDrives = true; + } + do { const { data } = await $.http.get('/v3/files', { params }); params.pageToken = data.nextPageToken; diff --git a/packages/backend/src/apps/google-drive/triggers/new-folders/index.ts b/packages/backend/src/apps/google-drive/triggers/new-folders/index.ts index 210ebcc5..56043ed5 100644 --- a/packages/backend/src/apps/google-drive/triggers/new-folders/index.ts +++ b/packages/backend/src/apps/google-drive/triggers/new-folders/index.ts @@ -32,6 +32,7 @@ export default defineTrigger({ key: 'folderId', type: 'dropdown' as const, required: false, + dependsOn: ['parameters.driveId'], description: 'Check a specific folder for new subfolders. Please note: new folders added to subfolders inside the folder you choose here will NOT trigger this flow. Defaults to the top-level folder if none is picked.', variables: false, @@ -43,6 +44,10 @@ export default defineTrigger({ name: 'key', value: 'listFolders', }, + { + name: 'parameters.driveId', + value: '{parameters.driveId}', + }, ], }, }, diff --git a/packages/backend/src/apps/google-drive/triggers/new-folders/new-folders.ts b/packages/backend/src/apps/google-drive/triggers/new-folders/new-folders.ts index 908ca73c..f502605a 100644 --- a/packages/backend/src/apps/google-drive/triggers/new-folders/new-folders.ts +++ b/packages/backend/src/apps/google-drive/triggers/new-folders/new-folders.ts @@ -8,15 +8,20 @@ const newFolders = async ($: IGlobalVariable) => { q += ` and parents in 'root'`; } - const params = { + const params: Record = { pageToken: undefined as unknown as string, orderBy: 'createdTime desc', fields: '*', pageSize: 1000, q, driveId: $.step.parameters.driveId, + supportsAllDrives: true, }; + if ($.step.parameters.driveId) { + params.includeItemsFromAllDrives = true; + } + do { const { data } = await $.http.get(`/v3/files`, { params }); params.pageToken = data.nextPageToken; diff --git a/packages/backend/src/apps/google-drive/triggers/updated-files/index.ts b/packages/backend/src/apps/google-drive/triggers/updated-files/index.ts index 2147819b..93ebece3 100644 --- a/packages/backend/src/apps/google-drive/triggers/updated-files/index.ts +++ b/packages/backend/src/apps/google-drive/triggers/updated-files/index.ts @@ -32,6 +32,7 @@ export default defineTrigger({ key: 'folderId', type: 'dropdown' as const, required: false, + dependsOn: ['parameters.driveId'], description: 'Check a specific folder for updated files. Please note: files located in subfolders of the folder you choose here will NOT trigger this flow. Defaults to the top-level folder if none is picked.', source: { @@ -42,6 +43,10 @@ export default defineTrigger({ name: 'key', value: 'listFolders', }, + { + name: 'parameters.driveId', + value: '{parameters.driveId}', + }, ], }, }, diff --git a/packages/backend/src/apps/google-drive/triggers/updated-files/updated-files.ts b/packages/backend/src/apps/google-drive/triggers/updated-files/updated-files.ts index d68f886c..7ff4b2bb 100644 --- a/packages/backend/src/apps/google-drive/triggers/updated-files/updated-files.ts +++ b/packages/backend/src/apps/google-drive/triggers/updated-files/updated-files.ts @@ -12,15 +12,20 @@ const updatedFiles = async ($: IGlobalVariable) => { q += ` and parents in 'root'`; } - const params = { + const params: Record = { pageToken: undefined as unknown as string, orderBy: 'modifiedTime desc', fields: '*', pageSize: 1000, q, driveId: $.step.parameters.driveId, + supportsAllDrives: true, }; + if ($.step.parameters.driveId) { + params.includeItemsFromAllDrives = true; + } + do { const { data } = await $.http.get(`/v3/files`, { params }); params.pageToken = data.nextPageToken; diff --git a/packages/backend/src/apps/google-sheets/dynamic-data/list-spreadsheets/index.ts b/packages/backend/src/apps/google-sheets/dynamic-data/list-spreadsheets/index.ts index 7fb644a2..5b322c07 100644 --- a/packages/backend/src/apps/google-sheets/dynamic-data/list-spreadsheets/index.ts +++ b/packages/backend/src/apps/google-sheets/dynamic-data/list-spreadsheets/index.ts @@ -16,9 +16,14 @@ export default { pageSize: 100, pageToken: undefined as unknown as string, orderBy: 'createdTime desc', - driveId: $.step.parameters.driveId + driveId: $.step.parameters.driveId, + supportsAllDrives: true, }; + if ($.step.parameters.driveId) { + params.includeItemsFromAllDrives = true; + } + do { const { data } = await $.http.get( `https://www.googleapis.com/drive/v3/files`, diff --git a/packages/backend/src/apps/google-sheets/triggers/new-spreadsheets/new-spreadsheets.ts b/packages/backend/src/apps/google-sheets/triggers/new-spreadsheets/new-spreadsheets.ts index e054beb7..bfcd47cc 100644 --- a/packages/backend/src/apps/google-sheets/triggers/new-spreadsheets/new-spreadsheets.ts +++ b/packages/backend/src/apps/google-sheets/triggers/new-spreadsheets/new-spreadsheets.ts @@ -1,15 +1,20 @@ import { IGlobalVariable } from '@automatisch/types'; const newSpreadsheets = async ($: IGlobalVariable) => { - const params = { + const params: Record = { pageToken: undefined as unknown as string, orderBy: 'createdTime desc', q: `mimeType='application/vnd.google-apps.spreadsheet'`, fields: '*', pageSize: 1000, driveId: $.step.parameters.driveId, + supportsAllDrives: true, }; + if ($.step.parameters.driveId) { + params.includeItemsFromAllDrives = true; + } + do { const { data } = await $.http.get( 'https://www.googleapis.com/drive/v3/files',