fix: remove duplicate wrap of paired item data (#4001)

* fix: remove duplicate wrap of paired item data and adding where missing for other nodes
n8n-io · Sep 1, 2022 · 54efe20 · 54efe20
1 parent c8743ff
commit 54efe20
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 148 deletions.
diff --git a/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts b/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
@@ -1367,10 +1367,6 @@ export class Hubspot implements INodeType {
 								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
 								responseData = responseData.contacts;
 							}
-							responseData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
-								{ itemData: { item: i } },
-							);
 						}
 						//https://developers.hubspot.com/docs/methods/contacts/get_recently_created_contacts
 						if (operation === 'getRecentlyCreatedUpdated') {
@@ -1406,10 +1402,6 @@ export class Hubspot implements INodeType {
 								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
 								responseData = responseData.contacts;
 							}
-							responseData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
-								{ itemData: { item: i } },
-							);
 						}
 						//https://developers.hubspot.com/docs/methods/contacts/delete_contact
 						if (operation === 'delete') {
@@ -1470,10 +1462,6 @@ export class Hubspot implements INodeType {
 								responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body, qs);
 								responseData = responseData.results;
 							}
-							responseData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
-								{ itemData: { item: i } },
-							);
 						}
 					}
 					//https://developers.hubspot.com/docs/methods/companies/companies-overview
@@ -1968,10 +1956,6 @@ export class Hubspot implements INodeType {
 								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
 								responseData = responseData.companies;
 							}
-							responseData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
-								{ itemData: { item: i } },
-							);
 						}
 						//https://developers.hubspot.com/docs/methods/companies/get_companies_modified
 						if (operation === 'getRecentlyCreated' || operation === 'getRecentlyModified') {
@@ -2000,10 +1984,6 @@ export class Hubspot implements INodeType {
 								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
 								responseData = responseData.results;
 							}
-							responseData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
-								{ itemData: { item: i } },
-							);
 						}
 						//https://developers.hubspot.com/docs/methods/companies/search_companies_by_domain
 						if (operation === 'searchByDomain') {
@@ -2030,10 +2010,6 @@ export class Hubspot implements INodeType {
 								responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body);
 								responseData = responseData.results;
 							}
-							responseData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
-								{ itemData: { item: i } },
-							);
 						}
 						//https://developers.hubspot.com/docs/methods/companies/delete_company
 						if (operation === 'delete') {
@@ -2218,10 +2194,6 @@ export class Hubspot implements INodeType {
 								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
 								responseData = responseData.deals;
 							}
-							responseData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
-								{ itemData: { item: i } },
-							);
 						}
 						if (operation === 'getRecentlyCreated' || operation === 'getRecentlyModified') {
 							let endpoint;
@@ -2252,10 +2224,6 @@ export class Hubspot implements INodeType {
 								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
 								responseData = responseData.results;
 							}
-							responseData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
-								{ itemData: { item: i } },
-							);
 						}
 						if (operation === 'delete') {
 							const dealId = this.getNodeParameter('dealId', i) as string;
@@ -2315,10 +2283,6 @@ export class Hubspot implements INodeType {
 								responseData = await hubspotApiRequest.call(this, 'POST', endpoint, body, qs);
 								responseData = responseData.results;
 							}
-							responseData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
-								{ itemData: { item: i } },
-							);
 						}
 					}
 					if (resource === 'engagement') {
@@ -2405,10 +2369,6 @@ export class Hubspot implements INodeType {
 								responseData = await hubspotApiRequest.call(this, 'GET', endpoint, {}, qs);
 								responseData = responseData.results;
 							}
-							responseData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
-								{ itemData: { item: i } },
-							);
 						}
 					}
 					//https://developers.hubspot.com/docs/methods/forms/forms_overview

diff --git a/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts b/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
@@ -492,10 +492,12 @@ export class NotionV2 implements INodeType {
 					if (simple === true) {
 						responseData = simplifyObjects(responseData, download);
 					}
-					returnData.push.apply(
-						returnData,
-						Array.isArray(responseData) ? responseData : [responseData],
+
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData),
+						{ itemData: { item: i } },
 					);
+					returnData.push(...executionData);
 				}
 			}
 
@@ -567,7 +569,12 @@ export class NotionV2 implements INodeType {
 					if (simple === true) {
 						responseData = simplifyObjects(responseData, download);
 					}
-					returnData.push.apply(returnData, responseData);
+
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 				}
 			}
 
@@ -591,10 +598,12 @@ export class NotionV2 implements INodeType {
 					if (simple === true) {
 						responseData = simplifyObjects(responseData, false);
 					}
-					returnData.push.apply(
-						returnData,
-						Array.isArray(responseData) ? responseData : [responseData],
+
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData),
+						{ itemData: { item: i } },
 					);
+					returnData.push(...executionData);
 				}
 			}
 		}

diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
@@ -186,7 +186,7 @@ export async function pgQueryV2(
 
 	const mode = overrideMode ? overrideMode : ((additionalFields.mode ?? 'multiple') as string);
 	if (mode === 'multiple') {
-		(await db.multi(pgp.helpers.concat(allQueries)))
+		return (await db.multi(pgp.helpers.concat(allQueries)))
 			.map((result, i) => {
 				return this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray([...result]), {
 					itemData: { item: i },

diff --git a/packages/nodes-base/nodes/Webflow/Webflow.node.ts b/packages/nodes-base/nodes/Webflow/Webflow.node.ts
@@ -239,10 +239,6 @@ export class Webflow implements INodeType {
 							);
 							responseData = responseData.items;
 						}
-						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
-							{ itemData: { item: i } },
-						);
 					} else if (operation === 'update') {
 						// ----------------------------------
 						//         item: update

diff --git a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
@@ -208,10 +208,6 @@ export class WooCommerce implements INodeType {
 						qs.per_page = this.getNodeParameter('limit', i) as number;
 						responseData = await woocommerceApiRequest.call(this, 'GET', '/customers', {}, qs);
 					}
-					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
-						{ itemData: { item: i } },
-					);
 				} else if (operation === 'update') {
 					// ----------------------------------------
 					//             customer: update
@@ -373,10 +369,6 @@ export class WooCommerce implements INodeType {
 						qs.per_page = this.getNodeParameter('limit', i) as number;
 						responseData = await woocommerceApiRequest.call(this, 'GET', '/products', {}, qs);
 					}
-					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
-						{ itemData: { item: i } },
-					);
 				}
 				//https://woocommerce.github.io/woocommerce-rest-api-docs/#delete-a-product
 				if (operation === 'delete') {
@@ -576,10 +568,6 @@ export class WooCommerce implements INodeType {
 						qs.per_page = this.getNodeParameter('limit', i) as number;
 						responseData = await woocommerceApiRequest.call(this, 'GET', '/orders', {}, qs);
 					}
-					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
-						{ itemData: { item: i } },
-					);
 				}
 				//https://woocommerce.github.io/woocommerce-rest-api-docs/#delete-an-order
 				if (operation === 'delete') {

diff --git a/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts b/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
@@ -288,10 +288,6 @@ export class Wordpress implements INodeType {
 							qs.per_page = this.getNodeParameter('limit', i) as number;
 							responseData = await wordpressApiRequest.call(this, 'GET', '/posts', {}, qs);
 						}
-						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
-							{ itemData: { item: i } },
-						);
 					}
 					//https://developer.wordpress.org/rest-api/reference/posts/#delete-a-post
 					if (operation === 'delete') {
@@ -414,10 +410,6 @@ export class Wordpress implements INodeType {
 							qs.per_page = this.getNodeParameter('limit', i) as number;
 							responseData = await wordpressApiRequest.call(this, 'GET', '/users', {}, qs);
 						}
-						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
-							{ itemData: { item: i } },
-						);
 					}
 					//https://developer.wordpress.org/rest-api/reference/users/#delete-a-user
 					if (operation === 'delete') {

diff --git a/packages/nodes-base/nodes/Xero/Xero.node.ts b/packages/nodes-base/nodes/Xero/Xero.node.ts
@@ -456,10 +456,6 @@ export class Xero implements INodeType {
 							responseData = responseData.Invoices;
 							responseData = responseData.splice(0, limit);
 						}
-						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
-							{ itemData: { item: i } },
-						);
 					}
 				}
 				if (resource === 'contact') {
@@ -613,10 +609,6 @@ export class Xero implements INodeType {
 							responseData = responseData.Contacts;
 							responseData = responseData.splice(0, limit);
 						}
-						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
-							{ itemData: { item: i } },
-						);
 					}
 					if (operation === 'update') {
 						const organizationId = this.getNodeParameter('organizationId', i) as string;

diff --git a/packages/nodes-base/nodes/Zammad/Zammad.node.ts b/packages/nodes-base/nodes/Zammad/Zammad.node.ts
@@ -651,10 +651,6 @@ export class Zammad implements INodeType {
 							{},
 							limit,
 						);
-						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
-							{ itemData: { item: i } },
-						);
 					}
 				} else if (resource === 'ticket') {
 					// **********************************************************************

diff --git a/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts b/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
@@ -455,10 +455,6 @@ export class Zendesk implements INodeType {
 							responseData = await zendeskApiRequest.call(this, 'GET', endpoint, {}, qs);
 							responseData = responseData.results || responseData.suspended_tickets;
 						}
-						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
-							{ itemData: { item: i } },
-						);
 					}
 					//https://developer.zendesk.com/rest_api/docs/support/tickets#delete-ticket
 					//https://developer.zendesk.com/api-reference/ticketing/tickets/suspended_tickets/#delete-suspended-ticket
@@ -524,10 +520,6 @@ export class Zendesk implements INodeType {
 							);
 							responseData = responseData.slice(0, limit);
 						}
-						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
-							{ itemData: { item: i } },
-						);
 					}
 				}
 				//https://developer.zendesk.com/api-reference/ticketing/users/users/
@@ -613,10 +605,6 @@ export class Zendesk implements INodeType {
 							responseData = await zendeskApiRequest.call(this, 'GET', `/users`, {}, qs);
 							responseData = responseData.users;
 						}
-						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
-							{ itemData: { item: i } },
-						);
 					}
 					//https://developer.zendesk.com/api-reference/ticketing/organizations/organizations/#list-organizations
 					if (operation === 'getOrganizations') {
@@ -651,10 +639,6 @@ export class Zendesk implements INodeType {
 							responseData = await zendeskApiRequest.call(this, 'GET', `/users/search`, {}, qs);
 							responseData = responseData.users;
 						}
-						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
-							{ itemData: { item: i } },
-						);
 					}
 					//https://developer.zendesk.com/api-reference/ticketing/users/users/#delete-user
 					if (operation === 'delete') {
@@ -754,10 +738,6 @@ export class Zendesk implements INodeType {
 							responseData = await zendeskApiRequest.call(this, 'GET', `/organizations`, {}, qs);
 							responseData = responseData.organizations;
 						}
-						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
-							{ itemData: { item: i } },
-						);
 					}
 					//https://developer.zendesk.com/api-reference/ticketing/organizations/organizations/#show-organizations-related-information
 					if (operation === 'getRelatedData') {