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.

Sign up for GitHub

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

Jump to bottom

bug fix: process all input items in GDrive list - N8N-3784 #3525

Merged
merged 10 commits into from
Jul 10, 2022
Merged

bug fix: process all input items in GDrive list - N8N-3784 #3525

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3b65eaf
Fix: process all input items in GDrive list
Yann-J Jun 2, 2022
213c5a3
Merge branch 'master' of https://github.com/n8n-io/n8n into pr/Yann-J…
michael-radency Jun 16, 2022
fd83d73
:zap: linter fixes
michael-radency Jun 16, 2022
a90b112
Merge branch 'master' of https://github.com/n8n-io/n8n into fix-gdriv…
michael-radency Jun 23, 2022
57739fa
:zap: added versioning
michael-radency Jun 23, 2022
324bd71
Merge branch 'master' of https://github.com/n8n-io/n8n into fix-gdriv…
michael-radency Jul 4, 2022
9d22665
:zap: fix option naming
michael-radency Jul 4, 2022
41149fb
Merge branch 'master' of https://github.com/n8n-io/n8n into fix-gdriv…
michael-radency Jul 8, 2022
bd9fd5c
:zap: removed option for choosing list operation behavior
michael-radency Jul 8, 2022
a9dc506
:zap: Improvement
RicardoE105 Jul 8, 2022
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
17 changes: 12 additions & 5 deletions packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export class GoogleDrive implements INodeType {
name: 'googleDrive',
icon: 'file:googleDrive.svg',
group: ['input'],
version: 1,
version: [1, 2],
subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
description: 'Access data on Google Drive',
defaults: {
Expand Down Expand Up @@ -475,7 +475,7 @@ export class GoogleDrive implements INodeType {
minValue: 1,
maxValue: 1000,
},
default: 100,
default: 50,
description: 'Max number of results to return',
},
{
Expand Down Expand Up @@ -951,7 +951,7 @@ export class GoogleDrive implements INodeType {
type: 'multiOptions',
options: [
{
name: '*',
name: '[All]',
value: '*',
description: 'All fields',
},
Expand Down Expand Up @@ -1404,7 +1404,7 @@ export class GoogleDrive implements INodeType {
},
options: [
{
name: '*',
name: '[All]',
value: '*',
description: 'All spaces',
},
Expand Down Expand Up @@ -2268,6 +2268,7 @@ export class GoogleDrive implements INodeType {
// Create a shallow copy of the binary data so that the old
// data references which do not get changed still stay behind
// but the incoming data does not get changed.
// @ts-ignore
Object.assign(newItem.binary, items[i].binary);
}

Expand Down Expand Up @@ -2365,7 +2366,13 @@ export class GoogleDrive implements INodeType {

const files = response!.files;

return [this.helpers.returnJsonArray(files as IDataObject[])];
const version = this.getNode().typeVersion;

if (version === 1) {
return [this.helpers.returnJsonArray(files as IDataObject[])];
} else {
returnData.push(...files);
}

} else if (operation === 'upload') {
// ----------------------------------
Expand Down