Merge pull request #1 from drudge/develop

Search orders works

Author: drudge

credentials/SalesforceOcapi.credentials.ts

@@ -4,9 +4,8 @@ import {
 } from 'n8n-workflow';
 
 export class SalesforceOcapi implements ICredentialType {
-	name = 'salesfoce-ocapi';
+	name = 'salesforceOcapi';
 	displayName = 'Salesforce OpenCommerce API';
-	documentationUrl = 'salesforce';
 	properties: INodeProperties[] = [
 		{
 			displayName: 'Environment Type',
@@ -57,8 +56,8 @@ export class SalesforceOcapi implements ICredentialType {
 			displayName: 'Version',
 			name: 'version',
 			type: 'string',
-			default: '21_1',
+			default: 'v21_1',
 			required: true,
-		}
+		},
 	];
 }

nodes/SalesforceOcapi/SalesforceOcapi.node.ts

@@ -4,17 +4,15 @@ import {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
-	IRunExecutionData,
 } from 'n8n-workflow';
 import { ISalesforceOcapiCredentials } from './SalesforceOcapi.node.types';
 
 import * as ocapi from '@fye/ocapi';
 
-
 export class SalesforceOcapi implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Salesforce OpenCommerce API',
-		name: 'salesforce-ocapi',
+		name: 'salesforceOcapi',
 		group: ['salesforce', 'ocapi', 'demandware'],
 		version: 1,
 		description: 'OCAPI for Salesforce Commerce Cloud',
@@ -27,7 +25,7 @@ export class SalesforceOcapi implements INodeType {
 		outputs: ['main'],
 		credentials: [
 			{
-				name: 'salesforce-ocapi',
+				name: 'salesforceOcapi',
 				required: true,
 			},
 		],
@@ -100,7 +98,7 @@ export class SalesforceOcapi implements INodeType {
 				name: 'select',
 				type: 'string',
 				required: true,
-				default: '**',
+				default: '(**)',
 				displayOptions: {
 					show: {
 						operation: [
@@ -190,10 +188,8 @@ export class SalesforceOcapi implements INodeType {
 		],
 	};
 
-
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-
-		const credentials = (await this.getCredentials('salesforce-ocapi') as ISalesforceOcapiCredentials);
+		const credentials = (await this.getCredentials('salesforceOcapi') as ISalesforceOcapiCredentials);
 		const siteId = this.getNodeParameter('siteId', 0) as string;
 		const operation = this.getNodeParameter('operation', 0) as string;
 		const config = ocapi.getConfig({
@@ -203,32 +199,28 @@ export class SalesforceOcapi implements INodeType {
 			siteId,
 			version: credentials.version,
 		});
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
 
-		let items: INodeExecutionData[] = [];
-
-		if (operation === 'searchOrders') {
-			const select = this.getNodeParameter('select', 0, '{}') as string;	
-			const query = JSON.parse(this.getNodeParameter('query', 0) as string);	
-			for await (const hit of ocapi.searchOrders({ config, select, query })) {
-				items.push({
-					json: hit,
-				});
-			}
-		} else if ([ 'getOrder', 'getProduct' ].includes(operation)) {
-			items = this.getInputData();
-			for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-				const item: INodeExecutionData = items[itemIndex];
+		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			if (operation === 'searchOrders') {
+				const select = this.getNodeParameter('select', itemIndex, '{}') as string;	
+				const query = JSON.parse(this.getNodeParameter('query', itemIndex) as string);	
+				for await (const json of ocapi.searchOrders({ config, select, query })) {
+					returnData.push({ json });
+				}
+			} else if ([ 'getOrder', 'getProduct' ].includes(operation)) {
 				if (operation === 'getProduct') {
 					const productId = this.getNodeParameter('productId', itemIndex) as string;	
 					const expand = this.getNodeParameter('expand', itemIndex) as IDataObject & { type: '' };
-					item.json = await ocapi.getProduct(config, expand.type ? `${productId}?expand=${expand.type}` : productId);
-				} else if (operation === 'getOrder') {
-					const orderNo = this.getNodeParameter('orderNo', itemIndex) as string;	
-					item.json = await ocapi.getOrder(config, orderNo);
-				} 
+					returnData.push({ json: await ocapi.getProduct(config, expand.type ? `${productId}?expand=${expand.type}` : productId) });
+				}// } else if (operation === 'getOrder') {
+				// 	const orderNo = this.getNodeParameter('orderNo', itemIndex) as string;	
+				// 	item.json = await ocapi.getOrder(config, orderNo);
+				// } 
 			}
 		}
 
-		return this.prepareOutputData(items);
+		return this.prepareOutputData(returnData);
 	}
 }

nodes/SalesforceOcapi/SalesforceOcapi.node.types.ts

@@ -1,8 +1,8 @@
 
 export type ISalesforceOcapiCredentials = {
-    clientId: string;
-    clientSecret: string;
-    hostname: string;
-    siteId: string;
-    version: string;
+	clientId: string;
+	clientSecret: string;
+	hostname: string;
+	siteId: string;
+	version: string;
 };

package.json

@@ -1,6 +1,6 @@
 {
     "name": "n8n-nodes-salesforce-ocapi",
-    "version": "0.1.2",
+    "version": "0.3.0",
     "description": "n8n node for Salesforce Commerce Cloud using the Open Commerce API",
     "license": "MIT",
     "homepage": "https://github.com/drudge/n8n-nodes-salesforce-ocapi",