admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 18:12:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

🔀 Merge branch 'master' into questdb-integration

Browse Source
This commit is contained in:
Jan Oberhauser
2020-07-10 10:52:56 +02:00
parent 3bf34cffa9 a00fedb351
commit 2a344fbb14
22 changed files with 266 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -1,10 +1,10 @@
# n8n - Workflow Automation Tool # n8n - Workflow Automation Tool
![n8n.io - Workflow Automation](https://raw.githubusercontent.com/n8n-io/n8n/master/docs/images/n8n-logo.png) ![n8n.io - Workflow Automation](https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-logo.png)
n8n is a free and open [fair-code](http://faircode.io) licensed node based Workflow Automation Tool. It can be self-hosted, easily extended, and so also used with internal tools. n8n is a free and open [fair-code](http://faircode.io) licensed node based Workflow Automation Tool. It can be self-hosted, easily extended, and so also used with internal tools.
<a href="https://raw.githubusercontent.com/n8n-io/n8n/master/docs/images/n8n-screenshot.png"><img src="https://raw.githubusercontent.com/n8n-io/n8n/master/docs/images/n8n-screenshot.png" width="550" alt="n8n.io - Screenshot"></a> <a href="https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot.png"><img src="https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot.png" width="550" alt="n8n.io - Screenshot"></a>

BIN
assets/n8n-logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
assets/n8n-screenshot.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 127 KiB

155
docker/images/n8n/README.md
View File

@@ -1,30 +1,28 @@
# n8n - Workflow Automation # n8n - Workflow Automation
![n8n.io - Workflow Automation](https://raw.githubusercontent.com/n8n-io/n8n/master/docs/images/n8n-logo.png) ![n8n.io - Workflow Automation](https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-logo.png)
n8n is a free and open [fair-code](http://faircode.io) licensed node based Workflow Automation Tool. It can be self-hosted, easily extended, and so also used with internal tools. n8n is a free and open [fair-code](http://faircode.io) licensed node based Workflow Automation Tool. It can be self-hosted, easily extended, and so also used with internal tools.
<a href="https://raw.githubusercontent.com/n8n-io/n8n/master/docs/images/n8n-screenshot.png"><img src="https://raw.githubusercontent.com/n8n-io/n8n/master/docs/images/n8n-screenshot.png" width="550" alt="n8n.io - Screenshot"></a> <a href="https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot.png"><img src="https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot.png" width="550" alt="n8n.io - Screenshot"></a>
## Contents ## Contents
- [Demo](#demo) - [Demo](#demo)
- [Available integrations](#available-integrations) - [Available integrations](#available-integrations)
- [Documentation](#documentation) - [Documentation](#documentation)
- [Start n8n in Docker](#start-n8n-in-docker) - [Start n8n in Docker](#start-n8n-in-docker)
- [Start with tunnel](#start-with-tunnel) - [Start with tunnel](#start-with-tunnel)
- [Securing n8n](#securing-n8n) - [Securing n8n](#securing-n8n)
- [Persist data](#persist-data) - [Persist data](#persist-data)
- [Passing Sensitive Data via File](#passing-sensitive-data-via-file) - [Passing Sensitive Data via File](#passing-sensitive-data-via-file)
- [Updating a Running docker-compose Instance](#updating-a-running-docker-compose-instance) - [Updating a Running docker-compose Instance](#updating-a-running-docker-compose-instance)
- [Example Setup with Lets Encrypt](#example-setup-with-lets-encrypt) - [Example Setup with Lets Encrypt](#example-setup-with-lets-encrypt)
- [What does n8n mean and how do you pronounce it](#what-does-n8n-mean-and-how-do-you-pronounce-it) - [What does n8n mean and how do you pronounce it](#what-does-n8n-mean-and-how-do-you-pronounce-it)
- [Support](#support) - [Support](#support)
- [Jobs](#jobs) - [Jobs](#jobs)
- [Upgrading](#upgrading) - [Upgrading](#upgrading)
- [License](#license) - [License](#license)
## Demo ## Demo
@@ -49,9 +47,9 @@ Additional information and example workflows on the n8n.io website: [https://n8n
``` ```
docker run -it --rm \ docker run -it --rm \
--name n8n \ --name n8n \
-p 5678:5678 \ -p 5678:5678 \
n8nio/n8n n8nio/n8n
``` ```
You can then access n8n by opening: You can then access n8n by opening:
@@ -71,14 +69,13 @@ To use it simply start n8n with `--tunnel`
``` ```
docker run -it --rm \ docker run -it --rm \
--name n8n \ --name n8n \
-p 5678:5678 \ -p 5678:5678 \
-v ~/.n8n:/root/.n8n \ -v ~/.n8n:/root/.n8n \
n8nio/n8n \ n8nio/n8n \
n8n start --tunnel n8n start --tunnel
``` ```
## Securing n8n ## Securing n8n
By default n8n can be accessed by everybody. This is OK if you have it only running By default n8n can be accessed by everybody. This is OK if you have it only running
@@ -93,7 +90,6 @@ N8N_BASIC_AUTH_USER=<USER>
N8N_BASIC_AUTH_PASSWORD=<PASSWORD> N8N_BASIC_AUTH_PASSWORD=<PASSWORD>
``` ```
## Persist data ## Persist data
The workflow data gets by default saved in an SQLite database in the user The workflow data gets by default saved in an SQLite database in the user
@@ -102,10 +98,10 @@ settings like webhook URL and encryption key.
``` ```
docker run -it --rm \ docker run -it --rm \
--name n8n \ --name n8n \
-p 5678:5678 \ -p 5678:5678 \
-v ~/.n8n:/root/.n8n \ -v ~/.n8n:/root/.n8n \
n8nio/n8n n8nio/n8n
``` ```
### Start with other Database ### Start with other Database
@@ -121,7 +117,6 @@ for the credentials. If none gets found n8n creates automatically one on
startup. In case credentials are already saved with a different encryption key startup. In case credentials are already saved with a different encryption key
it can not be used anymore as encrypting it is not possible anymore. it can not be used anymore as encrypting it is not possible anymore.
#### Use with MongoDB #### Use with MongoDB
> **WARNING**: Use Postgres if possible! Mongo has problems with saving large > **WARNING**: Use Postgres if possible! Mongo has problems with saving large
@@ -129,40 +124,39 @@ it can not be used anymore as encrypting it is not possible anymore.
> may be dropped in the future. > may be dropped in the future.
Replace the following placeholders with the actual data: Replace the following placeholders with the actual data:
- <MONGO_DATABASE> - MONGO_DATABASE
- <MONGO_HOST> - MONGO_HOST
- <MONGO_PORT> - MONGO_PORT
- <MONGO_USER> - MONGO_USER
- <MONGO_PASSWORD> - MONGO_PASSWORD
``` ```
docker run -it --rm \ docker run -it --rm \
--name n8n \ --name n8n \
-p 5678:5678 \ -p 5678:5678 \
-e DB_TYPE=mongodb \ -e DB_TYPE=mongodb \
-e DB_MONGODB_CONNECTION_URL="mongodb://<MONGO_USER>:<MONGO_PASSWORD>@<MONGO_SERVER>:<MONGO_PORT>/<MONGO_DATABASE>" \ -e DB_MONGODB_CONNECTION_URL="mongodb://<MONGO_USER>:<MONGO_PASSWORD>@<MONGO_SERVER>:<MONGO_PORT>/<MONGO_DATABASE>" \
-v ~/.n8n:/root/.n8n \ -v ~/.n8n:/root/.n8n \
n8nio/n8n \ n8nio/n8n \
n8n start n8n start
``` ```
A full working setup with docker-compose can be found [here](https://github.com/n8n-io/n8n/blob/master/docker/compose/withMongo/README.md) A full working setup with docker-compose can be found [here](https://github.com/n8n-io/n8n/blob/master/docker/compose/withMongo/README.md)
#### Use with PostgresDB #### Use with PostgresDB
Replace the following placeholders with the actual data: Replace the following placeholders with the actual data:
- <POSTGRES_DATABASE> - POSTGRES_DATABASE
- <POSTGRES_HOST> - POSTGRES_HOST
- <POSTGRES_PASSWORD> - POSTGRES_PASSWORD
- <POSTGRES_PORT> - POSTGRES_PORT
- <POSTGRES_USER> - POSTGRES_USER
- <POSTGRES_SCHEMA> - POSTGRES_SCHEMA
``` ```
docker run -it --rm \ docker run -it --rm \
--name n8n \ --name n8n \
-p 5678:5678 \ -p 5678:5678 \
-e DB_TYPE=postgresdb \ -e DB_TYPE=postgresdb \
-e DB_POSTGRESDB_DATABASE=<POSTGRES_DATABASE> \ -e DB_POSTGRESDB_DATABASE=<POSTGRES_DATABASE> \
-e DB_POSTGRESDB_HOST=<POSTGRES_HOST> \ -e DB_POSTGRESDB_HOST=<POSTGRES_HOST> \
@@ -170,39 +164,37 @@ docker run -it --rm \
-e DB_POSTGRESDB_USER=<POSTGRES_USER> \ -e DB_POSTGRESDB_USER=<POSTGRES_USER> \
-e DB_POSTGRESDB_SCHEMA=<POSTGRES_SCHEMA> \ -e DB_POSTGRESDB_SCHEMA=<POSTGRES_SCHEMA> \
-e DB_POSTGRESDB_PASSWORD=<POSTGRES_PASSWORD> \ -e DB_POSTGRESDB_PASSWORD=<POSTGRES_PASSWORD> \
-v ~/.n8n:/root/.n8n \ -v ~/.n8n:/root/.n8n \
n8nio/n8n \ n8nio/n8n \
n8n start n8n start
``` ```
A full working setup with docker-compose can be found [here](https://github.com/n8n-io/n8n/blob/master/docker/compose/withPostgres/README.md) A full working setup with docker-compose can be found [here](https://github.com/n8n-io/n8n/blob/master/docker/compose/withPostgres/README.md)
#### Use with MySQL #### Use with MySQL
Replace the following placeholders with the actual data: Replace the following placeholders with the actual data:
- <MYSQLDB_DATABASE> - MYSQLDB_DATABASE
- <MYSQLDB_HOST> - MYSQLDB_HOST
- <MYSQLDB_PASSWORD> - MYSQLDB_PASSWORD
- <MYSQLDB_PORT> - MYSQLDB_PORT
- <MYSQLDB_USER> - MYSQLDB_USER
``` ```
docker run -it --rm \ docker run -it --rm \
--name n8n \ --name n8n \
-p 5678:5678 \ -p 5678:5678 \
-e DB_TYPE=mysqldb \ -e DB_TYPE=mysqldb \
-e DB_MYSQLDB_DATABASE=<MYSQLDB_DATABASE> \ -e DB_MYSQLDB_DATABASE=<MYSQLDB_DATABASE> \
-e DB_MYSQLDB_HOST=<MYSQLDB_HOST> \ -e DB_MYSQLDB_HOST=<MYSQLDB_HOST> \
-e DB_MYSQLDB_PORT=<MYSQLDB_PORT> \ -e DB_MYSQLDB_PORT=<MYSQLDB_PORT> \
-e DB_MYSQLDB_USER=<MYSQLDB_USER> \ -e DB_MYSQLDB_USER=<MYSQLDB_USER> \
-e DB_MYSQLDB_PASSWORD=<MYSQLDB_PASSWORD> \ -e DB_MYSQLDB_PASSWORD=<MYSQLDB_PASSWORD> \
-v ~/.n8n:/root/.n8n \ -v ~/.n8n:/root/.n8n \
n8nio/n8n \ n8nio/n8n \
n8n start n8n start
``` ```
## Passing Sensitive Data via File ## Passing Sensitive Data via File
To avoid passing sensitive information via environment variables "_FILE" may be To avoid passing sensitive information via environment variables "_FILE" may be
@@ -211,16 +203,15 @@ with the given name. That makes it possible to load data easily from
Docker- and Kubernetes-Secrets. Docker- and Kubernetes-Secrets.
The following environment variables support file input: The following environment variables support file input:
- DB_MONGODB_CONNECTION_URL_FILE - DB_MONGODB_CONNECTION_URL_FILE
- DB_POSTGRESDB_DATABASE_FILE - DB_POSTGRESDB_DATABASE_FILE
- DB_POSTGRESDB_HOST_FILE - DB_POSTGRESDB_HOST_FILE
- DB_POSTGRESDB_PASSWORD_FILE - DB_POSTGRESDB_PASSWORD_FILE
- DB_POSTGRESDB_PORT_FILE - DB_POSTGRESDB_PORT_FILE
- DB_POSTGRESDB_USER_FILE - DB_POSTGRESDB_USER_FILE
- DB_POSTGRESDB_SCHEMA_FILE - DB_POSTGRESDB_SCHEMA_FILE
- N8N_BASIC_AUTH_PASSWORD_FILE - N8N_BASIC_AUTH_PASSWORD_FILE
- N8N_BASIC_AUTH_USER_FILE - N8N_BASIC_AUTH_USER_FILE
## Example Setup with Lets Encrypt ## Example Setup with Lets Encrypt
@@ -235,7 +226,7 @@ docker pull n8nio/n8n
# Stop current setup # Stop current setup
sudo docker-compose stop sudo docker-compose stop
# Delete it (will only delete the docker-containers, data is stored separately) # Delete it (will only delete the docker-containers, data is stored separately)
sudo docker-compose rm sudo docker-compose rm
# Then start it again # Then start it again
sudo docker-compose up -d sudo docker-compose up -d
``` ```
@@ -251,11 +242,11 @@ the environment variable `TZ`.
Example to use the same timezone for both: Example to use the same timezone for both:
``` ```
docker run -it --rm \ docker run -it --rm \
--name n8n \ --name n8n \
-p 5678:5678 \ -p 5678:5678 \
-e GENERIC_TIMEZONE="Europe/Berlin" \ -e GENERIC_TIMEZONE="Europe/Berlin" \
-e TZ="Europe/Berlin" \ -e TZ="Europe/Berlin" \
n8nio/n8n n8nio/n8n
``` ```

4
packages/cli/README.md
View File

@@ -1,10 +1,10 @@
# n8n - Workflow Automation Tool # n8n - Workflow Automation Tool
![n8n.io - Workflow Automation](https://raw.githubusercontent.com/n8n-io/n8n/master/docs/images/n8n-logo.png) ![n8n.io - Workflow Automation](https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-logo.png)
n8n is a free and open [fair-code](http://faircode.io) licensed node based Workflow Automation Tool. It can be self-hosted, easily extended, and so also used with internal tools. n8n is a free and open [fair-code](http://faircode.io) licensed node based Workflow Automation Tool. It can be self-hosted, easily extended, and so also used with internal tools.
<a href="https://raw.githubusercontent.com/n8n-io/n8n/master/docs/images/n8n-screenshot.png"><img src="https://raw.githubusercontent.com/n8n-io/n8n/master/docs/images/n8n-screenshot.png" width="550" alt="n8n.io - Screenshot"></a> <a href="https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot.png"><img src="https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot.png" width="550" alt="n8n.io - Screenshot"></a>
## Contents ## Contents

10
packages/cli/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "n8n", "name": "n8n",
"version": "0.72.0", "version": "0.73.1",
"description": "n8n Workflow Automation Tool", "description": "n8n Workflow Automation Tool",
"license": "SEE LICENSE IN LICENSE.md", "license": "SEE LICENSE IN LICENSE.md",
"homepage": "https://n8n.io", "homepage": "https://n8n.io",
@@ -100,10 +100,10 @@
"lodash.get": "^4.4.2", "lodash.get": "^4.4.2",
"mongodb": "^3.5.5", "mongodb": "^3.5.5",
"mysql2": "^2.0.1", "mysql2": "^2.0.1",
"n8n-core": "~0.37.0", "n8n-core": "~0.38.0",
"n8n-editor-ui": "~0.48.0", "n8n-editor-ui": "~0.49.0",
"n8n-nodes-base": "~0.67.0", "n8n-nodes-base": "~0.68.1",
"n8n-workflow": "~0.33.0", "n8n-workflow": "~0.34.0",
"oauth-1.0a": "^2.2.6", "oauth-1.0a": "^2.2.6",
"open": "^7.0.0", "open": "^7.0.0",
"pg": "^7.11.0", "pg": "^7.11.0",

4
packages/core/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "n8n-core", "name": "n8n-core",
"version": "0.37.0", "version": "0.38.0",
"description": "Core functionality of n8n", "description": "Core functionality of n8n",
"license": "SEE LICENSE IN LICENSE.md", "license": "SEE LICENSE IN LICENSE.md",
"homepage": "https://n8n.io", "homepage": "https://n8n.io",
@@ -46,7 +46,7 @@
"file-type": "^14.6.2", "file-type": "^14.6.2",
"lodash.get": "^4.4.2", "lodash.get": "^4.4.2",
"mime-types": "^2.1.27", "mime-types": "^2.1.27",
"n8n-workflow": "~0.33.0", "n8n-workflow": "~0.34.0",
"p-cancelable": "^2.0.0", "p-cancelable": "^2.0.0",
"request": "^2.88.2", "request": "^2.88.2",
"request-promise-native": "^1.0.7" "request-promise-native": "^1.0.7"

4
packages/editor-ui/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "n8n-editor-ui", "name": "n8n-editor-ui",
"version": "0.48.0", "version": "0.49.0",
"description": "Workflow Editor UI for n8n", "description": "Workflow Editor UI for n8n",
"license": "SEE LICENSE IN LICENSE.md", "license": "SEE LICENSE IN LICENSE.md",
"homepage": "https://n8n.io", "homepage": "https://n8n.io",
@@ -64,7 +64,7 @@
"lodash.debounce": "^4.0.8", "lodash.debounce": "^4.0.8",
"lodash.get": "^4.4.2", "lodash.get": "^4.4.2",
"lodash.set": "^4.3.2", "lodash.set": "^4.3.2",
"n8n-workflow": "~0.33.0", "n8n-workflow": "~0.34.0",
"node-sass": "^4.12.0", "node-sass": "^4.12.0",
"prismjs": "^1.17.1", "prismjs": "^1.17.1",
"quill": "^2.0.0-dev.3", "quill": "^2.0.0-dev.3",

8
packages/editor-ui/src/components/RunData.vue
View File

@@ -19,7 +19,7 @@
<div class="header"> <div class="header">
<div class="title-text"> <div class="title-text">
<strong v-if="dataCount < this.MAX_DISPLAY_ITEMS_AUTO_ALL && dataSize < MAX_DISPLAY_DATA_SIZE"> <strong v-if="dataCount < maxDisplayItems && dataSize < MAX_DISPLAY_DATA_SIZE">
Results: {{ dataCount }} Results: {{ dataCount }}
</strong> </strong>
<strong v-else>Results: <strong v-else>Results:
@@ -248,7 +248,11 @@ export default mixins(
return executionData.resultData.runData; return executionData.resultData.runData;
}, },
maxDisplayItemsOptions (): number[] { maxDisplayItemsOptions (): number[] {
return [25, 50, 100, 250, 500, 1000, this.dataCount].filter(option => option <= this.dataCount); const options = [25, 50, 100, 250, 500, 1000].filter(option => option <= this.dataCount);
if (!options.includes(this.dataCount)) {
options.push(this.dataCount);
}
return options;
}, },
node (): INodeUi | null { node (): INodeUi | null {
return this.$store.getters.activeNode; return this.$store.getters.activeNode;

2
packages/nodes-base/credentials/ZoomApi.credentials.ts
View File

@@ -5,7 +5,7 @@ export class ZoomApi implements ICredentialType {
displayName = 'Zoom API'; displayName = 'Zoom API';
properties = [ properties = [
{ {
displayName: 'JTW Token', displayName: 'JWT Token',
name: 'accessToken', name: 'accessToken',
type: 'string' as NodePropertyTypes, type: 'string' as NodePropertyTypes,
default: '' default: ''

2
packages/nodes-base/nodes/HttpRequest.node.ts
View File

@@ -802,7 +802,7 @@ export class HttpRequest implements INodeType {
if (oAuth2Api !== undefined) { if (oAuth2Api !== undefined) {
//@ts-ignore //@ts-ignore
response = await this.helpers.requestOAuth2.call(this, 'oAuth2Api', requestOptions); response = await this.helpers.requestOAuth2.call(this, 'oAuth2Api', requestOptions, 'Bearer');
} else { } else {
response = await this.helpers.request(requestOptions); response = await this.helpers.request(requestOptions);
} }

4
packages/nodes-base/nodes/Jira/IssueDescription.ts
View File

@@ -41,12 +41,12 @@ export const issueOperations = [
{ {
name: 'Notify', name: 'Notify',
value: 'notify', value: 'notify',
description: 'Creates an email notification for an issue and adds it to the mail queue.', description: 'Create an email notification for an issue and add it to the mail queue',
}, },
{ {
name: 'Status', name: 'Status',
value: 'transitions', value: 'transitions',
description: `Returns either all transitions or a transition that can be performed by the user on an issue, based on the issue's status.`, description: `Return either all transitions or a transition that can be performed by the user on an issue, based on the issue's status`,
}, },
{ {
name: 'Delete', name: 'Delete',

32
packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
View File

@@ -222,7 +222,7 @@ export class MicrosoftSql implements INodeType {
const pool = new mssql.ConnectionPool(config); const pool = new mssql.ConnectionPool(config);
await pool.connect(); await pool.connect();
let returnItems: INodeExecutionData[] = []; let returnItems = [];
const items = this.getInputData(); const items = this.getInputData();
const operation = this.getNodeParameter('operation', 0) as string; const operation = this.getNodeParameter('operation', 0) as string;
@@ -249,7 +249,7 @@ export class MicrosoftSql implements INodeType {
// ---------------------------------- // ----------------------------------
const tables = createTableStruct(this.getNodeParameter, items); const tables = createTableStruct(this.getNodeParameter, items);
const queriesResults = await executeQueryQueue( await executeQueryQueue(
tables, tables,
({ ({
table, table,
@@ -274,15 +274,7 @@ export class MicrosoftSql implements INodeType {
}, },
); );
const rowsAffected = flatten(queriesResults).reduce( returnItems = items;
(acc: number, resp: mssql.IResult<object>): number =>
(acc += resp.rowsAffected.reduce((sum, val) => (sum += val))),
0,
);
returnItems = this.helpers.returnJsonArray({
rowsAffected,
} as IDataObject);
} else if (operation === 'update') { } else if (operation === 'update') {
// ---------------------------------- // ----------------------------------
// update // update
@@ -294,10 +286,10 @@ export class MicrosoftSql implements INodeType {
const tables = createTableStruct( const tables = createTableStruct(
this.getNodeParameter, this.getNodeParameter,
items, items,
['updateKey'], ['updateKey'].concat(updateKeys),
'updateKey', 'updateKey',
); );
const queriesResults = await executeQueryQueue( await executeQueryQueue(
tables, tables,
({ ({
table, table,
@@ -326,15 +318,7 @@ export class MicrosoftSql implements INodeType {
}, },
); );
const rowsAffected = flatten(queriesResults).reduce( returnItems = items;
(acc: number, resp: mssql.IResult<object>): number =>
(acc += resp.rowsAffected.reduce((sum, val) => (sum += val))),
0,
);
returnItems = this.helpers.returnJsonArray({
rowsAffected,
} as IDataObject);
} else if (operation === 'delete') { } else if (operation === 'delete') {
// ---------------------------------- // ----------------------------------
// delete // delete
@@ -380,14 +364,14 @@ export class MicrosoftSql implements INodeType {
}), }),
); );
const rowsAffected = flatten(queriesResults).reduce( const rowsDeleted = flatten(queriesResults).reduce(
(acc: number, resp: mssql.IResult<object>): number => (acc: number, resp: mssql.IResult<object>): number =>
(acc += resp.rowsAffected.reduce((sum, val) => (sum += val))), (acc += resp.rowsAffected.reduce((sum, val) => (sum += val))),
0, 0,
); );
returnItems = this.helpers.returnJsonArray({ returnItems = this.helpers.returnJsonArray({
rowsAffected, rowsDeleted,
} as IDataObject); } as IDataObject);
} else { } else {
await pool.close(); await pool.close();

14
packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
View File

@@ -48,6 +48,9 @@ export async function pipedriveApiRequest(this: IHookFunctions | IExecuteFunctio
query.api_token = credentials.apiToken; query.api_token = credentials.apiToken;
const options: OptionsWithUri = { const options: OptionsWithUri = {
headers: {
Accept: 'application/json',
},
method, method,
qs: query, qs: query,
uri: `https://api.pipedrive.com/v1${endpoint}`, uri: `https://api.pipedrive.com/v1${endpoint}`,
@@ -93,7 +96,7 @@ export async function pipedriveApiRequest(this: IHookFunctions | IExecuteFunctio
if (error.response && error.response.body && error.response.body.error) { if (error.response && error.response.body && error.response.body.error) {
// Try to return the error prettier // Try to return the error prettier
let errorMessage = `Pipedrive error response [${error.statusCode}]: ${error.response.body.error}`; let errorMessage = `Pipedrive error response [${error.statusCode}]: ${error.response.body.error.message}`;
if (error.response.body.error_info) { if (error.response.body.error_info) {
errorMessage += ` - ${error.response.body.error_info}`; errorMessage += ` - ${error.response.body.error_info}`;
} }
@@ -124,7 +127,7 @@ export async function pipedriveApiRequestAllItems(this: IHookFunctions | IExecut
if (query === undefined) { if (query === undefined) {
query = {}; query = {};
} }
query.limit = 500; query.limit = 100;
query.start = 0; query.start = 0;
const returnData: IDataObject[] = []; const returnData: IDataObject[] = [];
@@ -133,7 +136,12 @@ export async function pipedriveApiRequestAllItems(this: IHookFunctions | IExecut
do { do {
responseData = await pipedriveApiRequest.call(this, method, endpoint, body, query); responseData = await pipedriveApiRequest.call(this, method, endpoint, body, query);
returnData.push.apply(returnData, responseData.data); // the search path returns data diferently
if (responseData.data.items) {
returnData.push.apply(returnData, responseData.data.items);
} else {
returnData.push.apply(returnData, responseData.data);
}
query.start = responseData.additionalData.pagination.next_start; query.start = responseData.additionalData.pagination.next_start;
} while ( } while (

131
packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
View File

@@ -25,7 +25,6 @@ interface CustomProperty {
value: string; value: string;
} }
/** /**
* Add the additional fields to the body * Add the additional fields to the body
* *
@@ -362,6 +361,11 @@ export class Pipedrive implements INodeType {
value: 'getAll', value: 'getAll',
description: 'Get data of all persons', description: 'Get data of all persons',
}, },
{
name: 'Search',
value: 'search',
description: 'Search all persons',
},
{ {
name: 'Update', name: 'Update',
value: 'update', value: 'update',
@@ -2021,6 +2025,7 @@ export class Pipedrive implements INodeType {
show: { show: {
operation: [ operation: [
'getAll', 'getAll',
'search',
], ],
}, },
}, },
@@ -2035,6 +2040,7 @@ export class Pipedrive implements INodeType {
show: { show: {
operation: [ operation: [
'getAll', 'getAll',
'search',
], ],
returnAll: [ returnAll: [
false, false,
@@ -2088,6 +2094,81 @@ export class Pipedrive implements INodeType {
}, },
], ],
}, },
// ----------------------------------
// person:search
// ----------------------------------
{
displayName: 'Term',
name: 'term',
type: 'string',
displayOptions: {
show: {
operation: [
'search',
],
resource: [
'person',
],
},
},
default: '',
description: 'The search term to look for. Minimum 2 characters (or 1 if using exact_match).',
},
{
displayName: 'Additional Fields',
name: 'additionalFields',
type: 'collection',
placeholder: 'Add Field',
displayOptions: {
show: {
operation: [
'search',
],
resource: [
'person',
],
},
},
default: {},
options: [
{
displayName: 'Exact Match',
name: 'exactMatch',
type: 'boolean',
default: false,
description: 'When enabled, only full exact matches against the given term are returned. It is not case sensitive.',
},
{
displayName: 'Fields',
name: 'fields',
type: 'string',
default: '',
description: 'A comma-separated string array. The fields to perform the search from. Defaults to all of them.',
},
{
displayName: 'Include Fields',
name: 'includeFields',
type: 'string',
default: '',
description: 'Supports including optional fields in the results which are not provided by default.',
},
{
displayName: 'Organization ID',
name: 'organizationId',
type: 'string',
default: '',
description: 'Will filter Deals by the provided Organization ID.',
},
{
displayName: 'RAW Data',
name: 'rawData',
type: 'boolean',
default: false,
description: `Returns the data exactly in the way it got received from the API.`,
},
],
},
], ],
}; };
@@ -2526,6 +2607,39 @@ export class Pipedrive implements INodeType {
endpoint = `/persons`; endpoint = `/persons`;
} else if (operation === 'search') {
// ----------------------------------
// persons:search
// ----------------------------------
requestMethod = 'GET';
qs.term = this.getNodeParameter('term', i) as string;
returnAll = this.getNodeParameter('returnAll', i) as boolean;
if (returnAll === false) {
qs.limit = this.getNodeParameter('limit', i) as number;
}
const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
if (additionalFields.fields) {
qs.fields = additionalFields.fields as string;
}
if (additionalFields.exactMatch) {
qs.exact_match = additionalFields.exactMatch as boolean;
}
if (additionalFields.organizationId) {
qs.organization_id = parseInt(additionalFields.organizationId as string, 10);
}
if (additionalFields.includeFields) {
qs.include_fields = additionalFields.includeFields as string;
}
endpoint = `/persons/search`;
} else if (operation === 'update') { } else if (operation === 'update') {
// ---------------------------------- // ----------------------------------
// person:update // person:update
@@ -2562,7 +2676,9 @@ export class Pipedrive implements INodeType {
let responseData; let responseData;
if (returnAll === true) { if (returnAll === true) {
responseData = await pipedriveApiRequestAllItems.call(this, requestMethod, endpoint, body, qs); responseData = await pipedriveApiRequestAllItems.call(this, requestMethod, endpoint, body, qs);
} else { } else {
if (customProperties !== undefined) { if (customProperties !== undefined) {
@@ -2597,6 +2713,19 @@ export class Pipedrive implements INodeType {
responseData.data = []; responseData.data = [];
} }
if (operation === 'search' && responseData.data && responseData.data.items) {
responseData.data = responseData.data.items;
const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
if (additionalFields.rawData !== true) {
responseData.data = responseData.data.map((item: { result_score: number, item: object }) => {
return {
result_score: item.result_score,
...item.item,
};
});
}
}
if (Array.isArray(responseData.data)) { if (Array.isArray(responseData.data)) {
returnData.push.apply(returnData, responseData.data as IDataObject[]); returnData.push.apply(returnData, responseData.data as IDataObject[]);
} else { } else {

13
packages/nodes-base/nodes/Postgres/Postgres.node.ts
View File

@@ -1,5 +1,10 @@
import { IExecuteFunctions } from 'n8n-core'; import { IExecuteFunctions } from 'n8n-core';
import { IDataObject, INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow'; import {
IDataObject,
INodeExecutionData,
INodeType,
INodeTypeDescription
} from 'n8n-workflow';
import * as pgPromise from 'pg-promise'; import * as pgPromise from 'pg-promise';
@@ -34,17 +39,17 @@ export class Postgres implements INodeType {
{ {
name: 'Execute Query', name: 'Execute Query',
value: 'executeQuery', value: 'executeQuery',
description: 'Executes a SQL query.', description: 'Execute an SQL query',
}, },
{ {
name: 'Insert', name: 'Insert',
value: 'insert', value: 'insert',
description: 'Insert rows in database.', description: 'Insert rows in database',
}, },
{ {
name: 'Update', name: 'Update',
value: 'update', value: 'update',
description: 'Updates rows in database.', description: 'Update rows in database',
}, },
], ],
default: 'insert', default: 'insert',

6
packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
View File

@@ -48,15 +48,15 @@ interface IPostMessageBody {
export class Rocketchat implements INodeType { export class Rocketchat implements INodeType {
description: INodeTypeDescription = { description: INodeTypeDescription = {
displayName: 'Rocketchat', displayName: 'RocketChat',
name: 'rocketchat', name: 'rocketchat',
icon: 'file:rocketchat.png', icon: 'file:rocketchat.png',
group: ['output'], group: ['output'],
version: 1, version: 1,
subtitle: '={{$parameter["resource"] + ": " + $parameter["operation"]}}', subtitle: '={{$parameter["resource"] + ": " + $parameter["operation"]}}',
description: 'Consume Rocketchat API', description: 'Consume RocketChat API',
defaults: { defaults: {
name: 'Rocketchat', name: 'RocketChat',
color: '#c02428', color: '#c02428',
}, },
inputs: ['main'], inputs: ['main'],

2
packages/nodes-base/nodes/Trello/AttachmentDescription.ts
View File

@@ -29,7 +29,7 @@ export const attachmentOperations = [
{ {
name: 'Get', name: 'Get',
value: 'get', value: 'get',
description: 'Get the data of an attachments', description: 'Get the data of an attachment',
}, },
{ {
name: 'Get All', name: 'Get All',

6
packages/nodes-base/nodes/Trello/ChecklistDescription.ts
View File

@@ -44,17 +44,17 @@ export const checklistOperations = [
{ {
name: 'Get Checklist Items', name: 'Get Checklist Items',
value: 'getCheckItem', value: 'getCheckItem',
description: 'Get a specific Checklist on a card', description: 'Get a specific checklist on a card',
}, },
{ {
name: 'Get Completed Checklist Items', name: 'Get Completed Checklist Items',
value: 'completedCheckItems', value: 'completedCheckItems',
description: 'Get the completed Checklist items on a card', description: 'Get the completed checklist items on a card',
}, },
{ {
name: 'Update Checklist Item', name: 'Update Checklist Item',
value: 'updateCheckItem', value: 'updateCheckItem',
description: 'Update an item in a checklist on a card.', description: 'Update an item in a checklist on a card',
}, },
], ],
default: 'getAll', default: 'getAll',

2
packages/nodes-base/nodes/Trello/LabelDescription.ts
View File

@@ -39,7 +39,7 @@ export const labelOperations = [
{ {
name: 'Get All', name: 'Get All',
value: 'getAll', value: 'getAll',
description: 'Returns all label for the board', description: 'Returns all labels for the board',
}, },
{ {
name: 'Remove From Card', name: 'Remove From Card',

6
packages/nodes-base/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "n8n-nodes-base", "name": "n8n-nodes-base",
"version": "0.67.0", "version": "0.68.1",
"description": "Base nodes of n8n", "description": "Base nodes of n8n",
"license": "SEE LICENSE IN LICENSE.md", "license": "SEE LICENSE IN LICENSE.md",
"homepage": "https://n8n.io", "homepage": "https://n8n.io",
@@ -335,7 +335,7 @@
"@types/xml2js": "^0.4.3", "@types/xml2js": "^0.4.3",
"gulp": "^4.0.0", "gulp": "^4.0.0",
"jest": "^24.9.0", "jest": "^24.9.0",
"n8n-workflow": "~0.32.0", "n8n-workflow": "~0.34.0",
"ts-jest": "^24.0.2", "ts-jest": "^24.0.2",
"tslint": "^5.17.0", "tslint": "^5.17.0",
"typescript": "~3.7.4" "typescript": "~3.7.4"
@@ -361,7 +361,7 @@
"mongodb": "^3.5.5", "mongodb": "^3.5.5",
"mssql": "^6.2.0", "mssql": "^6.2.0",
"mysql2": "^2.0.1", "mysql2": "^2.0.1",
"n8n-core": "~0.37.0", "n8n-core": "~0.38.0",
"nodemailer": "^6.4.6", "nodemailer": "^6.4.6",
"pdf-parse": "^1.1.1", "pdf-parse": "^1.1.1",
"pg-promise": "^9.0.3", "pg-promise": "^9.0.3",

2
packages/workflow/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "n8n-workflow", "name": "n8n-workflow",
"version": "0.33.0", "version": "0.34.0",
"description": "Workflow base code of n8n", "description": "Workflow base code of n8n",
"license": "SEE LICENSE IN LICENSE.md", "license": "SEE LICENSE IN LICENSE.md",
"homepage": "https://n8n.io", "homepage": "https://n8n.io",