From 3fd4884667b167d4773001efb8cc2406328a6113 Mon Sep 17 00:00:00 2001 From: ricardo Date: Sun, 15 Mar 2020 19:51:31 -0400 Subject: [PATCH 1/6] :sparkles: Microsoft Excel node --- packages/cli/src/Server.ts | 4 +- .../MicrosoftOAuth2Api.credentials.ts | 45 ++ .../nodes/Microsoft/GenericFunctions.ts | 73 +++ .../nodes/Microsoft/MicrosoftExcel.node.ts | 335 +++++++++++++ .../nodes/Microsoft/TableDescription.ts | 447 ++++++++++++++++++ .../nodes/Microsoft/WorkbookDescription.ts | 154 ++++++ .../nodes/Microsoft/WorksheetDescription.ts | 283 +++++++++++ packages/nodes-base/nodes/Microsoft/excel.png | Bin 0 -> 5984 bytes packages/nodes-base/package.json | 6 +- 9 files changed, 1344 insertions(+), 3 deletions(-) create mode 100644 packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts create mode 100644 packages/nodes-base/nodes/Microsoft/GenericFunctions.ts create mode 100644 packages/nodes-base/nodes/Microsoft/MicrosoftExcel.node.ts create mode 100644 packages/nodes-base/nodes/Microsoft/TableDescription.ts create mode 100644 packages/nodes-base/nodes/Microsoft/WorkbookDescription.ts create mode 100644 packages/nodes-base/nodes/Microsoft/WorksheetDescription.ts create mode 100644 packages/nodes-base/nodes/Microsoft/excel.png diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts index 4fe1ef70d7..5a1c0703bf 100644 --- a/packages/cli/src/Server.ts +++ b/packages/cli/src/Server.ts @@ -203,7 +203,9 @@ class App { }); } - jwt.verify(token, getKey, {}, (err: Error, decoded: string) => { + jwt.verify(token, getKey, {}, (err: Error, + //decoded: string + ) => { if (err) return ResponseHelper.jwtAuthAuthorizationError(res, "Invalid token"); next(); diff --git a/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts new file mode 100644 index 0000000000..2519ba583b --- /dev/null +++ b/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts @@ -0,0 +1,45 @@ +import { + ICredentialType, + NodePropertyTypes, +} from 'n8n-workflow'; + +export class MicrosoftOAuth2Api implements ICredentialType { + name = 'microsoftOAuth2Api'; + extends = [ + 'oAuth2Api', + ]; + displayName = 'Microsoft OAuth2 API'; + properties = [ + { + displayName: 'Authorization URL', + name: 'authUrl', + type: 'string' as NodePropertyTypes, + default: 'https://login.microsoftonline.com/{yourtenantid}/oauth2/v2.0/authorize', + }, + { + displayName: 'Access Token URL', + name: 'accessTokenUrl', + type: 'string' as NodePropertyTypes, + default: 'https://login.microsoftonline.com/{yourtenantid}/oauth2/v2.0/token', + }, + //https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-permissions-and-consent + { + displayName: 'Scope', + name: 'scope', + type: 'hidden' as NodePropertyTypes, + default: 'openid offline_access Files.ReadWrite', + }, + { + displayName: 'Auth URI Query Parameters', + name: 'authQueryParameters', + type: 'hidden' as NodePropertyTypes, + default: 'response_mode=query', + }, + { + displayName: 'Authentication', + name: 'authentication', + type: 'hidden' as NodePropertyTypes, + default: 'body', + }, + ]; +} diff --git a/packages/nodes-base/nodes/Microsoft/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/GenericFunctions.ts new file mode 100644 index 0000000000..b4f68be343 --- /dev/null +++ b/packages/nodes-base/nodes/Microsoft/GenericFunctions.ts @@ -0,0 +1,73 @@ +import { OptionsWithUri } from 'request'; +import { + IExecuteFunctions, + IExecuteSingleFunctions, + ILoadOptionsFunctions, +} from 'n8n-core'; +import { + IDataObject +} from 'n8n-workflow'; + +export async function microsoftApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, headers: IDataObject = {}): Promise { // tslint:disable-line:no-any + const options: OptionsWithUri = { + headers: { + 'Content-Type': 'application/json', + }, + method, + body, + qs, + uri: uri || `https://graph.microsoft.com/v1.0/me${resource}`, + json: true + }; + try { + if (Object.keys(headers).length !== 0) { + options.headers = Object.assign({}, options.headers, headers); + } + //@ts-ignore + return await this.helpers.requestOAuth.call(this, 'microsoftOAuth2Api', options); + } catch (error) { + if (error.response && error.response.body && error.response.body.error && error.response.body.error.message) { + // Try to return the error prettier + throw new Error(`Microsoft error response [${error.statusCode}]: ${error.response.body.error.message}`); + } + throw error; + } +} + +export async function microsoftApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string ,method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise { // tslint:disable-line:no-any + + const returnData: IDataObject[] = []; + + let responseData; + let uri: string | undefined; + query['$top'] = 100; + + do { + responseData = await microsoftApiRequest.call(this, method, endpoint, body, query, uri); + uri = responseData['@odata.nextLink']; + returnData.push.apply(returnData, responseData[propertyName]); + } while ( + responseData['@odata.nextLink'] !== undefined + ); + + return returnData; +} + +export async function microsoftApiRequestAllItemsSkip(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string ,method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise { // tslint:disable-line:no-any + + const returnData: IDataObject[] = []; + + let responseData; + query['$top'] = 100; + query['$skip'] = 0; + + do { + responseData = await microsoftApiRequest.call(this, method, endpoint, body, query); + query['$skip'] += query['$top']; + returnData.push.apply(returnData, responseData[propertyName]); + } while ( + responseData['value'].length !== 0 + ); + + return returnData; +} diff --git a/packages/nodes-base/nodes/Microsoft/MicrosoftExcel.node.ts b/packages/nodes-base/nodes/Microsoft/MicrosoftExcel.node.ts new file mode 100644 index 0000000000..c62730449d --- /dev/null +++ b/packages/nodes-base/nodes/Microsoft/MicrosoftExcel.node.ts @@ -0,0 +1,335 @@ +import { + IExecuteFunctions, +} from 'n8n-core'; + +import { + IDataObject, + INodeExecutionData, + INodeTypeDescription, + INodeType, + ILoadOptionsFunctions, + INodePropertyOptions, +} from 'n8n-workflow'; + +import { + microsoftApiRequest, + microsoftApiRequestAllItems, + microsoftApiRequestAllItemsSkip, +} from './GenericFunctions'; + +import { + workbookOperations, + workbookFields, +} from './WorkbookDescription'; + +import { + worksheetOperations, + worksheetFields, +} from './WorksheetDescription'; + +import { + tableOperations, + tableFields, +} from './TableDescription'; + +export class MicrosoftExcel implements INodeType { + description: INodeTypeDescription = { + displayName: 'Microsoft Excel', + name: 'microsoftExcel', + icon: 'file:excel.png', + group: ['input'], + version: 1, + subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}', + description: 'Consume Microsoft Excel API.', + defaults: { + name: 'Microsoft Excel', + color: '#1c6d40', + }, + inputs: ['main'], + outputs: ['main'], + credentials: [ + { + name: 'microsoftOAuth2Api', + required: true, + }, + ], + properties: [ + { + displayName: 'Resource', + name: 'resource', + type: 'options', + options: [ + { + name: 'Table', + value: 'table', + description: 'Represents an Excel table.', + }, + { + name: 'Workbook', + value: 'workbook', + description: 'Workbook is the top level object which contains related workbook objects such as worksheets, tables, ranges, etc.', + }, + { + name: 'Worksheet', + value: 'worksheet', + description: 'An Excel worksheet is a grid of cells. It can contain data, tables, charts, etc.', + }, + ], + default: 'workbook', + description: 'The resource to operate on.', + }, + ...workbookOperations, + ...workbookFields, + ...worksheetOperations, + ...worksheetFields, + ...tableOperations, + ...tableFields, + ], + }; + + methods = { + loadOptions: { + // Get all the workbooks to display them to user so that he can + // select them easily + async getWorkbooks(this: ILoadOptionsFunctions): Promise { + const qs: IDataObject = { + select: 'id,name', + }; + const returnData: INodePropertyOptions[] = []; + const workbooks = await microsoftApiRequestAllItems.call(this, 'value', 'GET', `/drive/root/search(q='.xlsx')`, {}, qs); + for (const workbook of workbooks) { + const workbookName = workbook.name; + const workbookId = workbook.id; + returnData.push({ + name: workbookName, + value: workbookId, + }); + } + return returnData; + }, + // Get all the worksheets to display them to user so that he can + // select them easily + async getworksheets(this: ILoadOptionsFunctions): Promise { + const workbookId = this.getCurrentNodeParameter('workbook'); + const qs: IDataObject = { + select: 'id,name', + }; + const returnData: INodePropertyOptions[] = []; + const worksheets = await microsoftApiRequestAllItems.call(this, 'value', 'GET', `/drive/items/${workbookId}/workbook/worksheets`, {}, qs); + for (const worksheet of worksheets) { + const worksheetName = worksheet.name; + const worksheetId = worksheet.id; + returnData.push({ + name: worksheetName, + value: worksheetId, + }); + } + return returnData; + }, + // Get all the tables to display them to user so that he can + // select them easily + async getTables(this: ILoadOptionsFunctions): Promise { + const workbookId = this.getCurrentNodeParameter('workbook'); + const worksheetId = this.getCurrentNodeParameter('worksheet'); + const qs: IDataObject = { + select: 'id,name', + }; + const returnData: INodePropertyOptions[] = []; + const tables = await microsoftApiRequestAllItems.call(this, 'value', 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables`, {}, qs); + for (const table of tables) { + const tableName = table.name; + const tableId = table.id; + returnData.push({ + name: tableName, + value: tableId, + }); + } + return returnData; + }, + } + }; + + async execute(this: IExecuteFunctions): Promise { + const items = this.getInputData(); + const returnData: IDataObject[] = []; + const length = items.length as unknown as number; + const qs: IDataObject = {}; + const result: IDataObject[] = []; + const object: IDataObject = {}; + let responseData; + const resource = this.getNodeParameter('resource', 0) as string; + const operation = this.getNodeParameter('operation', 0) as string; + if (resource === 'table') { + //https://docs.microsoft.com/en-us/graph/api/table-post-rows?view=graph-rest-1.0&tabs=http + if (operation === 'addRow') { + const workbookId = this.getNodeParameter('workbook', 0) as string; + const worksheetId = this.getNodeParameter('worksheet', 0) as string; + const tableId = this.getNodeParameter('table', 0) as string; + const additionalFields = this.getNodeParameter('additionalFields', 0) as IDataObject; + const body: IDataObject = {}; + if (Object.keys(items[0].json).length === 0) { + throw new Error('Input cannot be empty'); + } + if (additionalFields.index) { + body.index = additionalFields.index as number; + } + const values: any[][] = []; + for (const item of items) { + values.push(Object.values(item.json)); + } + body.values = values; + const { id } = await microsoftApiRequest.call(this, 'POST', `/drive/items/${workbookId}/workbook/createSession`, { persistChanges: true }); + responseData = await microsoftApiRequest.call(this, 'POST', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows/add`, body, {}, '', { 'workbook-session-id': id }); + await microsoftApiRequest.call(this, 'POST', `/drive/items/${workbookId}/workbook/closeSession`, {}, {}, '', { 'workbook-session-id': id }); + } + //https://docs.microsoft.com/en-us/graph/api/table-list-columns?view=graph-rest-1.0&tabs=http + if (operation === 'getColumns') { + for (let i = 0; i < length; i++) { + const workbookId = this.getNodeParameter('workbook', 0) as string; + const worksheetId = this.getNodeParameter('worksheet', 0) as string; + const tableId = this.getNodeParameter('table', 0) as string; + const returnAll = this.getNodeParameter('returnAll', i) as boolean; + const rawData = this.getNodeParameter('rawData', i) as boolean; + if (rawData) { + const filters = this.getNodeParameter('filters', i) as IDataObject; + if (filters.fields) { + qs['$select'] = filters.fields; + } + } + if (returnAll === true) { + responseData = await microsoftApiRequestAllItemsSkip.call(this, 'value', 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`, {}, qs); + } else { + qs['$top'] = this.getNodeParameter('limit', i) as number; + responseData = await microsoftApiRequest.call(this, 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`, {}, qs); + responseData = responseData.value; + } + if (!rawData) { + //@ts-ignore + responseData = responseData.map(column => ({ name: column.name })); + } + } + } + //https://docs.microsoft.com/en-us/graph/api/table-list-rows?view=graph-rest-1.0&tabs=http + if (operation === 'getRows') { + for (let i = 0; i < length; i++) { + const workbookId = this.getNodeParameter('workbook', 0) as string; + const worksheetId = this.getNodeParameter('worksheet', 0) as string; + const tableId = this.getNodeParameter('table', 0) as string; + const returnAll = this.getNodeParameter('returnAll', i) as boolean; + const rawData = this.getNodeParameter('rawData', i) as boolean; + if (rawData) { + const filters = this.getNodeParameter('filters', i) as IDataObject; + if (filters.fields) { + qs['$select'] = filters.fields; + } + } + if (returnAll === true) { + responseData = await microsoftApiRequestAllItemsSkip.call(this, 'value', 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows`, {}, qs); + } else { + qs['$top'] = this.getNodeParameter('limit', i) as number; + responseData = await microsoftApiRequest.call(this, 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows`, {}, qs); + responseData = responseData.value; + } + if (!rawData) { + qs['$select'] = 'name'; + let columns = await microsoftApiRequestAllItemsSkip.call(this, 'value', 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`, {}, qs); + //@ts-ignore + columns = columns.map(column => column.name); + for (let i = 0; i < responseData.length; i++) { + for (let y = 0; y < columns.length; y++) { + object[columns[y]] = responseData[i].values[0][y]; + } + result.push({ ...object }); + } + responseData = result; + } + } + } + } + if (resource === 'workbook') { + for (let i = 0; i < length; i++) { + //https://docs.microsoft.com/en-us/graph/api/worksheetcollection-add?view=graph-rest-1.0&tabs=http + if (operation === 'addWorksheet') { + const workbookId = this.getNodeParameter('workbook', i) as string; + const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject; + const body: IDataObject = {}; + if (additionalFields.name) { + body.name = additionalFields.name; + } + const { id } = await microsoftApiRequest.call(this, 'POST', `/drive/items/${workbookId}/workbook/createSession`, { persistChanges: true }); + responseData = await microsoftApiRequest.call(this, 'POST', `/drive/items/${workbookId}/workbook/worksheets/add`, body, {}, '', { 'workbook-session-id': id }); + await microsoftApiRequest.call(this, 'POST', `/drive/items/${workbookId}/workbook/closeSession`, {}, {}, '', { 'workbook-session-id': id }); + } + if (operation === 'getAll') { + const returnAll = this.getNodeParameter('returnAll', i) as boolean; + const filters = this.getNodeParameter('filters', i) as IDataObject; + if (filters.fields) { + qs['$select'] = filters.fields; + } + if (returnAll === true) { + responseData = await microsoftApiRequestAllItems.call(this, 'value', 'GET', `/drive/root/search(q='.xlsx')`, {}, qs); + } else { + qs['$top'] = this.getNodeParameter('limit', i) as number; + responseData = await microsoftApiRequest.call(this, 'GET', `/drive/root/search(q='.xlsx')`, {}, qs); + responseData = responseData.value; + } + } + } + } + if (resource === 'worksheet') { + for (let i = 0; i < length; i++) { + //https://docs.microsoft.com/en-us/graph/api/workbook-list-worksheets?view=graph-rest-1.0&tabs=http + if (operation === 'getAll') { + const returnAll = this.getNodeParameter('returnAll', i) as boolean; + const workbookId = this.getNodeParameter('workbook', i) as string; + const filters = this.getNodeParameter('filters', i) as IDataObject; + if (filters.fields) { + qs['$select'] = filters.fields; + } + if (returnAll === true) { + responseData = await microsoftApiRequestAllItems.call(this, 'value', 'GET', `/drive/items/${workbookId}/workbook/worksheets`, {}, qs); + } else { + qs['$top'] = this.getNodeParameter('limit', i) as number; + responseData = await microsoftApiRequest.call(this, 'GET', `/drive/items/${workbookId}/workbook/worksheets`, {}, qs); + responseData = responseData.value; + } + } + //https://docs.microsoft.com/en-us/graph/api/worksheet-range?view=graph-rest-1.0&tabs=http + if (operation === 'getContent') { + const workbookId = this.getNodeParameter('workbook', i) as string; + const worksheetId = this.getNodeParameter('worksheet', i) as string; + const range = this.getNodeParameter('range', i) as string; + const rawData = this.getNodeParameter('rawData', i) as boolean; + if (rawData) { + const filters = this.getNodeParameter('filters', i) as IDataObject; + if (filters.fields) { + qs['$select'] = filters.fields; + } + } + responseData = await microsoftApiRequest.call(this, 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/range(address='${range}')`, {}, qs); + if (!rawData) { + const keyRow = this.getNodeParameter('keyRow', i) as number; + const dataStartRow = this.getNodeParameter('dataStartRow', i) as number; + if (responseData.values === null) { + throw new Error('Range did not return data'); + } + const keyValues = responseData.values[keyRow]; + for (let i = dataStartRow; i < responseData.values.length; i++) { + for (let y = 0; y < keyValues.length; y++) { + object[keyValues[y]] = responseData.values[i][y]; + } + result.push({ ...object }); + } + responseData = result; + } + } + } + } + if (Array.isArray(responseData)) { + returnData.push.apply(returnData, responseData as IDataObject[]); + } else if (responseData !== undefined) { + returnData.push(responseData as IDataObject); + } + return [this.helpers.returnJsonArray(returnData)]; + } +} diff --git a/packages/nodes-base/nodes/Microsoft/TableDescription.ts b/packages/nodes-base/nodes/Microsoft/TableDescription.ts new file mode 100644 index 0000000000..6dc6de780b --- /dev/null +++ b/packages/nodes-base/nodes/Microsoft/TableDescription.ts @@ -0,0 +1,447 @@ +import { INodeProperties } from "n8n-workflow"; + +export const tableOperations = [ + { + displayName: 'Operation', + name: 'operation', + type: 'options', + displayOptions: { + show: { + resource: [ + 'table', + ], + }, + }, + options: [ + { + name: 'Add Row', + value: 'addRow', + description: 'Adds rows to the end of the table' + }, + { + name: 'Get Columns', + value: 'getColumns', + description: 'Retrieve a list of tablecolumns', + }, + { + name: 'Get Rows', + value: 'getRows', + description: 'Retrieve a list of tablerows', + }, + ], + default: 'addRow', + description: 'The operation to perform.', + }, +] as INodeProperties[]; + +export const tableFields = [ + +/* -------------------------------------------------------------------------- */ +/* table:addRow */ +/* -------------------------------------------------------------------------- */ + { + displayName: 'Workbook', + name: 'workbook', + type: 'options', + typeOptions: { + loadOptionsMethod: 'getWorkbooks', + }, + displayOptions: { + show: { + operation: [ + 'addRow', + ], + resource: [ + 'table', + ], + }, + }, + default: '', + }, + { + displayName: 'Worksheet', + name: 'worksheet', + type: 'options', + required: true, + typeOptions: { + loadOptionsMethod: 'getworksheets', + loadOptionsDependsOn: [ + 'workbook', + ], + }, + displayOptions: { + show: { + operation: [ + 'addRow', + ], + resource: [ + 'table', + ], + }, + }, + default: '', + }, + { + displayName: 'Table', + name: 'table', + type: 'options', + required: true, + typeOptions: { + loadOptionsMethod: 'getTables', + loadOptionsDependsOn: [ + 'worksheet', + ], + }, + displayOptions: { + show: { + operation: [ + 'addRow', + ], + resource: [ + 'table', + ], + }, + }, + default: '', + }, + { + displayName: 'Additional Fields', + name: 'additionalFields', + type: 'collection', + placeholder: 'Add Field', + default: {}, + displayOptions: { + show: { + operation: [ + 'addRow', + ], + resource: [ + 'table', + ], + }, + }, + options: [ + { + displayName: 'Index', + name: 'index', + type: 'number', + default: 0, + typeOptions: { + minValue: 0, + }, + description: `Specifies the relative position of the new row. If not defined,
+ the addition happens at the end. Any rows below the inserted row are shifted downwards. Zero-indexed`, + }, + ], + }, +/* -------------------------------------------------------------------------- */ +/* table:getRows */ +/* -------------------------------------------------------------------------- */ + { + displayName: 'Workbook', + name: 'workbook', + type: 'options', + typeOptions: { + loadOptionsMethod: 'getWorkbooks', + }, + displayOptions: { + show: { + operation: [ + 'getRows', + ], + resource: [ + 'table', + ], + }, + }, + default: '', + }, + { + displayName: 'Worksheet', + name: 'worksheet', + type: 'options', + required: true, + typeOptions: { + loadOptionsMethod: 'getworksheets', + loadOptionsDependsOn: [ + 'workbook', + ], + }, + displayOptions: { + show: { + operation: [ + 'getRows', + ], + resource: [ + 'table', + ], + }, + }, + default: '', + }, + { + displayName: 'Table', + name: 'table', + type: 'options', + required: true, + typeOptions: { + loadOptionsMethod: 'getTables', + loadOptionsDependsOn: [ + 'worksheet', + ], + }, + displayOptions: { + show: { + operation: [ + 'getRows', + ], + resource: [ + 'table', + ], + }, + }, + default: '', + }, + { + displayName: 'Return All', + name: 'returnAll', + type: 'boolean', + displayOptions: { + show: { + operation: [ + 'getRows', + ], + resource: [ + 'table', + ], + }, + }, + default: false, + description: 'If all results should be returned or only up to a given limit.', + }, + { + displayName: 'Limit', + name: 'limit', + type: 'number', + displayOptions: { + show: { + operation: [ + 'getRows', + ], + resource: [ + 'table', + ], + returnAll: [ + false, + ], + }, + }, + typeOptions: { + minValue: 1, + maxValue: 500, + }, + default: 100, + description: 'How many results to return.', + }, + { + displayName: 'RAW Data', + name: 'rawData', + type: 'boolean', + displayOptions: { + show: { + operation: [ + 'getRows', + ], + resource: [ + 'table', + ], + }, + }, + default: false, + description: 'If the data should be returned RAW instead of parsed into keys according to their header.', + }, + { + displayName: 'Filters', + name: 'filters', + type: 'collection', + placeholder: 'Add Filter', + default: {}, + displayOptions: { + show: { + operation: [ + 'getRows', + ], + resource: [ + 'table', + ], + rawData: [ + true, + ], + }, + }, + options: [ + { + displayName: 'Fields', + name: 'fields', + type: 'string', + default: '', + description: `Fields the response will containt. Multiple can be added separated by ,.`, + }, + ] + }, +/* -------------------------------------------------------------------------- */ +/* table:getColumns */ +/* -------------------------------------------------------------------------- */ + { + displayName: 'Workbook', + name: 'workbook', + type: 'options', + typeOptions: { + loadOptionsMethod: 'getWorkbooks', + }, + displayOptions: { + show: { + operation: [ + 'getColumns', + ], + resource: [ + 'table', + ], + }, + }, + default: '', + }, + { + displayName: 'Worksheet', + name: 'worksheet', + type: 'options', + required: true, + typeOptions: { + loadOptionsMethod: 'getworksheets', + loadOptionsDependsOn: [ + 'workbook', + ], + }, + displayOptions: { + show: { + operation: [ + 'getColumns', + ], + resource: [ + 'table', + ], + }, + }, + default: '', + }, + { + displayName: 'Table', + name: 'table', + type: 'options', + required: true, + typeOptions: { + loadOptionsMethod: 'getTables', + loadOptionsDependsOn: [ + 'worksheet', + ], + }, + displayOptions: { + show: { + operation: [ + 'getColumns', + ], + resource: [ + 'table', + ], + }, + }, + default: '', + }, + { + displayName: 'Return All', + name: 'returnAll', + type: 'boolean', + displayOptions: { + show: { + operation: [ + 'getColumns', + ], + resource: [ + 'table', + ], + }, + }, + default: false, + description: 'If all results should be returned or only up to a given limit.', + }, + { + displayName: 'Limit', + name: 'limit', + type: 'number', + displayOptions: { + show: { + operation: [ + 'getColumns', + ], + resource: [ + 'table', + ], + returnAll: [ + false, + ], + }, + }, + typeOptions: { + minValue: 1, + maxValue: 500, + }, + default: 100, + description: 'How many results to return.', + }, + { + displayName: 'RAW Data', + name: 'rawData', + type: 'boolean', + displayOptions: { + show: { + operation: [ + 'getColumns', + ], + resource: [ + 'table', + ], + }, + }, + default: false, + description: 'If the data should be returned RAW instead of parsed into keys according to their header.', + }, + { + displayName: 'Filters', + name: 'filters', + type: 'collection', + placeholder: 'Add Filter', + default: {}, + displayOptions: { + show: { + operation: [ + 'getColumns', + ], + resource: [ + 'table', + ], + rawData: [ + true + ], + }, + }, + options: [ + { + displayName: 'Fields', + name: 'fields', + type: 'string', + default: '', + description: `Fields the response will containt. Multiple can be added separated by ,.`, + }, + ] + }, +] as INodeProperties[]; diff --git a/packages/nodes-base/nodes/Microsoft/WorkbookDescription.ts b/packages/nodes-base/nodes/Microsoft/WorkbookDescription.ts new file mode 100644 index 0000000000..526a8ceb43 --- /dev/null +++ b/packages/nodes-base/nodes/Microsoft/WorkbookDescription.ts @@ -0,0 +1,154 @@ +import { INodeProperties } from "n8n-workflow"; + +export const workbookOperations = [ + { + displayName: 'Operation', + name: 'operation', + type: 'options', + displayOptions: { + show: { + resource: [ + 'workbook', + ], + }, + }, + options: [ + { + name: 'Add Worksheet', + value: 'addWorksheet', + description: 'Adds a new worksheet to the workbook.', + }, + { + name: 'Get All', + value: 'getAll', + description: 'Get data of all workbooks', + }, + ], + default: 'create', + description: 'The operation to perform.', + }, +] as INodeProperties[]; + +export const workbookFields = [ + +/* -------------------------------------------------------------------------- */ +/* workbook:addWorksheet */ +/* -------------------------------------------------------------------------- */ + { + displayName: 'Workbook', + name: 'workbook', + type: 'options', + required: true, + typeOptions: { + loadOptionsMethod: 'getWorkbooks', + }, + displayOptions: { + show: { + operation: [ + 'addWorksheet', + ], + resource: [ + 'workbook', + ], + }, + }, + default: '', + }, + { + displayName: 'Additional Fields', + name: 'additionalFields', + type: 'collection', + placeholder: 'Add Field', + default: {}, + displayOptions: { + show: { + operation: [ + 'addWorksheet', + ], + resource: [ + 'workbook', + ], + }, + }, + options: [ + { + displayName: 'Name', + name: 'name', + type: 'string', + default: '', + description: `The name of the worksheet to be added. If specified, name should be unqiue.
+ If not specified, Excel determines the name of the new worksheet.`, + }, + ] + }, +/* -------------------------------------------------------------------------- */ +/* workbook:getAll */ +/* -------------------------------------------------------------------------- */ + { + displayName: 'Return All', + name: 'returnAll', + type: 'boolean', + displayOptions: { + show: { + operation: [ + 'getAll', + ], + resource: [ + 'workbook', + ], + }, + }, + default: false, + description: 'If all results should be returned or only up to a given limit.', + }, + { + displayName: 'Limit', + name: 'limit', + type: 'number', + displayOptions: { + show: { + operation: [ + 'getAll', + ], + resource: [ + 'workbook', + ], + returnAll: [ + false, + ], + }, + }, + typeOptions: { + minValue: 1, + maxValue: 500, + }, + default: 100, + description: 'How many results to return.', + }, + { + displayName: 'Filters', + name: 'filters', + type: 'collection', + placeholder: 'Add Filter', + default: {}, + displayOptions: { + show: { + operation: [ + 'getAll', + ], + resource: [ + 'workbook', + ], + }, + }, + options: [ + { + displayName: 'Fields', + name: 'fields', + type: 'string', + default: '', + description: `Fields the response will containt. Multiple can be added separated by ,.`, + }, + ] + }, +] as INodeProperties[]; diff --git a/packages/nodes-base/nodes/Microsoft/WorksheetDescription.ts b/packages/nodes-base/nodes/Microsoft/WorksheetDescription.ts new file mode 100644 index 0000000000..204e5f0e41 --- /dev/null +++ b/packages/nodes-base/nodes/Microsoft/WorksheetDescription.ts @@ -0,0 +1,283 @@ +import { INodeProperties } from "n8n-workflow"; + +export const worksheetOperations = [ + { + displayName: 'Operation', + name: 'operation', + type: 'options', + displayOptions: { + show: { + resource: [ + 'worksheet', + ], + }, + }, + options: [ + { + name: 'Get All', + value: 'getAll', + description: 'Get all worksheets', + }, + { + name: 'Get Content', + value: 'getContent', + description: 'Get worksheet content', + }, + ], + default: 'create', + description: 'The operation to perform.', + }, +] as INodeProperties[]; + +export const worksheetFields = [ + +/* -------------------------------------------------------------------------- */ +/* worksheet:getAll */ +/* -------------------------------------------------------------------------- */ + { + displayName: 'Workbook', + name: 'workbook', + type: 'options', + typeOptions: { + loadOptionsMethod: 'getWorkbooks', + }, + displayOptions: { + show: { + operation: [ + 'getAll', + ], + resource: [ + 'worksheet', + ], + }, + }, + default: '', + }, + { + displayName: 'Return All', + name: 'returnAll', + type: 'boolean', + displayOptions: { + show: { + operation: [ + 'getAll', + ], + resource: [ + 'worksheet', + ], + }, + }, + default: false, + description: 'If all results should be returned or only up to a given limit.', + }, + { + displayName: 'Limit', + name: 'limit', + type: 'number', + displayOptions: { + show: { + operation: [ + 'getAll', + ], + resource: [ + 'worksheet', + ], + returnAll: [ + false, + ], + }, + }, + typeOptions: { + minValue: 1, + maxValue: 500, + }, + default: 100, + description: 'How many results to return.', + }, + { + displayName: 'Filters', + name: 'filters', + type: 'collection', + placeholder: 'Add Filter', + default: {}, + displayOptions: { + show: { + operation: [ + 'getAll', + ], + resource: [ + 'worksheet', + ], + }, + }, + options: [ + { + displayName: 'Fields', + name: 'fields', + type: 'string', + default: '', + description: `Fields the response will containt. Multiple can be added separated by ,.`, + }, + ] + }, +/* -------------------------------------------------------------------------- */ +/* worksheet:getContent */ +/* -------------------------------------------------------------------------- */ + { + displayName: 'Workbook', + name: 'workbook', + type: 'options', + required: true, + typeOptions: { + loadOptionsMethod: 'getWorkbooks', + }, + displayOptions: { + show: { + operation: [ + 'getContent', + ], + resource: [ + 'worksheet', + ], + }, + }, + default: '', + }, + { + displayName: 'Worksheet', + name: 'worksheet', + type: 'options', + required: true, + typeOptions: { + loadOptionsMethod: 'getworksheets', + loadOptionsDependsOn: [ + 'workbook', + ], + }, + displayOptions: { + show: { + operation: [ + 'getContent', + ], + resource: [ + 'worksheet', + ], + }, + }, + default: '', + }, + { + displayName: 'Range', + name: 'range', + type: 'string', + displayOptions: { + show: { + operation: [ + 'getContent', + ], + resource: [ + 'worksheet', + ], + }, + }, + default: 'A1:C3', + required: true, + description: 'The address or the name of the range. If not specified, the entire worksheet range is returned.', + }, + { + displayName: 'RAW Data', + name: 'rawData', + type: 'boolean', + displayOptions: { + show: { + operation: [ + 'getContent', + ], + resource: [ + 'worksheet', + ], + }, + }, + default: false, + description: 'If the data should be returned RAW instead of parsed into keys according to their header.', + }, + { + displayName: 'Data Start Row', + name: 'dataStartRow', + type: 'number', + typeOptions: { + minValue: 1, + }, + default: 1, + displayOptions: { + show: { + operation: [ + 'getContent', + ], + resource: [ + 'worksheet', + ], + }, + hide: { + rawData: [ + true + ], + }, + }, + description: 'Index of the first row which contains
the actual data and not the keys. Starts with 0.', + }, + { + displayName: 'Key Row', + name: 'keyRow', + type: 'number', + typeOptions: { + minValue: 0, + }, + displayOptions: { + show: { + operation: [ + 'getContent', + ], + resource: [ + 'worksheet', + ], + }, + hide: { + rawData: [ + true + ], + }, + }, + default: 0, + description: 'Index of the row which contains the keys. Starts at 0.
The incoming node data is matched to the keys for assignment. The matching is case sensitve.', + }, + { + displayName: 'Filters', + name: 'filters', + type: 'collection', + placeholder: 'Add Filter', + default: {}, + displayOptions: { + show: { + operation: [ + 'getContent', + ], + resource: [ + 'worksheet', + ], + rawData: [ + true, + ], + }, + }, + options: [ + { + displayName: 'Fields', + name: 'fields', + type: 'string', + default: '', + description: `Fields the response will containt. Multiple can be added separated by ,.`, + }, + ] + }, +] as INodeProperties[]; diff --git a/packages/nodes-base/nodes/Microsoft/excel.png b/packages/nodes-base/nodes/Microsoft/excel.png new file mode 100644 index 0000000000000000000000000000000000000000..40631413a5f656ad5819f9faada8eecc78509bd4 GIT binary patch literal 5984 zcmZ{Iby(ER*Z$HCDoE`DD@aO*OLwz0A`2q1q|~x3Qu+{rG!oLaNJ~mdNh+NSQj$wZ zNjCy7KHul}e1GpB@60uG?m2Ux`^=d?KG*e`a6KJ03Q|T=002Otp{{IjYxVvNV#3=w z=I%k+t-L0q|}S&TR+aFaikv#sGjO4)9-WfW!3<2NwVcbp+u5 z!!f0gV7#`&)z8uwqe9vbhz_)lD(gueZ)Awj6aJOBWGwm$>MJ74bQtrX1B z$OL7g4V8qux$s-rxLMosd%Gb1L;<9|C2ygNEy@b)?c(g}A?Yo{`Zq)J7XNVzu!8@l zpqyk_O|N ztbY>y+x~M-l%w5$Gr4;FQ`T*P0)KV{g!lyo{?)z>mHy+E)I~bl-e&%zFDoSdH}ik_ z{>dXP@F)5IcbNZF`nUJCR9RAKfq$<}mK55-2?GFVRy33qjJ$DvJtILqS7Fp~i^+^J`j%x_ ziq{Ed+|YvrsYC^FRlSw(NIT{`ojbp3x!mdR@N1TSQhq!f(-Mz7 zMw{Be^ca&F_}Z)-TJzR#$Gl0Cphocl%MrvG$KubJ z#-^=|K@5m~W}^7_l_w7Q7B{pZUm=%%0)C`zz!Kl3S}PVAtXxTDsIh#1V`wN#Sgl8h zIr$@0`^7hW6H|v8degWa_jUXTj3eW$qBWt?N^LBIaC?Yd1@pLW)B4Pz2B@vem(%mf zVa~w_KqiEQ&(L4{qwTi7tD>%{ew&+-LnChZtP!``B_QKDFaKP=1UQf}h59Vz0f3-Q z@fzHa093%@;W{WPv#pG)MEhB&HdMC=^>2UmW`$5o=M352&-a2C$1m6TbTFySIMck| zULpwjkiLu}(IyVe6*bI`O4V)aQFYW&V^kjD(Lwj=ETWw3Iy2@5&F^ z1ETPuq+negw zolVN{T(BTVldo=CzsFco_tVl)Gcji!s0q;rdzo>%U~7o4AZU{_A}gjn@ak*G0%r)< zr0iI%bEw&6FTsMBtvBW&z3{kF)DJ5;#1$CJm^!n8(6rZ0w)gpQ(N~8T`d3t4d9F~N zCJQAyIhc`Rj~hE2EmU*?ViCxIA{B64$x!{lN3VSLx-O&01sVh-#>Xb9&-&qB-jH*t z?qXVCdW?Iu_3?Yb003Ft;dsJvY>}+?#^JF9u_gG<9rMrRH1BHG_dFlsmjRukoI^jp zU!_1)DtU#m{3;?%TcaF?dO|W_9OR1#Mi~ZM8gS)zN~o-ejG^Zel462hbX!te?7kMr z8ulX|#~VOPcCZXVO#mDM4v|d!8{|j5Gi#pl38{PvZyu8w5;+(?dci)I&haZ$GH!uEa8w;AV2(s^_HE)`M z;emhZUj4+S`+na%M|nE8DQ|9pJtT{FU092*k$WOR)7Et#vf_Y-Sm(p!2A7h&GPb^L z?H8SAr;N;uz`7G~!JIR?bp;!(*4f3ec-599Ivm9OK$9_k$X?IA!8w<`g`hiQufA^<((kX~@1`4G+ts}wQ{n+dMnqnI=;bVZa60lBgCn?>B znQjA#y}B1bWv`@h=gva7nitQ=SyTVsqrKS?`%fHQNR)j!R}n2_6BG3Evj5>&0`sRX z{z5IyuIH?D_o46S(Nt_zfR%ZI>|G^9&gAR2NO1cWp}q4KJcU$8(AQni20CFP9)$n` zZ#|3mo0!}O8zH&S!<%HWa9Few-Sb9a zkGrH_@i|pJnP_pdL7jA!G;8A~Hh`(D;-1H|YIF4Uk5A0z{^2?H8q4ysR&w>FQ<)FO zs5ZngOH*VkLuSkgqEKlOJ|*|LR^Hdol6Dt( z?`MI&Pqeiw;wGj@wtJp8oMVxaZ1Pj9XNZjYtZ+W&yFKt;>;$}`yX9VM;gl!QoPw)n z3+aibifUjpVi#@@pn+60ni_8Y-OOw1UNOMzS&LPaIE$P8YimrnaHm5ZnB8$~(sIaG z4APHYKbh*)ms@L(mbkYbm$+rDrK6gJ-{DFwvC%vu+1vJJ%FD7<)W1$YoI7(fa25*b zA}TNAFNv+vhY#~Y-co0f5BWGv_E*7ouM9Nh9!Upk*|n9KkZ63vm))M>^x%9h;Q4)w z#`~>RQP|=_@(nF^$MB*W@4=6@@M>^8aXba2U~Yl!>6bIA`Vk@s2a78-R9!V^`|4bk zU@_)P(@HwkAYCyt8|L$vap1%o|%BECCCghOq)H>rKg}ly1*eIt6vSd{bBExy=@_uBoR@ayRf6Wh`eMT&vwaIT$q!F z(&G;B`I3#H4^PJ^3A}dKkOW^JBFR)D^&vU(nKom9^Jw>ChNJv0m(O|TD$;fEC@eAK ziHMS?@9ubieoYT)ZjTs?|8=-@?M@+bXT8LRr9K=)8%>N?CSJBL#_owFgpB&^;3V7D zkFmzo5P`(YHc3;{S!83+Rf%*iBhDk$lAf(-Kox)Aucu8FNz?)T~1Y?^*%ufbfG2L}$~*dbIzqd|fv|zIA!3j>5R}}hH*wt%J4yko%E)u>}2^5W)92eYK99m~lbx28B*UNtIUW}mMTkc)Qq zMekqc6*O!1Y4s2BLb|d<70~W_N#ol|H@;rAzb%i<`$CrRQ@%cQnLP-XzFw-x^Ibu0 zgye)jX!ywMl>}Ulzv}6FcJ;$eNPrSTXa=c+#!VE?&;&@$yzGB+YQZl|&^R9I(8KXk z{^dE;<~-pMFQ9$YJ_-nbm!S3*B~uxntCqn@b>mqq`s`Ic4INGU1wrEar-8oHg<$B3 zx@44sK*wkAujfBhS3Z22znfM zdI~qYAF3g7)gV1{WPj!2zE%Z^f}(WP>2%Wh$VzsSl3%tw`o0n3-VpoCAZo15)9cA| z{^x~e#RL|JtccGHcnK+qEf+yjHqNe}&WO(ZjJUV`b$iJZ2koXs;_)PUrR~$4#hX=H zdEd#aS7qbdK~LFD zurv8AeXATcqEg0y{XKM65%{+uYSFZ`1tp7^YJ}CMKKpCdwqiEN|`%<%owxszI%UP|K=# zDwDwyimI~ApUpzz$vH2F%btPfGDI-ZIe+n}KD)5G3_WNIk&7!%Okk6A+Zu8?=-9MS z?>t{12fh!`RGX__YF{D=cS(G$aTV>v}H8Y>03PGQq`P$ljM-_9WBT9krPi5w>OuF+nFI-tkWy4$139YS}qAt4)*LOctD;%R(Wra z@hvax@}v5-55m_kPxMsLXMOG_Hsr9SEWUi)%5gEwk8YN?Li(zi{tny@_4XoUg*HNH z(y#@xL0W6mCcFMoFs=b} zy0ve={KGftPMU<+tInk4DDC06n(xm6E_ch7tFYf#WRwOvL}@s-j;ZFMZ-EIklzH_+ zS!K%QzeXvvROVkzMYtDriXihP-ReLpt}!Hd{K4;}?6Y`%w+LVp&6=d{+5Pe7sSTAK z<{#KJ`o0zC1f76;8B0@?NU{S(h-^`EGzx_v;FKNFu*S{WFkr4R7MylC zoLwR;+B9?0lXkqzrN85U`t60bTGgk*il;**#R)tJo(BI)wv2jXC@B&0qh=JqfRiP&F0d(;!f0gz3vC!| zd3>ba)}tS4<-%75SZiU~Y_H{AEQ3%F3AB)YC@uL+-4l2IWYYqzR+i1%(t|9hEi#o-Cn z52OVHHkY)pRr$U?s#?pYK9qgNbWc}JQLWYEtok-)k-UV2A<4S*3jYwx!>cstdOK0U z!ov-I0YJcU==?EQBsWQ9l%lgiicT7=B5}SsFCS9?tZuc&;q}g9)B`CnOrUii5m7n? zFDVX;zq-GjB(dRhkYL8FcM&5wK&#(W#$y9d;`PN``^@J4>Qa_}JlOttwZ672{r2Z( z0#TM&2mVI$RqQSSuB}i|P@`CBrsfWo4QvW$A5qHg5;T=)0^oO#GF2HKyre|XA4Zwt zvzDQC)sBK7C4mo~Zc*n3fKAKnj3yLw@NKzy_EEN2j<{ z){cP0Z;^tgy$_8q^9~)*KaQ3|ly()KG~p!KGa%_Y(ZM*u8239ecj#zSC_e1%sb9I{ z1_hgTf-ge7duN>wy&R8Q&;3d%P$pkqGa2@c#xsEk9Bt1i6E^`#L^eU$3M2l=srLxzW8Y&R^hFq~@`1I-94BShr=81M-q`u-Uv z?&3lrDsb-6kwh()pvnobG_361%&N{2kC?hi3$~Epc|q#p=G^fpPcd`AC8ROReERB` z4LT>GL-w{y=^Uy^cD7={q3D#@LD4@cP1!6Ld}`yYcdkIeC$|r`2%eJslrCM?{S{}M zr93Uhn$)poh{&JyB#b5VX9f zqAX^^1Qa)hIvWs*wRx%^>vAf}vW=lm{N-K55Emy_F%l|xXmb8?uW|Lj9jQClpE(WQ z+^mci9W9RNL+f{i-^JM_F(~BHFy0AFDqdR9#%Jf;Yr!Jw?0efrJ{E4D783~0)DU;n zQuxYz&AyRlJ$UDZy}=`nnZy2e_?7j+sgR{@ow~M5#oPHxvhvw01W}SsX5s(woOr{4 bdqb4Qmz%rb(0TCZ=~zQWN4Z?lGU$H*2Ppz* literal 0 HcmV?d00001 diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json index 746f91f723..47f21e8396 100644 --- a/packages/nodes-base/package.json +++ b/packages/nodes-base/package.json @@ -54,7 +54,8 @@ "dist/credentials/MailchimpApi.credentials.js", "dist/credentials/MailgunApi.credentials.js", "dist/credentials/MandrillApi.credentials.js", - "dist/credentials/MattermostApi.credentials.js", + "dist/credentials/MattermostApi.credentials.js", + "dist/credentials/MicrosoftOAuth2Api.credentials.js", "dist/credentials/MongoDb.credentials.js", "dist/credentials/MySql.credentials.js", "dist/credentials/NextCloudApi.credentials.js", @@ -132,7 +133,8 @@ "dist/nodes/Mailgun/Mailgun.node.js", "dist/nodes/Mandrill/Mandrill.node.js", "dist/nodes/Mattermost/Mattermost.node.js", - "dist/nodes/Merge.node.js", + "dist/nodes/Merge.node.js", + "dist/nodes/Microsoft/MicrosoftExcel.node.js", "dist/nodes/MoveBinaryData.node.js", "dist/nodes/MongoDb/MongoDb.node.js", "dist/nodes/MySql/MySql.node.js", From 79ba4dd43d5d992ec966ffaeda4a98913868a435 Mon Sep 17 00:00:00 2001 From: ricardo Date: Tue, 17 Mar 2020 14:39:20 -0400 Subject: [PATCH 2/6] :zap: small improvements --- .../nodes/Microsoft/MicrosoftExcel.node.ts | 9 +++++ .../nodes/Microsoft/TableDescription.ts | 40 +++++++++++++++++++ .../nodes/Microsoft/WorksheetDescription.ts | 20 ++++++++++ 3 files changed, 69 insertions(+) diff --git a/packages/nodes-base/nodes/Microsoft/MicrosoftExcel.node.ts b/packages/nodes-base/nodes/Microsoft/MicrosoftExcel.node.ts index c62730449d..fd3de90659 100644 --- a/packages/nodes-base/nodes/Microsoft/MicrosoftExcel.node.ts +++ b/packages/nodes-base/nodes/Microsoft/MicrosoftExcel.node.ts @@ -206,6 +206,9 @@ export class MicrosoftExcel implements INodeType { if (!rawData) { //@ts-ignore responseData = responseData.map(column => ({ name: column.name })); + } else { + const dataProperty = this.getNodeParameter('dataProperty', i) as string; + responseData = { [dataProperty] : responseData }; } } } @@ -242,6 +245,9 @@ export class MicrosoftExcel implements INodeType { result.push({ ...object }); } responseData = result; + } else { + const dataProperty = this.getNodeParameter('dataProperty', i) as string; + responseData = { [dataProperty] : responseData }; } } } @@ -321,6 +327,9 @@ export class MicrosoftExcel implements INodeType { result.push({ ...object }); } responseData = result; + } else { + const dataProperty = this.getNodeParameter('dataProperty', i) as string; + responseData = { [dataProperty] : responseData }; } } } diff --git a/packages/nodes-base/nodes/Microsoft/TableDescription.ts b/packages/nodes-base/nodes/Microsoft/TableDescription.ts index 6dc6de780b..8c491a16e1 100644 --- a/packages/nodes-base/nodes/Microsoft/TableDescription.ts +++ b/packages/nodes-base/nodes/Microsoft/TableDescription.ts @@ -260,6 +260,26 @@ export const tableFields = [ default: false, description: 'If the data should be returned RAW instead of parsed into keys according to their header.', }, + { + displayName: 'Data Property', + name: 'dataProperty', + type: 'string', + default: 'data', + displayOptions: { + show: { + operation: [ + 'getRows' + ], + resource: [ + 'table', + ], + rawData: [ + true, + ], + }, + }, + description: 'The name of the property into which to write the RAW data.', + }, { displayName: 'Filters', name: 'filters', @@ -415,6 +435,26 @@ export const tableFields = [ default: false, description: 'If the data should be returned RAW instead of parsed into keys according to their header.', }, + { + displayName: 'Data Property', + name: 'dataProperty', + type: 'string', + default: 'data', + displayOptions: { + show: { + operation: [ + 'getColumns' + ], + resource: [ + 'table', + ], + rawData: [ + true, + ], + }, + }, + description: 'The name of the property into which to write the RAW data.', + }, { displayName: 'Filters', name: 'filters', diff --git a/packages/nodes-base/nodes/Microsoft/WorksheetDescription.ts b/packages/nodes-base/nodes/Microsoft/WorksheetDescription.ts index 204e5f0e41..f50fbb3ece 100644 --- a/packages/nodes-base/nodes/Microsoft/WorksheetDescription.ts +++ b/packages/nodes-base/nodes/Microsoft/WorksheetDescription.ts @@ -201,6 +201,26 @@ export const worksheetFields = [ default: false, description: 'If the data should be returned RAW instead of parsed into keys according to their header.', }, + { + displayName: 'Data Property', + name: 'dataProperty', + type: 'string', + default: 'data', + displayOptions: { + show: { + operation: [ + 'getContent' + ], + resource: [ + 'worksheet', + ], + rawData: [ + true, + ], + }, + }, + description: 'The name of the property into which to write the RAW data.', + }, { displayName: 'Data Start Row', name: 'dataStartRow', From b60c9be282c8ea603acb8e63da961c38e8bdb510 Mon Sep 17 00:00:00 2001 From: ricardo Date: Sun, 22 Mar 2020 13:03:56 -0400 Subject: [PATCH 3/6] :zap: added folder and changed name to credentials --- ...ls.ts => MicrosoftExcelOAuth2Api.credentials.ts} | 4 ++-- .../nodes/Microsoft/{ => Excel}/GenericFunctions.ts | 2 +- .../Microsoft/{ => Excel}/MicrosoftExcel.node.ts | 2 +- .../nodes/Microsoft/{ => Excel}/TableDescription.ts | 0 .../Microsoft/{ => Excel}/WorkbookDescription.ts | 0 .../Microsoft/{ => Excel}/WorksheetDescription.ts | 0 .../nodes/Microsoft/{ => Excel}/excel.png | Bin packages/nodes-base/package.json | 4 ++-- 8 files changed, 6 insertions(+), 6 deletions(-) rename packages/nodes-base/credentials/{MicrosoftOAuth2Api.credentials.ts => MicrosoftExcelOAuth2Api.credentials.ts} (91%) rename packages/nodes-base/nodes/Microsoft/{ => Excel}/GenericFunctions.ts (96%) rename packages/nodes-base/nodes/Microsoft/{ => Excel}/MicrosoftExcel.node.ts (99%) rename packages/nodes-base/nodes/Microsoft/{ => Excel}/TableDescription.ts (100%) rename packages/nodes-base/nodes/Microsoft/{ => Excel}/WorkbookDescription.ts (100%) rename packages/nodes-base/nodes/Microsoft/{ => Excel}/WorksheetDescription.ts (100%) rename packages/nodes-base/nodes/Microsoft/{ => Excel}/excel.png (100%) diff --git a/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts similarity index 91% rename from packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts rename to packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts index 2519ba583b..d6e8e0f452 100644 --- a/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts +++ b/packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts @@ -3,8 +3,8 @@ import { NodePropertyTypes, } from 'n8n-workflow'; -export class MicrosoftOAuth2Api implements ICredentialType { - name = 'microsoftOAuth2Api'; +export class MicrosoftExcelOAuth2Api implements ICredentialType { + name = 'microsoftExcelOAuth2Api'; extends = [ 'oAuth2Api', ]; diff --git a/packages/nodes-base/nodes/Microsoft/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts similarity index 96% rename from packages/nodes-base/nodes/Microsoft/GenericFunctions.ts rename to packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts index b4f68be343..33090090b3 100644 --- a/packages/nodes-base/nodes/Microsoft/GenericFunctions.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts @@ -24,7 +24,7 @@ export async function microsoftApiRequest(this: IExecuteFunctions | IExecuteSing options.headers = Object.assign({}, options.headers, headers); } //@ts-ignore - return await this.helpers.requestOAuth.call(this, 'microsoftOAuth2Api', options); + return await this.helpers.requestOAuth.call(this, 'microsoftExcelOAuth2Api', options); } catch (error) { if (error.response && error.response.body && error.response.body.error && error.response.body.error.message) { // Try to return the error prettier diff --git a/packages/nodes-base/nodes/Microsoft/MicrosoftExcel.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts similarity index 99% rename from packages/nodes-base/nodes/Microsoft/MicrosoftExcel.node.ts rename to packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts index fd3de90659..d7c372c2db 100644 --- a/packages/nodes-base/nodes/Microsoft/MicrosoftExcel.node.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts @@ -49,7 +49,7 @@ export class MicrosoftExcel implements INodeType { outputs: ['main'], credentials: [ { - name: 'microsoftOAuth2Api', + name: 'microsoftExcelOAuth2Api', required: true, }, ], diff --git a/packages/nodes-base/nodes/Microsoft/TableDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts similarity index 100% rename from packages/nodes-base/nodes/Microsoft/TableDescription.ts rename to packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts diff --git a/packages/nodes-base/nodes/Microsoft/WorkbookDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/WorkbookDescription.ts similarity index 100% rename from packages/nodes-base/nodes/Microsoft/WorkbookDescription.ts rename to packages/nodes-base/nodes/Microsoft/Excel/WorkbookDescription.ts diff --git a/packages/nodes-base/nodes/Microsoft/WorksheetDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts similarity index 100% rename from packages/nodes-base/nodes/Microsoft/WorksheetDescription.ts rename to packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts diff --git a/packages/nodes-base/nodes/Microsoft/excel.png b/packages/nodes-base/nodes/Microsoft/Excel/excel.png similarity index 100% rename from packages/nodes-base/nodes/Microsoft/excel.png rename to packages/nodes-base/nodes/Microsoft/Excel/excel.png diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json index 3bd0b4a6fd..b8ef81cded 100644 --- a/packages/nodes-base/package.json +++ b/packages/nodes-base/package.json @@ -55,7 +55,7 @@ "dist/credentials/MailgunApi.credentials.js", "dist/credentials/MandrillApi.credentials.js", "dist/credentials/MattermostApi.credentials.js", - "dist/credentials/MicrosoftOAuth2Api.credentials.js", + "dist/credentials/MicrosoftExcelOAuth2Api.credentials.js", "dist/credentials/MongoDb.credentials.js", "dist/credentials/MySql.credentials.js", "dist/credentials/NextCloudApi.credentials.js", @@ -135,7 +135,7 @@ "dist/nodes/Mandrill/Mandrill.node.js", "dist/nodes/Mattermost/Mattermost.node.js", "dist/nodes/Merge.node.js", - "dist/nodes/Microsoft/MicrosoftExcel.node.js", + "dist/nodes/Microsoft/Excel/MicrosoftExcel.node.js", "dist/nodes/MoveBinaryData.node.js", "dist/nodes/MongoDb/MongoDb.node.js", "dist/nodes/MySql/MySql.node.js", From eaa84827c786fb17ce6a1e63dc8e1c427e33c08b Mon Sep 17 00:00:00 2001 From: ricardo Date: Sun, 22 Mar 2020 15:14:45 -0400 Subject: [PATCH 4/6] :zap: Small improvements --- .../MicrosoftExcelOAuth2Api.credentials.ts | 26 +------------ .../MicrosoftOAuth2Api.credentials.ts | 38 +++++++++++++++++++ packages/nodes-base/package.json | 1 + 3 files changed, 40 insertions(+), 25 deletions(-) create mode 100644 packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts diff --git a/packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts index d6e8e0f452..3dc1f4b960 100644 --- a/packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts +++ b/packages/nodes-base/credentials/MicrosoftExcelOAuth2Api.credentials.ts @@ -6,22 +6,10 @@ import { export class MicrosoftExcelOAuth2Api implements ICredentialType { name = 'microsoftExcelOAuth2Api'; extends = [ - 'oAuth2Api', + 'microsoftOAuth2Api', ]; displayName = 'Microsoft OAuth2 API'; properties = [ - { - displayName: 'Authorization URL', - name: 'authUrl', - type: 'string' as NodePropertyTypes, - default: 'https://login.microsoftonline.com/{yourtenantid}/oauth2/v2.0/authorize', - }, - { - displayName: 'Access Token URL', - name: 'accessTokenUrl', - type: 'string' as NodePropertyTypes, - default: 'https://login.microsoftonline.com/{yourtenantid}/oauth2/v2.0/token', - }, //https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-permissions-and-consent { displayName: 'Scope', @@ -29,17 +17,5 @@ export class MicrosoftExcelOAuth2Api implements ICredentialType { type: 'hidden' as NodePropertyTypes, default: 'openid offline_access Files.ReadWrite', }, - { - displayName: 'Auth URI Query Parameters', - name: 'authQueryParameters', - type: 'hidden' as NodePropertyTypes, - default: 'response_mode=query', - }, - { - displayName: 'Authentication', - name: 'authentication', - type: 'hidden' as NodePropertyTypes, - default: 'body', - }, ]; } diff --git a/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts new file mode 100644 index 0000000000..aa98141e3f --- /dev/null +++ b/packages/nodes-base/credentials/MicrosoftOAuth2Api.credentials.ts @@ -0,0 +1,38 @@ +import { + ICredentialType, + NodePropertyTypes, +} from 'n8n-workflow'; + +export class MicrosoftOAuth2Api implements ICredentialType { + name = 'microsoftOAuth2Api'; + extends = [ + 'oAuth2Api', + ]; + displayName = 'Microsoft OAuth2 API'; + properties = [ + { + displayName: 'Authorization URL', + name: 'authUrl', + type: 'string' as NodePropertyTypes, + default: 'https://login.microsoftonline.com/{yourtenantid}/oauth2/v2.0/authorize', + }, + { + displayName: 'Access Token URL', + name: 'accessTokenUrl', + type: 'string' as NodePropertyTypes, + default: 'https://login.microsoftonline.com/{yourtenantid}/oauth2/v2.0/token', + }, + { + displayName: 'Auth URI Query Parameters', + name: 'authQueryParameters', + type: 'hidden' as NodePropertyTypes, + default: 'response_mode=query', + }, + { + displayName: 'Authentication', + name: 'authentication', + type: 'hidden' as NodePropertyTypes, + default: 'body', + }, + ]; +} diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json index 462c97bd71..c5fa0e2e47 100644 --- a/packages/nodes-base/package.json +++ b/packages/nodes-base/package.json @@ -56,6 +56,7 @@ "dist/credentials/MailgunApi.credentials.js", "dist/credentials/MandrillApi.credentials.js", "dist/credentials/MattermostApi.credentials.js", + "dist/credentials/MicrosoftOAuth2Api.credentials.js", "dist/credentials/MicrosoftExcelOAuth2Api.credentials.js", "dist/credentials/MongoDb.credentials.js", "dist/credentials/MySql.credentials.js", From 1b3417390b0e84eed7c52a0ae4d577b6e69ecf60 Mon Sep 17 00:00:00 2001 From: ricardo Date: Thu, 26 Mar 2020 15:44:48 -0400 Subject: [PATCH 5/6] :zap: added lookup and fixed issue with add columns operation --- .../Microsoft/Excel/MicrosoftExcel.node.ts | 72 ++++++++- .../nodes/Microsoft/Excel/TableDescription.ts | 138 ++++++++++++++++++ 2 files changed, 206 insertions(+), 4 deletions(-) diff --git a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts index d7c372c2db..4edab92d35 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts @@ -173,10 +173,35 @@ export class MicrosoftExcel implements INodeType { if (additionalFields.index) { body.index = additionalFields.index as number; } - const values: any[][] = []; + + // Get table columns to eliminate any columns not needed on the input + responseData = await microsoftApiRequest.call(this, 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`, {}, qs); + const columns = responseData.value.map((column: IDataObject) => (column.name)); + + const cleanedItems: IDataObject[] = []; + + // Delete columns the excel table does not have for (const item of items) { - values.push(Object.values(item.json)); + for (const key of Object.keys(item.json)) { + if (!columns.includes(key)) { + const property = { ...item.json }; + delete property[key]; + cleanedItems.push(property); + } + } } + + // Map the keys to the column index + const values: any[][] = []; + let value = []; + for (const item of cleanedItems) { + for (const column of columns) { + value.push(item[column]); + } + values.push(value); + value = []; + } + body.values = values; const { id } = await microsoftApiRequest.call(this, 'POST', `/drive/items/${workbookId}/workbook/createSession`, { persistChanges: true }); responseData = await microsoftApiRequest.call(this, 'POST', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows/add`, body, {}, '', { 'workbook-session-id': id }); @@ -204,8 +229,7 @@ export class MicrosoftExcel implements INodeType { responseData = responseData.value; } if (!rawData) { - //@ts-ignore - responseData = responseData.map(column => ({ name: column.name })); + responseData = responseData.map((column: IDataObject) => ({ name: column.name })); } else { const dataProperty = this.getNodeParameter('dataProperty', i) as string; responseData = { [dataProperty] : responseData }; @@ -251,6 +275,46 @@ export class MicrosoftExcel implements INodeType { } } } + if (operation === 'lookup') { + for (let i = 0; i < length; i++) { + const workbookId = this.getNodeParameter('workbook', 0) as string; + const worksheetId = this.getNodeParameter('worksheet', 0) as string; + const tableId = this.getNodeParameter('table', 0) as string; + const lookupColumn = this.getNodeParameter('lookupColumn', 0) as string; + const lookupValue = this.getNodeParameter('lookupValue', 0) as string; + const options = this.getNodeParameter('options', 0) as IDataObject; + + responseData = await microsoftApiRequestAllItemsSkip.call(this, 'value', 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows`, {}, qs); + + qs['$select'] = 'name'; + let columns = await microsoftApiRequestAllItemsSkip.call(this, 'value', 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`, {}, qs); + columns = columns.map((column: IDataObject) => column.name); + for (let i = 0; i < responseData.length; i++) { + for (let y = 0; y < columns.length; y++) { + object[columns[y]] = responseData[i].values[0][y]; + } + result.push({ ...object }); + } + responseData = result; + + if (!columns.includes(lookupColumn)) { + throw new Error(`Column ${lookupColumn} does not exist on the table selected`); + } + + if (options.returnAllMatches) { + + responseData = responseData.filter((data: IDataObject) => { + return (data[lookupColumn]?.toString() === lookupValue ); + }); + + } else { + + responseData = responseData.find((data: IDataObject) => { + return (data[lookupColumn]?.toString() === lookupValue ); + }); + } + } + } } if (resource === 'workbook') { for (let i = 0; i < length; i++) { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts index 8c491a16e1..ea8b78b9d6 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts @@ -28,6 +28,11 @@ export const tableOperations = [ value: 'getRows', description: 'Retrieve a list of tablerows', }, + { + name: 'Lookup', + value: 'lookup', + description: 'Looks for a specific column value and then returns the matching row' + }, ], default: 'addRow', description: 'The operation to perform.', @@ -484,4 +489,137 @@ export const tableFields = [ }, ] }, +/* -------------------------------------------------------------------------- */ +/* table:lookup */ +/* -------------------------------------------------------------------------- */ + { + displayName: 'Workbook', + name: 'workbook', + type: 'options', + required: true, + typeOptions: { + loadOptionsMethod: 'getWorkbooks', + }, + displayOptions: { + show: { + operation: [ + 'lookup', + ], + resource: [ + 'table', + ], + }, + }, + default: '', + }, + { + displayName: 'Worksheet', + name: 'worksheet', + type: 'options', + required: true, + typeOptions: { + loadOptionsMethod: 'getworksheets', + loadOptionsDependsOn: [ + 'workbook', + ], + }, + displayOptions: { + show: { + operation: [ + 'lookup', + ], + resource: [ + 'table', + ], + }, + }, + default: '', + }, + { + displayName: 'Table', + name: 'table', + type: 'options', + required: true, + typeOptions: { + loadOptionsMethod: 'getTables', + loadOptionsDependsOn: [ + 'worksheet', + ], + }, + displayOptions: { + show: { + operation: [ + 'lookup', + ], + resource: [ + 'table', + ], + }, + }, + default: '', + }, + { + displayName: 'Lookup Column', + name: 'lookupColumn', + type: 'string', + default: '', + placeholder: 'Email', + required: true, + displayOptions: { + show: { + resource: [ + 'table', + ], + operation: [ + 'lookup' + ], + }, + }, + description: 'The name of the column in which to look for value.', + }, + { + displayName: 'Lookup Value', + name: 'lookupValue', + type: 'string', + default: '', + placeholder: 'frank@example.com', + required: true, + displayOptions: { + show: { + resource: [ + 'table', + ], + operation: [ + 'lookup' + ], + }, + }, + description: 'The value to look for in column.', + }, + { + displayName: 'Options', + name: 'options', + type: 'collection', + placeholder: 'Add Option', + default: {}, + displayOptions: { + show: { + resource: [ + 'table', + ], + operation: [ + 'lookup', + ], + }, + }, + options: [ + { + displayName: 'Return All Matches', + name: 'returnAllMatches', + type: 'boolean', + default: false, + description: 'By default only the first result gets returned. If options gets set all found matches get returned.', + }, + ], + } ] as INodeProperties[]; From bba6a8494d5b4a616d1171bb1d3c7430b6d70460 Mon Sep 17 00:00:00 2001 From: Jan Oberhauser Date: Sat, 28 Mar 2020 19:08:39 +0100 Subject: [PATCH 6/6] :zap: Fixed some issues with Excel-Node --- .../credentials/TestOAuth2Api.credentials.ts | 26 ++ .../nodes/Google/GoogleDriveTrigger.node.ts | 293 ++++++++++++++++++ .../Microsoft/Excel/MicrosoftExcel.node.ts | 141 +++++---- .../nodes/Microsoft/Excel/TableDescription.ts | 2 +- .../Microsoft/Excel/WorkbookDescription.ts | 2 +- .../Microsoft/Excel/WorksheetDescription.ts | 2 +- .../nodes/Microsoft/Excel/excel.png | Bin 5984 -> 1964 bytes packages/nodes-base/package.json | 26 +- 8 files changed, 412 insertions(+), 80 deletions(-) create mode 100644 packages/nodes-base/credentials/TestOAuth2Api.credentials.ts create mode 100644 packages/nodes-base/nodes/Google/GoogleDriveTrigger.node.ts diff --git a/packages/nodes-base/credentials/TestOAuth2Api.credentials.ts b/packages/nodes-base/credentials/TestOAuth2Api.credentials.ts new file mode 100644 index 0000000000..2a350faecf --- /dev/null +++ b/packages/nodes-base/credentials/TestOAuth2Api.credentials.ts @@ -0,0 +1,26 @@ +import { + ICredentialType, + NodePropertyTypes, +} from 'n8n-workflow'; + +const scopes = [ + 'https://www.googleapis.com/auth/calendar', + 'https://www.googleapis.com/auth/calendar.events', +]; + +export class TestOAuth2Api implements ICredentialType { + name = 'testOAuth2Api'; + extends = [ + 'googleOAuth2Api', + ]; + displayName = 'Test OAuth2 API'; + properties = [ + { + displayName: 'Scope', + name: 'scope', + type: 'string' as NodePropertyTypes, + default: '', + placeholder: 'asdf', + }, + ]; +} diff --git a/packages/nodes-base/nodes/Google/GoogleDriveTrigger.node.ts b/packages/nodes-base/nodes/Google/GoogleDriveTrigger.node.ts new file mode 100644 index 0000000000..e347222e7e --- /dev/null +++ b/packages/nodes-base/nodes/Google/GoogleDriveTrigger.node.ts @@ -0,0 +1,293 @@ +// import { google } from 'googleapis'; + +// import { +// IHookFunctions, +// IWebhookFunctions, +// } from 'n8n-core'; + +// import { +// IDataObject, +// INodeTypeDescription, +// INodeType, +// IWebhookResponseData, +// } from 'n8n-workflow'; + +// import { getAuthenticationClient } from './GoogleApi'; + + +// export class GoogleDriveTrigger implements INodeType { +// description: INodeTypeDescription = { +// displayName: 'Google Drive Trigger', +// name: 'googleDriveTrigger', +// icon: 'file:googleDrive.png', +// group: ['trigger'], +// version: 1, +// subtitle: '={{$parameter["owner"] + "/" + $parameter["repository"] + ": " + $parameter["events"].join(", ")}}', +// description: 'Starts the workflow when a file on Google Drive got changed.', +// defaults: { +// name: 'Google Drive Trigger', +// color: '#3f87f2', +// }, +// inputs: [], +// outputs: ['main'], +// credentials: [ +// { +// name: 'googleApi', +// required: true, +// } +// ], +// webhooks: [ +// { +// name: 'default', +// httpMethod: 'POST', +// responseMode: 'onReceived', +// path: 'webhook', +// }, +// ], +// properties: [ +// { +// displayName: 'Resource Id', +// name: 'resourceId', +// type: 'string', +// default: '', +// required: true, +// placeholder: '', +// description: 'ID of the resource to watch, for example a file ID.', +// }, +// ], +// }; + +// // @ts-ignore (because of request) +// webhookMethods = { +// default: { +// async checkExists(this: IHookFunctions): Promise { +// // const webhookData = this.getWorkflowStaticData('node'); + +// // if (webhookData.webhookId === undefined) { +// // // No webhook id is set so no webhook can exist +// // return false; +// // } + +// // // Webhook got created before so check if it still exists +// // const owner = this.getNodeParameter('owner') as string; +// // const repository = this.getNodeParameter('repository') as string; +// // const endpoint = `/repos/${owner}/${repository}/hooks/${webhookData.webhookId}`; + +// // try { +// // await githubApiRequest.call(this, 'GET', endpoint, {}); +// // } catch (e) { +// // if (e.message.includes('[404]:')) { +// // // Webhook does not exist +// // delete webhookData.webhookId; +// // delete webhookData.webhookEvents; + +// // return false; +// // } + +// // // Some error occured +// // throw e; +// // } + +// // If it did not error then the webhook exists +// // return true; +// return false; +// }, +// async create(this: IHookFunctions): Promise { +// const webhookUrl = this.getNodeWebhookUrl('default'); + +// const resourceId = this.getNodeParameter('resourceId') as string; + +// const credentials = this.getCredentials('googleApi'); + +// if (credentials === undefined) { +// throw new Error('No credentials got returned!'); +// } + +// const scopes = [ +// 'https://www.googleapis.com/auth/drive', +// 'https://www.googleapis.com/auth/drive.appdata', +// 'https://www.googleapis.com/auth/drive.photos.readonly', +// ]; + +// const client = await getAuthenticationClient(credentials.email as string, credentials.privateKey as string, scopes); + +// const drive = google.drive({ +// version: 'v3', +// auth: client, +// }); + + +// const accessToken = await client.getAccessToken(); +// console.log('accessToken: '); +// console.log(accessToken); + +// const asdf = await drive.changes.getStartPageToken(); +// // console.log('asdf: '); +// // console.log(asdf); + + + + +// const response = await drive.changes.watch({ +// // +// pageToken: asdf.data.startPageToken, +// requestBody: { +// id: 'asdf-test-2', +// address: webhookUrl, +// resourceId, +// type: 'web_hook', +// // page_token: '', +// } +// }); + +// console.log('...response...CREATE'); +// console.log(JSON.stringify(response, null, 2)); + + + + + +// // const endpoint = `/repos/${owner}/${repository}/hooks`; + +// // const body = { +// // name: 'web', +// // config: { +// // url: webhookUrl, +// // content_type: 'json', +// // // secret: '...later...', +// // insecure_ssl: '1', // '0' -> not allow inscure ssl | '1' -> allow insercure SSL +// // }, +// // events, +// // active: true, +// // }; + + +// // let responseData; +// // try { +// // responseData = await githubApiRequest.call(this, 'POST', endpoint, body); +// // } catch (e) { +// // if (e.message.includes('[422]:')) { +// // throw new Error('A webhook with the identical URL exists already. Please delete it manually on Github!'); +// // } + +// // throw e; +// // } + +// // if (responseData.id === undefined || responseData.active !== true) { +// // // Required data is missing so was not successful +// // throw new Error('Github webhook creation response did not contain the expected data.'); +// // } + +// // const webhookData = this.getWorkflowStaticData('node'); +// // webhookData.webhookId = responseData.id as string; +// // webhookData.webhookEvents = responseData.events as string[]; + +// return true; +// }, +// async delete(this: IHookFunctions): Promise { +// const webhookUrl = this.getNodeWebhookUrl('default'); + +// const resourceId = this.getNodeParameter('resourceId') as string; + +// const credentials = this.getCredentials('googleApi'); + +// if (credentials === undefined) { +// throw new Error('No credentials got returned!'); +// } + +// const scopes = [ +// 'https://www.googleapis.com/auth/drive', +// 'https://www.googleapis.com/auth/drive.appdata', +// 'https://www.googleapis.com/auth/drive.photos.readonly', +// ]; + +// const client = await getAuthenticationClient(credentials.email as string, credentials.privateKey as string, scopes); + +// const drive = google.drive({ +// version: 'v3', +// auth: client, +// }); + +// // Remove channel +// const response = await drive.channels.stop({ +// requestBody: { +// id: 'asdf-test-2', +// address: webhookUrl, +// resourceId, +// type: 'web_hook', +// } +// }); + + +// console.log('...response...DELETE'); +// console.log(JSON.stringify(response, null, 2)); + + + +// // const webhookData = this.getWorkflowStaticData('node'); + +// // if (webhookData.webhookId !== undefined) { +// // const owner = this.getNodeParameter('owner') as string; +// // const repository = this.getNodeParameter('repository') as string; +// // const endpoint = `/repos/${owner}/${repository}/hooks/${webhookData.webhookId}`; +// // const body = {}; + +// // try { +// // await githubApiRequest.call(this, 'DELETE', endpoint, body); +// // } catch (e) { +// // return false; +// // } + +// // // Remove from the static workflow data so that it is clear +// // // that no webhooks are registred anymore +// // delete webhookData.webhookId; +// // delete webhookData.webhookEvents; +// // } + +// return true; +// }, +// }, +// }; + + + +// async webhook(this: IWebhookFunctions): Promise { +// const bodyData = this.getBodyData(); + +// console.log(''); +// console.log(''); +// console.log('GOT WEBHOOK CALL'); +// console.log(JSON.stringify(bodyData, null, 2)); + + + +// // Check if the webhook is only the ping from Github to confirm if it workshook_id +// if (bodyData.hook_id !== undefined && bodyData.action === undefined) { +// // Is only the ping and not an actual webhook call. So return 'OK' +// // but do not start the workflow. + +// return { +// webhookResponse: 'OK' +// }; +// } + +// // Is a regular webhoook call + +// // TODO: Add headers & requestPath +// const returnData: IDataObject[] = []; + +// returnData.push( +// { +// body: bodyData, +// headers: this.getHeaderData(), +// query: this.getQueryData(), +// } +// ); + +// return { +// workflowData: [ +// this.helpers.returnJsonArray(returnData) +// ], +// }; +// } +// } diff --git a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts index 4edab92d35..26e58ef9ad 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts @@ -153,23 +153,23 @@ export class MicrosoftExcel implements INodeType { const items = this.getInputData(); const returnData: IDataObject[] = []; const length = items.length as unknown as number; - const qs: IDataObject = {}; + let qs: IDataObject = {}; const result: IDataObject[] = []; - const object: IDataObject = {}; let responseData; const resource = this.getNodeParameter('resource', 0) as string; const operation = this.getNodeParameter('operation', 0) as string; + if (resource === 'table') { //https://docs.microsoft.com/en-us/graph/api/table-post-rows?view=graph-rest-1.0&tabs=http if (operation === 'addRow') { + // TODO: At some point it should be possible to use item dependent parameters. + // Is however important to then not make one separate request each. const workbookId = this.getNodeParameter('workbook', 0) as string; const worksheetId = this.getNodeParameter('worksheet', 0) as string; const tableId = this.getNodeParameter('table', 0) as string; const additionalFields = this.getNodeParameter('additionalFields', 0) as IDataObject; const body: IDataObject = {}; - if (Object.keys(items[0].json).length === 0) { - throw new Error('Input cannot be empty'); - } + if (additionalFields.index) { body.index = additionalFields.index as number; } @@ -178,41 +178,35 @@ export class MicrosoftExcel implements INodeType { responseData = await microsoftApiRequest.call(this, 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`, {}, qs); const columns = responseData.value.map((column: IDataObject) => (column.name)); - const cleanedItems: IDataObject[] = []; + const rows: any[][] = []; // tslint:disable-line:no-any - // Delete columns the excel table does not have + // Bring the items into the correct format for (const item of items) { - for (const key of Object.keys(item.json)) { - if (!columns.includes(key)) { - const property = { ...item.json }; - delete property[key]; - cleanedItems.push(property); - } - } - } - - // Map the keys to the column index - const values: any[][] = []; - let value = []; - for (const item of cleanedItems) { + const row = []; for (const column of columns) { - value.push(item[column]); + row.push(item.json[column]); } - values.push(value); - value = []; + rows.push(row); } - body.values = values; + body.values = rows; const { id } = await microsoftApiRequest.call(this, 'POST', `/drive/items/${workbookId}/workbook/createSession`, { persistChanges: true }); responseData = await microsoftApiRequest.call(this, 'POST', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows/add`, body, {}, '', { 'workbook-session-id': id }); await microsoftApiRequest.call(this, 'POST', `/drive/items/${workbookId}/workbook/closeSession`, {}, {}, '', { 'workbook-session-id': id }); + + if (Array.isArray(responseData)) { + returnData.push.apply(returnData, responseData as IDataObject[]); + } else if (responseData !== undefined) { + returnData.push(responseData as IDataObject); + } } //https://docs.microsoft.com/en-us/graph/api/table-list-columns?view=graph-rest-1.0&tabs=http if (operation === 'getColumns') { for (let i = 0; i < length; i++) { - const workbookId = this.getNodeParameter('workbook', 0) as string; - const worksheetId = this.getNodeParameter('worksheet', 0) as string; - const tableId = this.getNodeParameter('table', 0) as string; + qs = {}; + const workbookId = this.getNodeParameter('workbook', i) as string; + const worksheetId = this.getNodeParameter('worksheet', i) as string; + const tableId = this.getNodeParameter('table', i) as string; const returnAll = this.getNodeParameter('returnAll', i) as boolean; const rawData = this.getNodeParameter('rawData', i) as boolean; if (rawData) { @@ -234,14 +228,21 @@ export class MicrosoftExcel implements INodeType { const dataProperty = this.getNodeParameter('dataProperty', i) as string; responseData = { [dataProperty] : responseData }; } + + if (Array.isArray(responseData)) { + returnData.push.apply(returnData, responseData as IDataObject[]); + } else if (responseData !== undefined) { + returnData.push(responseData as IDataObject); + } } } //https://docs.microsoft.com/en-us/graph/api/table-list-rows?view=graph-rest-1.0&tabs=http if (operation === 'getRows') { for (let i = 0; i < length; i++) { - const workbookId = this.getNodeParameter('workbook', 0) as string; - const worksheetId = this.getNodeParameter('worksheet', 0) as string; - const tableId = this.getNodeParameter('table', 0) as string; + qs = {}; + const workbookId = this.getNodeParameter('workbook', i) as string; + const worksheetId = this.getNodeParameter('worksheet', i) as string; + const tableId = this.getNodeParameter('table', i) as string; const returnAll = this.getNodeParameter('returnAll', i) as boolean; const rawData = this.getNodeParameter('rawData', i) as boolean; if (rawData) { @@ -253,71 +254,78 @@ export class MicrosoftExcel implements INodeType { if (returnAll === true) { responseData = await microsoftApiRequestAllItemsSkip.call(this, 'value', 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows`, {}, qs); } else { - qs['$top'] = this.getNodeParameter('limit', i) as number; - responseData = await microsoftApiRequest.call(this, 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows`, {}, qs); + const rowsQs = { ...qs }; + rowsQs['$top'] = this.getNodeParameter('limit', i) as number; + responseData = await microsoftApiRequest.call(this, 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows`, {}, rowsQs); responseData = responseData.value; } if (!rawData) { - qs['$select'] = 'name'; - let columns = await microsoftApiRequestAllItemsSkip.call(this, 'value', 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`, {}, qs); + const columnsQs = { ...qs }; + columnsQs['$select'] = 'name'; + // TODO: That should probably be cached in the future + let columns = await microsoftApiRequestAllItemsSkip.call(this, 'value', 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`, {}, columnsQs); //@ts-ignore columns = columns.map(column => column.name); for (let i = 0; i < responseData.length; i++) { + const object: IDataObject = {}; for (let y = 0; y < columns.length; y++) { object[columns[y]] = responseData[i].values[0][y]; } - result.push({ ...object }); + returnData.push({ ...object }); } - responseData = result; } else { const dataProperty = this.getNodeParameter('dataProperty', i) as string; - responseData = { [dataProperty] : responseData }; + returnData.push({ [dataProperty]: responseData }); } } } if (operation === 'lookup') { for (let i = 0; i < length; i++) { - const workbookId = this.getNodeParameter('workbook', 0) as string; - const worksheetId = this.getNodeParameter('worksheet', 0) as string; - const tableId = this.getNodeParameter('table', 0) as string; - const lookupColumn = this.getNodeParameter('lookupColumn', 0) as string; - const lookupValue = this.getNodeParameter('lookupValue', 0) as string; - const options = this.getNodeParameter('options', 0) as IDataObject; + qs = {}; + const workbookId = this.getNodeParameter('workbook', i) as string; + const worksheetId = this.getNodeParameter('worksheet', i) as string; + const tableId = this.getNodeParameter('table', i) as string; + const lookupColumn = this.getNodeParameter('lookupColumn', i) as string; + const lookupValue = this.getNodeParameter('lookupValue', i) as string; + const options = this.getNodeParameter('options', i) as IDataObject; - responseData = await microsoftApiRequestAllItemsSkip.call(this, 'value', 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows`, {}, qs); + responseData = await microsoftApiRequestAllItemsSkip.call(this, 'value', 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/rows`, {}, {}); qs['$select'] = 'name'; + // TODO: That should probably be cached in the future let columns = await microsoftApiRequestAllItemsSkip.call(this, 'value', 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/tables/${tableId}/columns`, {}, qs); columns = columns.map((column: IDataObject) => column.name); - for (let i = 0; i < responseData.length; i++) { - for (let y = 0; y < columns.length; y++) { - object[columns[y]] = responseData[i].values[0][y]; - } - result.push({ ...object }); - } - responseData = result; if (!columns.includes(lookupColumn)) { throw new Error(`Column ${lookupColumn} does not exist on the table selected`); } + result.length = 0; + for (let i = 0; i < responseData.length; i++) { + const object: IDataObject = {}; + for (let y = 0; y < columns.length; y++) { + object[columns[y]] = responseData[i].values[0][y]; + } + result.push({ ...object }); + } + if (options.returnAllMatches) { - - responseData = responseData.filter((data: IDataObject) => { + responseData = result.filter((data: IDataObject) => { return (data[lookupColumn]?.toString() === lookupValue ); }); - + returnData.push.apply(returnData, responseData as IDataObject[]); } else { - - responseData = responseData.find((data: IDataObject) => { + responseData = result.find((data: IDataObject) => { return (data[lookupColumn]?.toString() === lookupValue ); }); + returnData.push(responseData as IDataObject); } } } } if (resource === 'workbook') { for (let i = 0; i < length; i++) { + qs = {}; //https://docs.microsoft.com/en-us/graph/api/worksheetcollection-add?view=graph-rest-1.0&tabs=http if (operation === 'addWorksheet') { const workbookId = this.getNodeParameter('workbook', i) as string; @@ -344,10 +352,17 @@ export class MicrosoftExcel implements INodeType { responseData = responseData.value; } } + + if (Array.isArray(responseData)) { + returnData.push.apply(returnData, responseData as IDataObject[]); + } else if (responseData !== undefined) { + returnData.push(responseData as IDataObject); + } } } if (resource === 'worksheet') { for (let i = 0; i < length; i++) { + qs = {}; //https://docs.microsoft.com/en-us/graph/api/workbook-list-worksheets?view=graph-rest-1.0&tabs=http if (operation === 'getAll') { const returnAll = this.getNodeParameter('returnAll', i) as boolean; @@ -376,7 +391,9 @@ export class MicrosoftExcel implements INodeType { qs['$select'] = filters.fields; } } + responseData = await microsoftApiRequest.call(this, 'GET', `/drive/items/${workbookId}/workbook/worksheets/${worksheetId}/range(address='${range}')`, {}, qs); + if (!rawData) { const keyRow = this.getNodeParameter('keyRow', i) as number; const dataStartRow = this.getNodeParameter('dataStartRow', i) as number; @@ -385,24 +402,20 @@ export class MicrosoftExcel implements INodeType { } const keyValues = responseData.values[keyRow]; for (let i = dataStartRow; i < responseData.values.length; i++) { + const object: IDataObject = {}; for (let y = 0; y < keyValues.length; y++) { object[keyValues[y]] = responseData.values[i][y]; } - result.push({ ...object }); + returnData.push({ ...object }); } - responseData = result; } else { const dataProperty = this.getNodeParameter('dataProperty', i) as string; - responseData = { [dataProperty] : responseData }; + returnData.push({ [dataProperty]: responseData }); } } } } - if (Array.isArray(responseData)) { - returnData.push.apply(returnData, responseData as IDataObject[]); - } else if (responseData !== undefined) { - returnData.push(responseData as IDataObject); - } + return [this.helpers.returnJsonArray(returnData)]; } } diff --git a/packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts index ea8b78b9d6..8c399330d5 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/TableDescription.ts @@ -1,4 +1,4 @@ -import { INodeProperties } from "n8n-workflow"; +import { INodeProperties } from 'n8n-workflow'; export const tableOperations = [ { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/WorkbookDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/WorkbookDescription.ts index 526a8ceb43..61f7b6f501 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/WorkbookDescription.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/WorkbookDescription.ts @@ -1,4 +1,4 @@ -import { INodeProperties } from "n8n-workflow"; +import { INodeProperties } from 'n8n-workflow'; export const workbookOperations = [ { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts b/packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts index f50fbb3ece..e5811e6c68 100644 --- a/packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts +++ b/packages/nodes-base/nodes/Microsoft/Excel/WorksheetDescription.ts @@ -1,4 +1,4 @@ -import { INodeProperties } from "n8n-workflow"; +import { INodeProperties } from 'n8n-workflow'; export const worksheetOperations = [ { diff --git a/packages/nodes-base/nodes/Microsoft/Excel/excel.png b/packages/nodes-base/nodes/Microsoft/Excel/excel.png index 40631413a5f656ad5819f9faada8eecc78509bd4..ba2b10c06305af8b06f424a16a69ed42fa1a584f 100644 GIT binary patch delta 1961 zcmV;a2UhstF02ob8Gi!+006nq0-pc?0n1QKR7C&)03dQjFKs^`az!9-RPprjAaX?@ zazy}ZH2?qqV2g0g*3bZ93m|et0BSTMeM&odQaXB6A8|$>aYZ3;L?CiSJ9<MIUoS5pFjhazy}ZH6Laz!6=Mt>r7N5Rd-AaO(>azr0; zMj&xTAaO-%jdlQI8USlG0BSS|Tmbs}`yz5i8*xJ*bVdMeJN5SUBy&dqWdQs9`}g?wGIvh-`uV)cz$SA@0BSRa zqmMy+ST%T1Fn@MUB6>;yXDjFI>BZ2<0An2hSOC!2(yYC)K6_R?dQ>fSOS#9su)wt< zcu6UANpzNfaFl#Fc~Ssl7wYco*528`%)~@}S^#Dx0A2ye)68p;cvpsKPl94ee_a4< zHvnld0AdsJ_4DoU?y0)2UW#oebVvYYBLG$a%GAxY!+*J3h-)K!OXKL|c$tG2a6tfJ z4FF&U08#+b+SH!1q<@`>e4B<-gk%wLKmcYZ07wAj>E)!hs%DOKWQ}qPZ$1Ds0N&%@ zkg1r7q>+T7jQ~sl06YKyIsi6*R4s#2cDML-0000rbW%=J0Q&{h1N{B@&-^L;`SZ>R zg@Hml9)Hk=X!_r&n=u*?=+LxVPAMY!$G?kzb|CZ8(Yun0ficYhgmitF%Bz__Zq6xWeMCoUY=-D|a` zw7WFAZU(FMipEnXFCIL5RG*skr>un5+WWUcC`$Qtc*ov@=k^;+DSygj)fx;2y(B!X zF+%A}Sg}>>4(~j1a|*fR!hj}t-VJye?r}O>cmZHu>6yLlcdt>3B8_Z zV}I?vb!k%vm)5BpdnWypDXSh{5L|zN3T@f9MPVO&r0>f;hg6L{re1InDllw%_S5Hk zOZoh1?#BVuR_!){O_jU0*x1HS*5BT$QKM%i;eF&HNi#A#Nf{@JNOb@9v95(47m_fe z7G@Hy?^@`1;q4m?27`9gUku6=AEVU>p?@o7dTL@cfCj&XXkhef5?MgFp-Umad*kU? zKZ=ArULe-!!xd5#rBvl`INCX^3hx%)1<>YatWd31Up#w+DP$5pAMc>Ra5s@ov#jEC zjLZ*LhWpWTc6bDsC){{K=BZFyC{YafZ1hyVHcl;eIsVEuX19~b0^bs2E=1x8S$|(; zIW-U&BCs1O=={E7{qEV|upI|@8< z%RKskRUwlo2ce2cIcM{%N2Kdbo~H;2hMJ~FC-Q$C8;UPAIWywww)|`41hG%)Gn0#Z zd;<`h(m*aAj}M5LO>yw_Aef@`Q-Am;m@|2AtIdK~4cP+d;g@$}tyZ(ivB8)eSZ^o` zqy38h3_}zNd#P4z=9~5TI>g3T9|r1t5l;v&O+N=$JqTZ!hL0tb*aR$gjw6xNzK8{p zSVGp9pM^(*_YrztR(!;`%51Z;5R8dDB!VOn%9IkV+2$#qboceS$50^ICx4UtfG~wr zV(KF@OCy+1Gr!F?^aTB^46%7%4g>W2B;FVT4(i=2co^NA;)ym)%u~r#AU3s%2dD^c zY++h>%OQB>;&g&(3n?*Fn-(B8FRP7GsU&=Pgezou`XM6Wr7cY%-S*vmlg+-#_M^f` zb_mGM2XSMQSQvs<7A$5|qh&Pkwwh>vOuO8#1T^C!jojQZ$?b8 zUV4VJo4GnBku%?~t#I&BmFlVdolf%py?^S$NxxtHXr?C&*SGK4 z4s4Uz18m#2eftiLDu?!-Ki*?7!GX_2Xgdy%9j8$|bh{Q$%6>SKS_vo@#EKBk%eqd~ zW$oJv<7xRUPk>fB%gciR!fvk!+P4iS;kMzZH6lPRTFgx#WR vU$Yob?Es8jNFr2kN&erfsx{VFL!RV)@{00000NkvXXu0mjf0^f~! literal 5984 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 bdqb4Qmz%rb(0TCZ=~zQWN4Z?lGU$H*2Ppz* diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json index c5fa0e2e47..25f148aa7e 100644 --- a/packages/nodes-base/package.json +++ b/packages/nodes-base/package.json @@ -42,8 +42,8 @@ "dist/credentials/GithubApi.credentials.js", "dist/credentials/GithubOAuth2Api.credentials.js", "dist/credentials/GitlabApi.credentials.js", - "dist/credentials/GoogleApi.credentials.js", - "dist/credentials/GoogleOAuth2Api.credentials.js", + "dist/credentials/GoogleApi.credentials.js", + "dist/credentials/GoogleOAuth2Api.credentials.js", "dist/credentials/HttpBasicAuth.credentials.js", "dist/credentials/HttpDigestAuth.credentials.js", "dist/credentials/HttpHeaderAuth.credentials.js", @@ -55,9 +55,9 @@ "dist/credentials/MailchimpApi.credentials.js", "dist/credentials/MailgunApi.credentials.js", "dist/credentials/MandrillApi.credentials.js", - "dist/credentials/MattermostApi.credentials.js", - "dist/credentials/MicrosoftOAuth2Api.credentials.js", - "dist/credentials/MicrosoftExcelOAuth2Api.credentials.js", + "dist/credentials/MattermostApi.credentials.js", + "dist/credentials/MicrosoftExcelOAuth2Api.credentials.js", + "dist/credentials/MicrosoftOAuth2Api.credentials.js", "dist/credentials/MongoDb.credentials.js", "dist/credentials/MySql.credentials.js", "dist/credentials/NextCloudApi.credentials.js", @@ -84,8 +84,8 @@ "dist/credentials/TypeformApi.credentials.js", "dist/credentials/TogglApi.credentials.js", "dist/credentials/VeroApi.credentials.js", - "dist/credentials/WordpressApi.credentials.js", - "dist/credentials/ZohoOAuth2Api.credentials.js" + "dist/credentials/WordpressApi.credentials.js", + "dist/credentials/ZohoOAuth2Api.credentials.js" ], "nodes": [ "dist/nodes/ActiveCampaign/ActiveCampaign.node.js", @@ -119,8 +119,8 @@ "dist/nodes/Github/Github.node.js", "dist/nodes/Github/GithubTrigger.node.js", "dist/nodes/Gitlab/Gitlab.node.js", - "dist/nodes/Gitlab/GitlabTrigger.node.js", - "dist/nodes/Google/GoogleCalendar.node.js", + "dist/nodes/Gitlab/GitlabTrigger.node.js", + "dist/nodes/Google/GoogleCalendar.node.js", "dist/nodes/Google/GoogleDrive.node.js", "dist/nodes/Google/GoogleSheets.node.js", "dist/nodes/GraphQL/GraphQL.node.js", @@ -137,8 +137,8 @@ "dist/nodes/Mailgun/Mailgun.node.js", "dist/nodes/Mandrill/Mandrill.node.js", "dist/nodes/Mattermost/Mattermost.node.js", - "dist/nodes/Merge.node.js", - "dist/nodes/Microsoft/Excel/MicrosoftExcel.node.js", + "dist/nodes/Merge.node.js", + "dist/nodes/Microsoft/Excel/MicrosoftExcel.node.js", "dist/nodes/MoveBinaryData.node.js", "dist/nodes/MongoDb/MongoDb.node.js", "dist/nodes/MySql/MySql.node.js", @@ -181,8 +181,8 @@ "dist/nodes/WriteBinaryFile.node.js", "dist/nodes/Webhook.node.js", "dist/nodes/Wordpress/Wordpress.node.js", - "dist/nodes/Xml.node.js", - "dist/nodes/Zoho/ZohoCrm.node.js" + "dist/nodes/Xml.node.js", + "dist/nodes/Zoho/ZohoCrm.node.js" ] }, "devDependencies": {