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

fix(gmail): fix node and improve helper so to avoid double wrapping in json key #4052

Merged
merged 3 commits into from
Sep 7, 2022
Merged

fix(gmail): fix node and improve helper so to avoid double wrapping in json key #4052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76db5c6
fix: improve helper so to avoid double wrapping in json key
krynble Sep 7, 2022
b74ab04
fix: gmail node should now correctly output data
krynble Sep 7, 2022
bd109d3
fix: remove unnecessary wrap
krynble Sep 7, 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
9 changes: 7 additions & 2 deletions packages/core/src/NodeExecuteFunctions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,8 +1309,13 @@ export function returnJsonArray(jsonData: IDataObject | IDataObject[]): INodeExe
jsonData = [jsonData];
}

jsonData.forEach((data: IDataObject) => {
returnData.push({ json: data });
jsonData.forEach((data: IDataObject & { json?: IDataObject }) => {
if (data.json) {
netroy marked this conversation as resolved.
Show resolved Hide resolved
// We already have the JSON key so avoid double wrapping
returnData.push({ ...data, json: data.json });
} else {
returnData.push({ json: data });
}
});

return returnData;
Expand Down
20 changes: 6 additions & 14 deletions packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ export class Gmail implements INodeType {
};
}

responseData = [nodeExecutionData];
responseData = nodeExecutionData;
}
if (operation === 'getAll') {
const returnAll = this.getNodeParameter('returnAll', i) as boolean;
Expand Down Expand Up @@ -734,7 +734,7 @@ export class Gmail implements INodeType {
};
}

responseData = [nodeExecutionData];
responseData = nodeExecutionData;
}
if (operation === 'delete') {
// https://developers.google.com/gmail/api/v1/reference/users/drafts/delete
Expand Down Expand Up @@ -818,18 +818,10 @@ export class Gmail implements INodeType {
}
}

let executionData = responseData as INodeExecutionData[];

if (!['get', 'getAll'].includes(operation) || resource === 'label') {
executionData = this.helpers.constructExecutionMetaData(
this.helpers.returnJsonArray(responseData),
{ itemData: { item: i } },
);
} else {
executionData = this.helpers.constructExecutionMetaData(executionData, {
itemData: { item: i },
});
}
const executionData = this.helpers.constructExecutionMetaData(
this.helpers.returnJsonArray(responseData),
{ itemData: { item: i } },
);

returnData.push(...executionData);
} catch (error) {
Expand Down