mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-11-12 15:44:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse source 
* fix: improve helper so to avoid double wrapping in json key

* fix: gmail node should now correctly output data
This commit is contained in:
Omar Ajoue 2022-09-07 16:02:48 +02:00 committed by GitHub
parent b26545d94c
commit fbd044bf87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
packages/core/src/NodeExecuteFunctions.ts
View file

@ -1309,8 +1309,13 @@ export function returnJsonArray(jsonData: IDataObject | IDataObject[]): INodeExe
jsonData = [jsonData]; jsonData = [jsonData];
} }
jsonData.forEach((data: IDataObject) => { jsonData.forEach((data: IDataObject & { json?: IDataObject }) => {
returnData.push({ json: data }); if (data.json) {
// We already have the JSON key so avoid double wrapping
returnData.push({ ...data, json: data.json });
} else {
returnData.push({ json: data });
}
}); });
return returnData; return returnData;

20
packages/nodes-base/nodes/Google/Gmail/Gmail.node.ts
View file

@ -508,7 +508,7 @@ export class Gmail implements INodeType {
}; };
} }
responseData = [nodeExecutionData]; responseData = nodeExecutionData;
} }
if (operation === 'getAll') { if (operation === 'getAll') {
const returnAll = this.getNodeParameter('returnAll', i) as boolean; const returnAll = this.getNodeParameter('returnAll', i) as boolean;
@ -734,7 +734,7 @@ export class Gmail implements INodeType {
}; };
} }
responseData = [nodeExecutionData]; responseData = nodeExecutionData;
} }
if (operation === 'delete') { if (operation === 'delete') {
// https://developers.google.com/gmail/api/v1/reference/users/drafts/delete // https://developers.google.com/gmail/api/v1/reference/users/drafts/delete
@ -818,18 +818,10 @@ export class Gmail implements INodeType {
} }
} }
let executionData = responseData as INodeExecutionData[]; const executionData = this.helpers.constructExecutionMetaData(
this.helpers.returnJsonArray(responseData),
if (!['get', 'getAll'].includes(operation) || resource === 'label') { { itemData: { item: i } },
executionData = this.helpers.constructExecutionMetaData( );
this.helpers.returnJsonArray(responseData),
{ itemData: { item: i } },
);
} else {
executionData = this.helpers.constructExecutionMetaData(executionData, {
itemData: { item: i },
});
}
returnData.push(...executionData); returnData.push(...executionData);
} catch (error) { } catch (error) {