From 29eab1dbcd529c56825d470f10cdb90bf185e213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 29 Jun 2021 07:28:02 +0200
Subject: [PATCH 01/74] :bug: Fix Pipedrive SVG icon (#1948)

* :art: Fix Pipedrive SVG icon

* :zap: Except Pipedrive SVG from optimizer
---
 package.json                                      | 2 +-
 packages/nodes-base/nodes/Pipedrive/pipedrive.svg | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 44145dbb5e..8855d43d8f 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "build": "lerna exec npm run build",
     "dev": "lerna exec npm run dev --parallel",
     "clean:dist": "lerna exec -- rimraf ./dist",
-    "optimize-svg": "find ./packages -name '*.svg' -print0 | xargs -0 -P16 -L20 npx svgo",
+    "optimize-svg": "find ./packages -name '*.svg' ! -name 'pipedrive.svg' -print0 | xargs -0 -P16 -L20 npx svgo",
     "start": "run-script-os",
     "start:default": "cd packages/cli/bin && ./n8n",
     "start:windows": "cd packages/cli/bin && n8n",
diff --git a/packages/nodes-base/nodes/Pipedrive/pipedrive.svg b/packages/nodes-base/nodes/Pipedrive/pipedrive.svg
index 281d3fd12e..fb3daef773 100644
--- a/packages/nodes-base/nodes/Pipedrive/pipedrive.svg
+++ b/packages/nodes-base/nodes/Pipedrive/pipedrive.svg
@@ -1 +1 @@
-<svg width="60" height="60" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg"><mask id="a" maskUnits="userSpaceOnUse" x="0" y="0" width="32" height="32" fill="#26292C"><path d="M2.737 0h26.526A2.737 2.737 0 0132 2.737v26.526A2.737 2.737 0 0129.263 32H2.737A2.737 2.737 0 010 29.263V2.737A2.737 2.737 0 012.737 0z"/></mask><g mask="url(#a)" fill="#26292C"><path d="M2.737 0h26.526A2.737 2.737 0 0132 2.737v26.526A2.737 2.737 0 0129.263 32H2.737A2.737 2.737 0 010 29.263V2.737A2.737 2.737 0 012.737 0z"/></g><mask id="b" maskUnits="userSpaceOnUse" x="7" y="4" width="18" height="24" fill="#26292C"><path d="M13.335 13.177c0 2.142 1.087 4.454 3.48 4.454 1.773 0 3.567-1.385 3.567-4.486 0-2.719-1.41-4.544-3.509-4.544-1.71 0-3.538 1.202-3.538 4.576zm4.38-8.545c4.29 0 7.174 3.397 7.174 8.454 0 4.977-3.038 8.452-7.381 8.452-2.071 0-3.398-.887-4.091-1.53.005.153.008.324.008.506v6.75H8.982V9.28c0-.262-.084-.344-.343-.344H7.111V4.997h3.728c1.717 0 2.156.874 2.24 1.547.697-.78 2.141-1.912 4.637-1.912z"/></mask><g mask="url(#b)" fill="#26292C"><path d="M13.335 13.177c0 2.142 1.087 4.454 3.48 4.454 1.773 0 3.567-1.385 3.567-4.486 0-2.719-1.41-4.544-3.509-4.544-1.71 0-3.538 1.202-3.538 4.576zm4.38-8.545c4.29 0 7.174 3.397 7.174 8.454 0 4.977-3.038 8.452-7.381 8.452-2.071 0-3.398-.887-4.091-1.53.005.153.008.324.008.506v6.75H8.982V9.28c0-.262-.084-.344-.343-.344H7.111V4.997h3.728c1.717 0 2.156.874 2.24 1.547.697-.78 2.141-1.912 4.637-1.912z" fill="#FFF"/></g></svg>
\ No newline at end of file
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" width="60" height="60" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg"><mask id="mask001" mask-type="alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="32" height="32" fill="#26292C"><path d="M2.73694 0H29.2631C30.7746 0 32 1.22507 32 2.73695V29.2631C32 30.7746 30.7749 32 29.2631 32H2.73694C1.22537 32 0 30.7749 0 29.2631V2.73695C0 1.22537 1.22508 0 2.73694 0Z" fill="#26292C"></path></mask><g mask="url(#mask001)" fill="#26292C"><path d="M2.73694 0H29.2631C30.7746 0 32 1.22507 32 2.73695V29.2631C32 30.7746 30.7749 32 29.2631 32H2.73694C1.22537 32 0 30.7749 0 29.2631V2.73695C0 1.22537 1.22508 0 2.73694 0Z" fill="#26292C"></path></g><mask id="mask1" mask-type="alpha" maskUnits="userSpaceOnUse" x="7" y="4" width="18" height="24" fill="#26292C"><path d="M13.3348 13.1766C13.3348 15.3194 14.4219 17.6311 16.8141 17.6311C18.5881 17.6311 20.3819 16.2461 20.3819 13.1451C20.3819 10.4264 18.9718 8.60127 16.8731 8.60127C15.163 8.60127 13.3348 9.80258 13.3348 13.1766ZM17.7158 4.63159C22.0051 4.63159 24.8891 8.02873 24.8891 13.0856C24.8891 18.0629 21.8509 21.5378 17.5076 21.5378C15.4368 21.5378 14.1103 20.6509 13.4168 20.0089C13.4217 20.1611 13.425 20.3316 13.425 20.5136V27.2632H8.98164V9.2797C8.98164 9.01824 8.89802 8.93552 8.63897 8.93552H7.11085V4.99729H10.8393C12.556 4.99729 12.9954 5.87097 13.079 6.54444C13.7759 5.76342 15.2204 4.63159 17.7158 4.63159Z" fill="#26292C"></path></mask><g mask="url(#mask1)" fill="#26292C"><path d="M13.3348 13.1766C13.3348 15.3194 14.4219 17.6311 16.8141 17.6311C18.5881 17.6311 20.3819 16.2461 20.3819 13.1451C20.3819 10.4264 18.9718 8.60127 16.8731 8.60127C15.163 8.60127 13.3348 9.80258 13.3348 13.1766ZM17.7158 4.63159C22.0051 4.63159 24.8891 8.02873 24.8891 13.0856C24.8891 18.0629 21.8509 21.5378 17.5076 21.5378C15.4368 21.5378 14.1103 20.6509 13.4168 20.0089C13.4217 20.1611 13.425 20.3316 13.425 20.5136V27.2632H8.98164V9.2797C8.98164 9.01824 8.89802 8.93552 8.63897 8.93552H7.11085V4.99729H10.8393C12.556 4.99729 12.9954 5.87097 13.079 6.54444C13.7759 5.76342 15.2204 4.63159 17.7158 4.63159Z" fill="#FFFFFF"></path></g></svg>

From b2e2cfa773dfbffea238a499220ba025eee398e4 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Tue, 29 Jun 2021 04:40:47 -0400
Subject: [PATCH 02/74] :bug: Handle bit (boolean) values correctly when
 inserting (#1949)

---
 packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
index d01643c124..cff19da729 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
@@ -102,6 +102,8 @@ export function extractValues(item: IDataObject): string {
 				return 'NULL';
 			} else if (typeof val === 'string') {
 				return `'${val.replace(/'/g, '\'\'')}'`;
+			} else if (typeof val === 'boolean') {
+				return +!!val;
 			}
 			return val;
 		}) // maybe other types such as dates have to be handled as well

From a4d0c0fcad4c672bbba59cf2ba9c26bcb0b691a4 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Tue, 29 Jun 2021 11:47:28 +0300
Subject: [PATCH 03/74] :bug: Fix keyboard shortcut issues (#1934)

* fix keyboard shortcut issues

* remove duplicate check

* remove duplicate check
---
 packages/editor-ui/src/modules/ui.ts      |  3 ---
 packages/editor-ui/src/views/NodeView.vue | 29 ++++++++++++++++-------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/packages/editor-ui/src/modules/ui.ts b/packages/editor-ui/src/modules/ui.ts
index 9fbe35fb37..a5681f4a84 100644
--- a/packages/editor-ui/src/modules/ui.ts
+++ b/packages/editor-ui/src/modules/ui.ts
@@ -31,9 +31,6 @@ const module: Module<IUiState, IRootState> = {
 		isModalActive: (state: IUiState) => {
 			return (name: string) => state.modalStack.length > 0 && name === state.modalStack[0];
 		},
-		anyModalsOpen: (state: IUiState) => {
-			return state.modalStack.length > 0;
-		},
 		sidebarMenuCollapsed: (state: IUiState): boolean => state.sidebarMenuCollapsed,
 	},
 	mutations: {
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 617aabcb41..7904b4eb0e 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -514,15 +514,29 @@ export default mixins(
 				// else which should ignore the default keybindings
 				for (let index = 0; index < path.length; index++) {
 					if (path[index].className && typeof path[index].className === 'string' && (
-						path[index].className.includes('el-message-box') ||
-						path[index].className.includes('el-select') ||
 						path[index].className.includes('ignore-key-press')
 					)) {
 						return;
 					}
 				}
-				const anyModalsOpen = this.$store.getters['ui/anyModalsOpen'];
-				if (anyModalsOpen) {
+
+				// el-dialog or el-message-box element is open
+				if (window.document.body.classList.contains('el-popup-parent--hidden')) {
+					return;
+				}
+
+				if (e.key === 'Escape') {
+					this.createNodeActive = false;
+					if (this.activeNode) {
+						this.$externalHooks().run('dataDisplay.nodeEditingFinished');
+						this.$store.commit('setActiveNode', null);
+					}
+
+					return;
+				}
+
+				// node modal is open
+				if (this.activeNode) {
 					return;
 				}
 
@@ -533,15 +547,12 @@ export default mixins(
 					e.preventDefault();
 
 					this.callDebounced('deleteSelectedNodes', 500);
-				} else if (e.key === 'Escape') {
-					this.$externalHooks().run('dataDisplay.nodeEditingFinished');
-					this.createNodeActive = false;
-					this.$store.commit('setActiveNode', null);
+
 				} else if (e.key === 'Tab') {
 					this.createNodeActive = !this.createNodeActive && !this.isReadOnly;
 				} else if (e.key === this.controlKeyCode) {
 					this.ctrlKeyPressed = true;
-				} else if (e.key === 'F2') {
+				} else if (e.key === 'F2' && !this.isReadOnly) {
 					const lastSelectedNode = this.lastSelectedNode;
 					if (lastSelectedNode !== null) {
 						this.callDebounced('renameNodePrompt', 1500, lastSelectedNode.name);

From 857a55a608da9fb9774ba1fa26888eccf7801c65 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Tue, 29 Jun 2021 10:55:01 +0200
Subject: [PATCH 04/74] :bookmark: Release n8n-nodes-base@0.123.1

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 6821dbb88e..5be403bb31 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.123.0",
+  "version": "0.123.1",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 3a2456a88e31a77c542123640089af8a20ceab92 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Tue, 29 Jun 2021 10:56:43 +0200
Subject: [PATCH 05/74] :bookmark: Release n8n-editor-ui@0.96.1

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index f829f339f0..54e7eb8f52 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.96.0",
+  "version": "0.96.1",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 312eb827f5cdba2d173ecd70a5bdffe3ec0ee512 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Tue, 29 Jun 2021 10:57:45 +0200
Subject: [PATCH 06/74] :arrow_up: Set n8n-editor-ui@0.96.1 and
 n8n-nodes-base@0.123.1 on n8n

---
 packages/cli/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 4c095c3960..d7da7ef50f 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -107,8 +107,8 @@
     "lodash.get": "^4.4.2",
     "mysql2": "~2.2.0",
     "n8n-core": "~0.75.0",
-    "n8n-editor-ui": "~0.96.0",
-    "n8n-nodes-base": "~0.123.0",
+    "n8n-editor-ui": "~0.96.1",
+    "n8n-nodes-base": "~0.123.1",
     "n8n-workflow": "~0.62.0",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",

From 38f0cc1a8f53c80d48d2b1d754f2faa0c406cfec Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Tue, 29 Jun 2021 10:58:44 +0200
Subject: [PATCH 07/74] :bookmark: Release n8n@0.126.1

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index d7da7ef50f..ca4a198df1 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.126.0",
+  "version": "0.126.1",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From a080fab1f1e0c7b74491358d27d83133c6113ad4 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Wed, 30 Jun 2021 10:17:30 +0300
Subject: [PATCH 08/74] :zap: Update click outside events to limit only to
 click events, ignoring blur (#1953)

---
 .../components/ExpandableInput/ExpandableInputEdit.vue    | 8 +++++---
 .../editor-ui/src/components/NodeCreator/NodeCreator.vue  | 8 +++++---
 packages/editor-ui/src/components/TagsDropdown.vue        | 8 +++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
index bed1a0c495..b90d8cfb38 100644
--- a/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
+++ b/packages/editor-ui/src/components/ExpandableInput/ExpandableInputEdit.vue
@@ -10,7 +10,7 @@
 			@keydown.esc="onEscape"
 			ref="input"
 			size="4"
-			v-click-outside="onBlur"
+			v-click-outside="onClickOutside"
 		/>
 	</ExpandableInputBase>
 </template>
@@ -47,8 +47,10 @@ export default Vue.extend({
 		onEnter() {
 			this.$emit('enter', (this.$refs.input as HTMLInputElement).value);
 		},
-		onBlur() {
-			this.$emit('blur', (this.$refs.input as HTMLInputElement).value);
+		onClickOutside(e: Event) {
+			if (e.type === 'click') {
+				this.$emit('blur', (this.$refs.input as HTMLInputElement).value);
+			}
 		},
 		onEscape() {
 			this.$emit('esc');
diff --git a/packages/editor-ui/src/components/NodeCreator/NodeCreator.vue b/packages/editor-ui/src/components/NodeCreator/NodeCreator.vue
index 4c9eccf5e0..ea36daf9be 100644
--- a/packages/editor-ui/src/components/NodeCreator/NodeCreator.vue
+++ b/packages/editor-ui/src/components/NodeCreator/NodeCreator.vue
@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<SlideTransition>
-			<div class="node-creator" v-if="active" v-click-outside="closeCreator">
+			<div class="node-creator" v-if="active" v-click-outside="onClickOutside">
 				<MainPanel @nodeTypeSelected="nodeTypeSelected" :categorizedItems="categorizedItems" :categoriesWithNodes="categoriesWithNodes" :searchItems="searchItems"></MainPanel>
 			</div>
 		</SlideTransition>
@@ -64,8 +64,10 @@ export default Vue.extend({
 		},
 	},
 	methods: {
-		closeCreator () {
-			this.$emit('closeNodeCreator');
+		onClickOutside (e: Event) {
+			if (e.type === 'click') {
+				this.$emit('closeNodeCreator');
+			}
 		},
 		nodeTypeSelected (nodeTypeName: string) {
 			this.$emit('nodeTypeSelected', nodeTypeName);
diff --git a/packages/editor-ui/src/components/TagsDropdown.vue b/packages/editor-ui/src/components/TagsDropdown.vue
index 5afc839159..6eedc1ec05 100644
--- a/packages/editor-ui/src/components/TagsDropdown.vue
+++ b/packages/editor-ui/src/components/TagsDropdown.vue
@@ -1,5 +1,5 @@
 <template>
-	<div :class="{'tags-container': true, focused}" @keydown.stop v-click-outside="onBlur">
+	<div :class="{'tags-container': true, focused}" @keydown.stop v-click-outside="onClickOutside">
 		<el-select
 			:popperAppendToBody="false"
 			:value="appliedTags"
@@ -215,8 +215,10 @@ export default mixins(showMessage).extend({
 				this.focusOnInput();
 			});
 		},
-		onBlur() {
-			this.$emit('blur');
+		onClickOutside(e: Event) {
+			if (e.type === 'click') {
+				this.$emit('blur');
+			}
 		},
 	},
 	watch: {

From 1e551a202f8d3996c6ce92efc0627ee95e0110c5 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Thu, 1 Jul 2021 09:04:24 +0200
Subject: [PATCH 09/74] :rotating_light: Add Workflow testing framework (#1814)

* Added flag to simplify output to execute command and created executeAll

Also created a command that lists workflows so it can be used by
other applications that wish to interact with n8n via CLI.

* Added compare funcionality that helps us identify possible breaking changes

* :zap: Add JSON flag to output execution result in json format

* Add execution time to execution result

* Add --output flag to save JSON formated results

* Fix typos

* Adding usage examples and warning message

* Changing command to always output JSON information

* :zap: Add concurrency to executeAll command

* :sparkles: Add IDs filter to executeAll command

* :pencil2: Fix typos

* Fix lint issues

* Improvements to execute all

* Added colors and beautified execute all command output

* Improving premature termination of execute all command

* Refactored output

* Added detection for warnings instead of errors for a few cases

* Fixed linting

* Improved process finishing

* Added encryption key init, removed messages from non-debug run and created sample github actions file

* Updated test command to use correct encryption key

* Correcting paths

* Changed command name and changed concurrency to be slot based

* Added the retry functionality

* Improved typing and fixed executions filtering

* Updated test description

* Added concurrency

* Added skip list and concurrency

* Fixed termination behavior, removed unnecessary code and added main mode to executions

* Added special edge cases handling

* Added safe debug flag for non tty terminals

* Removed comparison and retries for testing

* Changed the way we run commands to add more debug info

* Test adding concurrency

* Testing with regular testing procedure without comparison

* Adding compare flag

* Fixing short output command

* Upgraded concurrency to 16, fixed short output and covered nodes count

* Fixed short output condition

* Correcting short output information

* Correcting the output for short output

* Added a string to possible warnings list

* Added example usages with more arguments

* Improvements to code made by Ivan

* Removed colorize output setting (always use colors), moved execution timeout to become static and removed node list from executions

* Moving types to a separate file on execute batch command

* Changed interfaces file extension to prevent oclif warnings

* Updated workflow pdf files

* :zap: Change rule when tests run + minor formatting fixes

Co-authored-by: dali <servfrdali@yahoo.fr>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .github/workflows/test-workflows.yml        |  69 ++
 packages/cli/commands/Interfaces.d.ts       |  54 ++
 packages/cli/commands/execute.ts            |  14 +-
 packages/cli/commands/executeBatch.ts       | 796 ++++++++++++++++++++
 packages/cli/commands/import/credentials.ts |   3 +
 packages/cli/commands/import/workflow.ts    |   6 +
 packages/cli/commands/list/workflow.ts      |  67 ++
 packages/cli/package.json                   |   2 +
 packages/cli/tsconfig.json                  |   3 +-
 packages/workflow/src/Interfaces.ts         |   1 +
 10 files changed, 1009 insertions(+), 6 deletions(-)
 create mode 100644 .github/workflows/test-workflows.yml
 create mode 100644 packages/cli/commands/Interfaces.d.ts
 create mode 100644 packages/cli/commands/executeBatch.ts
 create mode 100644 packages/cli/commands/list/workflow.ts

diff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml
new file mode 100644
index 0000000000..909264e0ce
--- /dev/null
+++ b/.github/workflows/test-workflows.yml
@@ -0,0 +1,69 @@
+name: Run test workflows
+
+on:
+  schedule:
+    - cron: "0 2 * * *"
+  workflow_dispatch:
+
+
+jobs:
+  run-test-workflows:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.x]
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+        with:
+          path: n8n
+      -
+        name: Checkout workflows repo
+        uses: actions/checkout@v2
+        with:
+          repository: n8n-io/test-workflows
+          path: test-workflows
+      -
+        name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ matrix.node-version }}
+      -
+        name: npm install and build
+        run: |
+          cd n8n
+          npm install
+          npm run bootstrap
+          npm run build --if-present
+        env:
+          CI: true
+        shell: bash
+      -
+        name: Import credentials
+        run: n8n/packages/cli/bin/n8n import:credentials --input=test-workflows/credentials.json
+        shell: bash
+        env:
+          N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
+      -
+        name: Import workflows
+        run: n8n/packages/cli/bin/n8n import:workflow --separate --input=test-workflows/workflows
+        shell: bash
+        env:
+          N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
+      -
+        name: Copy static assets
+        run: |
+          cp n8n/assets/n8n-logo.png /tmp/n8n-logo.png
+          cp n8n/assets/n8n-screenshot.png /tmp/n8n-screenshot.png
+          cp n8n/node_modules/pdf-parse/test/data/05-versions-space.pdf /tmp/05-versions-space.pdf
+          cp n8n/node_modules/pdf-parse/test/data/04-valid.pdf /tmp/04-valid.pdf
+        shell: bash
+      -
+        name: Run tests
+        run: n8n/packages/cli/bin/n8n executeBatch --shallow --skipList=test-workflows/skipList.txt --shortOutput --concurrency=16 --compare=test-workflows/snapshots
+        shell: bash
+        env:
+          N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
diff --git a/packages/cli/commands/Interfaces.d.ts b/packages/cli/commands/Interfaces.d.ts
new file mode 100644
index 0000000000..aedd194539
--- /dev/null
+++ b/packages/cli/commands/Interfaces.d.ts
@@ -0,0 +1,54 @@
+interface IResult {
+	totalWorkflows: number;
+	summary: {
+		failedExecutions: number,
+		successfulExecutions: number,
+		warningExecutions: number,
+		errors: IExecutionError[],
+		warnings: IExecutionError[],
+	};
+	coveredNodes: {
+		[nodeType: string]: number
+	};
+	executions: IExecutionResult[];
+}
+interface IExecutionResult {
+	workflowId: string | number;
+	workflowName: string;
+	executionTime: number; // Given in seconds with decimals for milisseconds
+	finished: boolean;
+	executionStatus: ExecutionStatus;
+	error?: string;
+	changes?: string;
+	coveredNodes: {
+		[nodeType: string]: number
+	};
+}
+
+interface IExecutionError {
+	workflowId: string | number;
+	error: string;
+}
+
+interface IWorkflowExecutionProgress {
+	workflowId: string | number;
+	status: ExecutionStatus;
+}
+
+interface INodeSpecialCases {
+	[nodeName: string]: INodeSpecialCase;
+}
+
+interface INodeSpecialCase {
+	ignoredProperties?: string[];
+	capResults?: number;
+}
+
+type ExecutionStatus = 'success' | 'error' | 'warning' | 'running';
+
+declare module 'json-diff' {
+	interface IDiffOptions {
+		keysOnly?: boolean;
+	}
+	export function diff(obj1: unknown, obj2: unknown, diffOptions: IDiffOptions): string;
+}
diff --git a/packages/cli/commands/execute.ts b/packages/cli/commands/execute.ts
index 9eafd28c9e..48ae6a19f0 100644
--- a/packages/cli/commands/execute.ts
+++ b/packages/cli/commands/execute.ts
@@ -22,7 +22,7 @@ import {
 	WorkflowRunner,
 } from '../src';
 
-import { 
+import {
 	getLogger,
 } from '../src/Logger';
 
@@ -46,6 +46,9 @@ export class Execute extends Command {
 		id: flags.string({
 			description: 'id of the workflow to execute',
 		}),
+		rawOutput: flags.boolean({
+			description: 'Outputs only JSON data, with no other text',
+		}),
 	};
 
 
@@ -183,10 +186,11 @@ export class Execute extends Command {
 					stack: error.stack,
 				};
 			}
-
-			console.info('Execution was successful:');
-			console.info('====================================');
-			console.info(JSON.stringify(data, null, 2));
+			if (flags.rawOutput === undefined) {
+				this.log('Execution was successful:');
+				this.log('====================================');
+			}
+			this.log(JSON.stringify(data, null, 2));
 		} catch (e) {
 			console.error('Error executing workflow. See log messages for details.');
 			logger.error('\nExecution error:');
diff --git a/packages/cli/commands/executeBatch.ts b/packages/cli/commands/executeBatch.ts
new file mode 100644
index 0000000000..7bc6bb858d
--- /dev/null
+++ b/packages/cli/commands/executeBatch.ts
@@ -0,0 +1,796 @@
+import * as fs from 'fs';
+import {
+	Command,
+	flags,
+} from '@oclif/command';
+
+import {
+	UserSettings,
+} from 'n8n-core';
+
+import {
+	INode,
+	INodeExecutionData,
+	ITaskData,
+} from 'n8n-workflow';
+
+import {
+	ActiveExecutions,
+	CredentialsOverwrites,
+	CredentialTypes,
+	Db,
+	ExternalHooks,
+	IExecutionsCurrentSummary,
+	IWorkflowDb,
+	IWorkflowExecutionDataProcess,
+	LoadNodesAndCredentials,
+	NodeTypes,
+	WorkflowCredentials,
+	WorkflowRunner,
+} from '../src';
+
+import {
+	sep,
+} from 'path';
+
+import {
+	diff,
+} from 'json-diff';
+
+import {
+	getLogger,
+} from '../src/Logger';
+
+import {
+	LoggerProxy,
+} from 'n8n-workflow';
+
+export class ExecuteBatch extends Command {
+	static description = '\nExecutes multiple workflows once';
+
+	static cancelled = false;
+
+	static workflowExecutionsProgress: IWorkflowExecutionProgress[][];
+
+	static shallow = false;
+
+	static compare: string;
+
+	static snapshot: string;
+
+	static concurrency = 1;
+
+	static debug = false;
+
+	static executionTimeout = 3 * 60 * 1000;
+
+	static examples = [
+		`$ n8n executeAll`,
+		`$ n8n executeAll --concurrency=10 --skipList=/data/skipList.txt`,
+		`$ n8n executeAll --debug --output=/data/output.json`,
+		`$ n8n executeAll --ids=10,13,15 --shortOutput`,
+		`$ n8n executeAll --snapshot=/data/snapshots --shallow`,
+		`$ n8n executeAll --compare=/data/previousExecutionData --retries=2`,
+	];
+
+	static flags = {
+		help: flags.help({ char: 'h' }),
+		debug: flags.boolean({
+			description: 'Toggles on displaying all errors and debug messages.',
+		}),
+		ids: flags.string({
+			description: 'Specifies workflow IDs to get executed, separated by a comma.',
+		}),
+		concurrency: flags.integer({
+			default: 1,
+			description: 'How many workflows can run in parallel. Defaults to 1 which means no concurrency.',
+		}),
+		output: flags.string({
+			description: 'Enable execution saving, You must inform an existing folder to save execution via this param',
+		}),
+		snapshot: flags.string({
+			description: 'Enables snapshot saving. You must inform an existing folder to save snapshots via this param.',
+		}),
+		compare: flags.string({
+			description: 'Compares current execution with an existing snapshot. You must inform an existing folder where the snapshots are saved.',
+		}),
+		shallow: flags.boolean({
+			description: 'Compares only if attributes output from node are the same, with no regards to neste JSON objects.',
+		}),
+		skipList: flags.string({
+			description: 'File containing a comma separated list of workflow IDs to skip.',
+		}),
+		retries: flags.integer({
+			description: 'Retries failed workflows up to N tries. Default is 1. Set 0 to disable.',
+			default: 1,
+		}),
+		shortOutput: flags.boolean({
+			description: 'Omits the full execution information from output, displaying only summary.',
+		}),
+	};
+
+	/**
+	 * Gracefully handles exit.
+	 * @param {boolean} skipExit Whether to skip exit or number according to received signal
+	 */
+	static async stopProcess(skipExit: boolean | number = false) {
+
+		if (ExecuteBatch.cancelled === true) {
+			process.exit(0);
+		}
+
+		ExecuteBatch.cancelled = true;
+		const activeExecutionsInstance = ActiveExecutions.getInstance();
+		const stopPromises = activeExecutionsInstance.getActiveExecutions().map(async execution => {
+			activeExecutionsInstance.stopExecution(execution.id);
+		});
+
+		await Promise.allSettled(stopPromises);
+
+		setTimeout(() => {
+			process.exit(0);
+		}, 30000);
+
+		let executingWorkflows = activeExecutionsInstance.getActiveExecutions() as IExecutionsCurrentSummary[];
+
+		let count = 0;
+		while (executingWorkflows.length !== 0) {
+			if (count++ % 4 === 0) {
+				console.log(`Waiting for ${executingWorkflows.length} active executions to finish...`);
+				executingWorkflows.map(execution => {
+					console.log(` - Execution ID ${execution.id}, workflow ID: ${execution.workflowId}`);
+				});
+			}
+			await new Promise((resolve) => {
+				setTimeout(resolve, 500);
+			});
+			executingWorkflows = activeExecutionsInstance.getActiveExecutions();
+		}
+		// We may receive true but when called from `process.on`
+		// we get the signal (SIGNIT, etc.)
+		if (skipExit !== true) {
+			process.exit(0);
+		}
+	}
+
+	formatJsonOutput(data: object) {
+		return JSON.stringify(data, null, 2);
+	}
+
+	shouldBeConsideredAsWarning(errorMessage: string) {
+
+		const warningStrings = [
+			'refresh token is invalid',
+			'unable to connect to',
+			'econnreset',
+			'429',
+			'econnrefused',
+			'missing a required parameter',
+		];
+
+		errorMessage = errorMessage.toLowerCase();
+
+		for (let i = 0; i < warningStrings.length; i++) {
+			if (errorMessage.includes(warningStrings[i])) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+
+	async run() {
+
+		process.on('SIGTERM', ExecuteBatch.stopProcess);
+		process.on('SIGINT', ExecuteBatch.stopProcess);
+
+		const logger = getLogger();
+		LoggerProxy.init(logger);
+
+		const { flags } = this.parse(ExecuteBatch);
+
+		ExecuteBatch.debug = flags.debug === true;
+		ExecuteBatch.concurrency = flags.concurrency || 1;
+
+		const ids: number[] = [];
+		const skipIds: number[] = [];
+
+		if (flags.snapshot !== undefined) {
+			if (fs.existsSync(flags.snapshot)) {
+				if (!fs.lstatSync(flags.snapshot).isDirectory()) {
+					console.log(`The parameter --snapshot must be an existing directory`);
+					return;
+				}
+			} else {
+				console.log(`The parameter --snapshot must be an existing directory`);
+				return;
+			}
+
+			ExecuteBatch.snapshot = flags.snapshot;
+		}
+		if (flags.compare !== undefined) {
+			if (fs.existsSync(flags.compare)) {
+				if (!fs.lstatSync(flags.compare).isDirectory()) {
+					console.log(`The parameter --compare must be an existing directory`);
+					return;
+				}
+			} else {
+				console.log(`The parameter --compare must be an existing directory`);
+				return;
+			}
+
+			ExecuteBatch.compare = flags.compare;
+		}
+
+		if (flags.output !== undefined) {
+			if (fs.existsSync(flags.output)) {
+				if (fs.lstatSync(flags.output).isDirectory()) {
+					console.log(`The parameter --output must be a writable file`);
+					return;
+				}
+			}
+		}
+
+		if (flags.ids !== undefined) {
+			const paramIds = flags.ids.split(',');
+			const re = /\d+/;
+			const matchedIds = paramIds.filter(id => id.match(re)).map(id => parseInt(id.trim(), 10));
+
+			if (matchedIds.length === 0) {
+				console.log(`The parameter --ids must be a list of numeric IDs separated by a comma.`);
+				return;
+			}
+
+			ids.push(...matchedIds);
+		}
+
+		if (flags.skipList !== undefined) {
+			if (fs.existsSync(flags.skipList)) {
+				const contents = fs.readFileSync(flags.skipList, { encoding: 'utf-8' });
+				skipIds.push(...contents.split(',').map(id => parseInt(id.trim(), 10)));
+			} else {
+				console.log('Skip list file not found. Exiting.');
+				return;
+			}
+		}
+
+		if (flags.shallow === true) {
+			ExecuteBatch.shallow = true;
+		}
+
+
+		// Start directly with the init of the database to improve startup time
+		const startDbInitPromise = Db.init();
+
+		// Load all node and credential types
+		const loadNodesAndCredentials = LoadNodesAndCredentials();
+		const loadNodesAndCredentialsPromise = loadNodesAndCredentials.init();
+
+		// Make sure the settings exist
+		await UserSettings.prepareUserSettings();
+
+		// Wait till the database is ready
+		await startDbInitPromise;
+
+		let allWorkflows;
+
+		const query = Db.collections!.Workflow!.createQueryBuilder('workflows');
+
+		if (ids.length > 0) {
+			query.andWhere(`workflows.id in (:...ids)`, { ids });
+		}
+
+		if (skipIds.length > 0) {
+			query.andWhere(`workflows.id not in (:...skipIds)`, { skipIds });
+		}
+
+		allWorkflows = await query.getMany() as IWorkflowDb[];
+
+		if (ExecuteBatch.debug === true) {
+			process.stdout.write(`Found ${allWorkflows.length} workflows to execute.\n`);
+		}
+
+		// Wait till the n8n-packages have been read
+		await loadNodesAndCredentialsPromise;
+
+		// Load the credentials overwrites if any exist
+		await CredentialsOverwrites().init();
+
+		// Load all external hooks
+		const externalHooks = ExternalHooks();
+		await externalHooks.init();
+
+		// Add the found types to an instance other parts of the application can use
+		const nodeTypes = NodeTypes();
+		await nodeTypes.init(loadNodesAndCredentials.nodeTypes);
+		const credentialTypes = CredentialTypes();
+		await credentialTypes.init(loadNodesAndCredentials.credentialTypes);
+
+		// Send a shallow copy of allWorkflows so we still have all workflow data.
+		const results = await this.runTests([...allWorkflows]);
+
+		let { retries } = flags;
+
+		while (retries > 0 && (results.summary.warningExecutions + results.summary.failedExecutions > 0) && ExecuteBatch.cancelled === false) {
+			const failedWorkflowIds = results.summary.errors.map(execution => execution.workflowId);
+			failedWorkflowIds.push(...results.summary.warnings.map(execution => execution.workflowId));
+
+			const newWorkflowList = allWorkflows.filter(workflow => failedWorkflowIds.includes(workflow.id));
+
+			const retryResults = await this.runTests(newWorkflowList);
+
+			this.mergeResults(results, retryResults);
+			// By now, `results` has been updated with the new successful executions.
+			retries--;
+		}
+
+		if (flags.output !== undefined) {
+			fs.writeFileSync(flags.output, this.formatJsonOutput(results));
+			console.log('\nExecution finished.');
+			console.log('Summary:');
+			console.log(`\tSuccess: ${results.summary.successfulExecutions}`);
+			console.log(`\tFailures: ${results.summary.failedExecutions}`);
+			console.log(`\tWarnings: ${results.summary.warningExecutions}`);
+			console.log('\nNodes successfully tested:');
+			Object.entries(results.coveredNodes).forEach(([nodeName, nodeCount]) => {
+				console.log(`\t${nodeName}: ${nodeCount}`);
+			});
+			console.log('\nCheck the JSON file for more details.');
+		} else {
+			if (flags.shortOutput === true) {
+				console.log(this.formatJsonOutput({ ...results, executions: results.executions.filter(execution => execution.executionStatus !== 'success') }));
+			} else {
+				console.log(this.formatJsonOutput(results));
+			}
+		}
+
+		await ExecuteBatch.stopProcess(true);
+
+		if (results.summary.failedExecutions > 0) {
+			this.exit(1);
+		}
+		this.exit(0);
+
+	}
+
+	mergeResults(results: IResult, retryResults: IResult) {
+
+		if (retryResults.summary.successfulExecutions === 0) {
+			// Nothing to replace.
+			return;
+		}
+
+		// Find successful executions and replace them on previous result.
+		retryResults.executions.forEach(newExecution => {
+			if (newExecution.executionStatus === 'success') {
+				// Remove previous execution from list.
+				results.executions = results.executions.filter(previousExecutions => previousExecutions.workflowId !== newExecution.workflowId);
+
+				const errorIndex = results.summary.errors.findIndex(summaryInformation => summaryInformation.workflowId === newExecution.workflowId);
+				if (errorIndex !== -1) {
+					// This workflow errored previously. Decrement error count.
+					results.summary.failedExecutions--;
+					// Remove from the list of errors.
+					results.summary.errors.splice(errorIndex, 1);
+				}
+
+				const warningIndex = results.summary.warnings.findIndex(summaryInformation => summaryInformation.workflowId === newExecution.workflowId);
+				if (warningIndex !== -1) {
+					// This workflow errored previously. Decrement error count.
+					results.summary.warningExecutions--;
+					// Remove from the list of errors.
+					results.summary.warnings.splice(warningIndex, 1);
+				}
+				// Increment successful executions count and push it to all executions array.
+				results.summary.successfulExecutions++;
+				results.executions.push(newExecution);
+			}
+		});
+	}
+
+	async runTests(allWorkflows: IWorkflowDb[]): Promise<IResult> {
+		const result: IResult = {
+			totalWorkflows: allWorkflows.length,
+			summary: {
+				failedExecutions: 0,
+				warningExecutions: 0,
+				successfulExecutions: 0,
+				errors: [],
+				warnings: [],
+			},
+			coveredNodes: {},
+			executions: [],
+		};
+
+		if (ExecuteBatch.debug) {
+			this.initializeLogs();
+		}
+
+		return new Promise(async (res) => {
+			const promisesArray = [];
+			for (let i = 0; i < ExecuteBatch.concurrency; i++) {
+				const promise = new Promise(async (resolve) => {
+					let workflow: IWorkflowDb | undefined;
+					while (allWorkflows.length > 0) {
+						workflow = allWorkflows.shift();
+						if (ExecuteBatch.cancelled === true) {
+							process.stdout.write(`Thread ${i + 1} resolving and quitting.`);
+							resolve(true);
+							break;
+						}
+						// This if shouldn't be really needed
+						// but it's a concurrency precaution.
+						if (workflow === undefined) {
+							resolve(true);
+							return;
+						}
+
+						if (ExecuteBatch.debug) {
+							ExecuteBatch.workflowExecutionsProgress[i].push({
+								workflowId: workflow.id,
+								status: 'running',
+							});
+							this.updateStatus();
+						}
+
+						await this.startThread(workflow).then((executionResult) => {
+							if (ExecuteBatch.debug) {
+								ExecuteBatch.workflowExecutionsProgress[i].pop();
+							}
+							result.executions.push(executionResult);
+							if (executionResult.executionStatus === 'success') {
+								if (ExecuteBatch.debug) {
+									ExecuteBatch.workflowExecutionsProgress[i].push({
+										workflowId: workflow!.id,
+										status: 'success',
+									});
+									this.updateStatus();
+								}
+								result.summary.successfulExecutions++;
+								const nodeNames = Object.keys(executionResult.coveredNodes);
+
+								nodeNames.map(nodeName => {
+									if (result.coveredNodes[nodeName] === undefined) {
+										result.coveredNodes[nodeName] = 0;
+									}
+									result.coveredNodes[nodeName] += executionResult.coveredNodes[nodeName];
+								});
+							} else if (executionResult.executionStatus === 'warning') {
+								result.summary.warningExecutions++;
+								result.summary.warnings.push({
+									workflowId: executionResult.workflowId,
+									error: executionResult.error!,
+								});
+								if (ExecuteBatch.debug) {
+									ExecuteBatch.workflowExecutionsProgress[i].push({
+										workflowId: workflow!.id,
+										status: 'warning',
+									});
+									this.updateStatus();
+								}
+							} else if (executionResult.executionStatus === 'error') {
+								result.summary.failedExecutions++;
+								result.summary.errors.push({
+									workflowId: executionResult.workflowId,
+									error: executionResult.error!,
+								});
+								if (ExecuteBatch.debug) {
+									ExecuteBatch.workflowExecutionsProgress[i].push({
+										workflowId: workflow!.id,
+										status: 'error',
+									});
+									this.updateStatus();
+								}
+							} else {
+								throw new Error('Wrong execution status - cannot proceed');
+							}
+						});
+					}
+
+					resolve(true);
+				});
+
+				promisesArray.push(promise);
+			}
+
+			await Promise.allSettled(promisesArray);
+
+			res(result);
+		});
+	}
+
+	updateStatus() {
+
+		if (ExecuteBatch.cancelled === true) {
+			return;
+		}
+
+		if (process.stdout.isTTY === true) {
+			process.stdout.moveCursor(0, - (ExecuteBatch.concurrency));
+			process.stdout.cursorTo(0);
+			process.stdout.clearLine(0);
+		}
+
+
+		ExecuteBatch.workflowExecutionsProgress.map((concurrentThread, index) => {
+			let message = `${index + 1}: `;
+			concurrentThread.map((executionItem, workflowIndex) => {
+				let openColor = '\x1b[0m';
+				const closeColor = '\x1b[0m';
+				switch (executionItem.status) {
+					case 'success':
+						openColor = '\x1b[32m';
+						break;
+					case 'error':
+						openColor = '\x1b[31m';
+						break;
+					case 'warning':
+						openColor = '\x1b[33m';
+						break;
+					default:
+						break;
+				}
+				message += (workflowIndex > 0 ? ', ' : '') + `${openColor}${executionItem.workflowId}${closeColor}`;
+			});
+			if (process.stdout.isTTY === true) {
+				process.stdout.cursorTo(0);
+				process.stdout.clearLine(0);
+			}
+			process.stdout.write(message + '\n');
+		});
+	}
+
+	initializeLogs() {
+		process.stdout.write('**********************************************\n');
+		process.stdout.write('              n8n test workflows\n');
+		process.stdout.write('**********************************************\n');
+		process.stdout.write('\n');
+		process.stdout.write('Batch number:\n');
+		ExecuteBatch.workflowExecutionsProgress = [];
+		for (let i = 0; i < ExecuteBatch.concurrency; i++) {
+			ExecuteBatch.workflowExecutionsProgress.push([]);
+			process.stdout.write(`${i + 1}: \n`);
+		}
+	}
+
+	startThread(workflowData: IWorkflowDb): Promise<IExecutionResult> {
+		// This will be the object returned by the promise.
+		// It will be updated according to execution progress below.
+		const executionResult: IExecutionResult = {
+			workflowId: workflowData.id,
+			workflowName: workflowData.name,
+			executionTime: 0,
+			finished: false,
+			executionStatus: 'running',
+			coveredNodes: {},
+		};
+
+
+
+		const requiredNodeTypes = ['n8n-nodes-base.start'];
+		let startNode: INode | undefined = undefined;
+		for (const node of workflowData.nodes) {
+			if (requiredNodeTypes.includes(node.type)) {
+				startNode = node;
+				break;
+			}
+		}
+
+		// We have a cool feature here.
+		// On each node, on the Settings tab in the node editor you can change
+		// the `Notes` field to add special cases for comparison and snapshots.
+		// You need to set one configuration per line with the following possible keys:
+		// CAP_RESULTS_LENGTH=x where x is a number. Cap the number of rows from this node to x.
+		// This means if you set CAP_RESULTS_LENGTH=1 we will have only 1 row in the output
+		// IGNORED_PROPERTIES=x,y,z where x, y and z are JSON property names. Removes these
+		//    properties from the JSON object (useful for optional properties that can
+		//    cause the comparison to detect changes when not true).
+		const nodeEdgeCases = {} as INodeSpecialCases;
+		workflowData.nodes.forEach(node => {
+			executionResult.coveredNodes[node.type] = (executionResult.coveredNodes[node.type] || 0) + 1;
+			if (node.notes !== undefined && node.notes !== '') {
+				node.notes.split('\n').forEach(note => {
+					const parts = note.split('=');
+					if (parts.length === 2) {
+						if (nodeEdgeCases[node.name] === undefined) {
+							nodeEdgeCases[node.name] = {} as INodeSpecialCase;
+						}
+						if (parts[0] === 'CAP_RESULTS_LENGTH') {
+							nodeEdgeCases[node.name].capResults = parseInt(parts[1], 10);
+						} else if (parts[0] === 'IGNORED_PROPERTIES') {
+							nodeEdgeCases[node.name].ignoredProperties = parts[1].split(',').map(property => property.trim());
+						}
+					}
+				});
+			}
+		});
+
+		return new Promise(async (resolve) => {
+			if (startNode === undefined) {
+				// If the workflow does not contain a start-node we can not know what
+				// should be executed and with which data to start.
+				executionResult.error = 'Workflow cannot be started as it does not contain a "Start" node.';
+				executionResult.executionStatus = 'warning';
+				resolve(executionResult);
+			}
+
+			let gotCancel = false;
+
+			// Timeouts execution after 5 minutes.
+			const timeoutTimer = setTimeout(() => {
+				gotCancel = true;
+				executionResult.error = 'Workflow execution timed out.';
+				executionResult.executionStatus = 'warning';
+				resolve(executionResult);
+			}, ExecuteBatch.executionTimeout);
+
+
+			try {
+				const credentials = await WorkflowCredentials(workflowData!.nodes);
+
+				const runData: IWorkflowExecutionDataProcess = {
+					credentials,
+					executionMode: 'cli',
+					startNodes: [startNode!.name],
+					workflowData: workflowData!,
+				};
+
+				const workflowRunner = new WorkflowRunner();
+				const executionId = await workflowRunner.run(runData);
+
+				const activeExecutions = ActiveExecutions.getInstance();
+				const data = await activeExecutions.getPostExecutePromise(executionId);
+				if (gotCancel || ExecuteBatch.cancelled === true) {
+					clearTimeout(timeoutTimer);
+					// The promise was settled already so we simply ignore.
+					return;
+				}
+
+				if (data === undefined) {
+					executionResult.error = 'Workflow did not return any data.';
+					executionResult.executionStatus = 'error';
+				} else {
+					executionResult.executionTime = (Date.parse(data.stoppedAt as unknown as string) - Date.parse(data.startedAt as unknown as string)) / 1000;
+					executionResult.finished = (data?.finished !== undefined) as boolean;
+
+					if (data.data.resultData.error) {
+						executionResult.error =
+							data.data.resultData.error.hasOwnProperty('description') ?
+								// @ts-ignore
+								data.data.resultData.error.description : data.data.resultData.error.message;
+						if (data.data.resultData.lastNodeExecuted !== undefined) {
+							executionResult.error += ` on node ${data.data.resultData.lastNodeExecuted}`;
+						}
+						executionResult.executionStatus = 'error';
+
+						if (this.shouldBeConsideredAsWarning(executionResult.error || '')) {
+							executionResult.executionStatus = 'warning';
+						}
+					} else {
+						if (ExecuteBatch.shallow === true) {
+							// What this does is guarantee that top-level attributes
+							// from the JSON are kept and the are the same type.
+
+							// We convert nested JSON objects to a simple {object:true}
+							// and we convert nested arrays to ['json array']
+
+							// This reduces the chance of false positives but may
+							// result in not detecting deeper changes.
+							Object.keys(data.data.resultData.runData).map((nodeName: string) => {
+								data.data.resultData.runData[nodeName].map((taskData: ITaskData) => {
+									if (taskData.data === undefined) {
+										return;
+									}
+									Object.keys(taskData.data).map(connectionName => {
+										const connection = taskData.data![connectionName] as Array<INodeExecutionData[] | null>;
+										connection.map(executionDataArray => {
+											if (executionDataArray === null) {
+												return;
+											}
+
+											if (nodeEdgeCases[nodeName] !== undefined && nodeEdgeCases[nodeName].capResults !== undefined) {
+												executionDataArray.splice(nodeEdgeCases[nodeName].capResults!);
+											}
+
+											executionDataArray.map(executionData => {
+												if (executionData.json === undefined) {
+													return;
+												}
+												if (nodeEdgeCases[nodeName] !== undefined && nodeEdgeCases[nodeName].ignoredProperties !== undefined) {
+													nodeEdgeCases[nodeName].ignoredProperties!.forEach(ignoredProperty => delete executionData.json[ignoredProperty]);
+												}
+
+												const jsonProperties = executionData.json;
+
+												const nodeOutputAttributes = Object.keys(jsonProperties);
+												nodeOutputAttributes.map(attributeName => {
+													if (Array.isArray(jsonProperties[attributeName])) {
+														jsonProperties[attributeName] = ['json array'];
+													} else if (typeof jsonProperties[attributeName] === 'object') {
+														jsonProperties[attributeName] = { object: true };
+													}
+												});
+											});
+										});
+
+									});
+								});
+							});
+						} else {
+							// If not using shallow comparison then we only treat nodeEdgeCases.
+							const specialCases = Object.keys(nodeEdgeCases);
+
+							specialCases.forEach(nodeName => {
+								data.data.resultData.runData[nodeName].map((taskData: ITaskData) => {
+									if (taskData.data === undefined) {
+										return;
+									}
+									Object.keys(taskData.data).map(connectionName => {
+										const connection = taskData.data![connectionName] as Array<INodeExecutionData[] | null>;
+										connection.map(executionDataArray => {
+											if (executionDataArray === null) {
+												return;
+											}
+
+											if (nodeEdgeCases[nodeName].capResults !== undefined) {
+												executionDataArray.splice(nodeEdgeCases[nodeName].capResults!);
+											}
+
+											if (nodeEdgeCases[nodeName].ignoredProperties !== undefined) {
+												executionDataArray.map(executionData => {
+													if (executionData.json === undefined) {
+														return;
+													}
+													nodeEdgeCases[nodeName].ignoredProperties!.forEach(ignoredProperty => delete executionData.json[ignoredProperty]);
+												});
+											}
+										});
+
+									});
+								});
+							});
+						}
+
+						const serializedData = this.formatJsonOutput(data);
+						if (ExecuteBatch.compare === undefined) {
+							executionResult.executionStatus = 'success';
+						} else {
+							const fileName = (ExecuteBatch.compare.endsWith(sep) ? ExecuteBatch.compare : ExecuteBatch.compare + sep) + `${workflowData.id}-snapshot.json`;
+							if (fs.existsSync(fileName) === true) {
+
+								const contents = fs.readFileSync(fileName, { encoding: 'utf-8' });
+
+								const changes = diff(JSON.parse(contents), data, { keysOnly: true });
+
+								if (changes !== undefined) {
+									// we have structural changes. Report them.
+									executionResult.error = `Workflow may contain breaking changes`;
+									executionResult.changes = changes;
+									executionResult.executionStatus = 'error';
+								} else {
+									executionResult.executionStatus = 'success';
+								}
+							} else {
+								executionResult.error = 'Snapshot for not found.';
+								executionResult.executionStatus = 'warning';
+							}
+						}
+						// Save snapshots only after comparing - this is to make sure we're updating
+						// After comparing to existing verion.
+						if (ExecuteBatch.snapshot !== undefined) {
+							const fileName = (ExecuteBatch.snapshot.endsWith(sep) ? ExecuteBatch.snapshot : ExecuteBatch.snapshot + sep) + `${workflowData.id}-snapshot.json`;
+							fs.writeFileSync(fileName, serializedData);
+						}
+					}
+				}
+			} catch (e) {
+				executionResult.error = 'Workflow failed to execute.';
+				executionResult.executionStatus = 'error';
+			}
+			clearTimeout(timeoutTimer);
+			resolve(executionResult);
+		});
+	}
+
+}
diff --git a/packages/cli/commands/import/credentials.ts b/packages/cli/commands/import/credentials.ts
index b038f33693..af2d7e0d46 100644
--- a/packages/cli/commands/import/credentials.ts
+++ b/packages/cli/commands/import/credentials.ts
@@ -65,6 +65,9 @@ export class ImportCredentialsCommand extends Command {
 
 		try {
 			await Db.init();
+
+			// Make sure the settings exist
+			await UserSettings.prepareUserSettings();
 			let i;
 
 			const encryptionKey = await UserSettings.getEncryptionKey();
diff --git a/packages/cli/commands/import/workflow.ts b/packages/cli/commands/import/workflow.ts
index 5b31041a44..65ddb77000 100644
--- a/packages/cli/commands/import/workflow.ts
+++ b/packages/cli/commands/import/workflow.ts
@@ -18,6 +18,9 @@ import {
 import * as fs from 'fs';
 import * as glob from 'glob-promise';
 import * as path from 'path';
+import { 
+	UserSettings,
+} from 'n8n-core';
 
 export class ImportWorkflowsCommand extends Command {
 	static description = 'Import workflows';
@@ -60,6 +63,9 @@ export class ImportWorkflowsCommand extends Command {
 
 		try {
 			await Db.init();
+
+			// Make sure the settings exist
+			await UserSettings.prepareUserSettings();
 			let i;
 			if (flags.separate) {
 				const files = await glob((flags.input.endsWith(path.sep) ? flags.input : flags.input + path.sep) + '*.json');
diff --git a/packages/cli/commands/list/workflow.ts b/packages/cli/commands/list/workflow.ts
new file mode 100644
index 0000000000..6fdca2e253
--- /dev/null
+++ b/packages/cli/commands/list/workflow.ts
@@ -0,0 +1,67 @@
+import {
+	Command,
+	flags,
+} from '@oclif/command';
+
+import {
+	IDataObject
+} from 'n8n-workflow';
+
+import {
+	Db,
+} from "../../src";
+
+
+export class ListWorkflowCommand extends Command {
+	static description = '\nList workflows';
+
+	static examples = [
+		'$ n8n list:workflow',
+		'$ n8n list:workflow --active=true --onlyId',
+		'$ n8n list:workflow --active=false',
+	];
+
+	static flags = {
+		help: flags.help({ char: 'h' }),
+		active: flags.string({
+			description: 'Filters workflows by active status. Can be true or false',
+		}),
+		onlyId: flags.boolean({
+			description: 'Outputs workflow IDs only, one per line.',
+		}),
+	};
+
+	async run() {
+		const { flags } = this.parse(ListWorkflowCommand);
+
+		if (flags.active !== undefined && !['true', 'false'].includes(flags.active)) {
+			this.error('The --active flag has to be passed using true or false');
+		}
+
+		try {
+			await Db.init();
+
+			const findQuery: IDataObject = {};
+			if (flags.active !== undefined) {
+				findQuery.active = flags.active === 'true';
+			}
+
+			const workflows = await Db.collections.Workflow!.find(findQuery);
+			if (flags.onlyId) {
+				workflows.forEach(workflow => console.log(workflow.id));
+			} else {
+				workflows.forEach(workflow => console.log(workflow.id + "|" + workflow.name));
+			}
+
+
+		} catch (e) {
+			console.error('\nGOT ERROR');
+			console.log('====================================');
+			console.error(e.message);
+			console.error(e.stack);
+			this.exit(1);
+		}
+
+		this.exit();
+	}
+}
diff --git a/packages/cli/package.json b/packages/cli/package.json
index ca4a198df1..ce0467aa64 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -82,6 +82,7 @@
   "dependencies": {
     "@oclif/command": "^1.5.18",
     "@oclif/errors": "^1.2.2",
+    "@types/json-diff": "^0.5.1",
     "@types/jsonwebtoken": "^8.5.2",
     "basic-auth": "^2.0.1",
     "bcryptjs": "^2.4.3",
@@ -101,6 +102,7 @@
     "glob-promise": "^3.4.0",
     "google-timezones-json": "^1.0.2",
     "inquirer": "^7.0.1",
+    "json-diff": "^0.5.4",
     "jsonwebtoken": "^8.5.1",
     "jwks-rsa": "~1.12.1",
     "localtunnel": "^2.0.0",
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 4aaf4747fc..aa44bc610f 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -1,7 +1,8 @@
 {
 	"compilerOptions": {
 		"lib": [
-			"es2017"
+			"es2017",
+			"ES2020.Promise"
 		],
 		"types": [
 			"node",
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index e76da5fb2c..f48d605e2d 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -348,6 +348,7 @@ export interface INode {
 	type: string;
 	position: [number, number];
 	disabled?: boolean;
+	notes?: string;
 	notesInFlow?: boolean;
 	retryOnFail?: boolean;
 	maxTries?: number;

From a42bbf88f812d0b5a51ab8bdae5cd5b3b0dda3d5 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Thu, 1 Jul 2021 10:15:28 +0200
Subject: [PATCH 10/74] :zap: Enable tags selection (#1960)

---
 packages/editor-ui/src/components/WorkflowOpen.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/components/WorkflowOpen.vue b/packages/editor-ui/src/components/WorkflowOpen.vue
index 568b35a574..77e9e8a640 100644
--- a/packages/editor-ui/src/components/WorkflowOpen.vue
+++ b/packages/editor-ui/src/components/WorkflowOpen.vue
@@ -32,7 +32,7 @@
 						<template slot-scope="scope">
 							<div :key="scope.row.id">
 								<span class="name">{{scope.row.name}}</span>
-								<TagsContainer class="hidden-sm-and-down" :tagIds="getIds(scope.row.tags)" :limit="3" />
+								<TagsContainer class="hidden-sm-and-down" :tagIds="getIds(scope.row.tags)" :limit="3" @click="onTagClick" :clickable="true" :hoverable="true" />
 							</div>
 						</template>
 					</el-table-column>
@@ -124,6 +124,11 @@ export default mixins(
 		updateTagsFilter(tags: string[]) {
 			this.filterTagIds = tags;
 		},
+		onTagClick(tagId: string) {
+			if (tagId !== 'count' && !this.filterTagIds.includes(tagId)) {
+				this.filterTagIds.push(tagId);
+			}
+		},
 		async openWorkflow (data: IWorkflowShortResponse, column: any) { // tslint:disable-line:no-any
 			if (column.label !== 'Active') {
 

From 5ad4bf0890729ccaf176b91f38c3b6c795b8ee0a Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 1 Jul 2021 10:17:02 +0200
Subject: [PATCH 11/74] :construction_worker: Automatically push changed
 credentials after test

---
 .github/workflows/test-workflows.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml
index 909264e0ce..15e813b7ae 100644
--- a/.github/workflows/test-workflows.yml
+++ b/.github/workflows/test-workflows.yml
@@ -67,3 +67,17 @@ jobs:
         shell: bash
         env:
           N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
+      -
+        name: Export credentials
+        run: n8n/packages/cli/bin/n8n export:credentials --output=test-workflows/credentials.json --all --pretty
+        shell: bash
+        env:
+          N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
+      -
+        name: Commit and push credential changes
+        run: |
+          cd test-workflows
+          git config --global user.name 'n8n test bot'
+          git config --global user.email 'n8n-test-bot@users.noreply.github.com'
+          git commit -am "Automated credential update"
+          git push

From 5f76a5dc720fc9cad525038ca2824f59a2da54e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 2 Jul 2021 23:34:12 +0200
Subject: [PATCH 12/74] :zap: Expand Zoho node (#1763)

* :zap: Initial refactor of Zoho node

* :zap: Refactor out extra credentials parameter

* :fire: Remove unused filters

* :zap: Fix date of birth fields

* :zap: Fix param casing

* :zap: Adjust param types

* :zap: Adjust invoice operations

* :zap: Refactor types in adjusters

* :zap: Add product resource

* :zap: Refactor product details field

* :zap: Adjust purchase order params

* :zap: Adjust quote params

* :zap: Adjust sales orders params

* :fire: Remove old unused files

* :zap: Add vendor resource

* :zap: Fix minor details

* :zap: Implement continueOnFail

* :bug: Fix empty response for getAll

* :zap: Simplify response for single item

* :fire: Remove unused import

* :hammer: Restore old node name

* :zap: Prevent request on empty update

* :zap: Apply Dali's suggestions

* :zap: Improvements

* :zap: Add filters for lead:getAll

* :zap: Add upsert to all resources

* :zap: Add filters to all getAll operations

* :hammer: Restore continue on fail

* :hammer: Refactor upsert addition

* :hammer: Refactor getFields for readability

* :zap: Add custom fields to all create-update ops

* :zap: Implement custom fields adjuster

* :fire: Remove logging

* :shirt: Appease linter

* :shirt: Refactor type helper for linter

* :zap: Fix refactored type

* :hammer: Refactor reduce for simplicity

* :zap: Fix vendor:getAll filter options

* :zap: Fix custom fields for product operations

* :zap: Make sort_by into options param

* :truck: Rename upsert operation

* :pencil2: Add descriptions to upsert

* :zap: Deduplicate system-defined check fields

* :hammer: Re-order address fields

* :pencil2: Generalize references in getAll fields

* :fire: Remove extra comma

* :zap: Make getFields helper more readable

* :pencil2: Touch up description for account ID

* :fire: Remove currency from contacts

* :hammer: Resort emails and phones for contact

* :bug: Fix sales cycle duration param type

* :pencil2: Clarify descriptions with percentages

* :hammer: Reorder total fields

* :pencil2: Clarify percentages for discounts

* :pencil2: Clarify percentages for commissions

* :hammer: Convert currency to picklist

* :pencil2: Add documentation links

* :zap: Add resource loaders for picklists

* :zap: Fix build

* :hammer: Refactor product details

* :zap: Add resolve data to all resources

* :zap: Change resolve data toggle default

* :zap: Restore lead:getFields operation

* :fire: Remove upsert descriptions

* :hammer: Change casing for upsert operations

* :zap: Add operation descriptions

* :hammer: Restore makeResolve default value

* :hammer: Return nested details

* :zap: Reposition Resolve Data toggles

* :pencil2: Document breaking changes

* Revert "Reposition Resolve Data toggles"

This reverts commit 72ac41780b3ebec9cc6a5bf527e154ffe6ed884a.

* :zap: Improvements

Co-authored-by: ricardo <ricardoespinoza105@gmail.com>
---
 packages/cli/BREAKING-CHANGES.md              |   10 +
 .../nodes-base/nodes/Zoho/GenericFunctions.ts |  417 +++-
 .../nodes-base/nodes/Zoho/LeadDescription.ts  |  706 -------
 .../nodes-base/nodes/Zoho/LeadInterface.ts    |   37 -
 .../nodes-base/nodes/Zoho/ZohoCrm.node.ts     | 1751 +++++++++++++----
 .../Zoho/descriptions/AccountDescription.ts   |  415 ++++
 .../Zoho/descriptions/ContactDescription.ts   |  590 ++++++
 .../Zoho/descriptions/DealDescription.ts      |  385 ++++
 .../Zoho/descriptions/InvoiceDescription.ts   |  463 +++++
 .../Zoho/descriptions/LeadDescription.ts      |  694 +++++++
 .../Zoho/descriptions/ProductDescription.ts   |  352 ++++
 .../descriptions/PurchaseOrderDescription.ts  |  590 ++++++
 .../Zoho/descriptions/QuoteDescription.ts     |  459 +++++
 .../descriptions/SalesOrderDescription.ts     |  569 ++++++
 .../nodes/Zoho/descriptions/SharedFields.ts   |  577 ++++++
 .../Zoho/descriptions/VendorDescription.ts    |  301 +++
 .../nodes/Zoho/descriptions/index.ts          |   10 +
 packages/nodes-base/nodes/Zoho/types.d.ts     |  103 +
 packages/nodes-base/nodes/Zoho/zoho.svg       |    2 +-
 19 files changed, 7297 insertions(+), 1134 deletions(-)
 delete mode 100644 packages/nodes-base/nodes/Zoho/LeadDescription.ts
 delete mode 100644 packages/nodes-base/nodes/Zoho/LeadInterface.ts
 create mode 100644 packages/nodes-base/nodes/Zoho/descriptions/AccountDescription.ts
 create mode 100644 packages/nodes-base/nodes/Zoho/descriptions/ContactDescription.ts
 create mode 100644 packages/nodes-base/nodes/Zoho/descriptions/DealDescription.ts
 create mode 100644 packages/nodes-base/nodes/Zoho/descriptions/InvoiceDescription.ts
 create mode 100644 packages/nodes-base/nodes/Zoho/descriptions/LeadDescription.ts
 create mode 100644 packages/nodes-base/nodes/Zoho/descriptions/ProductDescription.ts
 create mode 100644 packages/nodes-base/nodes/Zoho/descriptions/PurchaseOrderDescription.ts
 create mode 100644 packages/nodes-base/nodes/Zoho/descriptions/QuoteDescription.ts
 create mode 100644 packages/nodes-base/nodes/Zoho/descriptions/SalesOrderDescription.ts
 create mode 100644 packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts
 create mode 100644 packages/nodes-base/nodes/Zoho/descriptions/VendorDescription.ts
 create mode 100644 packages/nodes-base/nodes/Zoho/descriptions/index.ts
 create mode 100644 packages/nodes-base/nodes/Zoho/types.d.ts

diff --git a/packages/cli/BREAKING-CHANGES.md b/packages/cli/BREAKING-CHANGES.md
index 2a762e0476..a7ac4db33b 100644
--- a/packages/cli/BREAKING-CHANGES.md
+++ b/packages/cli/BREAKING-CHANGES.md
@@ -2,6 +2,16 @@
 
 This list shows all the versions which include breaking changes and how to upgrade.
 
+## 0.127.0
+
+### What changed?
+
+For the Zoho node, the `lead:create` operation now requires a "Company" parameter, the parameter "Address" is now inside "Additional Options", and the parameters "Title" and "Is Duplicate Record" were removed. Also, the `lead:delete` operation now returns only the `id` of the deleted lead.
+
+### When is action necessary?
+
+If you are using `lead:create` with "Company" or "Address", reset the parameters; for the other two parameters, no action needed. If you are using the response from `lead:delete`, reselect the `id` key.
+
 ## 0.118.0
 
 ### What changed?
diff --git a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
index d5e07a3877..fa862de03b 100644
--- a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
@@ -1,59 +1,434 @@
-import { 
+import {
 	OptionsWithUri,
 } from 'request';
 
 import {
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
-	ILoadOptionsFunctions,
+	IHookFunctions,
 } from 'n8n-core';
+
 import {
-	IDataObject, NodeApiError
+	IDataObject,
+	ILoadOptionsFunctions,
+	NodeApiError,
+	NodeOperationError,
 } from 'n8n-workflow';
 
-export async function zohoApiRequest(this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
-	const { oauthTokenData: { api_domain } } = this.getCredentials('zohoOAuth2Api') as { [key: string]: IDataObject };
+import {
+	flow,
+	sortBy,
+} from 'lodash';
+
+import {
+	AllFields,
+	CamelCaseResource,
+	DateType,
+	GetAllFilterOptions,
+	IdType,
+	LoadedFields,
+	LoadedLayouts,
+	LocationType,
+	NameType,
+	ProductDetails,
+	ResourceItems,
+	SnakeCaseResource,
+	ZohoOAuth2ApiCredentials,
+} from './types';
+
+export async function zohoApiRequest(
+	this: IExecuteFunctions | IHookFunctions | ILoadOptionsFunctions,
+	method: string,
+	endpoint: string,
+	body: IDataObject = {},
+	qs: IDataObject = {},
+	uri?: string,
+) {
+	const { oauthTokenData } = this.getCredentials('zohoOAuth2Api') as ZohoOAuth2ApiCredentials;
 
 	const options: OptionsWithUri = {
-		headers: {
-			'Content-Type': 'application/json',
-		},
-		method,
 		body: {
 			data: [
 				body,
 			],
 		},
+		method,
 		qs,
-		uri: uri || `${api_domain}/crm/v2${resource}`,
+		uri: uri ?? `${oauthTokenData.api_domain}/crm/v2${endpoint}`,
 		json: true,
 	};
+
+	if (!Object.keys(body).length) {
+		delete options.body;
+	}
+
+	if (!Object.keys(qs).length) {
+		delete options.qs;
+	}
+
 	try {
-		//@ts-ignore
-		return await this.helpers.requestOAuth2.call(this, 'zohoOAuth2Api', options);
+		const responseData = await this.helpers.requestOAuth2?.call(this, 'zohoOAuth2Api', options);
+
+		if (responseData === undefined) return [];
+
+		throwOnErrorStatus.call(this, responseData);
+
+		return responseData;
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error);
 	}
 }
 
-export async function zohoApiRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, propertyName: string, method: string, endpoint: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
-
+/**
+ * Make an authenticated API request to Zoho CRM API and return all items.
+ */
+export async function zohoApiRequestAllItems(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: string,
+	endpoint: string,
+	body: IDataObject = {},
+	qs: IDataObject = {},
+) {
 	const returnData: IDataObject[] = [];
 
 	let responseData;
 	let uri: string | undefined;
-	query.per_page = 200;
-	query.page = 0;
+	qs.per_page = 200;
+	qs.page = 0;
 
 	do {
-		responseData = await zohoApiRequest.call(this, method, endpoint, body, query, uri);
+		responseData = await zohoApiRequest.call(this, method, endpoint, body, qs, uri);
+		if (Array.isArray(responseData) && !responseData.length) return returnData;
+		returnData.push(...responseData.data);
 		uri = responseData.info.more_records;
-		returnData.push.apply(returnData, responseData[propertyName]);
-		query.page++;
+		qs.page++;
 	} while (
 		responseData.info.more_records !== undefined &&
 		responseData.info.more_records === true
 	);
 
 	return returnData;
-}
\ No newline at end of file
+}
+
+/**
+ * Handle a Zoho CRM API listing by returning all items or up to a limit.
+ */
+export async function handleListing(
+	this: IExecuteFunctions,
+	method: string,
+	endpoint: string,
+	body: IDataObject = {},
+	qs: IDataObject = {},
+) {
+	const returnAll = this.getNodeParameter('returnAll', 0) as boolean;
+
+	if (returnAll) {
+		return await zohoApiRequestAllItems.call(this, method, endpoint, body, qs);
+	}
+
+	const responseData = await zohoApiRequestAllItems.call(this, method, endpoint, body, qs);
+	const limit = this.getNodeParameter('limit', 0) as number;
+
+	return responseData.slice(0, limit);
+}
+
+export function throwOnEmptyUpdate(this: IExecuteFunctions, resource: CamelCaseResource) {
+	throw new NodeOperationError(
+		this.getNode(),
+		`Please enter at least one field to update for the ${resource}.`,
+	);
+}
+
+export function throwOnMissingProducts(
+	this: IExecuteFunctions,
+	resource: CamelCaseResource,
+	productDetails: ProductDetails,
+	) {
+	if (!productDetails.length) {
+		throw new NodeOperationError(
+			this.getNode(),
+			`Please enter at least one product for the ${resource}.`,
+		);
+	}
+}
+
+export function throwOnErrorStatus(
+	this: IExecuteFunctions | IHookFunctions | ILoadOptionsFunctions,
+	responseData: { data?: Array<{ status: string, message: string }> },
+) {
+	if (responseData?.data?.[0].status === 'error') {
+		throw new NodeOperationError(this.getNode(), responseData as Error);
+	}
+}
+
+// ----------------------------------------
+//        required field adjusters
+// ----------------------------------------
+
+/**
+ * Place a product ID at a nested position in a product details field.
+ */
+export const adjustProductDetails = (productDetails: ProductDetails) => {
+	return productDetails.map(p => {
+		return {
+			...omit('product', p),
+			product: { id: p.id },
+			quantity: p.quantity || 1,
+		};
+	});
+};
+
+// ----------------------------------------
+//        additional field adjusters
+// ----------------------------------------
+
+/**
+ * Place a product ID at a nested position in a product details field.
+ *
+ * Only for updating products from Invoice, Purchase Order, Quote, and Sales Order.
+ */
+export const adjustProductDetailsOnUpdate = (allFields: AllFields) => {
+	if (!allFields.Product_Details) return allFields;
+
+	return allFields.Product_Details.map(p => {
+		return {
+			...omit('product', p),
+			product: { id: p.id },
+			quantity: p.quantity || 1,
+		};
+	});
+};
+
+/**
+ * Place a location field's contents at the top level of the payload.
+ */
+const adjustLocationFields = (locationType: LocationType) => (allFields: AllFields) => {
+	const locationField = allFields[locationType];
+
+	if (!locationField) return allFields;
+
+	return {
+		...omit(locationType, allFields),
+		...locationField.address_fields,
+	};
+};
+
+const adjustAddressFields = adjustLocationFields('Address');
+const adjustBillingAddressFields = adjustLocationFields('Billing_Address');
+const adjustMailingAddressFields = adjustLocationFields('Mailing_Address');
+const adjustShippingAddressFields = adjustLocationFields('Shipping_Address');
+const adjustOtherAddressFields = adjustLocationFields('Other_Address');
+
+/**
+ * Remove from a date field the timestamp set by the datepicker.
+ */
+ const adjustDateField = (dateType: DateType) => (allFields: AllFields) => {
+	const dateField = allFields[dateType];
+
+	if (!dateField) return allFields;
+
+	allFields[dateType] = dateField.split('T')[0];
+
+	return allFields;
+};
+
+const adjustDateOfBirthField = adjustDateField('Date_of_Birth');
+const adjustClosingDateField = adjustDateField('Closing_Date');
+const adjustInvoiceDateField = adjustDateField('Invoice_Date');
+const adjustDueDateField = adjustDateField('Due_Date');
+const adjustPurchaseOrderDateField = adjustDateField('PO_Date');
+const adjustValidTillField = adjustDateField('Valid_Till');
+
+/**
+ * Place an ID field's value nested inside the payload.
+ */
+const adjustIdField = (idType: IdType, nameProperty: NameType) => (allFields: AllFields) => {
+	const idValue = allFields[idType];
+
+	if (!idValue) return allFields;
+
+	return {
+		...omit(idType, allFields),
+		[nameProperty]: { id: idValue },
+	};
+};
+
+const adjustAccountIdField = adjustIdField('accountId', 'Account_Name');
+const adjustContactIdField = adjustIdField('contactId', 'Full_Name');
+const adjustDealIdField = adjustIdField('dealId', 'Deal_Name');
+
+const adjustCustomFields = (allFields: AllFields) => {
+	const { customFields, ...rest } = allFields;
+
+	if (!customFields?.customFields.length) return allFields;
+
+	return customFields.customFields.reduce((acc, cur) => {
+		acc[cur.fieldId] = cur.value;
+		return acc;
+	}, rest);
+};
+
+// ----------------------------------------
+//           payload adjusters
+// ----------------------------------------
+
+export const adjustAccountPayload = flow(
+	adjustBillingAddressFields,
+	adjustShippingAddressFields,
+	adjustCustomFields,
+);
+
+export const adjustContactPayload = flow(
+	adjustMailingAddressFields,
+	adjustOtherAddressFields,
+	adjustDateOfBirthField,
+	adjustCustomFields,
+);
+
+export const adjustDealPayload = flow(
+	adjustClosingDateField,
+	adjustCustomFields,
+);
+
+export const adjustInvoicePayload = flow(
+	adjustBillingAddressFields,
+	adjustShippingAddressFields,
+	adjustInvoiceDateField,
+	adjustDueDateField,
+	adjustAccountIdField,
+	adjustCustomFields,
+);
+
+export const adjustInvoicePayloadOnUpdate = flow(
+	adjustInvoicePayload,
+	adjustProductDetailsOnUpdate,
+);
+
+export const adjustLeadPayload = flow(
+	adjustAddressFields,
+	adjustCustomFields,
+);
+
+export const adjustPurchaseOrderPayload = flow(
+	adjustBillingAddressFields,
+	adjustShippingAddressFields,
+	adjustDueDateField,
+	adjustPurchaseOrderDateField,
+	adjustCustomFields,
+);
+
+export const adjustQuotePayload = flow(
+	adjustBillingAddressFields,
+	adjustShippingAddressFields,
+	adjustValidTillField,
+	adjustCustomFields,
+);
+
+export const adjustSalesOrderPayload = flow(
+	adjustBillingAddressFields,
+	adjustShippingAddressFields,
+	adjustDueDateField,
+	adjustAccountIdField,
+	adjustContactIdField,
+	adjustDealIdField,
+	adjustCustomFields,
+);
+
+export const adjustVendorPayload = flow(
+	adjustAddressFields,
+	adjustCustomFields,
+);
+
+export const adjustProductPayload = adjustCustomFields;
+
+// ----------------------------------------
+//               helpers
+// ----------------------------------------
+
+/**
+ * Create a copy of an object without a specific property.
+ */
+const omit = (propertyToOmit: string, { [propertyToOmit]: _, ...remainingObject }) => remainingObject;
+
+/**
+ * Convert items in a Zoho CRM API response into n8n load options.
+ */
+export const toLoadOptions = (items: ResourceItems, nameProperty: NameType) =>
+	items.map((item) => ({ name: item[nameProperty], value: item.id }));
+
+/**
+ * Retrieve all fields for a resource, sorted alphabetically.
+ */
+export async function getFields(
+	this: ILoadOptionsFunctions,
+	resource: SnakeCaseResource,
+	{ onlyCustom } = { onlyCustom: false },
+) {
+	const qs = { module: getModuleName(resource) };
+
+	let { fields } = await zohoApiRequest.call(this, 'GET', '/settings/fields', {}, qs) as LoadedFields;
+
+	if (onlyCustom) {
+		fields = fields.filter(({ custom_field }) => custom_field);
+	}
+
+	const options = fields.map(({ field_label, api_name }) => ({ name: field_label, value: api_name }));
+
+	return sortBy(options, o => o.name);
+}
+
+export function getModuleName(resource: string) {
+	const map: { [key: string]: string } = {
+		account: 'Accounts',
+		contact: 'Contacts',
+		deal: 'Deals',
+		invoice: 'Invoices',
+		lead: 'Leads',
+		product: 'Products',
+		purchaseOrder: 'Purchase_Orders',
+		salesOrder: 'Sales_Orders',
+		vendor: 'Vendors',
+		quote: 'Quotes',
+	};
+
+	return map[resource];
+}
+
+export async function getPicklistOptions(
+	this: ILoadOptionsFunctions,
+	resource: string,
+	targetField: string,
+) {
+	const qs = { module: getModuleName(resource) };
+	const responseData = await zohoApiRequest.call(this, 'GET', '/settings/layouts', {}, qs) as LoadedLayouts;
+
+	const	pickListOptions = responseData.layouts[0]
+		.sections.find(section => section.api_name === getSectionApiName(resource))
+		?.fields.find(f => f.api_name === targetField)
+		?.pick_list_values;
+
+	if (!pickListOptions) return [];
+
+	return pickListOptions.map(
+		(option) => ({ name: option.display_value, value: option.actual_value }),
+	);
+}
+
+
+function getSectionApiName(resource: string) {
+	if (resource === 'purchaseOrder') return 'Purchase Order Information';
+	if (resource === 'salesOrder') return 'Sales Order Information';
+
+	return `${capitalizeInitial(resource)} Information`;
+}
+
+/**
+ * Add filter options to a query string object.
+ */
+export const addGetAllFilterOptions = (qs: IDataObject, options: GetAllFilterOptions) => {
+	if (Object.keys(options).length) {
+		const { fields, ...rest } = options;
+		Object.assign(qs, fields && { fields: fields.join(',') }, rest);
+	}
+};
+
+export const capitalizeInitial = (str: string) => str[0].toUpperCase() + str.slice(1);
diff --git a/packages/nodes-base/nodes/Zoho/LeadDescription.ts b/packages/nodes-base/nodes/Zoho/LeadDescription.ts
deleted file mode 100644
index d232098ca7..0000000000
--- a/packages/nodes-base/nodes/Zoho/LeadDescription.ts
+++ /dev/null
@@ -1,706 +0,0 @@
-import { INodeProperties } from 'n8n-workflow';
-
-export const leadOperations = [
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-			},
-		},
-		options: [
-			{
-				name: 'Create',
-				value: 'create',
-				description: 'Create a new lead',
-			},
-			{
-				name: 'Delete',
-				value: 'delete',
-				description: 'Delete a lead',
-			},
-			{
-				name: 'Get',
-				value: 'get',
-				description: 'Get data of a lead',
-			},
-			{
-				name: 'Get All',
-				value: 'getAll',
-				description: 'Get data of all leads',
-			},
-			{
-				name: 'Get Fields',
-				value: 'getFields',
-				description: `Get the fields' metadata`,
-			},
-			{
-				name: 'Update',
-				value: 'update',
-				description: 'Update a lead',
-			},
-		],
-		default: 'create',
-		description: 'The operation to perform.',
-	},
-] as INodeProperties[];
-
-export const leadFields = [
-
-/* -------------------------------------------------------------------------- */
-/*                                 lead:create                                */
-/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Last Name',
-		name: 'lastName',
-		type: 'string',
-		default: '',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'create',
-				],
-			},
-		},
-		description: `User's last name`,
-	},
-	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				operation: [
-					'create',
-				],
-				resource: [
-					'lead',
-				],
-			},
-		},
-		options: [
-			{
-				displayName: 'Annual Revenue',
-				name: 'annualRevenue',
-				type: 'number',
-				typeOptions: {
-					numberPrecision: 2,
-				},
-				default: 0,
-			},
-			{
-				displayName: 'Company',
-				name: 'company',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Description',
-				name: 'description',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Email',
-				name: 'email',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Email Opt Out',
-				name: 'emailOptOut',
-				type: 'boolean',
-				default: false,
-			},
-			{
-				displayName: 'Fax',
-				name: 'fax',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'First Name',
-				name: 'firstName',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Industry',
-				name: 'industry',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getIndustries',
-				},
-				default: '',
-			},
-			{
-				displayName: 'Is Record Duplicate',
-				name: 'isRecordDuplicate',
-				type: 'boolean',
-				default: false,
-			},
-			{
-				displayName: 'Lead Source',
-				name: 'leadSource',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getLeadSources',
-				},
-				default: '',
-			},
-			{
-				displayName: 'Lead Status',
-				name: 'leadStatus',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getLeadStatuses',
-				},
-				default: '',
-			},
-			{
-				displayName: 'Mobile',
-				name: 'mobile',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'No. of Employees',
-				name: 'numberOfEmployees',
-				type: 'number',
-				default: 1,
-			},
-			{
-				displayName: 'Owner',
-				name: 'owner',
-				type: 'options',
-				default: '',
-				typeOptions: {
-					loadOptionsMethod: 'getUsers',
-				},
-			},
-			{
-				displayName: 'Phone',
-				name: 'phone',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Salutation',
-				name: 'salutation',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Secondary Email',
-				name: 'secondaryEmail',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Skype ID',
-				name: 'SkypeId',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Title',
-				name: 'title',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Twitter',
-				name: 'twitter',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Website',
-				name: 'website',
-				type: 'string',
-				default: '',
-			},
-		],
-	},
-	{
-		displayName: 'Address',
-		name: 'addressUi',
-		type: 'fixedCollection',
-		default: {},
-		placeholder: 'Add Address',
-		typeOptions: {
-			multipleValues: false,
-		},
-		required: false,
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'create',
-				],
-			},
-		},
-		options: [
-			{
-				name: 'addressValues',
-				displayName: 'Address',
-				values: [
-					{
-						displayName: 'Street',
-						name: 'street',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'City',
-						name: 'city',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'State',
-						name: 'state',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'Country',
-						name: 'country',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'Zip Code',
-						name: 'zipCode',
-						type: 'string',
-						default: '',
-					},
-				],
-			},
-		],
-	},
-/* -------------------------------------------------------------------------- */
-/*                                 lead:update                                */
-/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Lead ID',
-		name: 'leadId',
-		type: 'string',
-		default: '',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'update',
-				],
-			},
-		},
-	},
-	{
-			displayName: 'Additional Fields',
-			name: 'additionalFields',
-			type: 'collection',
-			placeholder: 'Add Field',
-			default: {},
-			displayOptions: {
-				show: {
-					operation: [
-						'update',
-					],
-					resource: [
-						'lead',
-					],
-				},
-			},
-			options: [
-				{
-					displayName: 'Annual Revenue',
-					name: 'annualRevenue',
-					type: 'number',
-					typeOptions: {
-						numberPrecision: 2,
-					},
-					default: 0,
-				},
-				{
-					displayName: 'Company',
-					name: 'company',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Description',
-					name: 'description',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Email',
-					name: 'email',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Email Opt Out',
-					name: 'emailOptOut',
-					type: 'boolean',
-					default: false,
-				},
-				{
-					displayName: 'Fax',
-					name: 'fax',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'First Name',
-					name: 'firstName',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Industry',
-					name: 'industry',
-					type: 'options',
-					typeOptions: {
-						loadOptionsMethod: 'getIndustries',
-					},
-					default: '',
-				},
-				{
-					displayName: 'Is Record Duplicate',
-					name: 'isRecordDuplicate',
-					type: 'boolean',
-					default: false,
-				},
-				{
-					displayName: 'Last Name',
-					name: 'lastName',
-					type: 'string',
-					default: '',
-					description: `User's last name`,
-				},
-				{
-					displayName: 'Lead Source',
-					name: 'leadSource',
-					type: 'options',
-					typeOptions: {
-						loadOptionsMethod: 'getLeadSources',
-					},
-					default: '',
-				},
-				{
-					displayName: 'Lead Status',
-					name: 'leadStatus',
-					type: 'options',
-					typeOptions: {
-						loadOptionsMethod: 'getLeadStatuses',
-					},
-					default: '',
-				},
-				{
-					displayName: 'Mobile',
-					name: 'mobile',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'No. of Employees',
-					name: 'numberOfEmployees',
-					type: 'number',
-					default: 1,
-				},
-				{
-					displayName: 'Owner',
-					name: 'owner',
-					type: 'options',
-					default: '',
-					typeOptions: {
-						loadOptionsMethod: 'getUsers',
-					},
-				},
-				{
-					displayName: 'Phone',
-					name: 'phone',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Salutation',
-					name: 'salutation',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Secondary Email',
-					name: 'secondaryEmail',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Skype ID',
-					name: 'SkypeId',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Title',
-					name: 'title',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Twitter',
-					name: 'twitter',
-					type: 'string',
-					default: '',
-				},
-				{
-					displayName: 'Website',
-					name: 'website',
-					type: 'string',
-					default: '',
-				},
-			],
-	},
-	{
-		displayName: 'Address',
-		name: 'addressUi',
-		type: 'fixedCollection',
-		default: {},
-		placeholder: 'Add Address',
-		typeOptions: {
-			multipleValues: false,
-		},
-		required: false,
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'update',
-				],
-			},
-		},
-		options: [
-			{
-				name: 'addressValues',
-				displayName: 'Address',
-				values: [
-					{
-						displayName: 'Street',
-						name: 'street',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'City',
-						name: 'city',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'State',
-						name: 'state',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'Country',
-						name: 'country',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'Zip Code',
-						name: 'zipCode',
-						type: 'string',
-						default: '',
-					},
-				],
-			},
-		],
-	},
-/* -------------------------------------------------------------------------- */
-/*                                 lead:get                                   */
-/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Lead ID',
-		name: 'leadId',
-		type: 'string',
-		default: '',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'get',
-				],
-			},
-		},
-	},
-/* -------------------------------------------------------------------------- */
-/*                                 lead:getAll                                */
-/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'getAll',
-				],
-			},
-		},
-		default: false,
-		description: 'If all results should be returned or only up to a given limit.',
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'getAll',
-				],
-				returnAll: [
-					false,
-				],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 200,
-		},
-		default: 100,
-		description: 'How many results to return.',
-	},
-	{
-		displayName: 'Options',
-		name: 'options',
-		type: 'collection',
-		placeholder: 'Add Option',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'getAll',
-				],
-			},
-		},
-		options: [
-			{
-				displayName: 'Approved',
-				name: 'approved',
-				type: 'boolean',
-				default: true,
-				description: 'To get the list of approved records. Default value is true.',
-			},
-			{
-				displayName: 'Converted',
-				name: 'converted',
-				type: 'boolean',
-				default: false,
-				description: 'To get the list of converted records. Default value is false',
-			},
-			{
-				displayName: 'Fields',
-				name: 'fields',
-				type: 'multiOptions',
-				typeOptions: {
-					loadOptionsMethod: 'getLeadFields',
-				},
-				default: [],
-			},
-			{
-				displayName: 'Include Child',
-				name: 'includeChild',
-				type: 'boolean',
-				default: false,
-				description: 'To include records from the child territories. True includes child territory records',
-			},
-			{
-				displayName: 'Sort By',
-				name: 'sortBy',
-				type: 'multiOptions',
-				typeOptions: {
-					loadOptionsMethod: 'getLeadFields',
-				},
-				default: [],
-			},
-			{
-				displayName: 'Sort Order',
-				name: 'sortOrder',
-				type: 'options',
-				options: [
-					{
-						name: 'ASC',
-						value: 'asc',
-					},
-					{
-						name: 'DESC',
-						value: 'desc',
-					},
-				],
-				default: 'desc',
-				description: 'Order sort attribute ascending or descending.',
-			},
-			{
-				displayName: 'Territory ID',
-				name: 'territoryId',
-				type: 'string',
-				default: '',
-				description: 'To get the list of records based on the territory	',
-			},
-		],
-	},
-/* -------------------------------------------------------------------------- */
-/*                                 lead:delete                                */
-/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Lead ID',
-		name: 'leadId',
-		type: 'string',
-		default: '',
-		required: true,
-		displayOptions: {
-			show: {
-				resource: [
-					'lead',
-				],
-				operation: [
-					'delete',
-				],
-			},
-		},
-	},
-] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/LeadInterface.ts b/packages/nodes-base/nodes/Zoho/LeadInterface.ts
deleted file mode 100644
index 957f816cb6..0000000000
--- a/packages/nodes-base/nodes/Zoho/LeadInterface.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-export interface ILead {
-	Annual_Revenue?: number;
-	City?: string;
-	Company?: string;
-	Country?: string;
-	Description?: string;
-	Designation?: string;
-	Email?: string;
-	Email_Opt_Out?: boolean;
-	Fax?: string;
-	First_Name?: string;
-	Industry?: string;
-	Is_Record_Duplicate?: boolean;
-	Last_Name?: string;
-	Lead_Owner?: string;
-	Lead_Source?: string;
-	Lead_Status?: string;
-	Mobile?: string;
-	No_of_Employees?: number;
-	Phone?: string;
-	Salutation?: string;
-	Secondary_Email?: string;
-	Skype_ID?: string;
-	State?: string;
-	Street?: string;
-	Twitter?: string;
-	Website?: string;
-	Zip_Code?: string;
-}
-
-export interface IAddress {
-	street?: string;
-	city?: string;
-	state?: string;
-	country?: string;
-	zipCode?: string;
-}
diff --git a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
index 8380f56049..da7c713551 100644
--- a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
+++ b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
@@ -6,37 +6,80 @@ import {
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
-	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
 import {
+	addGetAllFilterOptions,
+	adjustAccountPayload,
+	adjustContactPayload,
+	adjustDealPayload,
+	adjustInvoicePayload,
+	adjustInvoicePayloadOnUpdate,
+	adjustLeadPayload,
+	adjustProductDetails,
+	adjustProductPayload,
+	adjustPurchaseOrderPayload,
+	adjustQuotePayload,
+	adjustSalesOrderPayload,
+	adjustVendorPayload,
+	getFields,
+	getModuleName,
+	getPicklistOptions,
+	handleListing,
+	throwOnEmptyUpdate,
+	throwOnMissingProducts,
+	toLoadOptions,
 	zohoApiRequest,
 	zohoApiRequestAllItems,
 } from './GenericFunctions';
 
 import {
-	leadFields,
-	leadOperations,
-} from './LeadDescription';
+	CamelCaseResource,
+	GetAllFilterOptions,
+	LoadedAccounts,
+	LoadedContacts,
+	LoadedDeals,
+	LoadedProducts,
+	LoadedVendors,
+	ProductDetails,
+} from './types';
 
 import {
-	IAddress,
-	ILead,
-} from './LeadInterface';
+	accountFields,
+	accountOperations,
+	contactFields,
+	contactOperations,
+	dealFields,
+	dealOperations,
+	invoiceFields,
+	invoiceOperations,
+	leadFields,
+	leadOperations,
+	productFields,
+	productOperations,
+	purchaseOrderFields,
+	purchaseOrderOperations,
+	quoteFields,
+	quoteOperations,
+	salesOrderFields,
+	salesOrderOperations,
+	vendorFields,
+	vendorOperations,
+} from './descriptions';
 
 export class ZohoCrm implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Zoho CRM',
 		name: 'zohoCrm',
 		icon: 'file:zoho.svg',
+		group: ['transform'],
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		group: ['input'],
 		version: 1,
-		description: 'Consume Zoho CRM API.',
+		description: 'Consume the Zoho API',
 		defaults: {
-			name: 'Zoho CRM',
+			name: 'Zoho',
 			color: '#CE2232',
 		},
 		inputs: ['main'],
@@ -53,134 +96,222 @@ export class ZohoCrm implements INodeType {
 				name: 'resource',
 				type: 'options',
 				options: [
+					{
+						name: 'Account',
+						value: 'account',
+					},
+					{
+						name: 'Contact',
+						value: 'contact',
+					},
+					{
+						name: 'Deal',
+						value: 'deal',
+					},
+					{
+						name: 'Invoice',
+						value: 'invoice',
+					},
 					{
 						name: 'Lead',
 						value: 'lead',
 					},
+					{
+						name: 'Product',
+						value: 'product',
+					},
+					{
+						name: 'Purchase Order',
+						value: 'purchaseOrder',
+					},
+					{
+						name: 'Quote',
+						value: 'quote',
+					},
+					{
+						name: 'Sales Order',
+						value: 'salesOrder',
+					},
+					{
+						name: 'Vendor',
+						value: 'vendor',
+					},
 				],
-				default: 'lead',
-				description: 'The resource to operate on.',
+				default: 'account',
+				description: 'Resource to consume',
 			},
+			...accountOperations,
+			...accountFields,
+			...contactOperations,
+			...contactFields,
+			...dealOperations,
+			...dealFields,
+			...invoiceOperations,
+			...invoiceFields,
 			...leadOperations,
 			...leadFields,
+			...productOperations,
+			...productFields,
+			...purchaseOrderOperations,
+			...purchaseOrderFields,
+			...quoteOperations,
+			...quoteFields,
+			...salesOrderOperations,
+			...salesOrderFields,
+			...vendorOperations,
+			...vendorFields,
 		],
 	};
 
 	methods = {
 		loadOptions: {
-			// Get all the available users to display them to user so that he can
-			// select them easily
-			async getUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const { users } = await zohoApiRequest.call(this, 'GET', '/users', {}, { type: 'AllUsers' });
-				for (const user of users) {
-					const userName = `${user.first_name} ${user.last_name}`;
-					const userId = user.profile.id;
-					returnData.push({
-						name: userName,
-						value: userId,
-					});
-				}
-				return returnData;
+			// ----------------------------------------
+			//               resources
+			// ----------------------------------------
+
+			async getAccounts(this: ILoadOptionsFunctions) {
+				const accounts = await zohoApiRequestAllItems.call(this, 'GET', '/accounts') as LoadedAccounts;
+				return toLoadOptions(accounts, 'Account_Name');
 			},
-			// Get all the available accounts to display them to user so that he can
-			// select them easily
-			async getAccounts(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const qs: IDataObject = {};
-				qs.sort_by = 'Created_Time';
-				qs.sort_order = 'desc';
-				const { data } = await zohoApiRequest.call(this, 'GET', '/accounts', {}, qs);
-				for (const account of data) {
-					const accountName = account.Account_Name;
-					const accountId = account.id;
-					returnData.push({
-						name: accountName,
-						value: accountId,
-					});
-				}
-				return returnData;
+
+			async getContacts(this: ILoadOptionsFunctions) {
+				const contacts = await zohoApiRequestAllItems.call(this, 'GET', '/contacts') as LoadedContacts;
+				return toLoadOptions(contacts, 'Full_Name');
 			},
-			// Get all the available lead statuses to display them to user so that he can
-			// select them easily
-			async getLeadStatuses(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const qs: IDataObject = {};
-				qs.module = 'leads';
-				const { fields } = await zohoApiRequest.call(this, 'GET', '/settings/fields', {}, qs);
-				for (const field of fields) {
-					if (field.api_name === 'Lead_Status') {
-						for (const value of field.pick_list_values) {
-							const valueName = value.display_value;
-							const valueId = value.actual_value;
-							returnData.push({
-								name: valueName,
-								value: valueId,
-							});
-							return returnData;
-						}
-					}
-				}
-				return returnData;
+
+			async getDeals(this: ILoadOptionsFunctions) {
+				const deals = await zohoApiRequestAllItems.call(this, 'GET', '/deals') as LoadedDeals;
+				return toLoadOptions(deals, 'Deal_Name');
 			},
-			// Get all the available lead sources to display them to user so that he can
-			// select them easily
-			async getLeadSources(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const qs: IDataObject = {};
-				qs.module = 'leads';
-				const { fields } = await zohoApiRequest.call(this, 'GET', '/settings/fields', {}, qs);
-				for (const field of fields) {
-					if (field.api_name === 'Lead_Source') {
-						for (const value of field.pick_list_values) {
-							const valueName = value.display_value;
-							const valueId = value.actual_value;
-							returnData.push({
-								name: valueName,
-								value: valueId,
-							});
-							return returnData;
-						}
-					}
-				}
-				return returnData;
+
+			async getProducts(this: ILoadOptionsFunctions) {
+				const products = await zohoApiRequestAllItems.call(this, 'GET', '/products') as LoadedProducts;
+				return toLoadOptions(products, 'Product_Name');
 			},
-			// Get all the available industries to display them to user so that he can
-			// select them easily
-			async getIndustries(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const qs: IDataObject = {};
-				qs.module = 'leads';
-				const { fields } = await zohoApiRequest.call(this, 'GET', '/settings/fields', {}, qs);
-				for (const field of fields) {
-					if (field.api_name === 'Industry') {
-						for (const value of field.pick_list_values) {
-							const valueName = value.display_value;
-							const valueId = value.actual_value;
-							returnData.push({
-								name: valueName,
-								value: valueId,
-							});
-							return returnData;
-						}
-					}
-				}
-				return returnData;
+
+			async getVendors(this: ILoadOptionsFunctions) {
+				const vendors = await zohoApiRequestAllItems.call(this, 'GET', '/vendors') as LoadedVendors;
+				return toLoadOptions(vendors, 'Vendor_Name');
 			},
-			// Get all the available lead fields to display them to user so that he can
-			// select them easily
-			async getLeadFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const qs: IDataObject = {};
-				qs.module = 'leads';
-				const { fields } = await zohoApiRequest.call(this, 'GET', '/settings/fields', {}, qs);
-				for (const field of fields) {
-					returnData.push({
-						name: field.field_label,
-						value: field.api_name,
-					});
-				}
-				return returnData;
+
+			// ----------------------------------------
+			//             resource fields
+			// ----------------------------------------
+
+			// standard fields - called from `makeGetAllFields`
+
+			async getAccountFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'account');
+			},
+
+			async getContactFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'contact');
+			},
+
+			async getDealFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'deal');
+			},
+
+			async getInvoiceFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'invoice');
+			},
+
+			async getLeadFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'lead');
+			},
+
+			async getProductFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'product');
+			},
+
+			async getPurchaseOrderFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'purchase_order');
+			},
+
+			async getVendorOrderFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'vendor');
+			},
+
+			async getQuoteFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'quote');
+			},
+
+			async getSalesOrderFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'sales_order');
+			},
+
+			async getVendorFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'vendor');
+			},
+
+			// custom fields
+
+			async getCustomAccountFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'account', { onlyCustom: true });
+			},
+
+			async getCustomContactFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'contact', { onlyCustom: true });
+			},
+
+			async getCustomDealFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'deal', { onlyCustom: true });
+			},
+
+			async getCustomInvoiceFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'invoice', { onlyCustom: true });
+			},
+
+			async getCustomLeadFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'lead', { onlyCustom: true });
+			},
+
+			async getCustomProductFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'product', { onlyCustom: true });
+			},
+
+			async getCustomPurchaseOrderFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'purchase_order', { onlyCustom: true });
+			},
+
+			async getCustomVendorOrderFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'vendor', { onlyCustom: true });
+			},
+
+			async getCustomQuoteFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'quote', { onlyCustom: true });
+			},
+
+			async getCustomSalesOrderFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'sales_order', { onlyCustom: true });
+			},
+
+			async getCustomVendorFields(this: ILoadOptionsFunctions) {
+				return getFields.call(this, 'vendor', { onlyCustom: true });
+			},
+
+			// ----------------------------------------
+			//        resource picklist options
+			// ----------------------------------------
+
+			async getAccountType(this: ILoadOptionsFunctions) {
+				return getPicklistOptions.call(this, 'account', 'Account_Type');
+			},
+
+			async getDealStage(this: ILoadOptionsFunctions) {
+				return getPicklistOptions.call(this, 'deal', 'Stage');
+			},
+
+			async getPurchaseOrderStatus(this: ILoadOptionsFunctions) {
+				return getPicklistOptions.call(this, 'purchaseOrder', 'Status');
+			},
+
+			async getSalesOrderStatus(this: ILoadOptionsFunctions) {
+				return getPicklistOptions.call(this, 'salesOrder', 'Status');
+			},
+
+			async getQuoteStage(this: ILoadOptionsFunctions) {
+				return getPicklistOptions.call(this, 'quote', 'Quote_Stage');
 			},
 		},
 	};
@@ -188,265 +319,1147 @@ export class ZohoCrm implements INodeType {
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 		const returnData: IDataObject[] = [];
-		const length = items.length as unknown as number;
-		const qs: IDataObject = {};
+
+		const resource = this.getNodeParameter('resource', 0) as CamelCaseResource;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		const resolveData = this.getNodeParameter('resolveData', 0, false) as boolean;
+
 		let responseData;
-		for (let i = 0; i < length; i++) {
-			const resource = this.getNodeParameter('resource', 0) as string;
-			const operation = this.getNodeParameter('operation', 0) as string;
-			if (resource === 'lead') {
-				//https://www.zoho.com/crm/developer/docs/api/insert-records.html
-				if (operation === 'create') {
-					const lastName = this.getNodeParameter('lastName', i) as string;
-					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
-					const body: ILead = {
-						Last_Name: lastName,
-					};
-					if (additionalFields.owner) {
-						body.Lead_Owner = additionalFields.owner as string;
-					}
-					if (additionalFields.company) {
-						body.Company = additionalFields.company as string;
-					}
-					if (additionalFields.firstName) {
-						body.First_Name = additionalFields.firstName as string;
-					}
-					if (additionalFields.email) {
-						body.Email = additionalFields.email as string;
-					}
-					if (additionalFields.title) {
-						body.Designation = additionalFields.title as string;
-					}
-					if (additionalFields.phone) {
-						body.Phone = additionalFields.phone as string;
-					}
-					if (additionalFields.mobile) {
-						body.Mobile = additionalFields.mobile as string;
-					}
-					if (additionalFields.leadStatus) {
-						body.Lead_Status = additionalFields.leadStatus as string;
-					}
-					if (additionalFields.fax) {
-						body.Fax = additionalFields.fax as string;
-					}
-					if (additionalFields.website) {
-						body.Website = additionalFields.website as string;
-					}
-					if (additionalFields.leadSource) {
-						body.Lead_Source = additionalFields.leadSource as string;
-					}
-					if (additionalFields.industry) {
-						body.Industry = additionalFields.industry as string;
-					}
-					if (additionalFields.numberOfEmployees) {
-						body.No_of_Employees = additionalFields.numberOfEmployees as number;
-					}
-					if (additionalFields.annualRevenue) {
-						body.Annual_Revenue = additionalFields.annualRevenue as number;
-					}
-					if (additionalFields.emailOptOut) {
-						body.Email_Opt_Out = additionalFields.emailOptOut as boolean;
-					}
-					if (additionalFields.skypeId) {
-						body.Skype_ID = additionalFields.skypeId as string;
-					}
-					if (additionalFields.salutation) {
-						body.Salutation = additionalFields.salutation as string;
-					}
-					if (additionalFields.secondaryEmail) {
-						body.Secondary_Email = additionalFields.secondaryEmail as string;
-					}
-					if (additionalFields.twitter) {
-						body.Twitter = additionalFields.twitter as string;
-					}
-					if (additionalFields.isRecordDuplicate) {
-						body.Is_Record_Duplicate = additionalFields.isRecordDuplicate as boolean;
-					}
-					if (additionalFields.description) {
-						body.Description = additionalFields.description as string;
-					}
-					const address = (this.getNodeParameter('addressUi', i) as IDataObject).addressValues as IAddress;
-					if (address) {
-						if (address.country) {
-							body.Country = address.country as string;
-						}
-						if (address.city) {
-							body.City = address.city as string;
-						}
-						if (address.state) {
-							body.State = address.state as string;
-						}
-						if (address.street) {
-							body.Street = address.street as string;
-						}
-						if (address.zipCode) {
-							body.Zip_Code = address.zipCode as string;
-						}
-					}
-					responseData = await zohoApiRequest.call(this, 'POST', '/leads', body);
-					responseData = responseData.data;
 
-					if (responseData.length) {
-						responseData = responseData[0].details;
-					}
-				}
-				//https://www.zoho.com/crm/developer/docs/api/update-specific-record.html
-				if (operation === 'update') {
-					const leadId = this.getNodeParameter('leadId', i) as string;
-					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
-					const body: ILead = {};
-					if (additionalFields.lastName) {
-						body.Last_Name = additionalFields.lastName as string;
-					}
-					if (additionalFields.owner) {
-						body.Lead_Owner = additionalFields.owner as string;
-					}
-					if (additionalFields.company) {
-						body.Company = additionalFields.company as string;
-					}
-					if (additionalFields.firstName) {
-						body.First_Name = additionalFields.firstName as string;
-					}
-					if (additionalFields.email) {
-						body.Email = additionalFields.email as string;
-					}
-					if (additionalFields.title) {
-						body.Designation = additionalFields.title as string;
-					}
-					if (additionalFields.phone) {
-						body.Phone = additionalFields.phone as string;
-					}
-					if (additionalFields.mobile) {
-						body.Mobile = additionalFields.mobile as string;
-					}
-					if (additionalFields.leadStatus) {
-						body.Lead_Status = additionalFields.leadStatus as string;
-					}
-					if (additionalFields.fax) {
-						body.Fax = additionalFields.fax as string;
-					}
-					if (additionalFields.website) {
-						body.Website = additionalFields.website as string;
-					}
-					if (additionalFields.leadSource) {
-						body.Lead_Source = additionalFields.leadSource as string;
-					}
-					if (additionalFields.industry) {
-						body.Industry = additionalFields.industry as string;
-					}
-					if (additionalFields.numberOfEmployees) {
-						body.No_of_Employees = additionalFields.numberOfEmployees as number;
-					}
-					if (additionalFields.annualRevenue) {
-						body.Annual_Revenue = additionalFields.annualRevenue as number;
-					}
-					if (additionalFields.emailOptOut) {
-						body.Email_Opt_Out = additionalFields.emailOptOut as boolean;
-					}
-					if (additionalFields.skypeId) {
-						body.Skype_ID = additionalFields.skypeId as string;
-					}
-					if (additionalFields.salutation) {
-						body.Salutation = additionalFields.salutation as string;
-					}
-					if (additionalFields.secondaryEmail) {
-						body.Secondary_Email = additionalFields.secondaryEmail as string;
-					}
-					if (additionalFields.twitter) {
-						body.Twitter = additionalFields.twitter as string;
-					}
-					if (additionalFields.isRecordDuplicate) {
-						body.Is_Record_Duplicate = additionalFields.isRecordDuplicate as boolean;
-					}
-					if (additionalFields.description) {
-						body.Description = additionalFields.description as string;
-					}
-					const address = (this.getNodeParameter('addressUi', i) as IDataObject).addressValues as IAddress;
-					if (address) {
-						if (address.country) {
-							body.Country = address.country as string;
-						}
-						if (address.city) {
-							body.City = address.city as string;
-						}
-						if (address.state) {
-							body.State = address.state as string;
-						}
-						if (address.street) {
-							body.Street = address.street as string;
-						}
-						if (address.zipCode) {
-							body.Zip_Code = address.zipCode as string;
-						}
-					}
-					responseData = await zohoApiRequest.call(this, 'PUT', `/leads/${leadId}`, body);
-					responseData = responseData.data;
+		for (let i = 0; i < items.length; i++) {
 
-					if (responseData.length) {
-						responseData = responseData[0].details;
-					}
-				}
-				//https://www.zoho.com/crm/developer/docs/api/update-specific-record.html
-				if (operation === 'get') {
-					const leadId = this.getNodeParameter('leadId', i) as string;
-					responseData = await zohoApiRequest.call(this, 'GET', `/leads/${leadId}`);
-					if (responseData !== undefined) {
+			// https://www.zoho.com/crm/developer/docs/api/insert-records.html
+			// https://www.zoho.com/crm/developer/docs/api/get-records.html
+			// https://www.zoho.com/crm/developer/docs/api/update-specific-record.html
+			// https://www.zoho.com/crm/developer/docs/api/delete-specific-record.html
+			// https://www.zoho.com/crm/developer/docs/api/v2/upsert-records.html
+
+			try {
+
+				if (resource === 'account') {
+
+					// **********************************************************************
+					//                                account
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/accounts-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Accounts
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//             account: create
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Account_Name: this.getNodeParameter('accountName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustAccountPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/accounts', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//             account: delete
+						// ----------------------------------------
+
+						const accountId = this.getNodeParameter('accountId', i);
+
+						const endpoint = `/accounts/${accountId}`;
+						responseData = await zohoApiRequest.call(this, 'DELETE', endpoint);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//               account: get
+						// ----------------------------------------
+
+						const accountId = this.getNodeParameter('accountId', i);
+
+						const endpoint = `/accounts/${accountId}`;
+						responseData = await zohoApiRequest.call(this, 'GET', endpoint);
 						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//             account: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/accounts', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//             account: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustAccountPayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const accountId = this.getNodeParameter('accountId', i);
+
+						const endpoint = `/accounts/${accountId}`;
+						responseData = await zohoApiRequest.call(this, 'PUT', endpoint, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//             account: upsert
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Account_Name: this.getNodeParameter('accountName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustAccountPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/accounts/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'contact') {
+
+					// **********************************************************************
+					//                                contact
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/contacts-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Contacts
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//             contact: create
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Last_Name: this.getNodeParameter('lastName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustContactPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/contacts', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//             contact: delete
+						// ----------------------------------------
+
+						const contactId = this.getNodeParameter('contactId', i);
+
+						const endpoint = `/contacts/${contactId}`;
+						responseData = await zohoApiRequest.call(this, 'DELETE', endpoint);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//               contact: get
+						// ----------------------------------------
+
+						const contactId = this.getNodeParameter('contactId', i);
+
+						const endpoint = `/contacts/${contactId}`;
+						responseData = await zohoApiRequest.call(this, 'GET', endpoint);
+						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//             contact: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/contacts', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//             contact: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustContactPayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const contactId = this.getNodeParameter('contactId', i);
+
+						const endpoint = `/contacts/${contactId}`;
+						responseData = await zohoApiRequest.call(this, 'PUT', endpoint, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//             contact: upsert
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Last_Name: this.getNodeParameter('lastName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustContactPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/contacts/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'deal') {
+
+					// **********************************************************************
+					//                                deal
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/deals-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Deals
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//               deal: create
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Deal_Name: this.getNodeParameter('dealName', i),
+							Stage: this.getNodeParameter('stage', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustDealPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/deals', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//               deal: delete
+						// ----------------------------------------
+
+						const dealId = this.getNodeParameter('dealId', i);
+
+						responseData = await zohoApiRequest.call(this, 'DELETE', `/deals/${dealId}`);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//                deal: get
+						// ----------------------------------------
+
+						const dealId = this.getNodeParameter('dealId', i);
+
+						responseData = await zohoApiRequest.call(this, 'GET', `/deals/${dealId}`);
+						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//               deal: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/deals', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//               deal: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustDealPayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const dealId = this.getNodeParameter('dealId', i);
+
+						responseData = await zohoApiRequest.call(this, 'PUT', `/deals/${dealId}`, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//              deal: upsert
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Deal_Name: this.getNodeParameter('dealName', i),
+							Stage: this.getNodeParameter('stage', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustDealPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/deals/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'invoice') {
+
+					// **********************************************************************
+					//                                invoice
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/invoices-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Invoices
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//             invoice: create
+						// ----------------------------------------
+
+						const productDetails = this.getNodeParameter('Product_Details', i) as ProductDetails;
+
+						throwOnMissingProducts.call(this, resource, productDetails);
+
+						const body: IDataObject = {
+							Subject: this.getNodeParameter('subject', i),
+							Product_Details: adjustProductDetails(productDetails),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustInvoicePayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/invoices', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//             invoice: delete
+						// ----------------------------------------
+
+						const invoiceId = this.getNodeParameter('invoiceId', i);
+
+						const endpoint = `/invoices/${invoiceId}`;
+						responseData = await zohoApiRequest.call(this, 'DELETE', endpoint);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//               invoice: get
+						// ----------------------------------------
+
+						const invoiceId = this.getNodeParameter('invoiceId', i);
+
+						const endpoint = `/invoices/${invoiceId}`;
+						responseData = await zohoApiRequest.call(this, 'GET', endpoint);
+						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//             invoice: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/invoices', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//             invoice: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustInvoicePayloadOnUpdate(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const invoiceId = this.getNodeParameter('invoiceId', i);
+
+						const endpoint = `/invoices/${invoiceId}`;
+
+						responseData = await zohoApiRequest.call(this, 'PUT', endpoint, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//             invoice: upsert
+						// ----------------------------------------
+
+						const productDetails = this.getNodeParameter('Product_Details', i) as ProductDetails;
+
+						const body: IDataObject = {
+							Subject: this.getNodeParameter('subject', i),
+							Product_Details: adjustProductDetails(productDetails),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustInvoicePayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/invoices/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'lead') {
+
+					// **********************************************************************
+					//                                  lead
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/leads-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Leads
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//               lead: create
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Company: this.getNodeParameter('Company', i),
+							Last_Name: this.getNodeParameter('lastName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustLeadPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/leads', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//               lead: delete
+						// ----------------------------------------
+
+						const leadId = this.getNodeParameter('leadId', i);
+
+						responseData = await zohoApiRequest.call(this, 'DELETE', `/leads/${leadId}`);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//                lead: get
+						// ----------------------------------------
+
+						const leadId = this.getNodeParameter('leadId', i);
+
+						responseData = await zohoApiRequest.call(this, 'GET', `/leads/${leadId}`);
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//               lead: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/leads', {}, qs);
+
+					} else if (operation === 'getFields') {
+
+						// ----------------------------------------
+						//            lead: getFields
+						// ----------------------------------------
+
+						responseData = await zohoApiRequest.call(this, 'GET', '/settings/fields', {}, { module: 'leads' });
+						responseData = responseData.fields;
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//               lead: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustLeadPayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const leadId = this.getNodeParameter('leadId', i);
+
+						responseData = await zohoApiRequest.call(this, 'PUT', `/leads/${leadId}`, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//              lead: upsert
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Company: this.getNodeParameter('Company', i),
+							Last_Name: this.getNodeParameter('lastName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustLeadPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/leads/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'product') {
+
+					// **********************************************************************
+					//                              product
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/products-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Products
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//             product: create
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Product_Name: this.getNodeParameter('productName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustProductPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/products', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//            product: delete
+						// ----------------------------------------
+
+						const productId = this.getNodeParameter('productId', i);
+
+						const endpoint = `/products/${productId}`;
+						responseData = await zohoApiRequest.call(this, 'DELETE', endpoint);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//              product: get
+						// ----------------------------------------
+
+						const productId = this.getNodeParameter('productId', i);
+
+						const endpoint = `/products/${productId}`;
+						responseData = await zohoApiRequest.call(this, 'GET', endpoint);
+						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//            product: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/products', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//            product: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustProductPayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const productId = this.getNodeParameter('productId', i);
+
+						const endpoint = `/products/${productId}`;
+						responseData = await zohoApiRequest.call(this, 'PUT', endpoint, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//             product: upsert
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Product_Name: this.getNodeParameter('productName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustProductPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/products/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'purchaseOrder') {
+
+					// **********************************************************************
+					//                             purchaseOrder
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/purchase-orders-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Purchase_Order
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//          purchaseOrder: create
+						// ----------------------------------------
+
+						const productDetails = this.getNodeParameter('Product_Details', i) as ProductDetails;
+
+						throwOnMissingProducts.call(this, resource, productDetails);
+
+						const body: IDataObject = {
+							Subject: this.getNodeParameter('subject', i),
+							Vendor_Name: { id: this.getNodeParameter('vendorId', i) },
+							Product_Details: adjustProductDetails(productDetails),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustPurchaseOrderPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/purchase_orders', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//          purchaseOrder: delete
+						// ----------------------------------------
+
+						const purchaseOrderId = this.getNodeParameter('purchaseOrderId', i);
+
+						const endpoint = `/purchase_orders/${purchaseOrderId}`;
+						responseData = await zohoApiRequest.call(this, 'DELETE', endpoint);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//            purchaseOrder: get
+						// ----------------------------------------
+
+						const purchaseOrderId = this.getNodeParameter('purchaseOrderId', i);
+
+						const endpoint = `/purchase_orders/${purchaseOrderId}`;
+						responseData = await zohoApiRequest.call(this, 'GET', endpoint);
+						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//          purchaseOrder: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/purchase_orders', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//          purchaseOrder: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustPurchaseOrderPayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const purchaseOrderId = this.getNodeParameter('purchaseOrderId', i);
+
+						const endpoint = `/purchase_orders/${purchaseOrderId}`;
+						responseData = await zohoApiRequest.call(this, 'PUT', endpoint, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//          purchaseOrder: upsert
+						// ----------------------------------------
+
+						const productDetails = this.getNodeParameter('Product_Details', i) as ProductDetails;
+
+						const body: IDataObject = {
+							Subject: this.getNodeParameter('subject', i),
+							Vendor_Name: { id: this.getNodeParameter('vendorId', i) },
+							Product_Details: adjustProductDetails(productDetails),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustPurchaseOrderPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/purchase_orders/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'quote') {
+
+					// **********************************************************************
+					//                                 quote
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/quotes-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Quotes
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//              quote: create
+						// ----------------------------------------
+
+						const productDetails = this.getNodeParameter('Product_Details', i) as ProductDetails;
+
+						throwOnMissingProducts.call(this, resource, productDetails);
+
+						const body: IDataObject = {
+							Subject: this.getNodeParameter('subject', i),
+							Product_Details: adjustProductDetails(productDetails),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustQuotePayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/quotes', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//              quote: delete
+						// ----------------------------------------
+
+						const quoteId = this.getNodeParameter('quoteId', i);
+
+						responseData = await zohoApiRequest.call(this, 'DELETE', `/quotes/${quoteId}`);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//                quote: get
+						// ----------------------------------------
+
+						const quoteId = this.getNodeParameter('quoteId', i);
+
+						responseData = await zohoApiRequest.call(this, 'GET', `/quotes/${quoteId}`);
+						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//              quote: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/quotes', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//              quote: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustQuotePayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const quoteId = this.getNodeParameter('quoteId', i);
+
+						responseData = await zohoApiRequest.call(this, 'PUT', `/quotes/${quoteId}`, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//              quote: upsert
+						// ----------------------------------------
+
+						const productDetails = this.getNodeParameter('Product_Details', i) as ProductDetails;
+
+						const body: IDataObject = {
+							Subject: this.getNodeParameter('subject', i),
+							Product_Details: adjustProductDetails(productDetails),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustQuotePayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/quotes/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'salesOrder') {
+
+					// **********************************************************************
+					//                               salesOrder
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/sales-orders-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Sales_Orders
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//            salesOrder: create
+						// ----------------------------------------
+
+						const productDetails = this.getNodeParameter('Product_Details', i) as ProductDetails;
+
+						const body: IDataObject = {
+							Account_Name: { id: this.getNodeParameter('accountId', i) },
+							Subject: this.getNodeParameter('subject', i),
+							Product_Details: adjustProductDetails(productDetails),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustSalesOrderPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/sales_orders', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//            salesOrder: delete
+						// ----------------------------------------
+
+						const salesOrderId = this.getNodeParameter('salesOrderId', i);
+
+						const endpoint = `/sales_orders/${salesOrderId}`;
+						responseData = await zohoApiRequest.call(this, 'DELETE', endpoint);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//             salesOrder: get
+						// ----------------------------------------
+
+						const salesOrderId = this.getNodeParameter('salesOrderId', i);
+
+						const endpoint = `/sales_orders/${salesOrderId}`;
+						responseData = await zohoApiRequest.call(this, 'GET', endpoint);
+						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//            salesOrder: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/sales_orders', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//            salesOrder: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustSalesOrderPayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const salesOrderId = this.getNodeParameter('salesOrderId', i);
+
+						const endpoint = `/sales_orders/${salesOrderId}`;
+						responseData = await zohoApiRequest.call(this, 'PUT', endpoint, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//           salesOrder: upsert
+						// ----------------------------------------
+
+						const productDetails = this.getNodeParameter('Product_Details', i) as ProductDetails;
+
+						const body: IDataObject = {
+							Account_Name: { id: this.getNodeParameter('accountId', i) },
+							Subject: this.getNodeParameter('subject', i),
+							Product_Details: adjustProductDetails(productDetails),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustSalesOrderPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/sales_orders/upsert', body);
+						responseData = responseData.data[0].details;
+
+					}
+
+				} else if (resource === 'vendor') {
+
+					// **********************************************************************
+					//                               vendor
+					// **********************************************************************
+
+					// https://www.zoho.com/crm/developer/docs/api/v2/vendors-response.html
+					// https://help.zoho.com/portal/en/kb/crm/customize-crm-account/customizing-fields/articles/standard-modules-fields#Vendors
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//            vendor: create
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Vendor_Name: this.getNodeParameter('vendorName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustVendorPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/vendors', body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//            vendor: delete
+						// ----------------------------------------
+
+						const vendorId = this.getNodeParameter('vendorId', i);
+
+						const endpoint = `/vendors/${vendorId}`;
+						responseData = await zohoApiRequest.call(this, 'DELETE', endpoint);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//             vendor: get
+						// ----------------------------------------
+
+						const vendorId = this.getNodeParameter('vendorId', i);
+
+						const endpoint = `/vendors/${vendorId}`;
+						responseData = await zohoApiRequest.call(this, 'GET', endpoint);
+						responseData = responseData.data;
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//            vendor: getAll
+						// ----------------------------------------
+
+						const qs: IDataObject = {};
+						const options = this.getNodeParameter('options', i) as GetAllFilterOptions;
+
+						addGetAllFilterOptions(qs, options);
+
+						responseData = await handleListing.call(this, 'GET', '/vendors', {}, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//            vendor: update
+						// ----------------------------------------
+
+						const body: IDataObject = {};
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, adjustVendorPayload(updateFields));
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const vendorId = this.getNodeParameter('vendorId', i);
+
+						const endpoint = `/vendors/${vendorId}`;
+						responseData = await zohoApiRequest.call(this, 'PUT', endpoint, body);
+						responseData = responseData.data[0].details;
+
+					} else if (operation === 'upsert') {
+
+						// ----------------------------------------
+						//             vendor: upsert
+						// ----------------------------------------
+
+						const body: IDataObject = {
+							Vendor_Name: this.getNodeParameter('vendorName', i),
+						};
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, adjustVendorPayload(additionalFields));
+						}
+
+						responseData = await zohoApiRequest.call(this, 'POST', '/vendors/upsert', body);
+						responseData = responseData.data[0].details;
+
 					}
 
 				}
-				//https://www.zoho.com/crm/developer/docs/api/get-records.html
-				if (operation === 'getAll') {
-					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
-					const options = this.getNodeParameter('options', i) as IDataObject;
-					if (options.fields) {
-						qs.fields = (options.fields as string[]).join(',');
-					}
-					if (options.approved) {
-						qs.approved = options.approved as boolean;
-					}
-					if (options.converted) {
-						qs.converted = options.converted as boolean;
-					}
-					if (options.includeChild) {
-						qs.include_child = options.includeChild as boolean;
-					}
-					if (options.sortOrder) {
-						qs.sort_order = options.sortOrder as string;
-					}
-					if (options.sortBy) {
-						qs.sort_by = options.sortBy as string;
-					}
-					if (options.territoryId) {
-						qs.territory_id = options.territoryId as string;
-					}
-					if (returnAll) {
-						responseData = await zohoApiRequestAllItems.call(this, 'data', 'GET', '/leads', {}, qs);
-					} else {
-						qs.per_page = this.getNodeParameter('limit', i) as number;
-						responseData = await zohoApiRequest.call(this, 'GET', '/leads', {}, qs);
-						responseData = responseData.data;
-					}
-				}
-				//https://www.zoho.com/crm/developer/docs/api/delete-specific-record.html
-				if (operation === 'delete') {
-					const leadId = this.getNodeParameter('leadId', i) as string;
-					responseData = await zohoApiRequest.call(this, 'DELETE', `/leads/${leadId}`);
-					responseData = responseData.data;
-				}
-				//https://www.zoho.com/crm/developer/docs/api/field-meta.html
-				if (operation === 'getFields') {
-					qs.module = 'leads';
-					responseData = await zohoApiRequest.call(this, 'GET', '/settings/fields', {}, qs);
-					responseData = responseData.fields;
+
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ error: error.message });
+					continue;
 				}
+
+				throw error;
 			}
-			if (Array.isArray(responseData)) {
-				returnData.push.apply(returnData, responseData as IDataObject[]);
-			} else if (responseData !== undefined) {
-				returnData.push(responseData as IDataObject);
-			}
+
+			Array.isArray(responseData)
+				? returnData.push(...responseData)
+				: returnData.push(responseData);
 		}
+
 		return [this.helpers.returnJsonArray(returnData)];
 	}
 }
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/AccountDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/AccountDescription.ts
new file mode 100644
index 0000000000..6351d49f4d
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/AccountDescription.ts
@@ -0,0 +1,415 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	billingAddress,
+	currencies,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+	shippingAddress,
+} from './SharedFields';
+
+export const accountOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create an account',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete an account',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get an account',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all accounts',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update an account',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const accountFields = [
+	// ----------------------------------------
+	//            account: create
+	// ----------------------------------------
+	{
+		displayName: 'Account Name',
+		name: 'accountName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//          account: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Account Name',
+		name: 'accountName',
+		description: 'Name of the account. If a record with this account name exists it will be updated, otherwise a new one will be created.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//        account: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Account Number',
+				name: 'Account_Number',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Account Site',
+				name: 'Account_Site',
+				type: 'string',
+				default: '',
+				description: 'Name of the account’s location, e.g. Headquarters or London.',
+			},
+			{
+				displayName: 'Account Type',
+				name: 'Account_Type',
+				type: 'options',
+					typeOptions: {
+						loadOptionsMethod: 'getAccountType',
+					},
+				default: [],
+			},
+			{
+				displayName: 'Annual Revenue',
+				name: 'Annual_Revenue',
+				type: 'number',
+				default: '',
+			},
+			billingAddress,
+			{
+				displayName: 'Contact Details',
+				name: 'Contact_Details',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('account'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Employees',
+				name: 'Employees',
+				type: 'number',
+				default: '',
+				description: 'Number of employees in the account’s company.',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: '',
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Fax',
+				name: 'Fax',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Industry',
+				name: 'Industry',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			shippingAddress,
+			{
+				displayName: 'Ticker Symbol',
+				name: 'Ticker_Symbol',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Website',
+				name: 'Website',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//             account: delete
+	// ----------------------------------------
+	{
+		displayName: 'Account ID',
+		name: 'accountId',
+		description: 'ID of the account to delete. Can be found at the end of the URL.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//               account: get
+	// ----------------------------------------
+	{
+		displayName: 'Account ID',
+		name: 'accountId',
+		description: 'ID of the account to retrieve. Can be found at the end of the URL.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//             account: getAll
+	// ----------------------------------------
+	...makeGetAllFields('account'),
+
+	// ----------------------------------------
+	//             account: update
+	// ----------------------------------------
+	{
+		displayName: 'Account ID',
+		name: 'accountId',
+		description: 'ID of the account to update. Can be found at the end of the URL.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'account',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Account Name',
+				name: 'Account_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Account Number',
+				name: 'Account_Number',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Account Site',
+				name: 'Account_Site',
+				type: 'string',
+				default: '',
+				description: 'Name of the account’s location, e.g. Headquarters or London.',
+			},
+			{
+				displayName: 'Account Type',
+				name: 'Account_Type',
+				type: 'options',
+					typeOptions: {
+						loadOptionsMethod: 'getAccountType',
+					},
+				default: [],
+			},
+			{
+				displayName: 'Annual Revenue',
+				name: 'Annual_Revenue',
+				type: 'number',
+				default: '',
+			},
+			billingAddress,
+			{
+				displayName: 'Contact Details',
+				name: 'Contact_Details',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('account'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Employees',
+				name: 'Employees',
+				type: 'number',
+				default: '',
+				description: 'Number of employees in the account’s company.',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: '',
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Fax',
+				name: 'Fax',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Industry',
+				name: 'Industry',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			shippingAddress,
+			{
+				displayName: 'Ticker Symbol',
+				name: 'Ticker_Symbol',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Website',
+				name: 'Website',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/ContactDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/ContactDescription.ts
new file mode 100644
index 0000000000..fc58c8f6f4
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/ContactDescription.ts
@@ -0,0 +1,590 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	currencies,
+	mailingAddress,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+	otherAddress,
+} from './SharedFields';
+
+export const contactOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a contact',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a contact',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a contact',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all contacts',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a contact',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const contactFields = [
+	// ----------------------------------------
+	//             contact: create
+	// ----------------------------------------
+	{
+		displayName: 'Last Name',
+		name: 'lastName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assistant',
+				name: 'Assistant',
+				type: 'string',
+				default: '',
+				description: 'Name of the contact’s assistant.',
+			},
+			makeCustomFieldsFixedCollection('contact'),
+			{
+				displayName: 'Date of Birth',
+				name: 'Date_of_Birth',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Department',
+				name: 'Department',
+				type: 'string',
+				default: '',
+				description: 'Company department to which the contact belongs.',
+			},
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email (Primary)',
+				name: 'Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email (Secondary)',
+				name: 'Secondary_Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Fax',
+				name: 'Fax',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'First Name',
+				name: 'First_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Full Name',
+				name: 'Full_Name',
+				type: 'string',
+				default: '',
+			},
+			mailingAddress,
+			{
+				displayName: 'Mobile',
+				name: 'Mobile',
+				type: 'string',
+				default: '',
+			},
+			otherAddress,
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone (Assistant)',
+				name: 'Asst_Phone',
+				type: 'string',
+				default: '',
+				description: 'Phone number of the contact’s assistant.',
+			},
+			{
+				displayName: 'Phone (Home)',
+				name: 'Home_Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone (Other)',
+				name: 'Other_Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Salutation',
+				name: 'Salutation',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Skype ID',
+				name: 'Skype_ID',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Title',
+				name: 'Title',
+				type: 'string',
+				default: '',
+				description: 'Position of the contact at their company.',
+			},
+			{
+				displayName: 'Twitter',
+				name: 'Twitter',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//           contact: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Last Name',
+		name: 'lastName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assistant',
+				name: 'Assistant',
+				type: 'string',
+				default: '',
+				description: 'Name of the contact’s assistant.',
+			},
+			makeCustomFieldsFixedCollection('contact'),
+			{
+				displayName: 'Date of Birth',
+				name: 'Date_of_Birth',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Department',
+				name: 'Department',
+				type: 'string',
+				default: '',
+				description: 'Company department to which the contact belongs.',
+			},
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email (Primary)',
+				name: 'Email',
+				type: 'string',
+				default: '',
+				description: 'Email of the contact. If a record with this email exists it will be updated, otherwise a new one will be created.',
+			},
+			{
+				displayName: 'Email (Secondary)',
+				name: 'Secondary_Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Fax',
+				name: 'Fax',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'First Name',
+				name: 'First_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Full Name',
+				name: 'Full_Name',
+				type: 'string',
+				default: '',
+			},
+			mailingAddress,
+			{
+				displayName: 'Mobile',
+				name: 'Mobile',
+				type: 'string',
+				default: '',
+			},
+			otherAddress,
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone (Assistant)',
+				name: 'Asst_Phone',
+				type: 'string',
+				default: '',
+				description: 'Phone number of the contact’s assistant.',
+			},
+			{
+				displayName: 'Phone (Home)',
+				name: 'Home_Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone (Other)',
+				name: 'Other_Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Salutation',
+				name: 'Salutation',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Skype ID',
+				name: 'Skype_ID',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Title',
+				name: 'Title',
+				type: 'string',
+				default: '',
+				description: 'Position of the contact at their company.',
+			},
+			{
+				displayName: 'Twitter',
+				name: 'Twitter',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//             contact: delete
+	// ----------------------------------------
+	{
+		displayName: 'Contact ID',
+		name: 'contactId',
+		description: 'ID of the contact to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//               contact: get
+	// ----------------------------------------
+	{
+		displayName: 'Contact ID',
+		name: 'contactId',
+		description: 'ID of the contact to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//             contact: getAll
+	// ----------------------------------------
+	...makeGetAllFields('contact'),
+
+	// ----------------------------------------
+	//             contact: update
+	// ----------------------------------------
+	{
+		displayName: 'Contact ID',
+		name: 'contactId',
+		description: 'ID of the contact to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'contact',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assistant',
+				name: 'Assistant',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Assistant’s Phone',
+				name: 'Asst_Phone',
+				type: 'string',
+				default: '',
+				description: 'Phone number of the contact’s assistant.',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('contact'),
+			{
+				displayName: 'Date of Birth',
+				name: 'Date_of_Birth',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Department',
+				name: 'Department',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email (Primary)',
+				name: 'Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email (Secondary)',
+				name: 'Secondary_Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Fax',
+				name: 'Fax',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'First Name',
+				name: 'First_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Full Name',
+				name: 'Full_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Home Phone',
+				name: 'Home_Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Last Name',
+				name: 'Last_Name',
+				type: 'string',
+				default: '',
+			},
+			mailingAddress,
+			{
+				displayName: 'Mobile',
+				name: 'Mobile',
+				type: 'string',
+				default: '',
+			},
+			otherAddress,
+			{
+				displayName: 'Other Phone',
+				name: 'Other_Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Salutation',
+				name: 'Salutation',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Skype ID',
+				name: 'Skype_ID',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Title',
+				name: 'Title',
+				type: 'string',
+				default: '',
+				description: 'Position of the contact at their company.',
+			},
+			{
+				displayName: 'Twitter',
+				name: 'Twitter',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/DealDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/DealDescription.ts
new file mode 100644
index 0000000000..312c9b855b
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/DealDescription.ts
@@ -0,0 +1,385 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	currencies,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+} from './SharedFields';
+
+export const dealOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a deal',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a contact',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a contact',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all contacts',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a contact',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const dealFields = [
+	// ----------------------------------------
+	//              deal: create
+	// ----------------------------------------
+	{
+		displayName: 'Deal Name',
+		name: 'dealName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//             deal: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Deal Name',
+		name: 'dealName',
+		description: 'Name of the deal. If a record with this deal name exists it will be updated, otherwise a new one will be created.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+	// ----------------------------------------
+	//          deal: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Stage',
+		name: 'stage',
+		type: 'options',
+		required: true,
+		default: [],
+		typeOptions: {
+			loadOptionsMethod: 'getDealStage',
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Amount',
+				name: 'Amount',
+				type: 'number',
+				default: '',
+				description: 'Monetary amount of the deal.',
+			},
+			{
+				displayName: 'Closing Date',
+				name: 'Closing_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('deal'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Lead Conversion Time',
+				name: 'Lead_Conversion_Time',
+				type: 'number',
+				default: '',
+				description: 'Averge number of days to convert the lead into a deal.',
+			},
+			{
+				displayName: 'Next Step',
+				name: 'Next_Step',
+				type: 'string',
+				default: '',
+				description: 'Description of the next step in the sales process.',
+			},
+			{
+				displayName: 'Overall Sales Duration',
+				name: 'Overall_Sales_Duration',
+				type: 'number',
+				default: '',
+				description: 'Averge number of days to convert the lead into a deal and to win the deal.',
+			},
+			{
+				displayName: 'Probability',
+				name: 'Probability',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+					maxValue: 100,
+				},
+				default: '',
+				description: 'Probability of deal closure as a percentage. For example, enter 12 for 12%.',
+			},
+			{
+				displayName: 'Sales Cycle Duration',
+				name: 'Sales_Cycle_Duration',
+				type: 'number',
+				default: 0,
+				description: 'Averge number of days for the deal to be won.',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//               deal: delete
+	// ----------------------------------------
+	{
+		displayName: 'Deal ID',
+		name: 'dealId',
+		description: 'ID of the deal to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//                deal: get
+	// ----------------------------------------
+	{
+		displayName: 'Deal ID',
+		name: 'dealId',
+		description: 'ID of the deal to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//               deal: getAll
+	// ----------------------------------------
+	...makeGetAllFields('deal'),
+
+	// ----------------------------------------
+	//               deal: update
+	// ----------------------------------------
+	{
+		displayName: 'Deal ID',
+		name: 'dealId',
+		description: 'ID of the deal to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'deal',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Amount',
+				name: 'Amount',
+				type: 'number',
+				default: '',
+				description: 'Monetary amount of the deal.',
+			},
+			{
+				displayName: 'Closing Date',
+				name: 'Closing_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'string',
+				default: '',
+				description: 'Symbol of the currency in which revenue is generated.',
+			},
+			makeCustomFieldsFixedCollection('deal'),
+			{
+				displayName: 'Deal Name',
+				name: 'Deal_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Lead Conversion Time',
+				name: 'Lead_Conversion_Time',
+				type: 'number',
+				default: '',
+				description: 'Averge number of days to convert the lead into a deal.',
+			},
+			{
+				displayName: 'Next Step',
+				name: 'Next_Step',
+				type: 'string',
+				default: '',
+				description: 'Description of the next step in the sales process.',
+			},
+			{
+				displayName: 'Overall Sales Duration',
+				name: 'Overall_Sales_Duration',
+				type: 'number',
+				default: '',
+				description: 'Averge number of days to convert the lead into a deal and to win the deal.',
+			},
+			{
+				displayName: 'Probability',
+				name: 'Probability',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+					maxValue: 100,
+				},
+				default: '',
+				description: 'Probability of deal closure as a percentage. For example, enter 12 for 12%.',
+			},
+			{
+				displayName: 'Sales Cycle Duration',
+				name: 'Sales_Cycle_Duration',
+				type: 'number',
+				default: 0,
+				description: 'Averge number of days to win the deal.',
+			},
+			{
+				displayName: 'Stage',
+				name: 'Stage',
+				type: 'options',
+					typeOptions: {
+						loadOptionsMethod: 'getDealStage',
+					},
+				default: [],
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/InvoiceDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/InvoiceDescription.ts
new file mode 100644
index 0000000000..4ede26523f
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/InvoiceDescription.ts
@@ -0,0 +1,463 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	billingAddress,
+	currencies,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+	productDetailsOptions,
+	shippingAddress,
+} from './SharedFields';
+
+export const invoiceOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create an invoice',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete an invoice',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get an invoice',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all invoices',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update an invoice',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const invoiceFields = [
+	// ----------------------------------------
+	//            invoice: create
+	// ----------------------------------------
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'Subject or title of the invoice.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//            invoice: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'Subject or title of the invoice. If a record with this subject exists it will be updated, otherwise a new one will be created.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//        invoice: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Products',
+		name: 'Product_Details',
+		type: 'collection',
+		typeOptions: {
+			multipleValues: true,
+			multipleValueButtonText: 'Add Product',
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: productDetailsOptions,
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Account ID',
+				name: 'accountId',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getAccounts',
+				},
+				description: 'ID of the account associated with this invoice.',
+			},
+			{
+				displayName: 'Adjustment',
+				name: 'Adjustment',
+				type: 'number',
+				default: '',
+				description: 'Adjustment in the grand total, if any.',
+			},
+			billingAddress,
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('invoice'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Due Date',
+				name: 'Due_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: '',
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Grand Total',
+				name: 'Grand_Total',
+				type: 'number',
+				default: '',
+				description: 'Total amount for the product after deducting tax and discounts.',
+			},
+			{
+				displayName: 'Invoice Date',
+				name: 'Invoice_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Invoice Number',
+				name: 'Invoice_Number',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Sales Commission',
+				name: 'Sales_Commission',
+				type: 'number',
+				default: '',
+				description: 'Commission of sales person on deal closure as a percentage. For example, enter 12 for 12%.',
+			},
+			shippingAddress,
+			{
+				displayName: 'Status',
+				name: 'Status',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Sub Total',
+				name: 'Sub_Total',
+				type: 'number',
+				default: '',
+				description: 'Total amount for the product excluding tax.',
+			},
+			{
+				displayName: 'Tax',
+				name: 'Tax',
+				type: 'number',
+				default: '',
+				description: 'Tax amount as the sum of sales tax and value-added tax.',
+			},
+			{
+				displayName: 'Terms and Conditions',
+				name: 'Terms_and_Conditions',
+				type: 'string',
+				default: '',
+				description: 'Terms and conditions associated with the invoice.',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//             invoice: delete
+	// ----------------------------------------
+	{
+		displayName: 'Invoice ID',
+		name: 'invoiceId',
+		description: 'ID of the invoice to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//               invoice: get
+	// ----------------------------------------
+	{
+		displayName: 'Invoice ID',
+		name: 'invoiceId',
+		description: 'ID of the invoice to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//             invoice: getAll
+	// ----------------------------------------
+	...makeGetAllFields('invoice'),
+
+	// ----------------------------------------
+	//             invoice: update
+	// ----------------------------------------
+	{
+		displayName: 'Invoice ID',
+		name: 'invoiceId',
+		description: 'ID of the invoice to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'invoice',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Account ID',
+				name: 'accountId',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getAccounts',
+				},
+				description: 'ID of the account associated with this invoice.',
+			},
+			{
+				displayName: 'Adjustment',
+				name: 'Adjustment',
+				type: 'number',
+				default: '',
+				description: 'Adjustment in the grand total, if any.',
+			},
+			billingAddress,
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('invoice'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Due Date',
+				name: 'Due_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: '',
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Grand Total',
+				name: 'Grand_Total',
+				type: 'number',
+				default: '',
+				description: 'Total amount for the product after deducting tax and discounts.',
+			},
+			{
+				displayName: 'Invoice Date',
+				name: 'Invoice_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Invoice Number',
+				name: 'Invoice_Number',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Products',
+				name: 'Product_Details',
+				type: 'collection',
+				typeOptions: {
+					multipleValues: true,
+					multipleValueButtonText: 'Add Product',
+				},
+				default: {},
+				placeholder: 'Add Field',
+				options: productDetailsOptions,
+			},
+			{
+				displayName: 'Sales Commission',
+				name: 'Sales_Commission',
+				type: 'number',
+				default: '',
+				description: 'Commission of sales person on deal closure as a percentage. For example, enter 12 for 12%.',
+			},
+			shippingAddress,
+			{
+				displayName: 'Status',
+				name: 'Status',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Sub Total',
+				name: 'Sub_Total',
+				type: 'number',
+				default: '',
+				description: 'Total amount for the product excluding tax.',
+			},
+			{
+				displayName: 'Subject',
+				name: 'Subject',
+				type: 'string',
+				default: '',
+				description: 'Subject or title of the invoice.',
+			},
+			{
+				displayName: 'Tax',
+				name: 'Tax',
+				type: 'number',
+				default: '',
+				description: 'Tax amount as the sum of sales tax and value-added tax.',
+			},
+			{
+				displayName: 'Terms and Conditions',
+				name: 'Terms_and_Conditions',
+				type: 'string',
+				default: '',
+				description: 'Terms and conditions associated with the invoice.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/LeadDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/LeadDescription.ts
new file mode 100644
index 0000000000..1f26dd04e7
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/LeadDescription.ts
@@ -0,0 +1,694 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	address,
+	currencies,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+} from './SharedFields';
+
+export const leadOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a lead',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a lead',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a lead',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all leads',
+			},
+			{
+				name: 'Get Fields',
+				value: 'getFields',
+				description: 'Get lead fields',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a lead',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const leadFields = [
+	// ----------------------------------------
+	//             lead: create
+	// ----------------------------------------
+	{
+		displayName: 'Company',
+		name: 'Company',
+		description: 'Company at which the lead works.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Last Name',
+		name: 'lastName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			address,
+			{
+				displayName: 'Annual Revenue',
+				name: 'Annual_Revenue',
+				type: 'number',
+				default: '',
+				description: 'Annual revenue of the lead’s company.',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('lead'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Designation',
+				name: 'Designation',
+				type: 'string',
+				default: '',
+				description: 'Position of the lead at their company.',
+			},
+			{
+				displayName: 'Email',
+				name: 'Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email Opt Out',
+				name: 'Email_Opt_Out',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Fax',
+				name: 'Fax',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'First Name',
+				name: 'First_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Full Name',
+				name: 'Full_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Industry',
+				name: 'Industry',
+				type: 'string',
+				default: '',
+				description: 'Industry to which the lead belongs.',
+			},
+			{
+				displayName: 'Industry Type',
+				name: 'Industry_Type',
+				type: 'string',
+				default: '',
+				description: 'Type of industry to which the lead belongs.',
+			},
+			{
+				displayName: 'Lead Source',
+				name: 'Lead_Source',
+				type: 'string',
+				default: '',
+				description: 'Source from which the lead was created.',
+			},
+			{
+				displayName: 'Lead Status',
+				name: 'Lead_Status',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Mobile',
+				name: 'Mobile',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Number of Employees',
+				name: 'No_of_Employees',
+				type: 'number',
+				default: '',
+				description: 'Number of employees in the lead’s company.',
+			},
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Salutation',
+				name: 'Salutation',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Secondary Email',
+				name: 'Secondary_Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Skype ID',
+				name: 'Skype_ID',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Twitter',
+				name: 'Twitter',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Website',
+				name: 'Website',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//             lead: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Company',
+		name: 'Company',
+		description: 'Company at which the lead works.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Last Name',
+		name: 'lastName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+		options: [
+			address,
+			{
+				displayName: 'Annual Revenue',
+				name: 'Annual_Revenue',
+				type: 'number',
+				default: '',
+				description: 'Annual revenue of the lead’s company.',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('lead'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Designation',
+				name: 'Designation',
+				type: 'string',
+				default: '',
+				description: 'Position of the lead at their company.',
+			},
+			{
+				displayName: 'Email',
+				name: 'Email',
+				type: 'string',
+				default: '',
+				description: 'Email of the lead. If a record with this email exists it will be updated, otherwise a new one will be created.',
+			},
+			{
+				displayName: 'Email Opt Out',
+				name: 'Email_Opt_Out',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Fax',
+				name: 'Fax',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'First Name',
+				name: 'First_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Full Name',
+				name: 'Full_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Industry',
+				name: 'Industry',
+				type: 'string',
+				default: '',
+				description: 'Industry to which the lead belongs.',
+			},
+			{
+				displayName: 'Industry Type',
+				name: 'Industry_Type',
+				type: 'string',
+				default: '',
+				description: 'Type of industry to which the lead belongs.',
+			},
+			{
+				displayName: 'Lead Source',
+				name: 'Lead_Source',
+				type: 'string',
+				default: '',
+				description: 'Source from which the lead was created.',
+			},
+			{
+				displayName: 'Lead Status',
+				name: 'Lead_Status',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Mobile',
+				name: 'Mobile',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Number of Employees',
+				name: 'No_of_Employees',
+				type: 'number',
+				default: '',
+				description: 'Number of employees in the lead’s company.',
+			},
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Salutation',
+				name: 'Salutation',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Secondary Email',
+				name: 'Secondary_Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Skype ID',
+				name: 'Skype_ID',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Twitter',
+				name: 'Twitter',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Website',
+				name: 'Website',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//               lead: delete
+	// ----------------------------------------
+	{
+		displayName: 'Lead ID',
+		name: 'leadId',
+		description: 'ID of the lead to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//                lead: get
+	// ----------------------------------------
+	{
+		displayName: 'Lead ID',
+		name: 'leadId',
+		description: 'ID of the lead to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//               lead: getAll
+	// ----------------------------------------
+	...makeGetAllFields('lead'),
+
+	// ----------------------------------------
+	//               lead: update
+	// ----------------------------------------
+	{
+		displayName: 'Lead ID',
+		name: 'leadId',
+		description: 'ID of the lead to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'lead',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			address,
+			{
+				displayName: 'Annual Revenue',
+				name: 'Annual_Revenue',
+				type: 'number',
+				default: '',
+				description: 'Annual revenue of the lead’s company.',
+			},
+			{
+				displayName: 'Company',
+				name: 'Company',
+				type: 'string',
+				default: '',
+				description: 'Company at which the lead works.',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('lead'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Designation',
+				name: 'Designation',
+				type: 'string',
+				default: '',
+				description: 'Position of the lead at their company.',
+			},
+			{
+				displayName: 'Email',
+				name: 'Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email Opt Out',
+				name: 'Email_Opt_Out',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Fax',
+				name: 'Fax',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'First Name',
+				name: 'First_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Full Name',
+				name: 'Full_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Industry',
+				name: 'Industry',
+				type: 'string',
+				default: '',
+				description: 'Industry to which the lead belongs.',
+			},
+			{
+				displayName: 'Industry Type',
+				name: 'Industry_Type',
+				type: 'string',
+				default: '',
+				description: 'Type of industry to which the lead belongs.',
+			},
+			{
+				displayName: 'Last Name',
+				name: 'Last_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Lead Source',
+				name: 'Lead_Source',
+				type: 'string',
+				default: '',
+				description: 'Source from which the lead was created.',
+			},
+			{
+				displayName: 'Lead Status',
+				name: 'Lead_Status',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Mobile',
+				name: 'Mobile',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Number of Employees',
+				name: 'No_of_Employees',
+				type: 'number',
+				default: '',
+				description: 'Number of employees in the lead’s company.',
+			},
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Salutation',
+				name: 'Salutation',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Secondary Email',
+				name: 'Secondary_Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Skype ID',
+				name: 'Skype_ID',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Twitter',
+				name: 'Twitter',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Website',
+				name: 'Website',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/ProductDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/ProductDescription.ts
new file mode 100644
index 0000000000..19b6f880c6
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/ProductDescription.ts
@@ -0,0 +1,352 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+} from './SharedFields';
+
+export const productOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'product',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a product',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a product',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a product',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all products',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a product',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const productFields = [
+	// ----------------------------------------
+	//           product: create
+	// ----------------------------------------
+	{
+		displayName: 'Product Name',
+		name: 'productName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'product',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//            product: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Product Name',
+		name: 'productName',
+		description: 'Name of the product. If a record with this product name exists it will be updated, otherwise a new one will be created.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'product',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//         product: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'product',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Commission Rate',
+				name: 'Commission_Rate',
+				type: 'number',
+				description: 'Commission rate for the product. For example, enter 12 for 12%.',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+			},
+			makeCustomFieldsFixedCollection('product'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Manufacturer',
+				name: 'Manufacturer',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Product Active',
+				name: 'Product_Active',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Product Category',
+				name: 'Product_Category',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Quantity in Demand',
+				name: 'Qty_in_Demand',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+			},
+			{
+				displayName: 'Quantity in Stock',
+				name: 'Qty_in_Stock',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+			},
+			{
+				displayName: 'Taxable',
+				name: 'Taxable',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Unit Price',
+				name: 'Unit_Price',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//             product: delete
+	// ----------------------------------------
+	{
+		displayName: 'Product ID',
+		name: 'productId',
+		description: 'ID of the product to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'product',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//               product: get
+	// ----------------------------------------
+	{
+		displayName: 'Product ID',
+		name: 'productId',
+		description: 'ID of the product to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'product',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//             product: getAll
+	// ----------------------------------------
+	...makeGetAllFields('product'),
+
+	// ----------------------------------------
+	//             product: update
+	// ----------------------------------------
+	{
+		displayName: 'Product ID',
+		name: 'productId',
+		description: 'ID of the product to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'product',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'product',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Commission Rate',
+				name: 'Commission_Rate',
+				type: 'number',
+				description: 'Commission rate for the product. For example, enter 12 for 12%.',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+			},
+			makeCustomFieldsFixedCollection('product'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Manufacturer',
+				name: 'Manufacturer',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Product Active',
+				name: 'Product_Active',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Product Category',
+				name: 'Product_Category',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Quantity in Demand',
+				name: 'Qty_in_Demand',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+			},
+			{
+				displayName: 'Quantity in Stock',
+				name: 'Qty_in_Stock',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+			},
+			{
+				displayName: 'Taxable',
+				name: 'Taxable',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Unit Price',
+				name: 'Unit_Price',
+				type: 'number',
+				typeOptions: {
+					minValue: 0,
+				},
+				default: 0,
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/PurchaseOrderDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/PurchaseOrderDescription.ts
new file mode 100644
index 0000000000..2ef0b573f8
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/PurchaseOrderDescription.ts
@@ -0,0 +1,590 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	billingAddress,
+	currencies,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+	productDetailsOptions,
+	shippingAddress,
+} from './SharedFields';
+
+export const purchaseOrderOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a purchase order',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a purchase order',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a purchase order',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all purchase orders',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a purchase order',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const purchaseOrderFields = [
+	// ----------------------------------------
+	//         purchaseOrder: create
+	// ----------------------------------------
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'Subject or title of the purchase order.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//         purchaseOrder: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'Subject or title of the purchase order. If a record with this subject exists it will be updated, otherwise a new one will be created.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//      purchaseOrder: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Vendor ID',
+		name: 'vendorId',
+		type: 'options',
+		default: [],
+		typeOptions: {
+			loadOptionsMethod: 'getVendors',
+		},
+		description: 'ID of the vendor associated with the purchase order.',
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Products',
+		name: 'Product_Details',
+		type: 'collection',
+		typeOptions: {
+			multipleValues: true,
+			multipleValueButtonText: 'Add Product',
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: productDetailsOptions,
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Adjustment',
+				name: 'Adjustment',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Adjustment in the grand total, if any.',
+			},
+			{
+				displayName: 'Billing Address',
+				name: 'Billing_Address',
+				type: 'fixedCollection',
+				default: {},
+				placeholder: 'Add Billing Address Field',
+				options: [
+					{
+						displayName: 'Billing Address Fields',
+						name: 'billing_address_fields',
+						values: [
+							{
+								displayName: 'Billing City',
+								name: 'Billing_City',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Billing Code',
+								name: 'Billing_Code',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Billing Country',
+								name: 'Billing_Country',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Billing State',
+								name: 'Billing_State',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Billing Street',
+								name: 'Billing_Street',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Carrier',
+				name: 'Carrier',
+				type: 'string',
+				default: '',
+				description: 'Name of the carrier.',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('purchaseOrder'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Discount',
+				name: 'Discount',
+				type: 'number',
+				description: 'Discount applied to the purchase order. For example, enter 12 for 12%.',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+			},
+			{
+				displayName: 'Due Date',
+				name: 'Due_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Grand Total',
+				name: 'Grand_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product after deducting tax and discounts.',
+			},
+			{
+				displayName: 'PO Date',
+				name: 'PO_Date',
+				type: 'dateTime',
+				default: '',
+				description: 'Date on which the purchase order was issued.',
+			},
+			{
+				displayName: 'PO Number',
+				name: 'PO_Number',
+				type: 'string',
+				default: '',
+				description: 'ID of the purchase order after creating a case.',
+			},
+			{
+				displayName: 'Sales Commission',
+				name: 'Sales_Commission',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Commission of sales person on deal closure as a percentage. For example, enter 12 for 12%.',
+			},
+			shippingAddress,
+			{
+				displayName: 'Status',
+				name: 'Status',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getPurchaseOrderStatus',
+				},
+				description: 'Status of the purchase order.',
+			},
+			{
+				displayName: 'Sub Total',
+				name: 'Sub_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product excluding tax.',
+			},
+			{
+				displayName: 'Tax',
+				name: 'Tax',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Tax amount as the sum of sales tax and value-added tax.',
+			},
+			{
+				displayName: 'Terms and Conditions',
+				name: 'Terms_and_Conditions',
+				type: 'string',
+				default: '',
+				description: 'Terms and conditions associated with the purchase order.',
+			},
+			{
+				displayName: 'Tracking Number',
+				name: 'Tracking_Number',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//          purchaseOrder: delete
+	// ----------------------------------------
+	{
+		displayName: 'Purchase Order ID',
+		name: 'purchaseOrderId',
+		description: 'ID of the purchase order to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//            purchaseOrder: get
+	// ----------------------------------------
+	{
+		displayName: 'Purchase Order ID',
+		name: 'purchaseOrderId',
+		description: 'ID of the purchase order to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//          purchaseOrder: getAll
+	// ----------------------------------------
+	...makeGetAllFields('purchaseOrder'),
+
+	// ----------------------------------------
+	//          purchaseOrder: update
+	// ----------------------------------------
+	{
+		displayName: 'Purchase Order ID',
+		name: 'purchaseOrderId',
+		description: 'ID of the purchase order to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'purchaseOrder',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Adjustment',
+				name: 'Adjustment',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Adjustment in the grand total, if any.',
+			},
+			billingAddress,
+			{
+				displayName: 'Carrier',
+				name: 'Carrier',
+				type: 'string',
+				default: '',
+				description: 'Name of the carrier.',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('purchaseOrder'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Discount',
+				name: 'Discount',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+			},
+			{
+				displayName: 'Due Date',
+				name: 'Due_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Grand Total',
+				name: 'Grand_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product after deducting tax and discounts.',
+			},
+			{
+				displayName: 'PO Date',
+				name: 'PO_Date',
+				type: 'dateTime',
+				default: '',
+				description: 'Date on which the purchase order was issued.',
+			},
+			{
+				displayName: 'PO Number',
+				name: 'PO_Number',
+				type: 'string',
+				default: '',
+				description: 'ID of the purchase order after creating a case.',
+			},
+			// productDetails('purchaseOrder', 'update'),
+			{
+				displayName: 'Sales Commission',
+				name: 'Sales_Commission',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Commission of sales person on deal closure as a percentage. For example, enter 12 for 12%.',
+			},
+			shippingAddress,
+			{
+				displayName: 'Status',
+				name: 'Status',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getPurchaseOrderStatus',
+				},
+				description: 'Status of the purchase order.',
+			},
+			{
+				displayName: 'Sub Total',
+				name: 'Sub_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product excluding tax.',
+			},
+			{
+				displayName: 'Subject',
+				name: 'Subject',
+				type: 'string',
+				default: '',
+				description: 'Subject or title of the purchase order.',
+			},
+			{
+				displayName: 'Tax',
+				name: 'Tax',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Tax amount as the sum of sales tax and value-added tax.',
+			},
+			{
+				displayName: 'Terms and Conditions',
+				name: 'Terms_and_Conditions',
+				type: 'string',
+				default: '',
+				description: 'Terms and conditions associated with the purchase order.',
+			},
+			{
+				displayName: 'Tracking Number',
+				name: 'Tracking_Number',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/QuoteDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/QuoteDescription.ts
new file mode 100644
index 0000000000..0ecf64adaf
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/QuoteDescription.ts
@@ -0,0 +1,459 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	billingAddress,
+	currencies,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+	productDetailsOptions,
+	shippingAddress,
+} from './SharedFields';
+
+export const quoteOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a quote',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a quote',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a quote',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all quotes',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a quote',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const quoteFields = [
+	// ----------------------------------------
+	//            quote: create
+	// ----------------------------------------
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'Subject or title of the quote.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//            quote: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'Subject or title of the quote. If a record with this subject exists it will be updated, otherwise a new one will be created.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//          quote: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Products',
+		name: 'Product_Details',
+		type: 'collection',
+		typeOptions: {
+			multipleValues: true,
+			multipleValueButtonText: 'Add Product',
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: productDetailsOptions,
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Adjustment',
+				name: 'Adjustment',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Adjustment in the grand total, if any.',
+			},
+			billingAddress,
+			{
+				displayName: 'Carrier',
+				name: 'Carrier',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('quote'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Grand Total',
+				name: 'Grand_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product after deducting tax and discounts.',
+			},
+			{
+				displayName: 'Quote Stage',
+				name: 'Quote_Stage',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getQuoteStage',
+				},
+				description: 'Stage of the quote.',
+			},
+			shippingAddress,
+			{
+				displayName: 'Sub Total',
+				name: 'Sub_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product excluding tax.',
+			},
+			{
+				displayName: 'Tax',
+				name: 'Tax',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount as the sum of sales tax and value-added tax.',
+			},
+			{
+				displayName: 'Team',
+				name: 'Team',
+				type: 'string',
+				default: '',
+				description: 'Team for whom the quote is created.',
+			},
+			{
+				displayName: 'Terms and Conditions',
+				name: 'Terms_and_Conditions',
+				type: 'string',
+				default: '',
+				description: 'Terms and conditions associated with the quote.',
+			},
+			{
+				displayName: 'Valid Till',
+				name: 'Valid_Till',
+				type: 'dateTime',
+				default: '',
+				description: 'Date until when the quote is valid.',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//              quote: delete
+	// ----------------------------------------
+	{
+		displayName: 'Quote ID',
+		name: 'quoteId',
+		description: 'ID of the quote to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//                quote: get
+	// ----------------------------------------
+	{
+		displayName: 'Quote ID',
+		name: 'quoteId',
+		description: 'ID of the quote to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//              quote: getAll
+	// ----------------------------------------
+	...makeGetAllFields('quote'),
+
+	// ----------------------------------------
+	//              quote: update
+	// ----------------------------------------
+	{
+		displayName: 'Quote ID',
+		name: 'quoteId',
+		description: 'ID of the quote to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'quote',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Adjustment',
+				name: 'Adjustment',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Adjustment in the grand total, if any.',
+			},
+			billingAddress,
+			{
+				displayName: 'Carrier',
+				name: 'Carrier',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('quote'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Grand Total',
+				name: 'Grand_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product after deducting tax and discounts.',
+			},
+			{
+				displayName: 'Quote Stage',
+				name: 'Quote_Stage',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getQuoteStage',
+				},
+				description: 'Stage of the quote.',
+			},
+			shippingAddress,
+			{
+				displayName: 'Sub Total',
+				name: 'Sub_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product excluding tax.',
+			},
+			{
+				displayName: 'Subject',
+				name: 'Subject',
+				type: 'string',
+				default: '',
+				description: 'Subject or title of the quote.',
+			},
+			{
+				displayName: 'Tax',
+				name: 'Tax',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Tax amount as the sum of sales tax and value-added tax.',
+			},
+			{
+				displayName: 'Team',
+				name: 'Team',
+				type: 'string',
+				default: '',
+				description: 'Team for whom the quote is created.',
+			},
+			{
+				displayName: 'Terms and Conditions',
+				name: 'Terms_and_Conditions',
+				type: 'string',
+				default: '',
+				description: 'Terms and conditions associated with the quote.',
+			},
+			{
+				displayName: 'Valid Till',
+				name: 'Valid_Till',
+				type: 'dateTime',
+				default: '',
+				description: 'Date until when the quote is valid.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/SalesOrderDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/SalesOrderDescription.ts
new file mode 100644
index 0000000000..35547664cf
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/SalesOrderDescription.ts
@@ -0,0 +1,569 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	billingAddress,
+	currencies,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+	productDetailsOptions,
+	shippingAddress,
+} from './SharedFields';
+
+export const salesOrderOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a sales order',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a sales order',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a sales order',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all sales orders',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a sales order',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const salesOrderFields = [
+	// ----------------------------------------
+	//       salesOrder: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Account ID',
+		name: 'accountId',
+		required: true,
+		type: 'options',
+		default: [],
+		typeOptions: {
+			loadOptionsMethod: 'getAccounts',
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//           salesOrder: create
+	// ----------------------------------------
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'Subject or title of the sales order.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//           salesOrder: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		description: 'Subject or title of the sales order. If a record with this subject exists it will be updated, otherwise a new one will be created.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//       salesOrder: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Products',
+		name: 'Product_Details',
+		type: 'collection',
+		typeOptions: {
+			multipleValues: true,
+			multipleValueButtonText: 'Add Product',
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: productDetailsOptions,
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Adjustment',
+				name: 'Adjustment',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Adjustment in the grand total, if any.',
+			},
+			billingAddress,
+			{
+				displayName: 'Carrier',
+				name: 'Carrier',
+				type: 'string',
+				default: '',
+				description: 'Name of the carrier.',
+			},
+			{
+				displayName: 'Contact ID',
+				name: 'contactId',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getContacts',
+				},
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('salesOrder'),
+			{
+				displayName: 'Deal ID',
+				name: 'dealId',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getDeals',
+				},
+			},
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Discount',
+				name: 'Discount',
+				type: 'number',
+				description: 'Discount applied to the sales order. For example, enter 12 for 12%.',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+			},
+			{
+				displayName: 'Due Date',
+				name: 'Due_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Grand Total',
+				name: 'Grand_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product after deducting tax and discounts.',
+			},
+			{
+				displayName: 'Sales Order Number',
+				name: 'SO_Number',
+				type: 'string',
+				default: '',
+				description: 'ID of the sales order after creating a case.',
+			},
+			{
+				displayName: 'Sales Commission',
+				name: 'Sales_Commission',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Commission of sales person on deal closure as a percentage. For example, enter 12 for 12%.',
+			},
+			shippingAddress,
+			{
+				displayName: 'Status',
+				name: 'Status',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getSalesOrderStatus',
+				},
+				description: 'Status of the sales order.',
+			},
+			{
+				displayName: 'Sub Total',
+				name: 'Sub_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product excluding tax.',
+			},
+			{
+				displayName: 'Tax',
+				name: 'Tax',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Tax amount as the sum of sales tax and value-added tax.',
+			},
+			{
+				displayName: 'Terms and Conditions',
+				name: 'Terms_and_Conditions',
+				type: 'string',
+				default: '',
+				description: 'Terms and conditions associated with the purchase order.',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//            salesOrder: delete
+	// ----------------------------------------
+	{
+		displayName: 'Sales Order ID',
+		name: 'salesOrderId',
+		description: 'ID of the sales order to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//             salesOrder: get
+	// ----------------------------------------
+	{
+		displayName: 'Sales Order ID',
+		name: 'salesOrderId',
+		description: 'ID of the sales order to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//            salesOrder: getAll
+	// ----------------------------------------
+	...makeGetAllFields('salesOrder'),
+
+	// ----------------------------------------
+	//            salesOrder: update
+	// ----------------------------------------
+	{
+		displayName: 'Sales Order ID',
+		name: 'salesOrderId',
+		description: 'ID of the sales order to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'salesOrder',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Account ID',
+				name: 'accountId',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getAccounts',
+				},
+				description: 'ID of the account associated with this invoice.',
+			},
+			{
+				displayName: 'Adjustment',
+				name: 'Adjustment',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Adjustment in the grand total, if any.',
+			},
+			billingAddress,
+			{
+				displayName: 'Carrier',
+				name: 'Carrier',
+				type: 'string',
+				default: '',
+				description: 'Name of the carrier.',
+			},
+			{
+				displayName: 'Contact ID',
+				name: 'contactId',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getContacts',
+				},
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				description: 'Symbol of the currency in which revenue is generated.',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('salesOrder'),
+			{
+				displayName: 'Deal ID',
+				name: 'dealId',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getDeals',
+				},
+			},
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Discount',
+				name: 'Discount',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+			},
+			{
+				displayName: 'Due Date',
+				name: 'Due_Date',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Exchange Rate',
+				name: 'Exchange_Rate',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Exchange rate of the default currency to the home currency.',
+			},
+			{
+				displayName: 'Grand Total',
+				name: 'Grand_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product after deducting tax and discounts.',
+			},
+			{
+				displayName: 'Sales Order Number',
+				name: 'SO_Number',
+				type: 'string',
+				default: '',
+				description: 'ID of the sales order after creating a case.',
+			},
+			{
+				displayName: 'Sales Commission',
+				name: 'Sales_Commission',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Commission of sales person on deal closure as a percentage. For example, enter 12 for 12%.',
+			},
+			shippingAddress,
+			{
+				displayName: 'Status',
+				name: 'Status',
+				type: 'options',
+				default: [],
+				typeOptions: {
+					loadOptionsMethod: 'getSalesOrderStatus',
+				},
+				description: 'Status of the sales order.',
+			},
+			{
+				displayName: 'Sub Total',
+				name: 'Sub_Total',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Total amount for the product excluding tax.',
+			},
+			{
+				displayName: 'Subject',
+				name: 'Subject',
+				type: 'string',
+				default: '',
+				description: 'Subject or title of the sales order.',
+			},
+			{
+				displayName: 'Tax',
+				name: 'Tax',
+				type: 'number',
+				default: 0,
+				typeOptions: {
+					minValue: 0,
+				},
+				description: 'Tax amount as the sum of sales tax and value-added tax.',
+			},
+			{
+				displayName: 'Terms and Conditions',
+				name: 'Terms_and_Conditions',
+				type: 'string',
+				default: '',
+				description: 'Terms and conditions associated with the purchase order.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts b/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts
new file mode 100644
index 0000000000..e7030ba28f
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts
@@ -0,0 +1,577 @@
+import { capitalizeInitial } from '../GenericFunctions';
+import { CamelCaseResource } from '../types';
+
+export const billingAddress = {
+	displayName: 'Billing Address',
+	name: 'Billing_Address',
+	type: 'fixedCollection',
+	default: {},
+	placeholder: 'Add Billing Address Field',
+	options: [
+		{
+			displayName: 'Billing Address Fields',
+			name: 'address_fields',
+			values: [
+				{
+					displayName: 'Street',
+					name: 'Billing_Street',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'City',
+					name: 'Billing_City',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'State',
+					name: 'Billing_State',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Country',
+					name: 'Billing_Country',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Zip Code',
+					name: 'Billing_Code',
+					type: 'string',
+					default: '',
+				},
+			],
+		},
+	],
+};
+
+export const shippingAddress = {
+	displayName: 'Shipping Address',
+	name: 'Shipping_Address',
+	type: 'fixedCollection',
+	default: {},
+	placeholder: 'Add Shipping Address Field',
+	options: [
+		{
+			displayName: 'Shipping Address Fields',
+			name: 'address_fields',
+			values: [
+				{
+					displayName: 'Street',
+					name: 'Shipping_Street',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'City',
+					name: 'Shipping_City',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'State',
+					name: 'Shipping_State',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Country',
+					name: 'Shipping_Country',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Zip Code',
+					name: 'Shipping_Code',
+					type: 'string',
+					default: '',
+				},
+			],
+		},
+	],
+};
+
+export const mailingAddress = {
+	displayName: 'Mailing Address',
+	name: 'Mailing_Address',
+	type: 'fixedCollection',
+	default: {},
+	placeholder: 'Add Mailing Address Field',
+	options: [
+		{
+			displayName: 'Mailing Address Fields',
+			name: 'address_fields',
+			values: [
+				{
+					displayName: 'Street',
+					name: 'Mailing_Street',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'City',
+					name: 'Mailing_City',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'State',
+					name: 'Mailing_State',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Country',
+					name: 'Mailing_Country',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Zip Code',
+					name: 'Mailing_Zip',
+					type: 'string',
+					default: '',
+				},
+			],
+		},
+	],
+};
+
+export const otherAddress = {
+	displayName: 'Other Address',
+	name: 'Other_Address',
+	type: 'fixedCollection',
+	default: {},
+	placeholder: 'Add Other Address Field',
+	options: [
+		{
+			displayName: 'Other Address Fields',
+			name: 'address_fields',
+			values: [
+				{
+					displayName: 'Street',
+					name: 'Other_Street',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'City',
+					name: 'Other_City',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'State',
+					name: 'Other_State',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Zip Code',
+					name: 'Other_Zip',
+					type: 'string',
+					default: '',
+				},
+			],
+		},
+	],
+};
+
+export const address = {
+	displayName: 'Address',
+	name: 'Address',
+	type: 'fixedCollection',
+	default: {},
+	placeholder: 'Add Address Field',
+	options: [
+		{
+			displayName: 'Address Fields',
+			name: 'address_fields',
+			values: [
+				{
+					displayName: 'Street',
+					name: 'Street',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'City',
+					name: 'City',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'State',
+					name: 'State',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Country',
+					name: 'Country',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Zip Code',
+					name: 'Zip_Code',
+					type: 'string',
+					default: '',
+				},
+			],
+		},
+	],
+};
+
+// displayName: 'Products',
+// name: 'Product_Details',
+// type: 'collection',
+// typeOptions: {
+// 	multipleValues: true,
+// 	multipleValueButtonText: 'Add Product',
+// },
+// default: {},
+// placeholder: 'Add Field',
+// displayOptions: {
+// 	show: {
+// 		resource: [
+// 			resource,
+// 		],
+// 		operation: [
+// 			operation,
+// 		],
+// 	},
+// },
+
+export const productDetailsOptions = [
+	{
+		displayName: 'List Price',
+		name: 'list_price',
+		type: 'number',
+		default: '',
+	},
+	{
+		displayName: 'Product ID',
+		name: 'id',
+		type: 'options',
+		default: [],
+		typeOptions: {
+			loadOptionsMethod: 'getProducts',
+		},
+	},
+	{
+		displayName: 'Product Description',
+		name: 'product_description',
+		type: 'string',
+		default: '',
+	},
+	{
+		displayName: 'Quantity',
+		name: 'quantity',
+		type: 'number',
+		default: 1,
+	},
+	{
+		displayName: 'Quantity in Stock',
+		name: 'quantity_in_stock',
+		type: 'number',
+		default: 0,
+	},
+	{
+		displayName: 'Tax',
+		name: 'Tax',
+		type: 'number',
+		default: 0,
+	},
+	{
+		displayName: 'Total',
+		name: 'total',
+		type: 'number',
+		default: 0,
+	},
+	{
+		displayName: 'Total After Discount',
+		name: 'total_after_discount',
+		type: 'number',
+		default: 0,
+	},
+	{
+		displayName: 'Total (Net)',
+		name: 'net_total',
+		type: 'number',
+		default: 0,
+	},
+	{
+		displayName: 'Unit Price',
+		name: 'unit_price',
+		type: 'number',
+		default: 0,
+	},
+];
+
+export const makeGetAllFields = (resource: CamelCaseResource) => {
+	const loadOptionsMethod = `get${capitalizeInitial(resource)}Fields`;
+
+	return [
+		{
+			displayName: 'Return All',
+			name: 'returnAll',
+			type: 'boolean',
+			default: false,
+			description: 'Return all results.',
+			displayOptions: {
+				show: {
+					resource: [
+						resource,
+					],
+					operation: [
+						'getAll',
+					],
+				},
+			},
+		},
+		{
+			displayName: 'Limit',
+			name: 'limit',
+			type: 'number',
+			default: 5,
+			description: 'The number of results to return.',
+			typeOptions: {
+				minValue: 1,
+				maxValue: 1000,
+			},
+			displayOptions: {
+				show: {
+					resource: [
+						resource,
+					],
+					operation: [
+						'getAll',
+					],
+					returnAll: [
+						false,
+					],
+				},
+			},
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add Option',
+			default: {},
+			displayOptions: {
+				show: {
+					resource: [
+						resource,
+					],
+					operation: [
+						'getAll',
+					],
+				},
+			},
+			options: [
+				{
+					displayName: 'Approved',
+					name: 'approved',
+					type: 'boolean',
+					default: true,
+					description: 'Retrieve only approved records. Defaults to true.',
+				},
+				{
+					displayName: 'Converted',
+					name: 'converted',
+					type: 'boolean',
+					default: false,
+					description: 'Retrieve only converted records. Defaults to false.',
+				},
+				{
+					displayName: 'Fields',
+					name: 'fields',
+					type: 'multiOptions',
+					typeOptions: {
+						loadOptionsMethod,
+					},
+					default: [],
+					description: 'Return only these fields.',
+				},
+				{
+					displayName: 'Include Child',
+					name: 'include_child',
+					type: 'boolean',
+					default: false,
+					description: 'Retrieve only records from child territories.',
+				},
+				{
+					displayName: 'Sort By',
+					name: 'sort_by',
+					type: 'options',
+					typeOptions: {
+						loadOptionsMethod,
+					},
+					default: [],
+					description: 'Field to sort records by.',
+				},
+				{
+					displayName: 'Sort Order',
+					name: 'sort_order',
+					type: 'options',
+					options: [
+						{
+							name: 'Ascending',
+							value: 'asc',
+						},
+						{
+							name: 'Descending',
+							value: 'desc',
+						},
+					],
+					default: 'desc',
+					description: 'Ascending or descending order sort order.',
+				},
+				{
+					displayName: 'Territory ID',
+					name: 'territory_id',
+					type: 'string',
+					default: '',
+					description: 'Retrieve only records from this territory.',
+				},
+			],
+		},
+	];
+};
+
+export const makeCustomFieldsFixedCollection = (resource: CamelCaseResource) => {
+	const loadOptionsMethod = `getCustom${capitalizeInitial(resource)}Fields`;
+
+	return {
+		displayName: 'Custom Fields',
+		name: 'customFields',
+		placeholder: 'Add Custom Field',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		description: 'Filter by custom fields.',
+		default: {},
+		options: [
+			{
+				name: 'customFields',
+				displayName: 'Custom Field',
+				values: [
+					{
+						displayName: 'Field ID',
+						name: 'fieldId',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod,
+						},
+						default: '',
+						description: 'Custom field to set a value to.',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+						description: 'Value to set on custom field.',
+					},
+				],
+			},
+		],
+	};
+};
+
+// https://www.zoho.com/subscriptions/help/supported-currencies.html
+
+export const currencies = [
+	{ name: 'US Dollar', value: 'USD' },
+	{ name: 'Euro', value: 'EUR' },
+	{ name: 'UAE Dirham', value: 'AED' },
+	{ name: 'Afghani', value: 'AFN' },
+	{ name: 'Lek', value: 'ALL' },
+	{ name: 'Argentine Peso', value: 'ARS' },
+	{ name: 'Australian Dollar', value: 'AUD' },
+	{ name: 'Azerbaijan Manat', value: 'AZN' },
+	{ name: 'Barbados Dollar', value: 'BBD' },
+	{ name: 'Taka', value: 'BDT' },
+	{ name: 'Bulgarian Lev', value: 'BGN' },
+	{ name: 'Bermudian Dollar', value: 'BMD' },
+	{ name: 'Brunei Dollar', value: 'BND' },
+	{ name: 'Boliviano', value: 'BOB' },
+	{ name: 'Brazilian Real', value: 'BRL' },
+	{ name: 'Bahamian Dollar', value: 'BSD' },
+	{ name: 'Pula', value: 'BWP' },
+	{ name: 'Belize Dollar', value: 'BZD' },
+	{ name: 'Canadian Dollar', value: 'CAD' },
+	{ name: 'Swiss Franc', value: 'CHF' },
+	{ name: 'Chilean Peso', value: 'CLP' },
+	{ name: 'Yuan Renminbi', value: 'CNY' },
+	{ name: 'Colombian Peso', value: 'COP' },
+	{ name: 'Costa Rican Colon', value: 'CRC' },
+	{ name: 'Czech Koruna', value: 'CZK' },
+	{ name: 'Danish Krone', value: 'DKK' },
+	{ name: 'Dominican Peso', value: 'DOP' },
+	{ name: 'Algerian Dinar', value: 'DZD' },
+	{ name: 'Egyptian Pound', value: 'EGP' },
+	{ name: 'Fiji Dollar', value: 'FJD' },
+	{ name: 'Pound Sterling', value: 'GBP' },
+	{ name: 'Quetzal', value: 'GTQ' },
+	{ name: 'Hong Kong Dollar', value: 'HKD' },
+	{ name: 'Lempira', value: 'HNL' },
+	{ name: 'Kuna', value: 'HRK' },
+	{ name: 'Forint', value: 'HUF' },
+	{ name: 'Rupiah', value: 'IDR' },
+	{ name: 'New Israeli Sheqel', value: 'ILS' },
+	{ name: 'Indian Rupee', value: 'INR' },
+	{ name: 'Jamaican Dollar', value: 'JMD' },
+	{ name: 'Yen', value: 'JPY' },
+	{ name: 'Kenyan Shilling', value: 'KES' },
+	{ name: 'Won', value: 'KRW' },
+	{ name: 'Tenge', value: 'KZT' },
+	{ name: 'Lao Kip', value: 'LAK' },
+	{ name: 'Lebanese Pound', value: 'LBP' },
+	{ name: 'Sri Lanka Rupee', value: 'LKR' },
+	{ name: 'Liberian Dollar', value: 'LRD' },
+	{ name: 'Moroccan Dirham', value: 'MAD' },
+	{ name: 'Kyat', value: 'MMK' },
+	{ name: 'Pataca', value: 'MOP' },
+	{ name: 'Ouguiya', value: 'MRO' },
+	{ name: 'Mauritius Rupee', value: 'MUR' },
+	{ name: 'Rufiyaa', value: 'MVR' },
+	{ name: 'Mexican Peso', value: 'MXN' },
+	{ name: 'Malaysian Ringgit', value: 'MYR' },
+	{ name: 'Cordoba Oro', value: 'NIO' },
+	{ name: 'Norwegian Krone', value: 'NOK' },
+	{ name: 'Nepalese Rupee', value: 'NPR' },
+	{ name: 'New Zealand Dollar', value: 'NZD' },
+	{ name: 'Sol', value: 'PEN' },
+	{ name: 'Kina', value: 'PGK' },
+	{ name: 'Philippine Peso', value: 'PHP' },
+	{ name: 'Pakistan Rupee', value: 'PKR' },
+	{ name: 'Zloty', value: 'PLN' },
+	{ name: 'Qatari Rial', value: 'QAR' },
+	{ name: 'Romanian Leu', value: 'RON' },
+	{ name: 'Russian Ruble', value: 'RUB' },
+	{ name: 'Saudi Riyal', value: 'SAR' },
+	{ name: 'Solomon Islands Dollar	', value: 'SBD' },
+	{ name: 'Seychelles Rupee', value: 'SCR' },
+	{ name: 'Swedish Krona', value: 'SEK' },
+	{ name: 'Singapore Dollar', value: 'SGD' },
+	{ name: 'Syrian Pound', value: 'SYP' },
+	{ name: 'Baht', value: 'THB' },
+	{ name: 'Pa’anga', value: 'TOP' },
+	{ name: 'Turkish Lira', value: 'TRY' },
+	{ name: 'Trinidad and Tobago Dollar', value: 'TTD' },
+	{ name: 'New Taiwan Dollar', value: 'TWD' },
+	{ name: 'Hryvnia', value: 'UAH' },
+	{ name: 'Dong', value: 'VND' },
+	{ name: 'Vatu', value: 'VUV' },
+	{ name: 'Tala', value: 'WST' },
+	{ name: 'East Caribbean Dollar', value: 'XCD' },
+	{ name: 'West African CFA Franc', value: 'XOF' },
+	{ name: 'Yemeni Rial', value: 'YER' },
+	{ name: 'Rand', value: 'ZAR' },
+];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/VendorDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/VendorDescription.ts
new file mode 100644
index 0000000000..ff15df5ea7
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/VendorDescription.ts
@@ -0,0 +1,301 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+import {
+	address,
+	currencies,
+	makeCustomFieldsFixedCollection,
+	makeGetAllFields,
+} from './SharedFields';
+
+export const vendorOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'vendor',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a vendor',
+			},
+			{
+				name: 'Create or Update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a vendor',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a vendor',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all vendors',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a vendor',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const vendorFields = [
+	// ----------------------------------------
+	//            vendor: create
+	// ----------------------------------------
+	{
+		displayName: 'Vendor Name',
+		name: 'vendorName',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'vendor',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//           vendor: upsert
+	// ----------------------------------------
+	{
+		displayName: 'Vendor Name',
+		name: 'vendorName',
+		description: 'Name of the vendor. If a record with this vendor name exists it will be updated, otherwise a new one will be created.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'vendor',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//         vendor: create + upsert
+	// ----------------------------------------
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'vendor',
+				],
+				operation: [
+					'create',
+					'upsert',
+				],
+			},
+		},
+		options: [
+			address,
+			{
+				displayName: 'Category',
+				name: 'Category',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'options',
+				default: 'USD',
+				options: currencies,
+			},
+			makeCustomFieldsFixedCollection('vendor'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email',
+				name: 'Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Website',
+				name: 'Website',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//             vendor: delete
+	// ----------------------------------------
+	{
+		displayName: 'Vendor ID',
+		name: 'vendorId',
+		description: 'ID of the vendor to delete.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'vendor',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//               vendor: get
+	// ----------------------------------------
+	{
+		displayName: 'Vendor ID',
+		name: 'vendorId',
+		description: 'ID of the vendor to retrieve.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'vendor',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//             vendor: getAll
+	// ----------------------------------------
+	...makeGetAllFields('vendor'),
+
+	// ----------------------------------------
+	//             vendor: update
+	// ----------------------------------------
+	{
+		displayName: 'Vendor ID',
+		name: 'vendorId',
+		description: 'ID of the vendor to update.',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'vendor',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'vendor',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			address,
+			{
+				displayName: 'Category',
+				name: 'Category',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Currency',
+				name: 'Currency',
+				type: 'string',
+				default: '',
+			},
+			makeCustomFieldsFixedCollection('vendor'),
+			{
+				displayName: 'Description',
+				name: 'Description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Email',
+				name: 'Email',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Phone',
+				name: 'Phone',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Vendor Name',
+				name: 'Vendor_Name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Website',
+				name: 'Website',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/index.ts b/packages/nodes-base/nodes/Zoho/descriptions/index.ts
new file mode 100644
index 0000000000..152b54ef2b
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/descriptions/index.ts
@@ -0,0 +1,10 @@
+export * from './AccountDescription';
+export * from './ContactDescription';
+export * from './DealDescription';
+export * from './InvoiceDescription';
+export * from './LeadDescription';
+export * from './ProductDescription';
+export * from './PurchaseOrderDescription';
+export * from './QuoteDescription';
+export * from './SalesOrderDescription';
+export * from './VendorDescription';
diff --git a/packages/nodes-base/nodes/Zoho/types.d.ts b/packages/nodes-base/nodes/Zoho/types.d.ts
new file mode 100644
index 0000000000..46da58379c
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/types.d.ts
@@ -0,0 +1,103 @@
+import { IDataObject } from "n8n-workflow";
+
+// ----------------------------------------
+//          for generic functions
+// ----------------------------------------
+
+type Resource = 'account' | 'contact' | 'deal' | 'invoice' | 'lead' | 'product' | 'quote' | 'vendor';
+
+export type CamelCaseResource = Resource | 'purchaseOrder' | 'salesOrder';
+
+export type SnakeCaseResource = Resource | 'purchase_order' | 'sales_order';
+
+export type GetAllFilterOptions = {
+	fields: string[],
+	[otherOptions: string]: unknown;
+};
+
+// ----------------------------------------
+//               for auth
+// ----------------------------------------
+
+export type ZohoOAuth2ApiCredentials = {
+	oauthTokenData: {
+		api_domain: string;
+	};
+};
+
+// ----------------------------------------
+//         for field adjusters
+// ----------------------------------------
+
+export type IdType = 'accountId' | 'contactId' | 'dealId' | 'purchaseOrderId';
+
+export type NameType = 'Account_Name' | 'Full_Name' | 'Deal_Name' | 'Product_Name' | 'Vendor_Name';
+
+type LocationType = 'Address' | 'Billing_Address' | 'Mailing_Address' | 'Shipping_Address' | 'Other_Address';
+
+type DateType = 'Date_of_Birth' | 'Closing_Date' | 'Due_Date' | 'Invoice_Date' | 'PO_Date' | 'Valid_Till';
+
+export type AllFields =
+	{ [Date in DateType]?: string } &
+	{ [Location in LocationType]?: { address_fields: { [key: string]: string } } } &
+	{ Account?: { subfields: { id: string; name: string; } } } &
+	{ [key in 'accountId' | 'contactId' | 'dealId']?: string } &
+	{ customFields?: { customFields: Array<{ fieldId: string; value: string; }> } } &
+	{ Product_Details?: ProductDetails } &
+	IDataObject;
+
+export type ProductDetails = Array<{ id: string, quantity: number }>;
+
+export type ResourceItems = Array<{ [key: string]: string }>;
+
+// ----------------------------------------
+//         for resource loaders
+// ----------------------------------------
+
+export type LoadedAccounts = Array<{
+	Account_Name: string;
+	id: string;
+}>;
+
+export type LoadedContacts = Array<{
+	Full_Name: string;
+	id: string;
+}>;
+
+export type LoadedDeals = Array<{
+	Deal_Name: string;
+	id: string;
+}>;
+
+export type LoadedFields = {
+	fields: Array<{
+		field_label: string;
+		api_name: string;
+		custom_field: boolean;
+	}>
+};
+
+export type LoadedVendors = Array<{
+	Vendor_Name: string;
+	id: string;
+}>;
+
+export type LoadedProducts = Array<{
+	Product_Name: string;
+	id: string;
+}>;
+
+export type LoadedLayouts = {
+	layouts: Array<{
+		sections: Array<{
+			api_name: string;
+			fields: Array<{
+				api_name: string;
+				pick_list_values: Array<{
+					display_value: string;
+					actual_value: string;
+				}>
+			}>
+		}>
+	}>
+}
diff --git a/packages/nodes-base/nodes/Zoho/zoho.svg b/packages/nodes-base/nodes/Zoho/zoho.svg
index 9fc3141978..203761c270 100644
--- a/packages/nodes-base/nodes/Zoho/zoho.svg
+++ b/packages/nodes-base/nodes/Zoho/zoho.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 -30 100 100" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><defs><linearGradient x1="50%" y1="1.43%" x2="50%" y2="96.98%" id="b"><stop stop-color="#ffe513" offset=".562%"/><stop stop-color="#fdb924" offset="100%"/></linearGradient><linearGradient x1="4.51%" y1="13.49%" x2="95.67%" y2="87.06%" id="c"><stop stop-color="#008cd2" offset=".562%"/><stop stop-color="#00649d" offset="100%"/></linearGradient><linearGradient x1="50%" y1="27.78%" x2="50%" y2="97.53%" id="d"><stop stop-color="#26a146" offset="0%"/><stop stop-color="#008a52" offset="100%"/></linearGradient><linearGradient x1="43.73%" y1="8.21%" x2="57.54%" y2="93.2%" id="e"><stop stop-color="#d92231" offset="0%"/><stop stop-color="#ba2234" offset="100%"/></linearGradient></defs><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M102.964 7.581v24.414l-3.379 3.298V11.402z" fill="#e79225"/><path d="M80.822 7.601l-3.499 3.801.181.241 21.94-.08.201-.161 3.318-3.821z" fill="#fff16d"/><path d="M77.323 11.402h22.322v23.911H77.323z" fill="url(#b)"/><path d="M96.246 20.009a8.84 8.84 0 00-1.971-2.976c-.825-.845-1.749-1.488-2.795-1.91-1.026-.422-2.132-.643-3.338-.643s-2.333.221-3.358.643c-1.046.422-1.971 1.066-2.795 1.91-.865.865-1.508 1.87-1.951 2.976s-.644 2.313-.644 3.64a9.8 9.8 0 00.664 3.62 8.95 8.95 0 001.951 3.017c.804.825 1.73 1.448 2.755 1.87s2.172.644 3.399.644c1.186 0 2.293-.221 3.318-.644s1.971-1.046 2.795-1.87c.865-.885 1.528-1.89 1.971-2.996s.664-2.333.664-3.62c0-1.347-.221-2.554-.664-3.66zm-4.605 7.883c-.865 1.026-2.011 1.549-3.499 1.549s-2.655-.523-3.519-1.549-1.287-2.453-1.287-4.263c0-1.85.442-3.278 1.287-4.324.865-1.046 2.011-1.549 3.519-1.549 1.488 0 2.634.523 3.499 1.549.845 1.046 1.287 2.474 1.287 4.324 0 1.81-.422 3.238-1.287 4.263z"/><path d="M75.131 5.591v.121l2.856 21.94-1.669 4.625-.221-.161-2.936-21.035.06-.281 1.83-5.088z" fill="#009ada"/><path d="M53.151 8.648l21.98-3.057-1.85 5.269-.261.282-20.552 3.017.101-3.761z" fill="#91c9ed"/><path d="M73.281 10.859l3.037 21.417-21.659 3.037-2.916-20.693 1.267-.985z" fill="url(#c)"/><path d="M69.601 14.962c-.101-.664-.322-1.166-.684-1.508a1.61 1.61 0 00-1.086-.402c-.1 0-.221 0-.342.02-.563.081-.985.342-1.247.764-.201.302-.281.684-.281 1.126 0 .161.02.342.04.523l.784 5.57-6.234.925-.784-5.57c-.1-.644-.322-1.146-.684-1.488a1.52 1.52 0 00-1.066-.422c-.101 0-.201 0-.302.02-.583.081-1.026.342-1.307.764-.201.302-.282.684-.282 1.126 0 .161.02.342.04.543l2.132 14.499c.1.664.322 1.166.724 1.508.302.261.664.382 1.106.382.121 0 .241 0 .362-.02.543-.081.945-.342 1.207-.764.181-.302.261-.664.261-1.086 0-.161-.02-.342-.04-.523l-.865-5.731 6.234-.925.865 5.731c.1.664.322 1.166.704 1.488a1.61 1.61 0 001.086.402c.101 0 .221 0 .342-.02.563-.081.985-.342 1.247-.764.181-.302.282-.664.282-1.106 0-.161-.02-.342-.04-.523z"/><path d="M32.578 0l-7.823 18.582 1.066 8.165.06-.02 8.788-19.768-.04-.422-1.89-6.274z" fill="#66bf6b"/><path d="M32.578 0l2.071 6.958 19.346 8.667.06-.04-1.649-6.516z" fill="#98d0a0"/><path d="M34.609 6.817l19.446 8.768-8.788 19.929-19.446-8.768z" fill="url(#d)"/><path d="M48.164 17.194c-.422-1.126-1.005-2.091-1.77-2.896a8.24 8.24 0 00-2.775-1.911 8.257 8.257 0 00-3.278-.684h-.06c-1.126 0-2.232.261-3.318.744a8.883 8.883 0 00-2.976 2.091c-.845.885-1.528 1.971-2.051 3.218a10.783 10.783 0 00-.865 3.7v.422a9.24 9.24 0 00.563 3.197c.402 1.106.985 2.051 1.75 2.856s1.709 1.448 2.836 1.91a8.1 8.1 0 003.258.684h.02c1.106 0 2.212-.241 3.298-.704a9.018 9.018 0 002.996-2.111c.845-.885 1.548-1.951 2.071-3.198s.804-2.474.865-3.7v-.362a8.7 8.7 0 00-.563-3.258zm-3.881 5.792c-.724 1.73-1.709 2.916-2.896 3.56-.644.342-1.307.523-1.971.523-.583 0-1.206-.141-1.83-.402-1.367-.583-2.212-1.508-2.574-2.835a5.25 5.25 0 01-.181-1.388c0-.965.241-2.031.724-3.177.744-1.77 1.73-2.976 2.916-3.64a3.968 3.968 0 011.971-.523c.603 0 1.207.141 1.85.402 1.347.583 2.192 1.508 2.554 2.835.121.422.181.885.181 1.367 0 1.006-.241 2.091-.744 3.278z"/><path d="M23.207 3.157l3.177 21.276-1.448 7.481-.201-.261-3.097-20.552v-.402l1.367-7.179z" fill="#760d16"/><path d="M0 14.157l1.508-7.521 21.699-3.479-1.468 7.662v.503L.261 14.358z" fill="#ef463e"/><path d="M21.739 10.819l3.197 21.095-21.477 3.358L0 14.157z" fill="url(#e)"/><path d="M19.427 28.556c-.161-.201-.402-.342-.684-.442s-.623-.141-1.046-.141c-.382 0-.824.04-1.307.121l-5.671.965c.06-.443.282-1.006.664-1.709.422-.784 1.066-1.73 1.89-2.815l.664-.865.463-.583c1.307-1.709 2.091-3.097 2.413-4.183a8.663 8.663 0 00.322-1.87c.02-.181.02-.342.02-.503a7.4 7.4 0 00-.121-1.327c-.06-.402-.161-.724-.302-.985s-.302-.463-.503-.583c-.221-.141-.563-.201-.985-.201-.342 0-.764.04-1.267.121L7.421 14.68c-.784.141-1.388.362-1.75.724a1.38 1.38 0 00-.442 1.046 2.07 2.07 0 00.02.342c.101.563.382.965.845 1.166.282.121.603.181 1.005.181.261 0 .563-.02.885-.08l5.47-.965c0 .101.02.201.02.282a2.87 2.87 0 01-.181 1.005c-.161.463-.563 1.106-1.227 1.931l-.845 1.046c-1.488 1.79-2.534 3.318-3.177 4.585a9.917 9.917 0 00-.945 2.594 7.23 7.23 0 00-.161 1.428c0 .322.02.643.081.945.08.442.181.804.322 1.086s.342.503.563.623.523.161.965.161c.543 0 1.287-.08 2.232-.241l5.953-1.026c1.046-.181 1.79-.442 2.212-.784a1.39 1.39 0 00.523-1.106c0-.121-.02-.241-.04-.362a1.333 1.333 0 00-.322-.704z"/></g></symbol></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 -30 100 100" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#a" x=".5" y=".5"/><defs><linearGradient x1="50%" y1="1.43%" x2="50%" y2="96.98%" id="b"><stop stop-color="#ffe513" offset=".562%"/><stop stop-color="#fdb924" offset="100%"/></linearGradient><linearGradient x1="4.51%" y1="13.49%" x2="95.67%" y2="87.06%" id="c"><stop stop-color="#008cd2" offset=".562%"/><stop stop-color="#00649d" offset="100%"/></linearGradient><linearGradient x1="50%" y1="27.78%" x2="50%" y2="97.53%" id="d"><stop stop-color="#26a146" offset="0%"/><stop stop-color="#008a52" offset="100%"/></linearGradient><linearGradient x1="43.73%" y1="8.21%" x2="57.54%" y2="93.2%" id="e"><stop stop-color="#d92231" offset="0%"/><stop stop-color="#ba2234" offset="100%"/></linearGradient></defs><symbol id="a" overflow="visible"><g stroke="none" fill-rule="nonzero"><path d="M102.964 7.581v24.414l-3.379 3.298V11.402z" fill="#e79225"/><path d="M80.822 7.601l-3.499 3.801.181.241 21.94-.08.201-.161 3.318-3.821z" fill="#fff16d"/><path d="M77.323 11.402h22.322v23.911H77.323z" fill="url(#b)"/><path d="M96.246 20.009a8.84 8.84 0 00-1.971-2.976c-.825-.845-1.749-1.488-2.795-1.91-1.026-.422-2.132-.643-3.338-.643s-2.333.221-3.358.643c-1.046.422-1.971 1.066-2.795 1.91-.865.865-1.508 1.87-1.951 2.976s-.644 2.313-.644 3.64a9.8 9.8 0 00.664 3.62 8.95 8.95 0 001.951 3.017c.804.825 1.73 1.448 2.755 1.87s2.172.644 3.399.644c1.186 0 2.293-.221 3.318-.644s1.971-1.046 2.795-1.87c.865-.885 1.528-1.89 1.971-2.996s.664-2.333.664-3.62c0-1.347-.221-2.554-.664-3.66zm-4.605 7.883c-.865 1.026-2.011 1.549-3.499 1.549s-2.655-.523-3.519-1.549-1.287-2.453-1.287-4.263c0-1.85.442-3.278 1.287-4.324.865-1.046 2.011-1.549 3.519-1.549 1.488 0 2.634.523 3.499 1.549.845 1.046 1.287 2.474 1.287 4.324 0 1.81-.422 3.238-1.287 4.263z"/><path d="M75.131 5.591v.121l2.856 21.94-1.669 4.625-.221-.161-2.936-21.035.06-.281 1.83-5.088z" fill="#009ada"/><path d="M53.151 8.648l21.98-3.057-1.85 5.269-.261.282-20.552 3.017.101-3.761z" fill="#91c9ed"/><path d="M73.281 10.859l3.037 21.417-21.659 3.037-2.916-20.693 1.267-.985z" fill="url(#c)"/><path d="M69.601 14.962c-.101-.664-.322-1.166-.684-1.508a1.61 1.61 0 00-1.086-.402c-.1 0-.221 0-.342.02-.563.081-.985.342-1.247.764-.201.302-.281.684-.281 1.126 0 .161.02.342.04.523l.784 5.57-6.234.925-.784-5.57c-.1-.644-.322-1.146-.684-1.488a1.52 1.52 0 00-1.066-.422c-.101 0-.201 0-.302.02-.583.081-1.026.342-1.307.764-.201.302-.282.684-.282 1.126 0 .161.02.342.04.543l2.132 14.499c.1.664.322 1.166.724 1.508.302.261.664.382 1.106.382.121 0 .241 0 .362-.02.543-.081.945-.342 1.207-.764.181-.302.261-.664.261-1.086 0-.161-.02-.342-.04-.523l-.865-5.731 6.234-.925.865 5.731c.1.664.322 1.166.704 1.488a1.61 1.61 0 001.086.402c.101 0 .221 0 .342-.02.563-.081.985-.342 1.247-.764.181-.302.282-.664.282-1.106 0-.161-.02-.342-.04-.523z"/><path d="M32.578 0l-7.823 18.582 1.066 8.165.06-.02 8.788-19.768-.04-.422-1.89-6.274z" fill="#66bf6b"/><path d="M32.578 0l2.071 6.958 19.346 8.667.06-.04-1.649-6.516z" fill="#98d0a0"/><path d="M34.609 6.817l19.446 8.768-8.788 19.929-19.446-8.768z" fill="url(#d)"/><path d="M48.164 17.194c-.422-1.126-1.005-2.091-1.77-2.896a8.24 8.24 0 00-2.775-1.911 8.257 8.257 0 00-3.278-.684h-.06c-1.126 0-2.232.261-3.318.744a8.883 8.883 0 00-2.976 2.091c-.845.885-1.528 1.971-2.051 3.218a10.783 10.783 0 00-.865 3.7v.422a9.24 9.24 0 00.563 3.197c.402 1.106.985 2.051 1.75 2.856s1.709 1.448 2.836 1.91a8.1 8.1 0 003.258.684h.02c1.106 0 2.212-.241 3.298-.704a9.018 9.018 0 002.996-2.111c.845-.885 1.548-1.951 2.071-3.198s.804-2.474.865-3.7v-.362a8.7 8.7 0 00-.563-3.258zm-3.881 5.792c-.724 1.73-1.709 2.916-2.896 3.56-.644.342-1.307.523-1.971.523-.583 0-1.206-.141-1.83-.402-1.367-.583-2.212-1.508-2.574-2.835a5.25 5.25 0 01-.181-1.388c0-.965.241-2.031.724-3.177.744-1.77 1.73-2.976 2.916-3.64a3.968 3.968 0 011.971-.523c.603 0 1.207.141 1.85.402 1.347.583 2.192 1.508 2.554 2.835.121.422.181.885.181 1.367 0 1.006-.241 2.091-.744 3.278z"/><path d="M23.207 3.157l3.177 21.276-1.448 7.481-.201-.261-3.097-20.552v-.402l1.367-7.179z" fill="#760d16"/><path d="M0 14.157l1.508-7.521 21.699-3.479-1.468 7.662v.503L.261 14.358z" fill="#ef463e"/><path d="M21.739 10.819l3.197 21.095-21.477 3.358L0 14.157z" fill="url(#e)"/><path d="M19.427 28.556c-.161-.201-.402-.342-.684-.442s-.623-.141-1.046-.141c-.382 0-.824.04-1.307.121l-5.671.965c.06-.443.282-1.006.664-1.709.422-.784 1.066-1.73 1.89-2.815l.664-.865.463-.583c1.307-1.709 2.091-3.097 2.413-4.183a8.663 8.663 0 00.322-1.87c.02-.181.02-.342.02-.503a7.4 7.4 0 00-.121-1.327c-.06-.402-.161-.724-.302-.985s-.302-.463-.503-.583c-.221-.141-.563-.201-.985-.201-.342 0-.764.04-1.267.121L7.421 14.68c-.784.141-1.388.362-1.75.724a1.38 1.38 0 00-.442 1.046 2.07 2.07 0 00.02.342c.101.563.382.965.845 1.166.282.121.603.181 1.005.181.261 0 .563-.02.885-.08l5.47-.965c0 .101.02.201.02.282a2.87 2.87 0 01-.181 1.005c-.161.463-.563 1.106-1.227 1.931l-.845 1.046c-1.488 1.79-2.534 3.318-3.177 4.585a9.917 9.917 0 00-.945 2.594 7.23 7.23 0 00-.161 1.428c0 .322.02.643.081.945.08.442.181.804.322 1.086s.342.503.563.623.523.161.965.161c.543 0 1.287-.08 2.232-.241l5.953-1.026c1.046-.181 1.79-.442 2.212-.784a1.39 1.39 0 00.523-1.106c0-.121-.02-.241-.04-.362a1.333 1.333 0 00-.322-.704z"/></g></symbol></svg>

From 40bcd9b20ec6bce8ada26ac0933a5eeaa76952c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 2 Jul 2021 23:41:40 +0200
Subject: [PATCH 13/74] :zap: Add last name to contact:update on Salesforce
 Node (#1965)

---
 packages/nodes-base/nodes/Salesforce/ContactDescription.ts | 7 +++++++
 packages/nodes-base/nodes/Salesforce/Salesforce.node.ts    | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/packages/nodes-base/nodes/Salesforce/ContactDescription.ts b/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
index 3ec78b6e11..4e9901fc6e 100644
--- a/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/ContactDescription.ts
@@ -570,6 +570,13 @@ export const contactFields = [
 				description: `references the ID of a contact in Data.com.
 				If a contact has a value in this field, it means that a contact was imported as a contact from Data.com.`,
 			},
+			{
+				displayName: 'Last Name',
+				name: 'lastName',
+				type: 'string',
+				default: '',
+				description: 'Last name of the contact. Limited to 80 characters.',
+			},
 			{
 				displayName: 'Lead Source',
 				name: 'leadSource',
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index 9afccd687f..08269b0ca7 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -1337,6 +1337,9 @@ export class Salesforce implements INodeType {
 					if (!Object.keys(updateFields).length) {
 						throw new NodeOperationError(this.getNode(), 'You must add at least one update field');
 					}
+					if (updateFields.lastName !== undefined) {
+						body.LastName = updateFields.lastName as string;
+					}
 					if (updateFields.fax !== undefined) {
 						body.Fax = updateFields.fax as string;
 					}

From 64961199bad8cd184befafdccb4a1d3023c4b33b Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Fri, 2 Jul 2021 17:58:18 -0400
Subject: [PATCH 14/74] :zap: Add file/folder share operation (#1951)

* :zap: Add file/folder share operation

* :zap: Improvements

* :zap: Minor fixes

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 packages/nodes-base/nodes/Box/Box.node.ts     | 123 +++++
 .../nodes-base/nodes/Box/FileDescription.ts   | 241 ++++++++++
 .../nodes-base/nodes/Box/FolderDescription.ts | 424 ++++++++++++++++++
 3 files changed, 788 insertions(+)

diff --git a/packages/nodes-base/nodes/Box/Box.node.ts b/packages/nodes-base/nodes/Box/Box.node.ts
index 75006e46c2..9d462b60b7 100644
--- a/packages/nodes-base/nodes/Box/Box.node.ts
+++ b/packages/nodes-base/nodes/Box/Box.node.ts
@@ -29,6 +29,10 @@ import {
 
 import * as moment from 'moment-timezone';
 
+import {
+	noCase,
+} from 'change-case';
+
 export class Box implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Box',
@@ -81,6 +85,7 @@ export class Box implements INodeType {
 		const length = items.length as unknown as number;
 		const qs: IDataObject = {};
 		let responseData;
+		const timezone = this.getTimezone();
 		const resource = this.getNodeParameter('resource', 0) as string;
 		const operation = this.getNodeParameter('operation', 0) as string;
 		for (let i = 0; i < length; i++) {
@@ -199,6 +204,51 @@ export class Box implements INodeType {
 					}
 					returnData.push.apply(returnData, responseData as IDataObject[]);
 				}
+				// https://developer.box.com/reference/post-collaborations/
+				if (operation === 'share') {
+					const fileId = this.getNodeParameter('fileId', i) as string;
+					const role = this.getNodeParameter('role', i) as string;
+					const accessibleBy = this.getNodeParameter('accessibleBy', i) as string;
+					const options = this.getNodeParameter('options', i) as IDataObject;
+					// tslint:disable-next-line: no-any
+					const body: { accessible_by: IDataObject, [key: string]: any } = {
+						accessible_by: {},
+						item: {
+							id: fileId,
+							type: 'file',
+						},
+						role: (role === 'coOwner') ? 'co-owner' : noCase(role),
+						...options,
+					};
+
+					if (body.fields) {
+						qs.fields = body.fields;
+						delete body.fields;
+					}
+
+					if (body.expires_at) {
+						body.expires_at = moment.tz(body.expires_at, timezone).format();
+					}
+
+					if (body.notify) {
+						qs.notify = body.notify;
+						delete body.notify;
+					}
+
+					if (accessibleBy === 'user') {
+						const useEmail = this.getNodeParameter('useEmail', i) as boolean;
+						if (useEmail) {
+							body.accessible_by['login'] = this.getNodeParameter('email', i) as string;
+						} else {
+							body.accessible_by['id'] = this.getNodeParameter('userId', i) as string;
+						}
+					} else {
+						body.accessible_by['id'] = this.getNodeParameter('groupId', i) as string;
+					}
+
+					responseData = await boxApiRequest.call(this, 'POST', `/collaborations`, body, qs);
+					returnData.push(responseData as IDataObject);
+				}
 				// https://developer.box.com/reference/post-files-content
 				if (operation === 'upload') {
 					const parentId = this.getNodeParameter('parentId', i) as string;
@@ -356,6 +406,79 @@ export class Box implements INodeType {
 					}
 					returnData.push.apply(returnData, responseData as IDataObject[]);
 				}
+				// https://developer.box.com/reference/post-collaborations/
+				if (operation === 'share') {
+					const folderId = this.getNodeParameter('folderId', i) as string;
+					const role = this.getNodeParameter('role', i) as string;
+					const accessibleBy = this.getNodeParameter('accessibleBy', i) as string;
+					const options = this.getNodeParameter('options', i) as IDataObject;
+					// tslint:disable-next-line: no-any
+					const body: { accessible_by: IDataObject, [key: string]: any } = {
+						accessible_by: {},
+						item: {
+							id: folderId,
+							type: 'folder',
+						},
+						role: (role === 'coOwner') ? 'co-owner' : noCase(role),
+						...options,
+					};
+
+					if (body.fields) {
+						qs.fields = body.fields;
+						delete body.fields;
+					}
+
+					if (body.expires_at) {
+						body.expires_at = moment.tz(body.expires_at, timezone).format();
+					}
+
+					if (body.notify) {
+						qs.notify = body.notify;
+						delete body.notify;
+					}
+
+					if (accessibleBy === 'user') {
+						const useEmail = this.getNodeParameter('useEmail', i) as boolean;
+						if (useEmail) {
+							body.accessible_by['login'] = this.getNodeParameter('email', i) as string;
+						} else {
+							body.accessible_by['id'] = this.getNodeParameter('userId', i) as string;
+						}
+					} else {
+						body.accessible_by['id'] = this.getNodeParameter('groupId', i) as string;
+					}
+
+					responseData = await boxApiRequest.call(this, 'POST', `/collaborations`, body, qs);
+					returnData.push(responseData as IDataObject);
+				}
+				//https://developer.box.com/guides/folders/single/move/
+				if (operation === 'update') {
+					const folderId = this.getNodeParameter('folderId', i) as string;
+					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+					if (updateFields.fields) {
+						qs.fields = updateFields.fields;
+						delete updateFields.fields;
+					}
+
+					const body = {
+						...updateFields,
+					} as IDataObject;
+
+					if (body.parentId) {
+						body.parent = {
+							id: body.parentId,
+						};
+						delete body.parentId;
+					}
+
+					if (body.tags) {
+						body.tags = (body.tags as string).split(',');
+					}
+
+					responseData = await boxApiRequest.call(this, 'PUT', `/folders/${folderId}`, body, qs);
+					returnData.push(responseData as IDataObject);
+				}
 			}
 		}
 		if (resource === 'file' && operation === 'download') {
diff --git a/packages/nodes-base/nodes/Box/FileDescription.ts b/packages/nodes-base/nodes/Box/FileDescription.ts
index 9a3ae0e2c2..7aa5a87d72 100644
--- a/packages/nodes-base/nodes/Box/FileDescription.ts
+++ b/packages/nodes-base/nodes/Box/FileDescription.ts
@@ -40,6 +40,11 @@ export const fileOperations = [
 				value: 'search',
 				description: 'Search files',
 			},
+			{
+				name: 'Share',
+				value: 'share',
+				description: 'Share a file',
+			},
 			{
 				name: 'Upload',
 				value: 'upload',
@@ -496,6 +501,242 @@ export const fileFields = [
 		],
 	},
 
+	/* -------------------------------------------------------------------------- */
+	/*                                 file:share                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'File ID',
+		name: 'fileId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+			},
+		},
+		default: '',
+		description: 'The ID of the file to share.',
+	},
+	{
+		displayName: 'Accessible By',
+		name: 'accessibleBy',
+		type: 'options',
+		options: [
+			{
+				name: 'Group',
+				value: 'group',
+			},
+			{
+				name: 'User',
+				value: 'user',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+			},
+		},
+		default: '',
+		description: 'The type of object the file will be shared with.',
+	},
+	{
+		displayName: 'Use Email',
+		name: 'useEmail',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+				accessibleBy: [
+					'user',
+				],
+			},
+		},
+		default: true,
+		description: 'Whether identify the user by email or ID.',
+	},
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+				useEmail: [
+					true,
+				],
+				accessibleBy: [
+					'user',
+				],
+			},
+		},
+		default: '',
+		description: `The user's email address to share the file with.`,
+	},
+	{
+		displayName: 'User ID',
+		name: 'userId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+				useEmail: [
+					false,
+				],
+				accessibleBy: [
+					'user',
+				],
+			},
+		},
+		default: '',
+		description: `The user's ID to share the file with.`,
+	},
+	{
+		displayName: 'Group ID',
+		name: 'groupId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+				accessibleBy: [
+					'group',
+				],
+			},
+		},
+		default: '',
+		description: `The group's ID to share the file with.`,
+	},
+	{
+		displayName: 'Role',
+		name: 'role',
+		type: 'options',
+		options: [
+			{
+				name: 'Co-Owner',
+				value: 'coOwner',
+				description: 'A Co-owner has all of functional read/write access that an editor does',
+			},
+			{
+				name: 'Editor',
+				value: 'editor',
+				description: 'An editor has full read/write access to a folder or file',
+			},
+			{
+				name: 'Previewer',
+				value: 'previewer',
+				description: 'A previewer has limited read access',
+			},
+			{
+				name: 'Previewer Uploader',
+				value: 'previewerUploader',
+				description: 'This access level is a combination of Previewer and Uploader',
+			},
+			{
+				name: 'Uploader',
+				value: 'uploader',
+				description: 'An uploader has limited write access',
+			},
+			{
+				name: 'Viewer',
+				value: 'viewer',
+				description: 'A viewer has read access to a folder or file',
+			},
+			{
+				name: 'Viewer Uploader',
+				value: 'viewerUploader',
+				description: 'This access level is a combination of Viewer and Uploader',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+			},
+		},
+		default: 'editor',
+		description: 'The level of access granted.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'file',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Can View Path',
+				name: 'can_view_path',
+				type: 'boolean',
+				default: false,
+				description: `Whether the invited users can see the entire parent path to the associated folder.</br>
+				The user will not gain privileges in any parent folder and therefore cannot see content the user is not collaborated on.`,
+			},
+			{
+				displayName: 'Expires At',
+				name: 'expires_at',
+				type: 'dateTime',
+				default: '',
+				description: 'Set the expiration date for the collaboration. At this date, the collaboration will be automatically removed from the item.',
+			},
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'string',
+				default: '',
+				description: 'A comma-separated list of attributes to include in the response. This can be used to request fields that are not normally returned in a standard response.',
+			},
+			{
+				displayName: 'Notify',
+				name: 'notify',
+				type: 'boolean',
+				default: false,
+				description: 'Whether if users should receive email notification for the action performed.',
+			},
+		],
+	},
+
 	/* -------------------------------------------------------------------------- */
 	/*                                 file:upload                                */
 	/* -------------------------------------------------------------------------- */
diff --git a/packages/nodes-base/nodes/Box/FolderDescription.ts b/packages/nodes-base/nodes/Box/FolderDescription.ts
index 5e944b25d1..11ed33c2cf 100644
--- a/packages/nodes-base/nodes/Box/FolderDescription.ts
+++ b/packages/nodes-base/nodes/Box/FolderDescription.ts
@@ -35,6 +35,16 @@ export const folderOperations = [
 				value: 'search',
 				description: 'Search files',
 			},
+			{
+				name: 'Share',
+				value: 'share',
+				description: 'Share a folder',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update folder',
+			},
 		],
 		default: 'create',
 		description: 'The operation to perform.',
@@ -147,6 +157,7 @@ export const folderFields = [
 		default: '',
 		description: 'Folder ID',
 	},
+
 	/* -------------------------------------------------------------------------- */
 	/*                                 folder:delete                              */
 	/* -------------------------------------------------------------------------- */
@@ -441,4 +452,417 @@ export const folderFields = [
 			},
 		],
 	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 folder:share                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Folder ID',
+		name: 'folderId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+			},
+		},
+		default: '',
+		description: 'The ID of the folder to share.',
+	},
+	{
+		displayName: 'Accessible By',
+		name: 'accessibleBy',
+		type: 'options',
+		options: [
+			{
+				name: 'User',
+				value: 'user',
+			},
+			{
+				name: 'Group',
+				value: 'group',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+			},
+		},
+		default: 'user',
+		description: 'The type of object the file will be shared with.',
+	},
+	{
+		displayName: 'Use Email',
+		name: 'useEmail',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+				accessibleBy: [
+					'user',
+				],
+			},
+		},
+		default: true,
+		description: 'Whether identify the user by email or ID.',
+	},
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+				accessibleBy: [
+					'user',
+				],
+				useEmail: [
+					true,
+				],
+			},
+		},
+		default: '',
+		description: `The user's email address to share the folder with.`,
+	},
+	{
+		displayName: 'User ID',
+		name: 'userId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+				accessibleBy: [
+					'user',
+				],
+				useEmail: [
+					false,
+				],
+			},
+		},
+		default: '',
+		description: `The user's ID to share the folder with.`,
+	},
+	{
+		displayName: 'Group ID',
+		name: 'groupId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+				accessibleBy: [
+					'group',
+				],
+			},
+		},
+		default: '',
+		description: `The group's ID to share the folder with.`,
+	},
+	{
+		displayName: 'Role',
+		name: 'role',
+		type: 'options',
+		options: [
+			{
+				name: 'Co-Owner',
+				value: 'coOwner',
+				description: 'A Co-owner has all of functional read/write access that an editor does',
+			},
+			{
+				name: 'Editor',
+				value: 'editor',
+				description: 'An editor has full read/write access to a folder or file',
+			},
+			{
+				name: 'Previewer',
+				value: 'previewer',
+				description: 'A previewer has limited read access',
+			},
+			{
+				name: 'Previewer Uploader',
+				value: 'previewerUploader',
+				description: 'This access level is a combination of Previewer and Uploader',
+			},
+			{
+				name: 'Uploader',
+				value: 'uploader',
+				description: 'An uploader has limited write access',
+			},
+			{
+				name: 'Viewer',
+				value: 'viewer',
+				description: 'A viewer has read access to a folder or file',
+			},
+			{
+				name: 'Viewer Uploader',
+				value: 'viewerUploader',
+				description: 'This access level is a combination of Viewer and Uploader',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+			},
+		},
+		default: 'editor',
+		description: 'The level of access granted.',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		displayOptions: {
+			show: {
+				operation: [
+					'share',
+				],
+				resource: [
+					'folder',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Can View Path',
+				name: 'can_view_path',
+				type: 'boolean',
+				default: false,
+				description: `Whether the invited users can see the entire parent path to the associated folder.</br>
+				The user will not gain privileges in any parent folder and therefore cannot see content the user is not collaborated on.`,
+			},
+			{
+				displayName: 'Expires At',
+				name: 'expires_at',
+				type: 'dateTime',
+				default: '',
+				description: 'Set the expiration date for the collaboration. At this date, the collaboration will be automatically removed from the item.',
+			},
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'string',
+				default: '',
+				description: 'A comma-separated list of attributes to include in the response. This can be used to request fields that are not normally returned in a standard response.',
+			},
+			{
+				displayName: 'Notify',
+				name: 'notify',
+				type: 'boolean',
+				default: false,
+				description: 'Whether if users should receive email notification for the action performed.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 folder:update                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Folder ID',
+		name: 'folderId',
+		required: true,
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'folder',
+				],
+			},
+		},
+		default: '',
+		description: 'Folder ID',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+				resource: [
+					'folder',
+				],
+			},
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: [
+			{
+				displayName: 'Can Non-Owners Invite',
+				name: 'can_non_owners_invite',
+				type: 'boolean',
+				default: false,
+				description: 'Specifies if users who are not the owner of the folder can invite new collaborators to the folder.',
+			},
+			{
+				displayName: 'Can Non-Owners View Colaborators',
+				name: 'can_non_owners_view_collaborators',
+				type: 'boolean',
+				default: false,
+				description: 'Restricts collaborators who are not the owner of this folder from viewing other collaborations on this folder.',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'The optional description of this folder.',
+			},
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				type: 'string',
+				default: '',
+				description: 'A comma-separated list of attributes to include in the response. This can be used to request fields that are not normally returned in a standard response.',
+			},
+			{
+				displayName: 'Is Collaboration Restricted To Enterprise',
+				name: 'is_collaboration_restricted_to_enterprise',
+				type: 'boolean',
+				default: false,
+				description: 'Specifies if new invites to this folder are restricted to users within the enterprise. This does not affect existing collaborations.',
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				description: 'The optional new name for this folder.',
+			},
+			{
+				displayName: 'Parent ID',
+				name: 'parentId',
+				type: 'string',
+				default: '',
+				description: 'The parent folder for this folder. Use this to move the folder or to restore it out of the trash.',
+			},
+			{
+				displayName: 'Shared Link',
+				name: 'shared_link',
+				type: 'collection',
+				typeOptions: {
+					multipleValues: false,
+				},
+				description: 'Share link information.',
+				placeholder: 'Add Shared Link Config',
+				default: {},
+				options: [
+					{
+						displayName: 'Access',
+						name: 'access',
+						type: 'options',
+						options: [
+							{
+								name: 'Collaborators',
+								value: 'collaborators',
+								description: 'Only those who have been invited to the folder',
+							},
+							{
+								name: 'Company',
+								value: 'company',
+								description: 'only people within the company',
+							},
+							{
+								name: 'Open',
+								value: 'open',
+								description: 'Anyone with the link',
+							},
+						],
+						default: 'open',
+					},
+					{
+						displayName: 'Password',
+						name: 'password',
+						type: 'string',
+						displayOptions: {
+							show: {
+								access: [
+									'open',
+								],
+							},
+						},
+						default: '',
+						description: 'The password required to access the shared link. Set the password to null to remove it.',
+					},
+					{
+						displayName: 'Permissions',
+						name: 'permissions',
+						type: 'collection',
+						placeholder: 'Add Permition',
+						default: {},
+						options: [
+							{
+								displayName: 'Can Download',
+								name: 'can_download',
+								type: 'boolean',
+								default: false,
+								description: 'If the shared link allows for downloading of files.',
+							},
+							{
+								displayName: 'Unshared At',
+								name: 'unshared_at',
+								type: 'dateTime',
+								default: '',
+								description: 'The timestamp at which this shared link will expire.',
+							},
+							{
+								displayName: 'Vanity Name',
+								name: 'vanity_name',
+								type: 'string',
+								default: '',
+								description: 'Defines a custom vanity name to use in the shared link URL, for example https://app.box.com/v/my-shared-link.',
+							},
+						],
+					},
+					{
+						displayName: 'Tags',
+						name: 'tags',
+						type: 'string',
+						default: '',
+						description: 'The tags for this item. These tags are shown in the Box web app and mobile apps next to an item.',
+					},
+				],
+			},
+		],
+	},
 ] as INodeProperties[];

From 05921de99ae3971e497297f83c20946d4ab8cbde Mon Sep 17 00:00:00 2001
From: Ahsan Virani <ahsan.virani@gmail.com>
Date: Sat, 3 Jul 2021 11:14:11 +0200
Subject: [PATCH 15/74] :bug: Fix bug on n8n Training Customer Datastore Node
 (#1964)

---
 packages/nodes-base/nodes/N8nTrainingCustomerDatastore.node.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore.node.ts b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore.node.ts
index 0ccc9042c3..99705a7245 100644
--- a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore.node.ts
+++ b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore.node.ts
@@ -147,7 +147,7 @@ export class N8nTrainingCustomerDatastore implements INodeType {
 					responseData = data;
 				} else {
 					const limit = this.getNodeParameter('limit', i) as number;
-					responseData = data.splice(0, limit);
+					responseData = data.slice(0, limit);
 				}
 			}
 

From 6d8ea4bff5d474b3e72cc13b4c318f3d4844cb44 Mon Sep 17 00:00:00 2001
From: Kaito Udagawa <umireon@gmail.com>
Date: Sat, 3 Jul 2021 19:46:30 +0900
Subject: [PATCH 16/74] :bug: Fix Google Sheet to handle 0 correctly  (#1937)

* :bug: Fix Google Sheet to handle 0 correctly

`if (condition) { statement }` will not be executed if the `condition` is `0` (number) so that appending 0 to Google Sheets results in an empty cell.
Checking if the value is `null` or `undefined` is enough to guarantee that `toString` is callable.

* :bug: Add semicolon
---
 packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
index aca82ddea2..28d35d5afe 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheet.ts
@@ -486,8 +486,9 @@ export class GoogleSheet {
 		inputData.forEach((item) => {
 			rowData = [];
 			keyColumnOrder.forEach((key) => {
-				if (item.hasOwnProperty(key) && item[key]) {
-					rowData.push(item[key]!.toString());
+				const data = item[key];
+				if (item.hasOwnProperty(key) && data !== null && typeof data !== 'undefined') {
+					rowData.push(data.toString());
 				} else {
 					rowData.push('');
 				}

From 849c8ad2b733066622660fbcf3b5e8dc129d1ca7 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Sat, 3 Jul 2021 08:07:48 -0400
Subject: [PATCH 17/74] :zap: Send operations in bulk to Airtable (#1945)

* Add bulk operation to Airtable Node

* :zap: Small improvements to #1942

* :zap: Resolve lint issues

* :zap: Make by default bulk updates and fix issue with update

Co-authored-by: Michael Chen <michaelchen@live.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../nodes/Airtable/Airtable.node.ts           | 139 +++++++++++++-----
 1 file changed, 100 insertions(+), 39 deletions(-)

diff --git a/packages/nodes-base/nodes/Airtable/Airtable.node.ts b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
index 36c2846618..6f9c8fe506 100644
--- a/packages/nodes-base/nodes/Airtable/Airtable.node.ts
+++ b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
@@ -390,7 +390,7 @@ export class Airtable implements INodeType {
 			},
 
 			// ----------------------------------
-			//         append + update
+			//         append + delete + update
 			// ----------------------------------
 			{
 				displayName: 'Options',
@@ -401,12 +401,24 @@ export class Airtable implements INodeType {
 					show: {
 						operation: [
 							'append',
+							'delete',
 							'update',
 						],
 					},
 				},
 				default: {},
 				options: [
+					{
+						displayName: 'Bulk Size',
+						name: 'bulkSize',
+						type: 'number',
+						typeOptions: {
+							minValue: 1,
+							maxValue: 10,
+						},
+						default: 10,
+						description: `Number of records to process at once.`,
+					},
 					{
 						displayName: 'Ignore Fields',
 						name: 'ignoreFields',
@@ -428,6 +440,14 @@ export class Airtable implements INodeType {
 						displayName: 'Typecast',
 						name: 'typecast',
 						type: 'boolean',
+						displayOptions: {
+							show: {
+								'/operation': [
+									'append',
+									'update',
+								],
+							},
+						},
 						default: false,
 						description: 'If the Airtable API should attempt mapping of string values for linked records & select options.',
 					},
@@ -465,54 +485,81 @@ export class Airtable implements INodeType {
 			let fields: string[];
 			let options: IDataObject;
 
+			const rows: IDataObject[] = [];
+			let bulkSize = 10;
+
 			for (let i = 0; i < items.length; i++) {
 				addAllFields = this.getNodeParameter('addAllFields', i) as boolean;
 				options = this.getNodeParameter('options', i, {}) as IDataObject;
+				bulkSize = options.bulkSize as number || bulkSize;
+
+				const row: IDataObject = {};
 
 				if (addAllFields === true) {
 					// Add all the fields the item has
-					body.fields = items[i].json;
+					row.fields = { ...items[i].json };
+					// tslint:disable-next-line: no-any
+					delete (row.fields! as any).id;
 				} else {
 					// Add only the specified fields
-					body.fields = {} as IDataObject;
+					row.fields = {} as IDataObject;
 
 					fields = this.getNodeParameter('fields', i, []) as string[];
 
 					for (const fieldName of fields) {
 						// @ts-ignore
-						body.fields[fieldName] = items[i].json[fieldName];
+						row.fields[fieldName] = items[i].json[fieldName];
 					}
 				}
 
-				if (options.typecast === true) {
-					body['typecast'] = true;
+				rows.push(row);
+
+				if (rows.length === bulkSize || i === items.length - 1) {
+					if (options.typecast === true) {
+						body['typecast'] = true;
+					}
+
+					body['records'] = rows;
+
+					responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
+
+					returnData.push(...responseData.records);
+					// empty rows
+					rows.length = 0;
 				}
-
-				responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-
-				returnData.push(responseData);
 			}
 
 		} else if (operation === 'delete') {
 			requestMethod = 'DELETE';
 
-			let id: string;
+			const rows: string[] = [];
+			const options = this.getNodeParameter('options', 0, {}) as IDataObject;
+			const bulkSize = options.bulkSize as number || 10;
+
 			for (let i = 0; i < items.length; i++) {
+				let id: string;
+
 				id = this.getNodeParameter('id', i) as string;
 
-				endpoint = `${application}/${table}`;
+				rows.push(id);
 
-				// Make one request after another. This is slower but makes
-				// sure that we do not run into the rate limit they have in
-				// place and so block for 30 seconds. Later some global
-				// functionality in core should make it easy to make requests
-				// according to specific rules like not more than 5 requests
-				// per seconds.
-				qs.records = [id];
+				if (rows.length === bulkSize || i === items.length - 1) {
+					endpoint = `${application}/${table}`;
 
-				responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
+					// Make one request after another. This is slower but makes
+					// sure that we do not run into the rate limit they have in
+					// place and so block for 30 seconds. Later some global
+					// functionality in core should make it easy to make requests
+					// according to specific rules like not more than 5 requests
+					// per seconds.
+					qs.records = rows;
 
-				returnData.push(...responseData.records);
+					responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
+
+					returnData.push(...responseData.records);
+					// empty rows
+					rows.length = 0;
+				}
 			}
 
 		} else if (operation === 'list') {
@@ -585,55 +632,69 @@ export class Airtable implements INodeType {
 
 			requestMethod = 'PATCH';
 
-			let id: string;
 			let updateAllFields: boolean;
 			let fields: string[];
 			let options: IDataObject;
+
+			const rows: IDataObject[] = [];
+			let bulkSize = 10;
+
 			for (let i = 0; i < items.length; i++) {
 				updateAllFields = this.getNodeParameter('updateAllFields', i) as boolean;
 				options = this.getNodeParameter('options', i, {}) as IDataObject;
+				bulkSize = options.bulkSize as number || bulkSize;
+
+				const row: IDataObject = {};
+				row.fields = {} as IDataObject;
 
 				if (updateAllFields === true) {
 					// Update all the fields the item has
-					body.fields = items[i].json;
+					row.fields = { ...items[i].json };
+					// remove id field
+					// tslint:disable-next-line: no-any
+					delete (row.fields! as any).id;
 
 					if (options.ignoreFields && options.ignoreFields !== '') {
 						const ignoreFields = (options.ignoreFields as string).split(',').map(field => field.trim()).filter(field => !!field);
 						if (ignoreFields.length) {
 							// From: https://stackoverflow.com/questions/17781472/how-to-get-a-subset-of-a-javascript-objects-properties
-							body.fields = Object.entries(items[i].json)
+							row.fields = Object.entries(items[i].json)
 								.filter(([key]) => !ignoreFields.includes(key))
 								.reduce((obj, [key, val]) => Object.assign(obj, { [key]: val }), {});
 						}
 					}
 				} else {
-					// Update only the specified fields
-					body.fields = {} as IDataObject;
-
 					fields = this.getNodeParameter('fields', i, []) as string[];
 
 					for (const fieldName of fields) {
 						// @ts-ignore
-						body.fields[fieldName] = items[i].json[fieldName];
+						row.fields[fieldName] = items[i].json[fieldName];
 					}
 				}
 
-				id = this.getNodeParameter('id', i) as string;
+				row.id = this.getNodeParameter('id', i) as string;
 
-				endpoint = `${application}/${table}`;
+				rows.push(row);
 
-				// Make one request after another. This is slower but makes
-				// sure that we do not run into the rate limit they have in
-				// place and so block for 30 seconds. Later some global
-				// functionality in core should make it easy to make requests
-				// according to specific rules like not more than 5 requests
-				// per seconds.
+				if (rows.length === bulkSize || i === items.length - 1) {
+					endpoint = `${application}/${table}`;
 
-				const data = { records: [{ id, fields: body.fields }], typecast: (options.typecast) ? true : false };
+					// Make one request after another. This is slower but makes
+					// sure that we do not run into the rate limit they have in
+					// place and so block for 30 seconds. Later some global
+					// functionality in core should make it easy to make requests
+					// according to specific rules like not more than 5 requests
+					// per seconds.
 
-				responseData = await apiRequest.call(this, requestMethod, endpoint, data, qs);
+					const data = { records: rows, typecast: (options.typecast) ? true : false };
 
-				returnData.push(...responseData.records);
+					responseData = await apiRequest.call(this, requestMethod, endpoint, data, qs);
+
+					returnData.push(...responseData.records);
+
+					// empty rows
+					rows.length = 0;
+				}
 			}
 
 		} else {

From 2e40a0e64efd285a314c8c056eb9e0e09e6c3606 Mon Sep 17 00:00:00 2001
From: Snyk bot <snyk-bot@snyk.io>
Date: Sat, 3 Jul 2021 15:19:57 +0300
Subject: [PATCH 18/74] :arrow_up: Set fflate@0.7.0 on n8n-nodes-base

Snyk has created this PR to upgrade fflate from 0.6.10 to 0.7.0.

See this package in npm:
https://www.npmjs.com/package/fflate

See this project in Snyk:
https://app.snyk.io/org/janober/project/a08454f4-33a1-49bc-bb2a-f31792e94f42?utm_source=github&utm_medium=upgrade-pr
---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 5be403bb31..7a2c4ca1ea 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -627,7 +627,7 @@
     "cheerio": "1.0.0-rc.6",
     "cron": "^1.7.2",
     "eventsource": "^1.0.7",
-    "fflate": "^0.6.9",
+    "fflate": "^0.7.0",
     "formidable": "^1.2.1",
     "get-system-fonts": "^2.0.2",
     "glob-promise": "^3.4.0",

From b49202687da0d33052008ebe6cd7f1135dc76d1f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 3 Jul 2021 14:30:02 +0200
Subject: [PATCH 19/74] :sparkles: Add support to display binary video content

---
 packages/editor-ui/src/components/BinaryDataDisplay.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/editor-ui/src/components/BinaryDataDisplay.vue b/packages/editor-ui/src/components/BinaryDataDisplay.vue
index c6ab2aa748..3a737c1f0f 100644
--- a/packages/editor-ui/src/components/BinaryDataDisplay.vue
+++ b/packages/editor-ui/src/components/BinaryDataDisplay.vue
@@ -14,6 +14,10 @@
 			<div v-if="!binaryData">
 				Data to display did not get found
 			</div>
+			<video v-else-if="binaryData.mimeType && binaryData.mimeType.startsWith('video/')" controls autoplay>
+				<source :src="'data:' + binaryData.mimeType + ';base64,' + binaryData.data" :type="binaryData.mimeType">
+				Your browser does not support the video element. Kindly update it to latest version.
+			</video>
 			<embed v-else :src="'data:' + binaryData.mimeType + ';base64,' + binaryData.data" class="binary-data" :class="embedClass"/>
 		</div>
 

From 276eaea4bfb50cacfd350bb8e8be478596f345c1 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Sat, 3 Jul 2021 14:40:16 +0200
Subject: [PATCH 20/74] :zap: Clean up node description (#1883)

Co-authored-by: Jan <janober@users.noreply.github.com>
---
 packages/nodes-base/nodes/Box/BoxTrigger.node.ts                | 2 +-
 packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts      | 2 +-
 packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts    | 2 +-
 packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts      | 2 +-
 packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts         | 2 +-
 packages/nodes-base/nodes/CrateDb/CrateDb.node.ts               | 2 +-
 packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts  | 2 +-
 packages/nodes-base/nodes/Discourse/Discourse.node.ts           | 2 +-
 packages/nodes-base/nodes/EmailReadImap.node.ts                 | 2 +-
 packages/nodes-base/nodes/ExecuteCommand.node.ts                | 2 +-
 packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts      | 2 +-
 packages/nodes-base/nodes/FileMaker/FileMaker.node.ts           | 2 +-
 packages/nodes-base/nodes/Ftp.node.ts                           | 2 +-
 packages/nodes-base/nodes/Function.node.ts                      | 2 +-
 packages/nodes-base/nodes/FunctionItem.node.ts                  | 2 +-
 packages/nodes-base/nodes/GetResponse/GetResponse.node.ts       | 2 +-
 .../nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts     | 2 +-
 packages/nodes-base/nodes/Ghost/Ghost.node.ts                   | 2 +-
 packages/nodes-base/nodes/Github/Github.node.ts                 | 2 +-
 packages/nodes-base/nodes/Github/GithubTrigger.node.ts          | 2 +-
 packages/nodes-base/nodes/Gitlab/Gitlab.node.ts                 | 2 +-
 packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts          | 2 +-
 .../nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts     | 2 +-
 .../nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts     | 2 +-
 .../nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts     | 2 +-
 .../nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts    | 2 +-
 packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts       | 2 +-
 packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts        | 2 +-
 packages/nodes-base/nodes/Gotify/Gotify.node.ts                 | 2 +-
 packages/nodes-base/nodes/HelpScout/HelpScout.node.ts           | 2 +-
 packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts    | 2 +-
 packages/nodes-base/nodes/HttpRequest.node.ts                   | 2 +-
 packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts        | 2 +-
 packages/nodes-base/nodes/If.node.ts                            | 2 +-
 packages/nodes-base/nodes/Intercom/Intercom.node.ts             | 2 +-
 .../nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts   | 2 +-
 packages/nodes-base/nodes/Iterable/Iterable.node.ts             | 2 +-
 packages/nodes-base/nodes/Jira/JiraTrigger.node.ts              | 2 +-
 packages/nodes-base/nodes/Keap/Keap.node.ts                     | 2 +-
 packages/nodes-base/nodes/Keap/KeapTrigger.node.ts              | 2 +-
 packages/nodes-base/nodes/Line/Line.node.ts                     | 2 +-
 packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts             | 2 +-
 packages/nodes-base/nodes/MailerLite/MailerLite.node.ts         | 2 +-
 packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts  | 2 +-
 packages/nodes-base/nodes/Mailgun/Mailgun.node.ts               | 2 +-
 packages/nodes-base/nodes/Mandrill/Mandrill.node.ts             | 2 +-
 packages/nodes-base/nodes/Merge.node.ts                         | 2 +-
 packages/nodes-base/nodes/MessageBird/MessageBird.node.ts       | 2 +-
 .../nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts     | 2 +-
 .../nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts          | 2 +-
 packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts    | 2 +-
 packages/nodes-base/nodes/Mindee/Mindee.node.ts                 | 2 +-
 packages/nodes-base/nodes/Mocean/Mocean.node.ts                 | 2 +-
 packages/nodes-base/nodes/MongoDb/mongo.node.options.ts         | 2 +-
 packages/nodes-base/nodes/MoveBinaryData.node.ts                | 2 +-
 packages/nodes-base/nodes/Msg91/Msg91.node.ts                   | 2 +-
 packages/nodes-base/nodes/MySql/MySql.node.ts                   | 2 +-
 packages/nodes-base/nodes/Nasa/Nasa.node.ts                     | 2 +-
 packages/nodes-base/nodes/OpenWeatherMap.node.ts                | 2 +-
 packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts   | 2 +-
 packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts         | 2 +-
 packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts    | 2 +-
 packages/nodes-base/nodes/PostHog/PostHog.node.ts               | 2 +-
 packages/nodes-base/nodes/Postgres/Postgres.node.ts             | 2 +-
 packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts      | 2 +-
 packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts         | 2 +-
 packages/nodes-base/nodes/Pushcut/Pushcut.node.ts               | 2 +-
 packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts        | 2 +-
 packages/nodes-base/nodes/Pushover/Pushover.node.ts             | 2 +-
 packages/nodes-base/nodes/QuestDb/QuestDb.node.ts               | 2 +-
 packages/nodes-base/nodes/QuickBase/QuickBase.node.ts           | 2 +-
 packages/nodes-base/nodes/Redis/Redis.node.ts                   | 2 +-
 packages/nodes-base/nodes/RenameKeys.node.ts                    | 2 +-
 packages/nodes-base/nodes/Sendy/Sendy.node.ts                   | 2 +-
 packages/nodes-base/nodes/Set.node.ts                           | 2 +-
 packages/nodes-base/nodes/Signl4/Signl4.node.ts                 | 2 +-
 packages/nodes-base/nodes/Snowflake/Snowflake.node.ts           | 2 +-
 packages/nodes-base/nodes/SplitInBatches.node.ts                | 2 +-
 packages/nodes-base/nodes/Spotify/Spotify.node.ts               | 2 +-
 packages/nodes-base/nodes/SpreadsheetFile.node.ts               | 2 +-
 packages/nodes-base/nodes/SseTrigger.node.ts                    | 2 +-
 packages/nodes-base/nodes/Stackby/Stackby.node.ts               | 2 +-
 packages/nodes-base/nodes/Strapi/Strapi.node.ts                 | 2 +-
 packages/nodes-base/nodes/Strava/Strava.node.ts                 | 2 +-
 packages/nodes-base/nodes/Strava/StravaTrigger.node.ts          | 2 +-
 .../nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts   | 2 +-
 packages/nodes-base/nodes/Switch.node.ts                        | 2 +-
 packages/nodes-base/nodes/Telegram/Telegram.node.ts             | 2 +-
 packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts      | 2 +-
 packages/nodes-base/nodes/TheHive/TheHive.node.ts               | 2 +-
 packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts        | 2 +-
 packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts          | 2 +-
 packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts      | 2 +-
 packages/nodes-base/nodes/Webhook.node.ts                       | 2 +-
 packages/nodes-base/nodes/Wekan/Wekan.node.ts                   | 2 +-
 packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts                  | 2 +-
 96 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/packages/nodes-base/nodes/Box/BoxTrigger.node.ts b/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
index 534f11a993..ffd2a4ee34 100644
--- a/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
+++ b/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
@@ -21,7 +21,7 @@ export class BoxTrigger implements INodeType {
 		icon: 'file:box.png',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when a Box events occurs.',
+		description: 'Starts the workflow when Box events occur',
 		defaults: {
 			name: 'Box Trigger',
 			color: '#00aeef',
diff --git a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
index 227f1e2cef..0a33857d5e 100644
--- a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
@@ -20,7 +20,7 @@ export class CalendlyTrigger implements INodeType {
 		icon: 'file:calendly.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when Calendly events occur.',
+		description: 'Starts the workflow when Calendly events occur',
 		defaults: {
 			name: 'Calendly Trigger',
 			color: '#374252',
diff --git a/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts b/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts
index 2c0f7fafcd..fb7fcdf035 100644
--- a/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts
+++ b/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts
@@ -17,7 +17,7 @@ export class ChargebeeTrigger implements INodeType {
 		icon: 'file:chargebee.png',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when Chargebee events occur.',
+		description: 'Starts the workflow when Chargebee events occur',
 		defaults: {
 			name: 'Chargebee Trigger',
 			color: '#559922',
diff --git a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
index 5558862ba7..047a1b5ef0 100644
--- a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
@@ -26,7 +26,7 @@ export class ClockifyTrigger implements INodeType {
 		name: 'clockifyTrigger',
 		group: [ 'trigger' ],
 		version: 1,
-		description: 'Watches Clockify For Events',
+		description: 'Listens to Clockify events',
 		defaults: {
 			name: 'Clockify Trigger',
 			color: '#000000',
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
index 806d2d942e..2d7ed96c52 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
@@ -48,7 +48,7 @@ export class ConvertKit implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume ConvertKit API.',
+		description: 'Consume ConvertKit API',
 		defaults: {
 			name: 'ConvertKit',
 			color: '#fb6970',
diff --git a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
index 4dc1130b52..659001eec1 100644
--- a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
+++ b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
@@ -25,7 +25,7 @@ export class CrateDb implements INodeType {
 		icon: 'file:cratedb.png',
 		group: ['input'],
 		version: 1,
-		description: 'Add and update data in CrateDB.',
+		description: 'Add and update data in CrateDB',
 		defaults: {
 			name: 'CrateDB',
 			color: '#47889f',
diff --git a/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts b/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
index b39a48333b..e0de9a5df8 100644
--- a/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
+++ b/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
@@ -31,7 +31,7 @@ export class CustomerIoTrigger implements INodeType {
 		group: ['trigger'],
 		icon: 'file:customerio.svg',
 		version: 1,
-		description: 'Starts the workflow on a Customer.io update. (Beta)',
+		description: 'Starts the workflow on a Customer.io update (Beta)',
 		defaults: {
 			name: 'Customer.io Trigger',
 			color: '#ffcd00',
diff --git a/packages/nodes-base/nodes/Discourse/Discourse.node.ts b/packages/nodes-base/nodes/Discourse/Discourse.node.ts
index 78f68374f5..7110e0759b 100644
--- a/packages/nodes-base/nodes/Discourse/Discourse.node.ts
+++ b/packages/nodes-base/nodes/Discourse/Discourse.node.ts
@@ -55,7 +55,7 @@ export class Discourse implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Discourse API.',
+		description: 'Consume Discourse API',
 		defaults: {
 			name: 'Discourse',
 			color: '#000000',
diff --git a/packages/nodes-base/nodes/EmailReadImap.node.ts b/packages/nodes-base/nodes/EmailReadImap.node.ts
index fb90534a7c..1a046287b1 100644
--- a/packages/nodes-base/nodes/EmailReadImap.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap.node.ts
@@ -35,7 +35,7 @@ export class EmailReadImap implements INodeType {
 		icon: 'fa:inbox',
 		group: ['trigger'],
 		version: 1,
-		description: 'Triggers the workflow when a new email gets received',
+		description: 'Triggers the workflow when a new email is received',
 		defaults: {
 			name: 'IMAP Email',
 			color: '#44AA22',
diff --git a/packages/nodes-base/nodes/ExecuteCommand.node.ts b/packages/nodes-base/nodes/ExecuteCommand.node.ts
index 55494ce9f2..acf72d9dc7 100644
--- a/packages/nodes-base/nodes/ExecuteCommand.node.ts
+++ b/packages/nodes-base/nodes/ExecuteCommand.node.ts
@@ -51,7 +51,7 @@ export class ExecuteCommand implements INodeType {
 		icon: 'fa:terminal',
 		group: ['transform'],
 		version: 1,
-		description: 'Executes a command on the host.',
+		description: 'Executes a command on the host',
 		defaults: {
 			name: 'Execute Command',
 			color: '#886644',
diff --git a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
index 2f68521790..738134a81e 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
@@ -33,7 +33,7 @@ export class FacebookTrigger implements INodeType {
 		group: ['trigger'],
 		version: 1,
 		subtitle: '={{$parameter["appId"] +"/"+ $parameter["object"]}}',
-		description: 'Starts the workflow when a Facebook events occurs.',
+		description: 'Starts the workflow when Facebook events occur',
 		defaults: {
 			name: 'Facebook Trigger',
 			color: '#3B5998',
diff --git a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
index 402ff35f9d..8ddd3c2bc0 100644
--- a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
+++ b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
@@ -30,7 +30,7 @@ export class FileMaker implements INodeType {
 		icon: 'file:filemaker.png',
 		group: ['input'],
 		version: 1,
-		description: 'Retrieve data from FileMaker data API.',
+		description: 'Retrieve data from the FileMaker data API',
 		defaults: {
 			name: 'FileMaker',
 			color: '#665533',
diff --git a/packages/nodes-base/nodes/Ftp.node.ts b/packages/nodes-base/nodes/Ftp.node.ts
index ef254b055d..27f20a079e 100644
--- a/packages/nodes-base/nodes/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp.node.ts
@@ -45,7 +45,7 @@ export class Ftp implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["protocol"] + ": " + $parameter["operation"]}}',
-		description: 'Transfers files via FTP or SFTP.',
+		description: 'Transfers files via FTP or SFTP',
 		defaults: {
 			name: 'FTP',
 			color: '#303050',
diff --git a/packages/nodes-base/nodes/Function.node.ts b/packages/nodes-base/nodes/Function.node.ts
index 3058468dae..6fcb75a244 100644
--- a/packages/nodes-base/nodes/Function.node.ts
+++ b/packages/nodes-base/nodes/Function.node.ts
@@ -15,7 +15,7 @@ export class Function implements INodeType {
 		icon: 'fa:code',
 		group: ['transform'],
 		version: 1,
-		description: 'Run custom function code which gets executed once and allows to add, remove, change and replace items.',
+		description: 'Run custom function code which gets executed once and allows you to add, remove, change and replace items',
 		defaults: {
 			name: 'Function',
 			color: '#FF9922',
diff --git a/packages/nodes-base/nodes/FunctionItem.node.ts b/packages/nodes-base/nodes/FunctionItem.node.ts
index 88142fa530..64cb55be2f 100644
--- a/packages/nodes-base/nodes/FunctionItem.node.ts
+++ b/packages/nodes-base/nodes/FunctionItem.node.ts
@@ -17,7 +17,7 @@ export class FunctionItem implements INodeType {
 		icon: 'fa:code',
 		group: ['transform'],
 		version: 1,
-		description: 'Run custom function code which gets executed once per item.',
+		description: 'Run custom function code which gets executed once per item',
 		defaults: {
 			name: 'FunctionItem',
 			color: '#ddbb33',
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts b/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
index 09e772e1ac..0cdbc66ef5 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
+++ b/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
@@ -31,7 +31,7 @@ export class GetResponse implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume GetResponse API.',
+		description: 'Consume GetResponse API',
 		defaults: {
 			name: 'GetResponse',
 			color: '#00afec',
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
index c1bd9cbbf7..911f82f94d 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
+++ b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
@@ -26,7 +26,7 @@ export class GetResponseTrigger implements INodeType {
 		icon: 'file:getResponse.png',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when GetResponse events occur.',
+		description: 'Starts the workflow when GetResponse events occur',
 		defaults: {
 			name: 'GetResponse Trigger',
 			color: '#00afec',
diff --git a/packages/nodes-base/nodes/Ghost/Ghost.node.ts b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
index 241ae39ec9..0e52947639 100644
--- a/packages/nodes-base/nodes/Ghost/Ghost.node.ts
+++ b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
@@ -33,7 +33,7 @@ export class Ghost implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Ghost API.',
+		description: 'Consume Ghost API',
 		defaults: {
 			name: 'Ghost',
 			color: '#15212a',
diff --git a/packages/nodes-base/nodes/Github/Github.node.ts b/packages/nodes-base/nodes/Github/Github.node.ts
index c1b27ffa02..d39fa72b5f 100644
--- a/packages/nodes-base/nodes/Github/Github.node.ts
+++ b/packages/nodes-base/nodes/Github/Github.node.ts
@@ -28,7 +28,7 @@ export class Github implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume GitHub API.',
+		description: 'Consume GitHub API',
 		defaults: {
 			name: 'GitHub',
 			color: '#000000',
diff --git a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
index 64a5b6faf0..039173cb3f 100644
--- a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
+++ b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
@@ -25,7 +25,7 @@ export class GithubTrigger implements INodeType {
 		group: ['trigger'],
 		version: 1,
 		subtitle: '={{$parameter["owner"] + "/" + $parameter["repository"] + ": " + $parameter["events"].join(", ")}}',
-		description: 'Starts the workflow when a Github events occurs.',
+		description: 'Starts the workflow when Github events occur',
 		defaults: {
 			name: 'Github Trigger',
 			color: '#000000',
diff --git a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
index 4b0f10d9fe..fc2a175430 100644
--- a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
@@ -23,7 +23,7 @@ export class Gitlab implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Retrieve data from GitLab API.',
+		description: 'Retrieve data from GitLab API',
 		defaults: {
 			name: 'Gitlab',
 			color: '#FC6D27',
diff --git a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
index 9098d987b7..3fda35e8ef 100644
--- a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
@@ -24,7 +24,7 @@ export class GitlabTrigger implements INodeType {
 		group: ['trigger'],
 		version: 1,
 		subtitle: '={{$parameter["owner"] + "/" + $parameter["repository"] + ": " + $parameter["events"].join(", ")}}',
-		description: 'Starts the workflow when a GitLab event occurs.',
+		description: 'Starts the workflow when GitLab events occur',
 		defaults: {
 			name: 'Gitlab Trigger',
 			color: '#FC6D27',
diff --git a/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts b/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
index 77423a3301..fef36f86f1 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
@@ -32,7 +32,7 @@ export class GoogleBigQuery implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Google BigQuery API.',
+		description: 'Consume Google BigQuery API',
 		defaults: {
 			name: 'Google BigQuery',
 			color: '#3E87E4',
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
index 5c2d4a4d76..6cf7e674df 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
@@ -44,7 +44,7 @@ export class GoogleCalendar implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Google Calendar API.',
+		description: 'Consume Google Calendar API',
 		defaults: {
 			name: 'Google Calendar',
 			color: '#3E87E4',
diff --git a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
index 0caa44bf7a..e777e943ef 100644
--- a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
@@ -33,7 +33,7 @@ export class GoogleContacts implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Google Contacts API.',
+		description: 'Consume Google Contacts API',
 		defaults: {
 			name: 'Google Contacts',
 			color: '#1a73e8',
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
index 3e0f7a31f3..e594b4656e 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
@@ -24,7 +24,7 @@
 // 		group: ['trigger'],
 // 		version: 1,
 // 		subtitle: '={{$parameter["owner"] + "/" + $parameter["repository"] + ": " + $parameter["events"].join(", ")}}',
-// 		description: 'Starts the workflow when a file on Google Drive got changed.',
+// 		description: 'Starts the workflow when a file on Google Drive is changed',
 // 		defaults: {
 // 			name: 'Google Drive Trigger',
 // 			color: '#3f87f2',
diff --git a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
index ae711478c7..29c945d9db 100644
--- a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
+++ b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
@@ -29,7 +29,7 @@ export class GoogleTasks implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Google Tasks API.',
+		description: 'Consume Google Tasks API',
 		defaults: {
 			name: 'Google Tasks',
 			color: '#3E87E4',
diff --git a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
index 9179277488..016634aaa5 100644
--- a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
@@ -55,7 +55,7 @@ export class YouTube implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume YouTube API.',
+		description: 'Consume YouTube API',
 		defaults: {
 			name: 'YouTube',
 			color: '#FF0000',
diff --git a/packages/nodes-base/nodes/Gotify/Gotify.node.ts b/packages/nodes-base/nodes/Gotify/Gotify.node.ts
index 1c6179efc6..03e3eec7e2 100644
--- a/packages/nodes-base/nodes/Gotify/Gotify.node.ts
+++ b/packages/nodes-base/nodes/Gotify/Gotify.node.ts
@@ -22,7 +22,7 @@ export class Gotify implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Gotify API.',
+		description: 'Consume Gotify API',
 		defaults: {
 			name: 'Gotify',
 			color: '#71c8ec',
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
index 73dab6fef1..b2756f1a68 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
+++ b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
@@ -64,7 +64,7 @@ export class HelpScout implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Help Scout API.',
+		description: 'Consume HelpScout API',
 		defaults: {
 			name: 'HelpScout',
 			color: '#1392ee',
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
index 8ca2d098ec..292272a120 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
+++ b/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
@@ -26,7 +26,7 @@ export class HelpScoutTrigger implements INodeType {
 		icon: 'file:helpScout.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when HelpScout events occur.',
+		description: 'Starts the workflow when HelpScout events occur',
 		defaults: {
 			name: 'HelpScout Trigger',
 			color: '#1392ee',
diff --git a/packages/nodes-base/nodes/HttpRequest.node.ts b/packages/nodes-base/nodes/HttpRequest.node.ts
index 0d9ac472c0..ae26e3dd98 100644
--- a/packages/nodes-base/nodes/HttpRequest.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest.node.ts
@@ -32,7 +32,7 @@ export class HttpRequest implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["requestMethod"] + ": " + $parameter["url"]}}',
-		description: 'Makes a HTTP request and returns the received data',
+		description: 'Makes an HTTP request and returns the response data',
 		defaults: {
 			name: 'HTTP Request',
 			color: '#2200DD',
diff --git a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
index 6281780e20..d6224f3948 100644
--- a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
@@ -37,7 +37,7 @@ export class HubspotTrigger implements INodeType {
 		icon: 'file:hubspot.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when HubSpot events occur.',
+		description: 'Starts the workflow when HubSpot events occur',
 		defaults: {
 			name: 'Hubspot Trigger',
 			color: '#ff7f64',
diff --git a/packages/nodes-base/nodes/If.node.ts b/packages/nodes-base/nodes/If.node.ts
index 278162d606..2a2a3bd0bd 100644
--- a/packages/nodes-base/nodes/If.node.ts
+++ b/packages/nodes-base/nodes/If.node.ts
@@ -16,7 +16,7 @@ export class If implements INodeType {
 		icon: 'fa:map-signs',
 		group: ['transform'],
 		version: 1,
-		description: 'Splits a stream depending on defined compare operations.',
+		description: 'Splits a stream based on comparisons',
 		defaults: {
 			name: 'IF',
 			color: '#408000',
diff --git a/packages/nodes-base/nodes/Intercom/Intercom.node.ts b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
index d1f677dbcb..ac53077900 100644
--- a/packages/nodes-base/nodes/Intercom/Intercom.node.ts
+++ b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
@@ -47,7 +47,7 @@ export class Intercom implements INodeType {
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume intercom API',
+		description: 'Consume Intercom API',
 		defaults: {
 			name: 'Intercom',
 			color: '#0575f3',
diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
index daffd871fc..1b1cce0dc9 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
@@ -20,7 +20,7 @@ export class InvoiceNinjaTrigger implements INodeType {
 		icon: 'file:invoiceNinja.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when Invoice Ninja events occur.',
+		description: 'Starts the workflow when Invoice Ninja events occur',
 		defaults: {
 			name: 'Invoice Ninja Trigger',
 			color: '#000000',
diff --git a/packages/nodes-base/nodes/Iterable/Iterable.node.ts b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
index bde2a5acf2..44356f2143 100644
--- a/packages/nodes-base/nodes/Iterable/Iterable.node.ts
+++ b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
@@ -42,7 +42,7 @@ export class Iterable implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Iterable API.',
+		description: 'Consume Iterable API',
 		defaults: {
 			name: 'Iterable',
 			color: '#725ed8',
diff --git a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
index 64ad396372..af66c852cc 100644
--- a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
+++ b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
@@ -26,7 +26,7 @@ export class JiraTrigger implements INodeType {
 		icon: 'file:jira.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when Jira events occurs.',
+		description: 'Starts the workflow when Jira events occur',
 		defaults: {
 			name: 'Jira Trigger',
 			color: '#4185f7',
diff --git a/packages/nodes-base/nodes/Keap/Keap.node.ts b/packages/nodes-base/nodes/Keap/Keap.node.ts
index 8ddcf53f13..d335af4aa1 100644
--- a/packages/nodes-base/nodes/Keap/Keap.node.ts
+++ b/packages/nodes-base/nodes/Keap/Keap.node.ts
@@ -110,7 +110,7 @@ export class Keap implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Keap API.',
+		description: 'Consume Keap API',
 		defaults: {
 			name: 'Keap',
 			color: '#79af53',
diff --git a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
index 4ea0ef21a9..4474bc2a2e 100644
--- a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
+++ b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
@@ -28,7 +28,7 @@ export class KeapTrigger implements INodeType {
 		group: ['trigger'],
 		version: 1,
 		subtitle: '={{$parameter["eventId"]}}',
-		description: 'Starts the workflow when Infusionsoft events occur.',
+		description: 'Starts the workflow when Infusionsoft events occur',
 		defaults: {
 			name: 'Keap Trigger',
 			color: '#79af53',
diff --git a/packages/nodes-base/nodes/Line/Line.node.ts b/packages/nodes-base/nodes/Line/Line.node.ts
index b4681c3ec3..57ae68b263 100644
--- a/packages/nodes-base/nodes/Line/Line.node.ts
+++ b/packages/nodes-base/nodes/Line/Line.node.ts
@@ -29,7 +29,7 @@ export class Line implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Line API.',
+		description: 'Consume Line API',
 		defaults: {
 			name: 'Line',
 			color: '#00b900',
diff --git a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
index 2f7d3e0da9..3a93c55f7d 100644
--- a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
+++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
@@ -24,7 +24,7 @@ export class LinkedIn implements INodeType {
 		icon: 'file:linkedin.png',
 		group: ['input'],
 		version: 1,
-		description: 'Consume LinkedIn Api',
+		description: 'Consume LinkedIn API',
 		defaults: {
 			name: 'LinkedIn',
 			color: '#0075b4',
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts b/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
index f45e900a38..1e383fd0b8 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
+++ b/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
@@ -29,7 +29,7 @@ export class MailerLite implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Mailer Lite API.',
+		description: 'Consume Mailer Lite API',
 		defaults: {
 			name: 'MailerLite',
 			color: '#58be72',
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
index 658e059af0..a527c74fb6 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
+++ b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
@@ -21,7 +21,7 @@ export class MailerLiteTrigger implements INodeType {
 		icon: 'file:mailerLite.png',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when a MailerLite events occurs.',
+		description: 'Starts the workflow when MailerLite events occur',
 		defaults: {
 			name: 'MailerLite Trigger',
 			color: '#58be72',
diff --git a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
index 596fed5147..b59db606d0 100644
--- a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
+++ b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
@@ -19,7 +19,7 @@ export class Mailgun implements INodeType {
 		icon: 'file:mailgun.svg',
 		group: ['output'],
 		version: 1,
-		description: 'Sends an Email via Mailgun',
+		description: 'Sends an email via Mailgun',
 		defaults: {
 			name: 'Mailgun',
 			color: '#c02428',
diff --git a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
index c29f66d0df..74a2a6fe27 100644
--- a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
+++ b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
@@ -105,7 +105,7 @@ export class Mandrill implements INodeType {
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume mandrill API',
+		description: 'Consume Mandrill API',
 		defaults: {
 			name: 'Mandrill',
 			color: '#c02428',
diff --git a/packages/nodes-base/nodes/Merge.node.ts b/packages/nodes-base/nodes/Merge.node.ts
index 7a8a0a3ac1..a6cb8ab4f7 100644
--- a/packages/nodes-base/nodes/Merge.node.ts
+++ b/packages/nodes-base/nodes/Merge.node.ts
@@ -17,7 +17,7 @@ export class Merge implements INodeType {
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["mode"]}}',
-		description: 'Merges data of multiple streams once data of both is available',
+		description: 'Merges data of multiple streams once data from both is available',
 		defaults: {
 			name: 'Merge',
 			color: '#00bbcc',
diff --git a/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts b/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
index d61b7ccb33..c6b767a6f9 100644
--- a/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
+++ b/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
@@ -22,7 +22,7 @@ export class MessageBird implements INodeType {
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Sending SMS',
+		description: 'Sends SMS via MessageBird',
 		defaults: {
 			name: 'MessageBird',
 			color: '#2481d7',
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
index 02f43789e0..22f11ec238 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
@@ -42,7 +42,7 @@ export class MicrosoftExcel implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Microsoft Excel API.',
+		description: 'Consume Microsoft Excel API',
 		defaults: {
 			name: 'Microsoft Excel',
 			color: '#1c6d40',
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
index 0574c1fe9d..65e374b343 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
@@ -36,7 +36,7 @@ export class MicrosoftOneDrive implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Microsoft OneDrive API.',
+		description: 'Consume Microsoft OneDrive API',
 		defaults: {
 			name: 'Microsoft OneDrive',
 			color: '#1d4bab',
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
index 3043600c99..db164c424b 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
@@ -38,7 +38,7 @@ export class MicrosoftSql implements INodeType {
 		icon: 'file:mssql.svg',
 		group: ['input'],
 		version: 1,
-		description: 'Gets, add and update data in Microsoft SQL.',
+		description: 'Get, add and update data in Microsoft SQL',
 		defaults: {
 			name: 'Microsoft SQL',
 			color: '#bcbcbd',
diff --git a/packages/nodes-base/nodes/Mindee/Mindee.node.ts b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
index be504e88c9..53c3046d30 100644
--- a/packages/nodes-base/nodes/Mindee/Mindee.node.ts
+++ b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
@@ -26,7 +26,7 @@ export class Mindee implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Mindee API.',
+		description: 'Consume Mindee API',
 		defaults: {
 			name: 'Mindee',
 			color: '#e94950',
diff --git a/packages/nodes-base/nodes/Mocean/Mocean.node.ts b/packages/nodes-base/nodes/Mocean/Mocean.node.ts
index 3c2e9facfd..ae2f87ba43 100644
--- a/packages/nodes-base/nodes/Mocean/Mocean.node.ts
+++ b/packages/nodes-base/nodes/Mocean/Mocean.node.ts
@@ -17,7 +17,7 @@ export class Mocean implements INodeType {
 		icon: 'file:mocean.png',
 		group: ['transform'],
 		version: 1,
-		description: 'Send SMS & voice messages via Mocean (https://moceanapi.com)',
+		description: 'Send SMS and voice messages via Mocean',
 		defaults: {
 			name: 'Mocean',
 			color: '#772244',
diff --git a/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts b/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts
index 6d863987cc..f6e9601214 100644
--- a/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts
+++ b/packages/nodes-base/nodes/MongoDb/mongo.node.options.ts
@@ -11,7 +11,7 @@ export const nodeDescription: INodeTypeDescription = {
 	icon: 'file:mongodb.svg',
 	group: ['input'],
 	version: 1,
-	description: 'Find, insert and update documents in MongoDB.',
+	description: 'Find, insert and update documents in MongoDB',
 	defaults: {
 		name: 'MongoDB',
 		color: '#13AA52',
diff --git a/packages/nodes-base/nodes/MoveBinaryData.node.ts b/packages/nodes-base/nodes/MoveBinaryData.node.ts
index 79e74f8244..ed6454d581 100644
--- a/packages/nodes-base/nodes/MoveBinaryData.node.ts
+++ b/packages/nodes-base/nodes/MoveBinaryData.node.ts
@@ -49,7 +49,7 @@ export class MoveBinaryData implements INodeType {
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["mode"]==="binaryToJson" ? "Binary to JSON" : "JSON to Binary"}}',
-		description: 'Move data between binary and JSON properties.',
+		description: 'Move data between binary and JSON properties',
 		defaults: {
 			name: 'Move Binary Data',
 			color: '#7722CC',
diff --git a/packages/nodes-base/nodes/Msg91/Msg91.node.ts b/packages/nodes-base/nodes/Msg91/Msg91.node.ts
index 6dc6b14b0a..9f605d7ee8 100644
--- a/packages/nodes-base/nodes/Msg91/Msg91.node.ts
+++ b/packages/nodes-base/nodes/Msg91/Msg91.node.ts
@@ -20,7 +20,7 @@ export class Msg91 implements INodeType {
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Send Transactional SMS',
+		description: 'Sends transactional SMS via MSG91',
 		defaults: {
 			name: 'Msg91',
 			color: '#0000ff',
diff --git a/packages/nodes-base/nodes/MySql/MySql.node.ts b/packages/nodes-base/nodes/MySql/MySql.node.ts
index fd1de1af07..20eebf52de 100644
--- a/packages/nodes-base/nodes/MySql/MySql.node.ts
+++ b/packages/nodes-base/nodes/MySql/MySql.node.ts
@@ -18,7 +18,7 @@ export class MySql implements INodeType {
 		icon: 'file:mysql.svg',
 		group: ['input'],
 		version: 1,
-		description: 'Get, add and update data in MySQL.',
+		description: 'Get, add and update data in MySQL',
 		defaults: {
 			name: 'MySQL',
 			color: '#4279a2',
diff --git a/packages/nodes-base/nodes/Nasa/Nasa.node.ts b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
index 5b523c5bc0..6a3d249e82 100644
--- a/packages/nodes-base/nodes/Nasa/Nasa.node.ts
+++ b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
@@ -25,7 +25,7 @@ export class Nasa implements INodeType {
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ":" + $parameter["resource"]}}',
-		description: 'Retrieve data the from NASA API',
+		description: 'Retrieve data from the NASA API',
 		defaults: {
 			name: 'NASA',
 			color: '#0B3D91',
diff --git a/packages/nodes-base/nodes/OpenWeatherMap.node.ts b/packages/nodes-base/nodes/OpenWeatherMap.node.ts
index 4aaa76a4bc..305d7e8c2a 100644
--- a/packages/nodes-base/nodes/OpenWeatherMap.node.ts
+++ b/packages/nodes-base/nodes/OpenWeatherMap.node.ts
@@ -19,7 +19,7 @@ export class OpenWeatherMap implements INodeType {
 		icon: 'fa:sun',
 		group: ['input'],
 		version: 1,
-		description: 'Gets current and future weather information.',
+		description: 'Gets current and future weather information',
 		defaults: {
 			name: 'OpenWeatherMap',
 			color: '#554455',
diff --git a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
index 8c1616b4fe..da913acdb2 100644
--- a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
+++ b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
@@ -33,7 +33,7 @@ export class Phantombuster implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Phantombuster API.',
+		description: 'Consume Phantombuster API',
 		defaults: {
 			name: 'Phantombuster',
 			color: '#62bfd7',
diff --git a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
index 908790a5cf..6286663353 100644
--- a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
+++ b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
@@ -29,7 +29,7 @@ export class PhilipsHue implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Philips Hue API.',
+		description: 'Consume Philips Hue API',
 		defaults: {
 			name: 'Philips Hue',
 			color: '#063c9a',
diff --git a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
index eeadedf403..067f41eb45 100644
--- a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
@@ -43,7 +43,7 @@ export class PipedriveTrigger implements INodeType {
 		icon: 'file:pipedrive.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when Pipedrive events occur.',
+		description: 'Starts the workflow when Pipedrive events occur',
 		defaults: {
 			name: 'Pipedrive Trigger',
 			color: '#559922',
diff --git a/packages/nodes-base/nodes/PostHog/PostHog.node.ts b/packages/nodes-base/nodes/PostHog/PostHog.node.ts
index f56860731a..7f4dbce2c5 100644
--- a/packages/nodes-base/nodes/PostHog/PostHog.node.ts
+++ b/packages/nodes-base/nodes/PostHog/PostHog.node.ts
@@ -47,7 +47,7 @@ export class PostHog implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume PostHog API.',
+		description: 'Consume PostHog API',
 		defaults: {
 			name: 'PostHog',
 			color: '#000000',
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
index 30880f3f8d..2b7f49baab 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
@@ -18,7 +18,7 @@ export class Postgres implements INodeType {
 		icon: 'file:postgres.svg',
 		group: ['input'],
 		version: 1,
-		description: 'Gets, add and update data in Postgres.',
+		description: 'Get, add and update data in Postgres',
 		defaults: {
 			name: 'Postgres',
 			color: '#336791',
diff --git a/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts b/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
index a66f099399..b85aa2d04f 100644
--- a/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
+++ b/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
@@ -22,7 +22,7 @@ export class PostmarkTrigger implements INodeType {
 		icon: 'file:postmark.png',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when Postmark events occur.',
+		description: 'Starts the workflow when Postmark events occur',
 		defaults: {
 			name: 'Postmark Trigger',
 			color: '#fedd00',
diff --git a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
index 8e38f2c45d..ea95fe61ca 100644
--- a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
+++ b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
@@ -29,7 +29,7 @@ export class Pushbullet implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Pushbullet API.',
+		description: 'Consume Pushbullet API',
 		defaults: {
 			name: 'Pushbullet',
 			color: '#457854',
diff --git a/packages/nodes-base/nodes/Pushcut/Pushcut.node.ts b/packages/nodes-base/nodes/Pushcut/Pushcut.node.ts
index 28fb18cb97..27d7242ebe 100644
--- a/packages/nodes-base/nodes/Pushcut/Pushcut.node.ts
+++ b/packages/nodes-base/nodes/Pushcut/Pushcut.node.ts
@@ -23,7 +23,7 @@ export class Pushcut implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Pushcut API.',
+		description: 'Consume Pushcut API',
 		defaults: {
 			name: 'Pushcut',
 			color: '#1f2957',
diff --git a/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts b/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts
index 3e7e4df6c4..7922c70fbf 100644
--- a/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts
+++ b/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts
@@ -21,7 +21,7 @@ export class PushcutTrigger implements INodeType {
 		icon: 'file:pushcut.png',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when a Pushcut events occurs.',
+		description: 'Starts the workflow when Pushcut events occur',
 		defaults: {
 			name: 'Pushcut Trigger',
 			color: '#1f2957',
diff --git a/packages/nodes-base/nodes/Pushover/Pushover.node.ts b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
index 10115f9bcb..44cc8438dd 100644
--- a/packages/nodes-base/nodes/Pushover/Pushover.node.ts
+++ b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
@@ -27,7 +27,7 @@ export class Pushover implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Pushover API.',
+		description: 'Consume Pushover API',
 		defaults: {
 			name: 'Pushover',
 			color: '#4b9cea',
diff --git a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
index 03e26d41ed..50a4e7c9e4 100644
--- a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
+++ b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
@@ -21,7 +21,7 @@ export class QuestDb implements INodeType {
 		icon: 'file:questdb.png',
 		group: ['input'],
 		version: 1,
-		description: 'Gets, add and update data in QuestDB.',
+		description: 'Get, add and update data in QuestDB',
 		defaults: {
 			name: 'QuestDB',
 			color: '#2C4A79',
diff --git a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
index b26128c22d..c7e072ee75 100644
--- a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
+++ b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
@@ -46,7 +46,7 @@ export class QuickBase implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Integrate with the Quick Base RESTful API.',
+		description: 'Integrate with the Quick Base RESTful API',
 		defaults: {
 			name: 'Quick Base',
 			color: '#73489d',
diff --git a/packages/nodes-base/nodes/Redis/Redis.node.ts b/packages/nodes-base/nodes/Redis/Redis.node.ts
index 012486462e..3202fa576e 100644
--- a/packages/nodes-base/nodes/Redis/Redis.node.ts
+++ b/packages/nodes-base/nodes/Redis/Redis.node.ts
@@ -20,7 +20,7 @@ export class Redis implements INodeType {
 		icon: 'file:redis.svg',
 		group: ['input'],
 		version: 1,
-		description: 'Get, send and update data in Redis.',
+		description: 'Get, send and update data in Redis',
 		defaults: {
 			name: 'Redis',
 			color: '#0033AA',
diff --git a/packages/nodes-base/nodes/RenameKeys.node.ts b/packages/nodes-base/nodes/RenameKeys.node.ts
index d427db9cf4..167be3234d 100644
--- a/packages/nodes-base/nodes/RenameKeys.node.ts
+++ b/packages/nodes-base/nodes/RenameKeys.node.ts
@@ -23,7 +23,7 @@ export class RenameKeys implements INodeType {
 		icon: 'fa:edit',
 		group: ['transform'],
 		version: 1,
-		description: 'Renames keys.',
+		description: 'Renames keys',
 		defaults: {
 			name: 'Rename Keys',
 			color: '#772244',
diff --git a/packages/nodes-base/nodes/Sendy/Sendy.node.ts b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
index 7a010b8165..14548355f1 100644
--- a/packages/nodes-base/nodes/Sendy/Sendy.node.ts
+++ b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
@@ -33,7 +33,7 @@ export class Sendy implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Sendy API.',
+		description: 'Consume Sendy API',
 		defaults: {
 			name: 'Sendy',
 			color: '#000000',
diff --git a/packages/nodes-base/nodes/Set.node.ts b/packages/nodes-base/nodes/Set.node.ts
index 9c17ec7e50..01cd0ff8f0 100644
--- a/packages/nodes-base/nodes/Set.node.ts
+++ b/packages/nodes-base/nodes/Set.node.ts
@@ -16,7 +16,7 @@ export class Set implements INodeType {
 		icon: 'fa:pen',
 		group: ['input'],
 		version: 1,
-		description: 'Sets values on the items and removes if selected all other values.',
+		description: 'Sets values on items and optionally remove other values',
 		defaults: {
 			name: 'Set',
 			color: '#0000FF',
diff --git a/packages/nodes-base/nodes/Signl4/Signl4.node.ts b/packages/nodes-base/nodes/Signl4/Signl4.node.ts
index e54d7d0425..390d1fd1c2 100644
--- a/packages/nodes-base/nodes/Signl4/Signl4.node.ts
+++ b/packages/nodes-base/nodes/Signl4/Signl4.node.ts
@@ -24,7 +24,7 @@ export class Signl4 implements INodeType {
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume SIGNL4 API.',
+		description: 'Consume SIGNL4 API',
 		defaults: {
 			name: 'SIGNL4',
 			color: '#53afe8',
diff --git a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
index cc8e753329..4da65da65a 100644
--- a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
+++ b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
@@ -25,7 +25,7 @@ export class Snowflake implements INodeType {
 		icon: 'file:snowflake.svg',
 		group: ['input'],
 		version: 1,
-		description: 'Get, add and update data in Snowflake.',
+		description: 'Get, add and update data in Snowflake',
 		defaults: {
 			name: 'Snowflake',
 			color: '#5ebbeb',
diff --git a/packages/nodes-base/nodes/SplitInBatches.node.ts b/packages/nodes-base/nodes/SplitInBatches.node.ts
index fb2fd6a582..ed7fd01d73 100644
--- a/packages/nodes-base/nodes/SplitInBatches.node.ts
+++ b/packages/nodes-base/nodes/SplitInBatches.node.ts
@@ -14,7 +14,7 @@ export class SplitInBatches implements INodeType {
 		icon: 'fa:th-large',
 		group: ['organization'],
 		version: 1,
-		description: 'Saves the originally incoming data and with each iteration it returns a predefined amount of them.',
+		description: 'Split data into batches and iterate over each batch',
 		defaults: {
 			name: 'SplitInBatches',
 			color: '#007755',
diff --git a/packages/nodes-base/nodes/Spotify/Spotify.node.ts b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
index 1b3e4b48dd..012867f395 100644
--- a/packages/nodes-base/nodes/Spotify/Spotify.node.ts
+++ b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
@@ -25,7 +25,7 @@ export class Spotify implements INodeType {
 		icon: 'file:spotify.svg',
 		group: ['input'],
 		version: 1,
-		description: 'Access public song data via the Spotify API.',
+		description: 'Access public song data via the Spotify API',
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 		defaults: {
 			name: 'Spotify',
diff --git a/packages/nodes-base/nodes/SpreadsheetFile.node.ts b/packages/nodes-base/nodes/SpreadsheetFile.node.ts
index e2b8350a84..628aa0c882 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile.node.ts
@@ -53,7 +53,7 @@ export class SpreadsheetFile implements INodeType {
 		icon: 'fa:table',
 		group: ['transform'],
 		version: 1,
-		description: 'Reads and writes data from a spreadsheet file.',
+		description: 'Reads and writes data from a spreadsheet file',
 		defaults: {
 			name: 'Spreadsheet File',
 			color: '#2244FF',
diff --git a/packages/nodes-base/nodes/SseTrigger.node.ts b/packages/nodes-base/nodes/SseTrigger.node.ts
index 6d410a097e..69983c87c6 100644
--- a/packages/nodes-base/nodes/SseTrigger.node.ts
+++ b/packages/nodes-base/nodes/SseTrigger.node.ts
@@ -14,7 +14,7 @@ export class SseTrigger implements INodeType {
 		icon: 'fa:cloud-download-alt',
 		group: ['trigger'],
 		version: 1,
-		description: 'Triggers workflow on a new Server-Sent Event',
+		description: 'Triggers the workflow when Server-Sent Events occur',
 		defaults: {
 			name: 'SSE Trigger',
 			color: '#225577',
diff --git a/packages/nodes-base/nodes/Stackby/Stackby.node.ts b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
index f06c6836de..6e595cd12e 100644
--- a/packages/nodes-base/nodes/Stackby/Stackby.node.ts
+++ b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
@@ -23,7 +23,7 @@ export class Stackby implements INodeType {
 		icon: 'file:stackby.png',
 		group: ['transform'],
 		version: 1,
-		description: 'Read, Write, and Delete Data in Stackby',
+		description: 'Read, write, and delete data in Stackby',
 		defaults: {
 			name: 'Stackby',
 			color: '#772244',
diff --git a/packages/nodes-base/nodes/Strapi/Strapi.node.ts b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
index 70e3357632..2091df3a9e 100644
--- a/packages/nodes-base/nodes/Strapi/Strapi.node.ts
+++ b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
@@ -30,7 +30,7 @@ export class Strapi implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Strapi API.',
+		description: 'Consume Strapi API',
 		defaults: {
 			name: 'Strapi',
 			color: '#725ed8',
diff --git a/packages/nodes-base/nodes/Strava/Strava.node.ts b/packages/nodes-base/nodes/Strava/Strava.node.ts
index 5fbf6d7b45..b420c0f519 100644
--- a/packages/nodes-base/nodes/Strava/Strava.node.ts
+++ b/packages/nodes-base/nodes/Strava/Strava.node.ts
@@ -29,7 +29,7 @@ export class Strava implements INodeType {
 		group: ['input'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Strava API.',
+		description: 'Consume Strava API',
 		defaults: {
 			name: 'Strava',
 			color: '#ea5929',
diff --git a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
index 0e78a63555..9500891224 100644
--- a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
@@ -26,7 +26,7 @@ export class StravaTrigger implements INodeType {
 		icon: 'file:strava.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when a Strava events occurs.',
+		description: 'Starts the workflow when Strava events occur',
 		defaults: {
 			name: 'Strava Trigger',
 			color: '#ea5929',
diff --git a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
index 8aa2b3dac1..e285003f6e 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
+++ b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
@@ -40,7 +40,7 @@ export class SurveyMonkeyTrigger implements INodeType {
 		icon: 'file:surveyMonkey.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when Survey Monkey events occur.',
+		description: 'Starts the workflow when Survey Monkey events occur',
 		defaults: {
 			name: 'SurveyMonkey Trigger',
 			color: '#53b675',
diff --git a/packages/nodes-base/nodes/Switch.node.ts b/packages/nodes-base/nodes/Switch.node.ts
index 665aac4d84..8d90399324 100644
--- a/packages/nodes-base/nodes/Switch.node.ts
+++ b/packages/nodes-base/nodes/Switch.node.ts
@@ -16,7 +16,7 @@ export class Switch implements INodeType {
 		icon: 'fa:map-signs',
 		group: ['transform'],
 		version: 1,
-		description: 'Route items depending on defined expression or rules.',
+		description: 'Route items depending on defined expression or rules',
 		defaults: {
 			name: 'Switch',
 			color: '#506000',
diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.ts b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
index e55c477419..8f5ee6a254 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.ts
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
@@ -24,7 +24,7 @@ export class Telegram implements INodeType {
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Sends data to Telegram.',
+		description: 'Sends data to Telegram',
 		defaults: {
 			name: 'Telegram',
 			color: '#0088cc',
diff --git a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
index b55b4264e0..554983cef9 100644
--- a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
+++ b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
@@ -27,7 +27,7 @@ export class TelegramTrigger implements INodeType {
 		group: ['trigger'],
 		version: 1,
 		subtitle: '=Updates: {{$parameter["updates"].join(", ")}}',
-		description: 'Starts the workflow on a Telegram update.',
+		description: 'Starts the workflow on a Telegram update',
 		defaults: {
 			name: 'Telegram Trigger',
 			color: '#0088cc',
diff --git a/packages/nodes-base/nodes/TheHive/TheHive.node.ts b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
index e3021879c0..5b3a93c7f0 100644
--- a/packages/nodes-base/nodes/TheHive/TheHive.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
@@ -72,7 +72,7 @@ export class TheHive implements INodeType {
 		group: ['transform'],
 		subtitle: '={{$parameter["operation"]}} : {{$parameter["resource"]}}',
 		version: 1,
-		description: 'Consume TheHive APIs',
+		description: 'Consume TheHive API',
 		defaults: {
 			name: 'TheHive',
 			color: '#f3d02f',
diff --git a/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts b/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
index fcd211d12e..82a07b5099 100644
--- a/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
@@ -17,7 +17,7 @@ export class TheHiveTrigger implements INodeType {
 		icon: 'file:thehive.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when a TheHive event occurs.',
+		description: 'Starts the workflow when TheHive events occur',
 		defaults: {
 			name: 'TheHive Trigger',
 			color: '#f3d02f',
diff --git a/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts b/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
index 0ecf55fa70..0ed7aa2e86 100644
--- a/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
+++ b/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
@@ -24,7 +24,7 @@ export class TrelloTrigger implements INodeType {
 		icon: 'file:trello.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when Trello events occur.',
+		description: 'Starts the workflow when Trello events occur',
 		defaults: {
 			name: 'Trello Trigger',
 			color: '#026aa7',
diff --git a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
index 5cd9cac97a..f6e4a4def7 100644
--- a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
+++ b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
@@ -28,7 +28,7 @@ export class TypeformTrigger implements INodeType {
 		group: ['trigger'],
 		version: 1,
 		subtitle: '=Form ID: {{$parameter["formId"]}}',
-		description: 'Starts the workflow on a Typeform form submission.',
+		description: 'Starts the workflow on a Typeform form submission',
 		defaults: {
 			name: 'Typeform Trigger',
 			color: '#404040',
diff --git a/packages/nodes-base/nodes/Webhook.node.ts b/packages/nodes-base/nodes/Webhook.node.ts
index 5526d93782..f51a0fb692 100644
--- a/packages/nodes-base/nodes/Webhook.node.ts
+++ b/packages/nodes-base/nodes/Webhook.node.ts
@@ -45,7 +45,7 @@ export class Webhook implements INodeType {
 		name: 'webhook',
 		group: ['trigger'],
 		version: 1,
-		description: 'Starts the workflow when a webhook got called.',
+		description: 'Starts the workflow when a webhook is called',
 		defaults: {
 			name: 'Webhook',
 			color: '#885577',
diff --git a/packages/nodes-base/nodes/Wekan/Wekan.node.ts b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
index 87f99d9df2..ced73ee665 100644
--- a/packages/nodes-base/nodes/Wekan/Wekan.node.ts
+++ b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
@@ -56,7 +56,7 @@ export class Wekan implements INodeType {
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Open-Source Kanban',
+		description: 'Consume Wekan API',
 		defaults: {
 			name: 'Wekan',
 			color: '#006581',
diff --git a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
index da7c713551..ec0a90e16f 100644
--- a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
+++ b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
@@ -77,7 +77,7 @@ export class ZohoCrm implements INodeType {
 		group: ['transform'],
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 		version: 1,
-		description: 'Consume the Zoho API',
+		description: 'Consume Zoho CRM API',
 		defaults: {
 			name: 'Zoho',
 			color: '#CE2232',

From ac892343292f398325f56de4dd5e6dc1769cd61a Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 3 Jul 2021 14:47:31 +0200
Subject: [PATCH 21/74] :construction_worker: Push credentials also if the
 tests fail

---
 .github/workflows/test-workflows.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml
index 15e813b7ae..3a9064884d 100644
--- a/.github/workflows/test-workflows.yml
+++ b/.github/workflows/test-workflows.yml
@@ -69,12 +69,14 @@ jobs:
           N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
       -
         name: Export credentials
+        if: always()
         run: n8n/packages/cli/bin/n8n export:credentials --output=test-workflows/credentials.json --all --pretty
         shell: bash
         env:
           N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
       -
         name: Commit and push credential changes
+        if: always()
         run: |
           cd test-workflows
           git config --global user.name 'n8n test bot'

From bac13ba821f677a733888105235f80515d7170ed Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 3 Jul 2021 15:05:54 +0200
Subject: [PATCH 22/74] :construction_worker: Try to fix push to test-workflows

---
 .github/workflows/test-workflows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml
index 3a9064884d..8250a5a9b4 100644
--- a/.github/workflows/test-workflows.yml
+++ b/.github/workflows/test-workflows.yml
@@ -82,4 +82,4 @@ jobs:
           git config --global user.name 'n8n test bot'
           git config --global user.email 'n8n-test-bot@users.noreply.github.com'
           git commit -am "Automated credential update"
-          git push
+          git push --force --quiet "https://janober:${{ secrets.TOKEN }}@github.com/n8n-io/test-workflows.git" main:main

From 1b46ea5d30d4d7ee026a58197ef3aca628e918eb Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Sun, 4 Jul 2021 12:57:53 -0400
Subject: [PATCH 23/74] :bug: Fix issue setting passphrase correctly (#1966)

---
 packages/nodes-base/nodes/Ssh/Ssh.node.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Ssh/Ssh.node.ts b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
index 293203e3eb..acbb3cb2c0 100644
--- a/packages/nodes-base/nodes/Ssh/Ssh.node.ts
+++ b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
@@ -320,7 +320,7 @@ export class Ssh implements INodeType {
 					privateKey: path,
 				} as any; // tslint:disable-line: no-any
 
-				if (!credentials.passphrase) {
+				if (credentials.passphrase) {
 					options.passphrase = credentials.passphrase as string;
 				}
 

From 6e5be51ceff1cffe48f2a4934c7da31c074852c0 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 4 Jul 2021 18:12:44 +0000
Subject: [PATCH 24/74] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-workflow@0.?=
 =?UTF-8?q?63.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/workflow/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 0adc605196..0fa3d4943d 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "0.62.0",
+  "version": "0.63.0",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 1532d27102e5f20cce94c102cf36e9efb915d25e Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 4 Jul 2021 18:13:00 +0000
Subject: [PATCH 25/74] :arrow_up: Set n8n-workflow@0.63.0 on n8n-core

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 71871514bf..c33a6ccb04 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -47,7 +47,7 @@
     "file-type": "^14.6.2",
     "lodash.get": "^4.4.2",
     "mime-types": "^2.1.27",
-    "n8n-workflow": "~0.62.0",
+    "n8n-workflow": "~0.63.0",
     "oauth-1.0a": "^2.2.6",
     "p-cancelable": "^2.0.0",
     "request": "^2.88.2",

From 8b943738631664e44cc1f98d52e878a586f94d47 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 4 Jul 2021 18:13:01 +0000
Subject: [PATCH 26/74] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-core@0.76.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index c33a6ccb04..5151bfbb5b 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.75.0",
+  "version": "0.76.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From d4c47a62c03f18c15b8ee224d7406a610f9dbc1e Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 4 Jul 2021 18:13:16 +0000
Subject: [PATCH 27/74] :arrow_up: Set n8n-core@0.76.0 and n8n-workflow@0.63.0
 on n8n-node-dev

---
 packages/node-dev/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 594fe74133..99260de7ff 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -59,8 +59,8 @@
     "change-case": "^4.1.1",
     "copyfiles": "^2.1.1",
     "inquirer": "^7.0.1",
-    "n8n-core": "~0.75.0",
-    "n8n-workflow": "~0.62.0",
+    "n8n-core": "~0.76.0",
+    "n8n-workflow": "~0.63.0",
     "oauth-1.0a": "^2.2.6",
     "replace-in-file": "^6.0.0",
     "request": "^2.88.2",

From 0fcd0cb87a1a2730592fa6a56dd93d0103fc825a Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 4 Jul 2021 18:13:16 +0000
Subject: [PATCH 28/74] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-node-dev@0.?=
 =?UTF-8?q?16.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/node-dev/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 99260de7ff..e6d7bceaa9 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "0.15.0",
+  "version": "0.16.0",
   "description": "CLI to simplify n8n credentials/node development",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 0d62098571d20c9bed03e598807c73c198459378 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 4 Jul 2021 18:13:35 +0000
Subject: [PATCH 29/74] :arrow_up: Set n8n-core@0.76.0 and n8n-workflow@0.63.0
 on n8n-nodes-base

---
 packages/nodes-base/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 7a2c4ca1ea..ea109d0926 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -611,7 +611,7 @@
     "@types/xml2js": "^0.4.3",
     "gulp": "^4.0.0",
     "jest": "^26.4.2",
-    "n8n-workflow": "~0.62.0",
+    "n8n-workflow": "~0.63.0",
     "ts-jest": "^26.3.0",
     "tslint": "^6.1.2",
     "typescript": "~3.9.7"
@@ -649,7 +649,7 @@
     "mqtt": "4.2.6",
     "mssql": "^6.2.0",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.75.0",
+    "n8n-core": "~0.76.0",
     "node-ssh": "^11.0.0",
     "nodemailer": "^6.5.0",
     "pdf-parse": "^1.1.1",

From 0b41c7466b25317948765f5813f29995cffb8228 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 4 Jul 2021 18:13:35 +0000
Subject: [PATCH 30/74] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-base@?=
 =?UTF-8?q?0.124.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index ea109d0926..3c42c04fd1 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.123.1",
+  "version": "0.124.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From ba7b48751798e4b819472a3753a03d578953751c Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 4 Jul 2021 18:14:34 +0000
Subject: [PATCH 31/74] :arrow_up: Set n8n-workflow@0.63.0 on n8n-editor-ui

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 54e7eb8f52..83bd501618 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -68,7 +68,7 @@
     "lodash.debounce": "^4.0.8",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
-    "n8n-workflow": "~0.62.0",
+    "n8n-workflow": "~0.63.0",
     "node-sass": "^4.12.0",
     "normalize-wheel": "^1.0.1",
     "prismjs": "^1.17.1",

From 80a5c8ac60700651853e7a43e9e4d94a145a558f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 4 Jul 2021 18:14:34 +0000
Subject: [PATCH 32/74] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-editor-ui@0?=
 =?UTF-8?q?.97.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 83bd501618..c7b4d1489d 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.96.1",
+  "version": "0.97.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 97eb22db04cdb36e11fd3dfd781244494c02bdfc Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 4 Jul 2021 18:15:30 +0000
Subject: [PATCH 33/74] :arrow_up: Set n8n-core@0.76.0, n8n-editor-ui@0.97.0,
 n8n-nodes-base@0.124.0 and n8n-workflow@0.63.0 on n8n

---
 packages/cli/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index ce0467aa64..d90f56f4f6 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -108,10 +108,10 @@
     "localtunnel": "^2.0.0",
     "lodash.get": "^4.4.2",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.75.0",
-    "n8n-editor-ui": "~0.96.1",
-    "n8n-nodes-base": "~0.123.1",
-    "n8n-workflow": "~0.62.0",
+    "n8n-core": "~0.76.0",
+    "n8n-editor-ui": "~0.97.0",
+    "n8n-nodes-base": "~0.124.0",
+    "n8n-workflow": "~0.63.0",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",
     "pg": "^8.3.0",

From 297d9fe77d49a0c432365a5146aeba251e8a5d2c Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 4 Jul 2021 18:15:30 +0000
Subject: [PATCH 34/74] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.127.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index d90f56f4f6..4d866ec729 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.126.1",
+  "version": "0.127.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 8d235e94cb79f5c0c542b68e5a0c3718bd094e45 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Tue, 6 Jul 2021 23:25:25 +0200
Subject: [PATCH 35/74] :zap: Performance improvements for executions count on
 Postgres (#1888)

* Performance improvements for executions count on Postgres

As reported by a community member https://community.n8n.io/t/stress-load-testing/4846/5
and https://github.com/n8n-io/n8n/issues/1578, when using postgres with
a big volume of executions, the executions list's performance degrades.

This PR is aimed at Postgres specifically by querying postgres' stats
collector instead of running a full table scan, providing a good
estimate.

More can be read here: https://www.citusdata.com/blog/2016/10/12/count-performance/

* Removed order of magnitude so we display closer numbers

* Making count based on statistics only when not applying filters

* :zap: Minor styling improvements

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 packages/cli/src/Interfaces.ts                |  1 +
 packages/cli/src/Server.ts                    | 44 ++++++++++++++++---
 packages/editor-ui/src/Interface.ts           |  1 +
 .../src/components/ExecutionsList.vue         | 13 ++++--
 4 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index df965c50e7..e1c09cf55e 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -188,6 +188,7 @@ export interface IExecutionsListResponse {
 	count: number;
 	// results: IExecutionShortResponse[];
 	results: IExecutionsSummary[];
+	estimated: boolean;
 }
 
 export interface IExecutionsStopData {
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 0a31144999..ee2f50f2cf 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -33,6 +33,7 @@ import {
 	CredentialsHelper,
 	CredentialsOverwrites,
 	CredentialTypes,
+	DatabaseType,
 	Db,
 	ExternalHooks,
 	GenericHelpers,
@@ -88,6 +89,7 @@ import {
 	IRunData,
 	IWorkflowBase,
 	IWorkflowCredentials,
+	LoggerProxy,
 	Workflow,
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
@@ -1612,8 +1614,7 @@ class App {
 			executingWorkflowIds.push(...this.activeExecutionsInstance.getActiveExecutions().map(execution => execution.id.toString()) as string[]);
 
 			const countFilter = JSON.parse(JSON.stringify(filter));
-			countFilter.select = ['id'];
-			countFilter.where = {id: Not(In(executingWorkflowIds))};
+			countFilter.id = Not(In(executingWorkflowIds));
 
 			const resultsQuery = await Db.collections.Execution!
 				.createQueryBuilder("execution")
@@ -1645,10 +1646,10 @@ class App {
 
 			const resultsPromise = resultsQuery.getMany();
 
-			const countPromise = Db.collections.Execution!.count(countFilter);
+			const countPromise = getExecutionsCount(countFilter);
 
 			const results: IExecutionFlattedDb[] = await resultsPromise;
-			const count = await countPromise;
+			const countedObjects = await countPromise;
 
 			const returnResults: IExecutionsSummary[] = [];
 
@@ -1667,8 +1668,9 @@ class App {
 			}
 
 			return {
-				count,
+				count: countedObjects.count,
 				results: returnResults,
+				estimated: countedObjects.estimate,
 			};
 		}));
 
@@ -2161,3 +2163,35 @@ export async function start(): Promise<void> {
 		await app.externalHooks.run('n8n.ready', [app]);
 	});
 }
+
+async function getExecutionsCount(countFilter: IDataObject): Promise<{ count: number; estimate: boolean; }> {
+
+	const dbType = await GenericHelpers.getConfigValue('database.type') as DatabaseType;
+	const filteredFields = Object.keys(countFilter).filter(field => field !== 'id');
+
+	// Do regular count for other databases than pgsql and
+	// if we are filtering based on workflowId or finished fields.
+	if (dbType !== 'postgresdb' || filteredFields.length > 0) {
+		const count = await Db.collections.Execution!.count(countFilter);
+		return { count, estimate: false };
+	}
+
+	try {
+		// Get an estimate of rows count.
+		const estimateRowsNumberSql = "SELECT n_live_tup FROM pg_stat_all_tables WHERE relname = 'execution_entity';";
+		const rows: Array<{ n_live_tup: string }> = await Db.collections.Execution!.query(estimateRowsNumberSql);
+
+		const estimate = parseInt(rows[0].n_live_tup, 10);
+		// If over 100k, return just an estimate.
+		if (estimate > 100000) {
+			// if less than 100k, we get the real count as even a full
+			// table scan should not take so long.
+			return { count: estimate, estimate: true };
+		}
+	} catch (err) {
+		LoggerProxy.warn('Unable to get executions count from postgres: ' + err);
+	}
+
+	const count = await Db.collections.Execution!.count(countFilter);
+	return { count, estimate: false };
+}
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index f119699f6e..2fa997a545 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -325,6 +325,7 @@ export interface IExecutionShortResponse {
 export interface IExecutionsListResponse {
 	count: number;
 	results: IExecutionsSummary[];
+	estimated: boolean;
 }
 
 export interface IExecutionsCurrentSummaryExtended {
diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index e0e129a737..1ecfc4caf8 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -1,6 +1,6 @@
 <template>
 	<span>
-		<el-dialog :visible="dialogVisible" append-to-body width="80%" :title="`Workflow Executions (${combinedExecutions.length}/${combinedExecutionsCount})`" :before-close="closeDialog">
+		<el-dialog :visible="dialogVisible" append-to-body width="80%" :title="`Workflow Executions ${combinedExecutions.length}/${finishedExecutionsCountEstimated === true ? '~' : ''}${combinedExecutionsCount}`" :before-close="closeDialog">
 			<div class="filters">
 				<el-row>
 					<el-col :span="4" class="filter-headline">
@@ -38,7 +38,7 @@
 
 			<div class="selection-options">
 				<span v-if="checkAll === true || isIndeterminate === true">
-					Selected: {{numSelected}}/{{finishedExecutionsCount}}
+					Selected: {{numSelected}} / <span v-if="finishedExecutionsCountEstimated === true">~</span>{{finishedExecutionsCount}}
 					<el-button type="danger" title="Delete Selected" icon="el-icon-delete" size="mini" @click="handleDeleteSelected" circle></el-button>
 				</span>
 			</div>
@@ -142,7 +142,7 @@
 				</el-table-column>
 			</el-table>
 
-			<div class="load-more" v-if="finishedExecutionsCount > finishedExecutions.length">
+			<div class="load-more" v-if="finishedExecutionsCount > finishedExecutions.length || finishedExecutionsCountEstimated === true">
 				<el-button title="Load More" @click="loadMore()" size="small" :disabled="isDataLoading">
 					<font-awesome-icon icon="sync" /> Load More
 				</el-button>
@@ -200,6 +200,7 @@ export default mixins(
 		return {
 			finishedExecutions: [] as IExecutionsSummary[],
 			finishedExecutionsCount: 0,
+			finishedExecutionsCountEstimated: false,
 
 			checkAll: false,
 			autoRefresh: true,
@@ -256,7 +257,7 @@ export default mixins(
 			return returnData;
 		},
 		combinedExecutionsCount (): number {
-			return this.activeExecutions.length + this.finishedExecutionsCount;
+			return 0 + this.activeExecutions.length + this.finishedExecutionsCount;
 		},
 		numSelected (): number {
 			if (this.checkAll === true) {
@@ -489,16 +490,19 @@ export default mixins(
 			}
 			this.finishedExecutions = this.finishedExecutions.filter(execution => !gaps.includes(parseInt(execution.id, 10)) && lastId >= parseInt(execution.id, 10));
 			this.finishedExecutionsCount = results[0].count;
+			this.finishedExecutionsCountEstimated = results[0].estimated;
 		},
 		async loadFinishedExecutions (): Promise<void> {
 			if (this.filter.status === 'running') {
 				this.finishedExecutions = [];
 				this.finishedExecutionsCount = 0;
+				this.finishedExecutionsCountEstimated = false;
 				return;
 			}
 			const data = await this.restApi().getPastExecutions(this.workflowFilterPast, this.requestItemsPerRequest);
 			this.finishedExecutions = data.results;
 			this.finishedExecutionsCount = data.count;
+			this.finishedExecutionsCountEstimated = data.estimated;
 		},
 		async loadMore () {
 			if (this.filter.status === 'running') {
@@ -526,6 +530,7 @@ export default mixins(
 
 			this.finishedExecutions.push.apply(this.finishedExecutions, data.results);
 			this.finishedExecutionsCount = data.count;
+			this.finishedExecutionsCountEstimated = data.estimated;
 
 			this.isDataLoading = false;
 		},

From c7db9c0a4d7789d6d856ac0098ad07d03f566766 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Tue, 6 Jul 2021 18:26:34 -0400
Subject: [PATCH 36/74] :bug: Fix connectionTimeout, add requestTImeout and fix
 issue with column names with spaces (#1971)

* :bug: fix issue sending connectionTimeout parameter

* :bug: Fix issue when inserting data using columns with spaces

* :bug: Fix issue when updating data using columns with spaces

* :bug: Fix issue when deleting data using columns with spaces

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../nodes-base/credentials/MicrosoftSql.credentials.ts    | 7 +++++++
 .../nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts    | 8 +++++++-
 .../nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts   | 8 +++++---
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/packages/nodes-base/credentials/MicrosoftSql.credentials.ts b/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
index 7d0693ca72..2b09904e18 100644
--- a/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
@@ -57,5 +57,12 @@ export class MicrosoftSql implements ICredentialType {
 			default: 15000,
 			description: 'Connection timeout in ms.',
 		},
+		{
+			displayName: 'Request Timeout',
+			name: 'requestTimeout',
+			type: 'number',
+			default: 15000,
+			description: ' Request timeout in ms.',
+		},
 	];
 }
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
index cff19da729..23a929b3aa 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
@@ -121,7 +121,7 @@ export function extractUpdateSet(item: IDataObject, columns: string[]): string {
 	return columns
 		.map(
 			column =>
-				`${column} = ${
+				`"${column}" = ${
 					typeof item[column] === 'string' ? `'${item[column]}'` : item[column]
 				}`,
 		)
@@ -153,3 +153,9 @@ export function extractDeleteValues(items: IDataObject[], key: string): string {
 		.map(item => (typeof item[key] === 'string' ? `'${item[key]}'` : item[key]))
 		.join(',')})`;
 }
+
+
+export function formatColumns(columns: string) {
+	return columns.split(',')
+	.map((column) => (`"${column.trim()}"`)).join(',');
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
index db164c424b..867928a24f 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
@@ -29,6 +29,7 @@ import {
 	extractUpdateCondition,
 	extractUpdateSet,
 	extractValues,
+	formatColumns,
 } from './GenericFunctions';
 
 export class MicrosoftSql implements INodeType {
@@ -226,7 +227,8 @@ export class MicrosoftSql implements INodeType {
 			user: credentials.user as string,
 			password: credentials.password as string,
 			domain: credentials.domain ? (credentials.domain as string) : undefined,
-			connectTimeout: credentials.connectTimeout as number,
+			connectionTimeout: credentials.connectTimeout as number,
+			requestTimeout: credentials.requestTimeout as number,
 			options: {
 				encrypt: credentials.tls as boolean,
 				enableArithAbort: false,
@@ -281,7 +283,7 @@ export class MicrosoftSql implements INodeType {
 							return pool
 								.request()
 								.query(
-									`INSERT INTO ${table}(${columnString}) VALUES ${values};`,
+									`INSERT INTO ${table}(${formatColumns(columnString)}) VALUES ${values};`,
 								);
 						});
 					},
@@ -364,7 +366,7 @@ export class MicrosoftSql implements INodeType {
 									return pool
 										.request()
 										.query(
-											`DELETE FROM ${table} WHERE ${deleteKey} IN ${extractDeleteValues(
+											`DELETE FROM ${table} WHERE "${deleteKey}" IN ${extractDeleteValues(
 												deleteValues,
 												deleteKey,
 											)};`,

From a74fc78ed34b370894e8e4fda9d6244833f948a2 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Wed, 7 Jul 2021 07:57:59 +0200
Subject: [PATCH 37/74] :zap: Update Vero icon

---
 packages/nodes-base/nodes/Vero/Vero.node.ts |   2 +-
 packages/nodes-base/nodes/Vero/vero.png     | Bin 1135 -> 0 bytes
 packages/nodes-base/nodes/Vero/vero.svg     |  21 ++++++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 delete mode 100644 packages/nodes-base/nodes/Vero/vero.png
 create mode 100644 packages/nodes-base/nodes/Vero/vero.svg

diff --git a/packages/nodes-base/nodes/Vero/Vero.node.ts b/packages/nodes-base/nodes/Vero/Vero.node.ts
index d7fd01cb08..aba898064d 100644
--- a/packages/nodes-base/nodes/Vero/Vero.node.ts
+++ b/packages/nodes-base/nodes/Vero/Vero.node.ts
@@ -26,7 +26,7 @@ export class Vero implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Vero',
 		name: 'vero',
-		icon: 'file:vero.png',
+		icon: 'file:vero.svg',
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
diff --git a/packages/nodes-base/nodes/Vero/vero.png b/packages/nodes-base/nodes/Vero/vero.png
deleted file mode 100644
index aaa2d140d45bb9763793d5255de9d774798679ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1135
zcmV-#1d#iQP)<h;3K|Lk000e1NJLTq002Ay002A)0{{R34I(K(0002<P)t-s|NsB{
z{rv!*%>bXz{r~>P;OqVU{khub|Ns5~q0IoD&Hw)X{r>*}qtO7N&(!De0iw_J{QCi=
z&-?!V@%j3t(&HYe(g2{*==JyE@%7p5@&TjG`2GB3xYy<L_Qc}ssnz6)#@s8a((Cv5
z)aviT;Odjh-$Jj{MzGTXrqKbU&j0@Z`~UsX>F>PV>9*SEuGi(C(BgN$+EujFC8*OQ
zsn80h&~v@oZM)b_veg-=(G;f90;td1@AAIi>$2JAjmY1I#NC6#+-JGhUbfZ&q|){L
z{MYL6%jNCK<n5Zx;C#T_0GP})tI|BL(J-pd&E@TfAG47F00TEkL_t(Y$L*Bqb`n7l
zg>Ns8-Lp9}Fzk>(AOQkF_OQg5O=A+5_kS9zMUNg~1pMVW=KE8_(A8Db_jci#XZ{Bq
zxt+vZ?1H=TrGs4K<rdBg5^_`BR9xhLz$UoR)1&p;^rrum5y{whwHp0Dw{PFA)n>@+
zOsoGQiN<|Zv}&(kHW&6K*jjRr>q{gf%U-byTrBmYwAPYiJE}PE*k($Ixp=D>>y+&q
z=By>Z5xR#&a+AAdj#gF1;!0U-8t0aGQQ|k>KL-3YQWlPdXn?IdB(_Jk{X>=CWeU7m
z2#G?`E2lOYC;iDIF|-yzZDgVrT9}}HJ*m~~1F%y$$m;GUmsmLC(arl;uL^zbom2ct
zp&Iz-DU0Dih$~vSj$@_H{Z^iyO2h23f?o)m6J4Of?`B?<H-*<>sB6Dmq5>Z{6=K$R
zO6u6wZ$aw579s{y3Ad^$^cyfs4g!7fqrDUgex{XEDIAT1lXRkqP+58>X~l3+^qQe^
zS6g<bZGH%5Wa16dcr%oBXd1IzJY;FTT<zGfC(V$$Efj+r+9CmEsj%s_DxeNOd#xNC
zqhQ!v@CKwKr@pR(ArT7)Tvx#udbUpypk}yt&WucCZqrOMmYfE~I;m0`df7VFQ<Z2e
z=!Fx`vJ2|vkI7^}|EA+Id=Xxm(eEoEs<4=miB4_XcstJWGe{TLCaSI;MHNWoGX9Lt
ze_L{HPI8&a(!Q&uJGY*ZNgA2R+*^`C4RR4HYP2ux!#DQgli8`z_NUU>K9-$uXdKK`
z`eT%tkNC=R#h^eQ+lC@*3%{x?x@GogF3KHzyG_Tiumh)f%odGIrLsS2zlTIP)EP6b
zcfeH_ZNJ=c7`l9N5<2D-_$3wI35Ey3&lEewRaRWWA(@6Hl4&O_vbK>+BH!}HM`q}K
z0K<+*^aPKM#beInd@(zKgPn0ox4}xT6aV8Z3N9eAGYt2_zgASbVP_Wn0Ty=W)WWqH
zvW!%U=Hnw0e-A9OHjQ_RgMjypx%bQNbA1SOC&6tA5_{p&S&3-yb{z2fDtFJuoA%R_
z-8M6LZ(O8%)$6!I4}XEB0A+63-yvN`x_IW_;48FAO}PO}zs>*v002ovPDHLkV1lc`
BT~Yu5

diff --git a/packages/nodes-base/nodes/Vero/vero.svg b/packages/nodes-base/nodes/Vero/vero.svg
new file mode 100644
index 0000000000..46f4cf1efa
--- /dev/null
+++ b/packages/nodes-base/nodes/Vero/vero.svg
@@ -0,0 +1,21 @@
+<svg width="225" height="225" xmlns="http://www.w3.org/2000/svg" fill="none">
+ <defs>
+  <linearGradient y2="0.53466" y1="0.45356" x2="-0.15926" x1="1.04746" id="a">
+   <stop stop-color="#2936a3" offset="0"/>
+   <stop stop-color="#162286" offset="1"/>
+  </linearGradient>
+  <linearGradient y2="0.15582" y1="0.6753" x2="0.95825" x1="-0.19201" id="b">
+   <stop stop-color="#2297f4" offset="0"/>
+   <stop stop-color="#31a0f9" offset="1"/>
+  </linearGradient>
+ </defs>
+ <clipPath id="c">
+  <path id="svg_1" d="m0,0l720,0l0,150.523l-720,0l0,-150.523z"/>
+ </clipPath>
+ <g>
+  <title>Layer 1</title>
+  <path stroke="null" id="svg_4" fill="url(#a)" d="m211.145,121.3891c18.18,-18.1614 18.18,-47.6067 0,-65.7681c-18.18,-18.16132 -47.656,-18.16135 -65.836,0l-32.919,32.8841l32.817,32.7831c0.034,0.0338 0.068,0.0674 0.101,0.1011c18.161,18.1421 47.594,18.1613 65.779,0.0578l0.058,-0.058z"/>
+  <path stroke="null" id="svg_5" fill="#17da88" d="m46.5554,154.275l-32.9202,-32.8854c-18.18028,-18.1613 -18.18026,-47.6066 0,-65.768c18.1803,-18.16133 47.6564,-18.16132 65.8367,0l32.9201,32.8859l-65.8366,65.7675z"/>
+  <path stroke="null" id="svg_6" fill="url(#b)" d="m211.145,121.3893c-18.18,18.1613 -47.656,18.1613 -65.836,0c-0.034,-0.0337 -0.068,-0.0674 -0.101,-0.1011l-32.816,-32.781l-65.8363,65.7678l18.8086,18.789c25.9719,25.945 68.0807,25.945 94.0527,0l51.728,-51.6747z"/>
+ </g>
+</svg>
\ No newline at end of file

From a842e4bc0aec8413352c69a99430c3ee8bce6f2a Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Thu, 8 Jul 2021 07:46:20 +0200
Subject: [PATCH 38/74] :bug: Fix nodes panel reactivity bug (#1972)

* add keys

* fix nodes panel reactivity bug

* fix lint issues
---
 .../src/components/NodeCreator/ItemIterator.vue |  2 +-
 .../src/components/NodeCreator/NodeCreator.vue  | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/components/NodeCreator/ItemIterator.vue b/packages/editor-ui/src/components/NodeCreator/ItemIterator.vue
index 7cf00057ef..e7a8774408 100644
--- a/packages/editor-ui/src/components/NodeCreator/ItemIterator.vue
+++ b/packages/editor-ui/src/components/NodeCreator/ItemIterator.vue
@@ -8,7 +8,7 @@
 			@before-leave="beforeLeave"
 			@leave="leave"
 		>
-			<div v-for="(item, index) in elements" :key="item.key" :class="item.type">
+			<div v-for="(item, index) in elements" :key="item.key" :class="item.type" :data-key="item.key">
 				<CreatorItem
 					:item="item"
 					:active="activeIndex === index && !disabled"
diff --git a/packages/editor-ui/src/components/NodeCreator/NodeCreator.vue b/packages/editor-ui/src/components/NodeCreator/NodeCreator.vue
index ea36daf9be..feb88ee8d2 100644
--- a/packages/editor-ui/src/components/NodeCreator/NodeCreator.vue
+++ b/packages/editor-ui/src/components/NodeCreator/NodeCreator.vue
@@ -29,9 +29,17 @@ export default Vue.extend({
 	props: [
 		'active',
 	],
+	data() {
+		return {
+			allNodeTypes: [],
+		};
+	},
 	computed: {
+		nodeTypes(): INodeTypeDescription[] {
+			return this.$store.getters.allNodeTypes;
+		},
 		visibleNodeTypes(): INodeTypeDescription[] {
-			return this.$store.getters.allNodeTypes
+			return this.allNodeTypes
 				.filter((nodeType: INodeTypeDescription) => {
 					return !HIDDEN_NODES.includes(nodeType.name);
 				});
@@ -73,6 +81,13 @@ export default Vue.extend({
 			this.$emit('nodeTypeSelected', nodeTypeName);
 		},
 	},
+	watch: {
+		nodeTypes(newList, prevList) {
+			if (prevList.length === 0) {
+				this.allNodeTypes = newList;
+			}
+		},
+	},
 });
 </script>
 

From abc2f2a51596d962915d898cbc5c6d3ce92afa18 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Thu, 8 Jul 2021 04:12:19 -0400
Subject: [PATCH 39/74] :zap: Add resource contact segment and company contact
 to Mautic node (#1975)

* Add contact To Segment operation

* :zap: Improvements to #1973

* :zap: Rename resource

Co-authored-by: Rodrigo Correia <rodrigoscdc@gmail.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 ...iption.ts => CompanyContactDescription.ts} |  12 +--
 .../nodes/Mautic/ContactSegmentDescription.ts |  82 ++++++++++++++++++
 .../nodes-base/nodes/Mautic/Mautic.node.ts    |  60 ++++++++++---
 .../nodes/Mautic/MauticTrigger.node.ts        |   2 +-
 packages/nodes-base/nodes/Mautic/mautic.png   | Bin 2092 -> 0 bytes
 packages/nodes-base/nodes/Mautic/mautic.svg   |  17 ++++
 6 files changed, 156 insertions(+), 17 deletions(-)
 rename packages/nodes-base/nodes/Mautic/{ContactCompanyDescription.ts => CompanyContactDescription.ts} (84%)
 create mode 100644 packages/nodes-base/nodes/Mautic/ContactSegmentDescription.ts
 delete mode 100644 packages/nodes-base/nodes/Mautic/mautic.png
 create mode 100644 packages/nodes-base/nodes/Mautic/mautic.svg

diff --git a/packages/nodes-base/nodes/Mautic/ContactCompanyDescription.ts b/packages/nodes-base/nodes/Mautic/CompanyContactDescription.ts
similarity index 84%
rename from packages/nodes-base/nodes/Mautic/ContactCompanyDescription.ts
rename to packages/nodes-base/nodes/Mautic/CompanyContactDescription.ts
index 6aabd5bc93..bb4f3faece 100644
--- a/packages/nodes-base/nodes/Mautic/ContactCompanyDescription.ts
+++ b/packages/nodes-base/nodes/Mautic/CompanyContactDescription.ts
@@ -2,7 +2,7 @@ import {
 	INodeProperties,
 } from 'n8n-workflow';
 
-export const contactCompanyOperations = [
+export const companyContactOperations = [
 	{
 		displayName: 'Operation',
 		name: 'operation',
@@ -10,7 +10,7 @@ export const contactCompanyOperations = [
 		displayOptions: {
 			show: {
 				resource: [
-					'contactCompany',
+					'companyContact',
 				],
 			},
 		},
@@ -31,10 +31,10 @@ export const contactCompanyOperations = [
 	},
 ] as INodeProperties[];
 
-export const contactCompanyFields = [
+export const companyContactFields = [
 
 	/* -------------------------------------------------------------------------- */
-	/*                                contactCompany:add                          */
+	/*                                companyContact:add                          */
 	/* -------------------------------------------------------------------------- */
 	{
 		displayName: 'Contact ID',
@@ -43,7 +43,7 @@ export const contactCompanyFields = [
 		displayOptions: {
 			show: {
 				resource: [
-					'contactCompany',
+					'companyContact',
 				],
 				operation: [
 					'add',
@@ -61,7 +61,7 @@ export const contactCompanyFields = [
 		displayOptions: {
 			show: {
 				resource: [
-					'contactCompany',
+					'companyContact',
 				],
 				operation: [
 					'add',
diff --git a/packages/nodes-base/nodes/Mautic/ContactSegmentDescription.ts b/packages/nodes-base/nodes/Mautic/ContactSegmentDescription.ts
new file mode 100644
index 0000000000..302002b9dc
--- /dev/null
+++ b/packages/nodes-base/nodes/Mautic/ContactSegmentDescription.ts
@@ -0,0 +1,82 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const contactSegmentOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'contactSegment',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Add',
+				value: 'add',
+				description: 'Add contact to a segment',
+			},
+			{
+				name: 'Remove',
+				value: 'remove',
+				description: 'Remove contact from a segment',
+			},
+		],
+		default: 'add',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const contactSegmentFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                               contactSegment:add                           */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Contact ID',
+		name: 'contactId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'contactSegment',
+				],
+				operation: [
+					'add',
+					'remove',
+				],
+			},
+		},
+		default: '',
+		description: 'Contact ID',
+	},
+	{
+
+		displayName: 'Segment ID',
+		name: 'segmentId',
+		type: 'options',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'contactSegment',
+				],
+				operation: [
+					'add',
+					'remove',
+				],
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getSegments',
+		},
+		default: '',
+		description: 'Segment ID',
+
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Mautic/Mautic.node.ts b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
index 56d7eb8f2b..6296666049 100644
--- a/packages/nodes-base/nodes/Mautic/Mautic.node.ts
+++ b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
@@ -30,9 +30,14 @@ import {
 } from './CompanyDescription';
 
 import {
-	contactCompanyFields,
-	contactCompanyOperations,
-} from './ContactCompanyDescription';
+	companyContactFields,
+	companyContactOperations,
+} from './CompanyContactDescription';
+
+import {
+	contactSegmentFields,
+	contactSegmentOperations,
+} from './ContactSegmentDescription';
 
 import {
 	snakeCase,
@@ -42,7 +47,7 @@ export class Mautic implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Mautic',
 		name: 'mautic',
-		icon: 'file:mautic.png',
+		icon: 'file:mautic.svg',
 		group: ['output'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
@@ -104,15 +109,20 @@ export class Mautic implements INodeType {
 						value: 'company',
 						description: 'Create or modify a company',
 					},
+					{
+						name: 'Company Contact',
+						value: 'companyContact',
+						description: 'Add/remove contacts to/from a company',
+					},
 					{
 						name: 'Contact',
 						value: 'contact',
 						description: 'Create & modify contacts',
 					},
 					{
-						name: 'Contact <> Company',
-						value: 'contactCompany',
-						description: 'Add/ remove contacts from a company',
+						name: 'Contact Segment',
+						value: 'contactSegment',
+						description: 'Add/remove contacts to/from a segment',
 					},
 				],
 				default: 'contact',
@@ -122,8 +132,10 @@ export class Mautic implements INodeType {
 			...companyFields,
 			...contactOperations,
 			...contactFields,
-			...contactCompanyOperations,
-			...contactCompanyFields,
+			...contactSegmentOperations,
+			...contactSegmentFields,
+			...companyContactOperations,
+			...companyContactFields,
 		],
 	};
 
@@ -194,6 +206,19 @@ export class Mautic implements INodeType {
 				}
 				return returnData;
 			},
+			// Get all the available segments to display them to user so that he can
+			// select them easily
+			async getSegments(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const segments = await mauticApiRequestAllItems.call(this, 'lists', 'GET', '/segments');
+				for (const segment of segments) {
+					returnData.push({
+						name: segment.name,
+						value: segment.id,
+					});
+				}
+				return returnData;
+			},
 		},
 	};
 
@@ -547,7 +572,22 @@ export class Mautic implements INodeType {
 				}
 			}
 
-			if (resource === 'contactCompany') {
+			if (resource === 'contactSegment') {
+				//https://developer.mautic.org/?php#add-contact-to-a-segment
+				if (operation === 'add') {
+					const contactId = this.getNodeParameter('contactId', i) as string;
+					const segmentId = this.getNodeParameter('segmentId', i) as string;
+					responseData = await mauticApiRequest.call(this, 'POST', `/segments/${segmentId}/contact/${contactId}/add`);
+				}
+				//https://developer.mautic.org/#remove-contact-from-a-segment
+				if (operation === 'remove') {
+					const contactId = this.getNodeParameter('contactId', i) as string;
+					const segmentId = this.getNodeParameter('segmentId', i) as string;
+					responseData = await mauticApiRequest.call(this, 'POST', `/segments/${segmentId}/contact/${contactId}/remove`);
+				}
+			}
+
+			if (resource === 'companyContact') {
 				//https://developer.mautic.org/#add-contact-to-a-company
 				if (operation === 'add') {
 					const contactId = this.getNodeParameter('contactId', i) as string;
diff --git a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
index 239350bc50..019e89b2df 100644
--- a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
@@ -24,7 +24,7 @@ export class MauticTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Mautic Trigger',
 		name: 'mauticTrigger',
-		icon: 'file:mautic.png',
+		icon: 'file:mautic.svg',
 		group: ['trigger'],
 		version: 1,
 		description: 'Handle Mautic events via webhooks',
diff --git a/packages/nodes-base/nodes/Mautic/mautic.png b/packages/nodes-base/nodes/Mautic/mautic.png
deleted file mode 100644
index d427cae7dc0791b34849edb5b5669863180e5888..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2092
zcmYL~dpy(oAIG<**c_aO+@&#*`>-Urw-A&2S;a^bg_M&zhjh{s4Kan5$fcG`6!oyp
zZF24Amd$0-au;EvD7NpJ^!uI1<NbMmp6}QD@_0W!|9p~<U=K;blwlwcNXpsC(NlC=
zZ5#>6hJw(w1%bfUM_j!RibAY^fxCacfaWCVgkl5o0J@ogZYnYnZ+chUeG#uW>i<#*
z6cM=L^8}2I8f-xRPcMT1O!%{1qzLG!Uj_JlEPkVSGqpJxp#91UXr>}vNH_cGH^%-S
zHpl+23x)O12k7Ra(9J(jSZlh`$k^!JTxN6gb%yaKY%U;TVXcW9K3~8<Z7>bx9*{2r
zfMM<#OcjBs%pL#0n^1Zrs0e5>_c-wo=-BHUS_v>rfqFBakaD064YZ<xW^<s?40yd4
zU|Ry+`+#>AI_3@Pq8Ie}(-Z3j5|e;{zl*PZ|0-CM<Zqq-2J3}Oj;qwzHYLWov#Iw2
za0ji-wHG<<Cx0hLc{!PU9{b4YeqCQ(T38UE5@DpPDbIXfkwM%^OC!a{Sm@=1SR*Jl
zaV<srK%i|-&W?88PVK4L;;}=<zbCdDx1rlY95jf;^!k;^OzjV~^5os7VQT<jyU=IZ
zr1bo6xO&n1Hy^0AvI)aG&+(4tmZ<wqUT9l>;!=N9k8Glu67R1&^Zb;@y)fnK5>}B5
z;o<eRXPR4p2}WO$tA|!wgkrAqqEl>nfY_3vnRF<WJp-rqO;92g8EyV9^kP$h+%h&c
zyn{NNR}9f5%(7-Cab*|SxfSec*rM;&tdyWLTk$AbYqjjV>BqW5xdQ}Ds$=`pv%2PH
zqy@J_yvy3M@|u~+8u-XmPHEr6N+t9=?3gDAlX_Q2NhP{sR1Zct>qRV1Ajn*TlaO$p
zc=+?tS+dXLT|XS5pzNe%cUt8Nd@!8kSa@>X0*`0l4P+Y-xY~VD`yYMFV*7nmi*UEr
zOzw_LJ<U}ZFqs}|eTnH;5#}6+HEErqSsFY~zf6gb=PfbHI;GO)lk@me_gGudS@B|t
z^p(!s^4BA8jICzvCyX*f*JUKHtW;k$rTY7P=}@C?k2zi?XSoyE(>V7ET5L)jT}zBM
zxHuGje_Y|VYBHwK-u3+*+GSO-`@73Hvs&9_s5#{^wIPS@)Y{bG!K(Bx0!xb#sZtsJ
zg)5N_uv40DY)j_r(?DPl%C7f_7fXPm+=K<cJojLgsT7%?(i_G<*no}cE3UD{Du=;I
zwlZIrD+7<tIUDLUT!^#Ym$RhZ1*Q}F-NXllo$$7+hxM}NE4eWq&>D)^;>ADi&N=87
zL%t2>W`@^fLQ=%9zZ`}76~z9bk;^*|YVP%-YSv_qVAYY_mNKa(OO-;yjL!5&Eq6V&
z2!7QyD6R8)-#ao{=+B4K6|1K1IRp~g*Z&FcCgPH6FuwZ9^WyqB*)dktQjlrI$%|pJ
z8W2uIB^3Q&)_cb1l^j!6lWZe#HKBo-eBUO##*S|{Z!%x1hr4m|*6Dd((s-8+&c~-1
zFI%NCkQTjXd8FxmZV&7gBc%(Z>LeTobIuJpeN?TRhLpu@TVP%qlGt)%f{@BtDh@P7
zt1zKt{31EM`x;i^fTeWR7omLI+*JNq4A=BSh^2`|zx7DdY`VfyKluA(!C58T3mJpo
zQhUVZpMfInWX}XyxGDFm?VGW?ZS>>uv8P7Ns?QzLS#c85FQv5_c}&h%Wh*0zqj$t5
z198!okBTbD>k$JmqT0|?Gw0)%Lg4=6&hh6#EQE}<Y!0N$o70@FwSC0cm4$d|&#z7m
z>aF`rY9d2p_dN%kdSsp^&uZ`vA;ktwDLs-=Trjo2>MzZ-5-T*Znx{IT$iAsd>XeX&
zW}QlQ6uQJGlkfYiYj68;O}}#Nyep6jJy4I~7x2UFgXKIE646(_+%3G^d&ON#Khy&!
zWdyzOO<k%Zq{_R%bb#EHhU{2+XV<%I$fsdkC3g5%Howx16<<yA$VPU4MeJH@3Ieqp
zt&t>uOhP7Le3^$cAy$Z}m6jk|WErtN9Z4VPmZ-bN^``Q;+%|M0*ltom&R__)@I*|U
zi*OElES?t@GsXVI1INK?3j#=!E_Q_$nGJ;#iwixH<f(Xz&Rc4?*Z&cAuOv3_%n2Ld
z95}qdx*o*NvS1`GRF%2=olR4I%H37B%;&IJJ+U20QRTD=o2<)G^><Y0vqbqD)Ii*x
zGfMUFPH4Y!k=H26Fl{XP*j8mbwY*hI$X-ZuRV62mQXH5a{A^&%7%Vx2DsBsJ&WES*
zkbY4YPUnIJT^WccTg*du(UP_ta4>JB7$F2k=<FAAm@`Fdo~@E@JEm7H%%tZkkh(%K
zs4D4(L!HaJ{EX0LXSs+c<;WS~L)-ajCumskkD0^A#mrd0ozxp3e$oqsR^E!+qrjEv
zd5bE#IqG*l$amFx+5E$!V<ZG~@sOlR`%)j<96%|bfPC=ztei4bOHu+4OP?cHkG#-*
z@2@<^g8co6dj>}R#^$@~gx%%y>)hyw@0c$#Doxp!aykt->Cj2f03A2guD9{)7W<>E
zo;9|XywS)uoOc?ZQJI`;h%j+Jffm{~<zrUYS|*Ky=?@2)$M&q~NUau}@ThPmw<%7g
ze3GReC>g1fJoi?|a9*W?;L$%h98*G|W5S*}31i18dS0=E2|;pIv0i!;!(;wJmB+ov
VD>}ghY0;+zaz2Q4tgsJE_!rj32VVdH

diff --git a/packages/nodes-base/nodes/Mautic/mautic.svg b/packages/nodes-base/nodes/Mautic/mautic.svg
new file mode 100644
index 0000000000..0a0ac69608
--- /dev/null
+++ b/packages/nodes-base/nodes/Mautic/mautic.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="349.779px" height="349.779px" viewBox="0 0 349.779 349.779" enable-background="new 0 0 349.779 349.779"
+	 xml:space="preserve">
+<path fill="#FFFFFF" d="M174.89,349.779C78.612,349.779,0,271.462,0,174.89S78.612,0,174.89,0c23.26,0,45.931,4.417,67.129,13.543
+	c5.889,2.65,8.833,9.422,6.478,15.605c-2.649,5.888-9.421,8.833-15.604,6.477c-18.549-7.655-37.98-11.482-58.002-11.482
+	c-83.323,0-151.041,67.718-151.041,151.041S91.567,326.225,174.89,326.225c83.323,0,151.041-67.718,151.041-151.041
+	c0-17.96-2.944-35.332-9.127-51.819c-2.355-6.183,0.883-12.955,7.066-15.31c6.183-2.355,12.954,0.883,15.31,7.066
+	c7.066,19.138,10.6,39.453,10.6,60.063C349.779,271.167,271.462,349.779,174.89,349.779"/>
+<g>
+	<polygon fill="#FDB933" points="251.44,156.93 224.354,185.194 239.369,248.496 273.522,248.496 	"/>
+</g>
+<polygon fill="#FDB933" points="240.253,73.312 249.674,82.734 174.89,161.935 110.999,96.277 74.196,248.496 108.35,248.496 
+	128.665,163.996 174.89,214.343 273.817,106.583 283.239,116.299 292.66,63.007 "/>
+</svg>

From d3da5023f03da0d889c201fe8417217214cc6402 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Sat, 10 Jul 2021 11:34:41 +0200
Subject: [PATCH 40/74] :bug: Fix "unknown", never-end workflow and not
 displaying error message (#1978)

* Added try catch blocks to avoid endlessly running workflows

* Added handling for subworkflows

* :zap: Fix one cause of "unkown" status of worklows with "main" mode

* :zap: Fix one cause of "unkown" status of worklows with "own" mode

* :zap: Fix one cause of "unkown" status of worklows with "queue" mode

* Saving database recovery

* :bug: Fix issue that errors did not get saved correctly and also not
displayed

* :zap: Save workflow timeout correctly as error

* Adding error capture to queued jobs

* :zap: Mark canceled executions as not finished consistently across all
modes

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../cli/src/WorkflowExecuteAdditionalData.ts  | 106 ++++++++++-----
 packages/cli/src/WorkflowRunner.ts            | 126 +++++++++++++-----
 packages/cli/src/WorkflowRunnerProcess.ts     |   9 +-
 packages/core/src/WorkflowExecute.ts          |   8 +-
 .../src/components/mixins/pushConnection.ts   |  25 +---
 .../src/components/mixins/showMessage.ts      |  22 +++
 packages/editor-ui/src/views/NodeView.vue     |  33 +++++
 7 files changed, 232 insertions(+), 97 deletions(-)

diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index 9d0478d997..679ba945eb 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -387,9 +387,9 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 					}
 
 					// Leave log message before flatten as that operation increased memory usage a lot and the chance of a crash is highest here
-					Logger.debug(`Save execution data to database for execution ID ${this.executionId}`, { 
-						executionId: this.executionId, 
-						workflowId: this.workflowData.id, 
+					Logger.debug(`Save execution data to database for execution ID ${this.executionId}`, {
+						executionId: this.executionId,
+						workflowId: this.workflowData.id,
 						finished: fullExecutionData.finished,
 						stoppedAt: fullExecutionData.stoppedAt,
 					});
@@ -409,12 +409,12 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 						executeErrorWorkflow(this.workflowData, fullRunData, this.mode, this.executionId, this.retryOf);
 					}
 				} catch (error) {
-					Logger.error(`Failed saving execution data to DB on execution ID ${this.executionId}`, { 
-						executionId: this.executionId, 
+					Logger.error(`Failed saving execution data to DB on execution ID ${this.executionId}`, {
+						executionId: this.executionId,
 						workflowId: this.workflowData.id,
 						error,
 					});
-					
+
 					if (!isManualMode) {
 						executeErrorWorkflow(this.workflowData, fullRunData, this.mode, undefined, this.retryOf);
 					}
@@ -608,44 +608,78 @@ export async function executeWorkflow(workflowInfo: IExecuteWorkflowInfo, additi
 		executionId = parentExecutionId !== undefined ? parentExecutionId : await ActiveExecutions.getInstance().add(runData);
 	}
 
-	const runExecutionData = runData.executionData as IRunExecutionData;
+	let data;
+	try {
+		// Get the needed credentials for the current workflow as they will differ to the ones of the
+		// calling workflow.
+		const credentials = await WorkflowCredentials(workflowData!.nodes);
 
-	// Get the needed credentials for the current workflow as they will differ to the ones of the
-	// calling workflow.
-	const credentials = await WorkflowCredentials(workflowData!.nodes);
+		// Create new additionalData to have different workflow loaded and to call
+		// different webooks
+		const additionalDataIntegrated = await getBase(credentials);
+		additionalDataIntegrated.hooks = getWorkflowHooksIntegrated(runData.executionMode, executionId, workflowData!, { parentProcessMode: additionalData.hooks!.mode });
+		// Make sure we pass on the original executeWorkflow function we received
+		// This one already contains changes to talk to parent process
+		// and get executionID from `activeExecutions` running on main process
+		additionalDataIntegrated.executeWorkflow = additionalData.executeWorkflow;
 
+		let subworkflowTimeout = additionalData.executionTimeoutTimestamp;
+		if (workflowData.settings?.executionTimeout !== undefined && workflowData.settings.executionTimeout > 0) {
+			// We might have received a max timeout timestamp from the parent workflow
+			// If we did, then we get the minimum time between the two timeouts
+			// If no timeout was given from the parent, then we use our timeout.
+			subworkflowTimeout = Math.min(additionalData.executionTimeoutTimestamp || Number.MAX_SAFE_INTEGER, Date.now() + (workflowData.settings.executionTimeout as number * 1000));
+		}
 
-	// Create new additionalData to have different workflow loaded and to call
-	// different webooks
-	const additionalDataIntegrated = await getBase(credentials);
-	additionalDataIntegrated.hooks = getWorkflowHooksIntegrated(runData.executionMode, executionId, workflowData!, { parentProcessMode: additionalData.hooks!.mode });
-	// Make sure we pass on the original executeWorkflow function we received
-	// This one already contains changes to talk to parent process
-	// and get executionID from `activeExecutions` running on main process
-	additionalDataIntegrated.executeWorkflow = additionalData.executeWorkflow;
+		additionalDataIntegrated.executionTimeoutTimestamp = subworkflowTimeout;
 
-	let subworkflowTimeout = additionalData.executionTimeoutTimestamp;
-	if (workflowData.settings?.executionTimeout !== undefined && workflowData.settings.executionTimeout > 0) {
-		// We might have received a max timeout timestamp from the parent workflow
-		// If we did, then we get the minimum time between the two timeouts
-		// If no timeout was given from the parent, then we use our timeout.
-		subworkflowTimeout = Math.min(additionalData.executionTimeoutTimestamp || Number.MAX_SAFE_INTEGER, Date.now() + (workflowData.settings.executionTimeout as number * 1000));
-	}
+		const runExecutionData = runData.executionData as IRunExecutionData;
 
-	additionalDataIntegrated.executionTimeoutTimestamp = subworkflowTimeout;
-
-
-	// Execute the workflow
-	const workflowExecute = new WorkflowExecute(additionalDataIntegrated, runData.executionMode, runExecutionData);
-	if (parentExecutionId !== undefined) {
-		// Must be changed to become typed
-		return {
+		// Execute the workflow
+		const workflowExecute = new WorkflowExecute(additionalDataIntegrated, runData.executionMode, runExecutionData);
+		if (parentExecutionId !== undefined) {
+			// Must be changed to become typed
+			return {
+				startedAt: new Date(),
+				workflow,
+				workflowExecute,
+			};
+		}
+		data = await workflowExecute.processRunExecutionData(workflow);
+	} catch (error) {
+		const fullRunData: IRun = {
+			data: {
+				resultData: {
+					error,
+					runData: {},
+				},
+			},
+			finished: false,
+			mode: 'integrated',
 			startedAt: new Date(),
-			workflow,
-			workflowExecute,
+			stoppedAt: new Date(),
+		};
+		// When failing, we might not have finished the execution
+		// Therefore, database might not contain finished errors.
+		// Force an update to db as there should be no harm doing this
+
+		const fullExecutionData: IExecutionDb = {
+			data: fullRunData.data,
+			mode: fullRunData.mode,
+			finished: fullRunData.finished ? fullRunData.finished : false,
+			startedAt: fullRunData.startedAt,
+			stoppedAt: fullRunData.stoppedAt,
+			workflowData,
+		};
+
+		const executionData = ResponseHelper.flattenExecutionData(fullExecutionData);
+
+		await Db.collections.Execution!.update(executionId, executionData as IExecutionFlattedDb);
+		throw {
+			...error,
+			stack: error!.stack,
 		};
 	}
-	const data = await workflowExecute.processRunExecutionData(workflow);
 
 	await externalHooks.run('workflow.postExecute', [data, workflowData]);
 
diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index 56031d5a77..ee928657c2 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -8,6 +8,7 @@ import {
 	IBullJobResponse,
 	ICredentialsOverwrite,
 	ICredentialsTypeData,
+	IExecutionDb,
 	IExecutionFlattedDb,
 	IExecutionResponse,
 	IProcessMessageDataHook,
@@ -29,6 +30,7 @@ import {
 import {
 	ExecutionError,
 	IRun,
+	IWorkflowBase,
 	LoggerProxy as Logger,
 	Workflow,
 	WorkflowExecuteMode,
@@ -85,11 +87,15 @@ export class WorkflowRunner {
 	 * @param {string} executionId
 	 * @memberof WorkflowRunner
 	 */
-	processError(error: ExecutionError, startedAt: Date, executionMode: WorkflowExecuteMode, executionId: string) {
+	async processError(error: ExecutionError, startedAt: Date, executionMode: WorkflowExecuteMode, executionId: string, hooks?: WorkflowHooks) {
 		const fullRunData: IRun = {
 			data: {
 				resultData: {
-					error,
+					error: {
+						...error,
+						message: error.message,
+						stack: error.stack,
+					},
 					runData: {},
 				},
 			},
@@ -102,6 +108,10 @@ export class WorkflowRunner {
 		// Remove from active execution with empty data. That will
 		// set the execution to failed.
 		this.activeExecutions.remove(executionId, fullRunData);
+
+		if (hooks) {
+			await hooks.executeHookFunctions('workflowExecuteAfter', [fullRunData]);
+		}
 	}
 
 	/**
@@ -179,28 +189,34 @@ export class WorkflowRunner {
 		// Register the active execution
 		const executionId = await this.activeExecutions.add(data, undefined);
 		Logger.verbose(`Execution for workflow ${data.workflowData.name} was assigned id ${executionId}`, {executionId});
-
+		let workflowExecution: PCancelable<IRun>;
 		additionalData.hooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(data, executionId, true);
 
-		additionalData.sendMessageToUI = WorkflowExecuteAdditionalData.sendMessageToUI.bind({sessionId: data.sessionId});
+		try {
+			additionalData.sendMessageToUI = WorkflowExecuteAdditionalData.sendMessageToUI.bind({sessionId: data.sessionId});
 
-		let workflowExecution: PCancelable<IRun>;
-		if (data.executionData !== undefined) {
-			Logger.debug(`Execution ID ${executionId} had Execution data. Running with payload.`, {executionId});
-			const workflowExecute = new WorkflowExecute(additionalData, data.executionMode, data.executionData);
-			workflowExecution = workflowExecute.processRunExecutionData(workflow);
-		} else if (data.runData === undefined || data.startNodes === undefined || data.startNodes.length === 0 || data.destinationNode === undefined) {
-			Logger.debug(`Execution ID ${executionId} will run executing all nodes.`, {executionId});
-			// Execute all nodes
+			if (data.executionData !== undefined) {
+				Logger.debug(`Execution ID ${executionId} had Execution data. Running with payload.`, {executionId});
+				const workflowExecute = new WorkflowExecute(additionalData, data.executionMode, data.executionData);
+				workflowExecution = workflowExecute.processRunExecutionData(workflow);
+			} else if (data.runData === undefined || data.startNodes === undefined || data.startNodes.length === 0 || data.destinationNode === undefined) {
+				Logger.debug(`Execution ID ${executionId} will run executing all nodes.`, {executionId});
+				// Execute all nodes
 
-			// Can execute without webhook so go on
-			const workflowExecute = new WorkflowExecute(additionalData, data.executionMode);
-			workflowExecution = workflowExecute.run(workflow, undefined, data.destinationNode);
-		} else {
-			Logger.debug(`Execution ID ${executionId} is a partial execution.`, {executionId});
-			// Execute only the nodes between start and destination nodes
-			const workflowExecute = new WorkflowExecute(additionalData, data.executionMode);
-			workflowExecution = workflowExecute.runPartialWorkflow(workflow, data.runData, data.startNodes, data.destinationNode);
+				// Can execute without webhook so go on
+				const workflowExecute = new WorkflowExecute(additionalData, data.executionMode);
+				workflowExecution = workflowExecute.run(workflow, undefined, data.destinationNode);
+			} else {
+				Logger.debug(`Execution ID ${executionId} is a partial execution.`, {executionId});
+				// Execute only the nodes between start and destination nodes
+				const workflowExecute = new WorkflowExecute(additionalData, data.executionMode);
+				workflowExecution = workflowExecute.runPartialWorkflow(workflow, data.runData, data.startNodes, data.destinationNode);
+			}
+
+		} catch (error) {
+			await this.processError(error, new Date(), data.executionMode, executionId, additionalData.hooks);
+
+			throw error;
 		}
 
 		this.activeExecutions.attachWorkflowExecution(executionId, workflowExecution);
@@ -247,7 +263,17 @@ export class WorkflowRunner {
 			removeOnComplete: true,
 			removeOnFail: true,
 		};
-		const job = await this.jobQueue.add(jobData, jobOptions);
+		let job: Bull.Job;
+		try {
+			job = await this.jobQueue.add(jobData, jobOptions);
+		} catch (error) {
+			// We use "getWorkflowHooksIntegrated" here as we are just integrated in the "workflowExecuteAfter"
+			// hook anyway and other get so ignored
+			const hooks = WorkflowExecuteAdditionalData.getWorkflowHooksIntegrated(data.executionMode, executionId, data.workflowData, { retryOf: data.retryOf ? data.retryOf.toString() : undefined });
+			await this.processError(error, new Date(), data.executionMode, executionId, hooks);
+			return executionId;
+		}
+
 		console.log('Started with ID: ' + job.id.toString());
 
 		const hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerMain(data.executionMode, executionId, data.workflowData, { retryOf: data.retryOf ? data.retryOf.toString() : undefined });
@@ -264,7 +290,7 @@ export class WorkflowRunner {
 				const fullRunData :IRun = {
 					data: {
 						resultData: {
-							error: new WorkflowOperationError('Workflow has been canceled!'),
+							error: new WorkflowOperationError('Workflow-Execution has been canceled!'),
 							runData: {},
 						},
 					},
@@ -280,6 +306,9 @@ export class WorkflowRunner {
 
 			const queueRecoveryInterval = config.get('queue.bull.queueRecoveryInterval') as number;
 
+			const racingPromises: Array<Promise<IBullJobResponse | object>> = [jobData];
+
+			let clearWatchdogInterval;
 			if (queueRecoveryInterval > 0) {
 				/*************************************************
 				 * Long explanation about what this solves:      *
@@ -295,7 +324,7 @@ export class WorkflowRunner {
 				*************************************************/
 				let watchDogInterval: NodeJS.Timeout | undefined;
 
-				const watchDog = new Promise((res) => {
+				const watchDog: Promise<object> = new Promise((res) => {
 					watchDogInterval = setInterval(async () => {
 						const currentJob = await this.jobQueue.getJob(job.id);
 						// When null means job is finished (not found in queue)
@@ -306,19 +335,43 @@ export class WorkflowRunner {
 					}, queueRecoveryInterval * 1000);
 				});
 
+				racingPromises.push(watchDog);
 
-				const clearWatchdogInterval = () => {
+				clearWatchdogInterval = () => {
 					if (watchDogInterval) {
 						clearInterval(watchDogInterval);
 						watchDogInterval = undefined;
 					}
 				};
+			}
 
-				await Promise.race([jobData, watchDog]);
-				clearWatchdogInterval();
+			try {
+				await Promise.race(racingPromises);
+				if (clearWatchdogInterval !== undefined) {
+					clearWatchdogInterval();
+				}
+			} catch (error) {
+				const hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerExecuter(data.executionMode, executionId, data.workflowData, { retryOf: data.retryOf ? data.retryOf.toString() : undefined });
+				Logger.error(`Problem with execution ${executionId}: ${error.message}. Aborting.`);
+				if (clearWatchdogInterval !== undefined) {
+					clearWatchdogInterval();
+				}
+				await this.processError(error, new Date(), data.executionMode, executionId, hooks);
 
-			} else {
-				await jobData;
+				const fullRunData :IRun = {
+					data: {
+						resultData: {
+							error,
+							runData: {},
+						},
+					},
+					mode: data.executionMode,
+					startedAt: new Date(),
+					stoppedAt: new Date(),
+				};
+				this.activeExecutions.remove(executionId, fullRunData);
+				resolve(fullRunData);
+				return;
 			}
 
 
@@ -427,8 +480,13 @@ export class WorkflowRunner {
 
 		const workflowHooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(data, executionId);
 
-		// Send all data to subprocess it needs to run the workflow
-		subprocess.send({ type: 'startWorkflow', data } as IProcessMessage);
+		try {
+			// Send all data to subprocess it needs to run the workflow
+			subprocess.send({ type: 'startWorkflow', data } as IProcessMessage);
+		} catch (error) {
+			await this.processError(error, new Date(), data.executionMode, executionId, workflowHooks);
+			return executionId;
+		}
 
 		// Start timeout for the execution
 		let executionTimeout: NodeJS.Timeout;
@@ -476,14 +534,14 @@ export class WorkflowRunner {
 			} else if (message.type === 'processError') {
 				clearTimeout(executionTimeout);
 				const executionError = message.data.executionError as ExecutionError;
-				this.processError(executionError, startedAt, data.executionMode, executionId);
-
+				await this.processError(executionError, startedAt, data.executionMode, executionId, workflowHooks);
 			} else if (message.type === 'processHook') {
 				this.processHookMessage(workflowHooks, message.data as IProcessMessageDataHook);
 			} else if (message.type === 'timeout') {
 				// Execution timed out and its process has been terminated
 				const timeoutError = new WorkflowOperationError('Workflow execution timed out!');
 
+				// No need to add hook here as the subprocess takes care of calling the hooks
 				this.processError(timeoutError, startedAt, data.executionMode, executionId);
 			} else if (message.type === 'startExecution') {
 				const executionId = await this.activeExecutions.add(message.data.runData);
@@ -506,13 +564,13 @@ export class WorkflowRunner {
 				// Execution timed out and its process has been terminated
 				const timeoutError = new WorkflowOperationError('Workflow execution timed out!');
 
-				this.processError(timeoutError, startedAt, data.executionMode, executionId);
+				await this.processError(timeoutError, startedAt, data.executionMode, executionId, workflowHooks);
 			} else if (code !== 0) {
 				Logger.debug(`Subprocess for execution ID ${executionId} finished with error code ${code}.`, {executionId});
 				// Process did exit with error code, so something went wrong.
 				const executionError = new WorkflowOperationError('Workflow execution process did crash for an unknown reason!');
 
-				this.processError(executionError, startedAt, data.executionMode, executionId);
+				await this.processError(executionError, startedAt, data.executionMode, executionId, workflowHooks);
 			}
 
 			for(const executionId of childExecutionIds) {
diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
index 3dbc77cf6c..321389ae2f 100644
--- a/packages/cli/src/WorkflowRunnerProcess.ts
+++ b/packages/cli/src/WorkflowRunnerProcess.ts
@@ -30,6 +30,7 @@ import {
 	IWorkflowExecuteHooks,
 	LoggerProxy,
 	Workflow,
+	WorkflowExecuteMode,
 	WorkflowHooks,
 	WorkflowOperationError,
 } from 'n8n-workflow';
@@ -315,7 +316,7 @@ process.on('message', async (message: IProcessMessage) => {
 				for (const executionId of executionIds) {
 					const childWorkflowExecute = workflowRunner.childExecutions[executionId];
 					runData = childWorkflowExecute.workflowExecute.getFullRunData(workflowRunner.childExecutions[executionId].startedAt);
-					const timeOutError = message.type === 'timeout' ? new WorkflowOperationError('Workflow execution timed out!') : undefined;
+					const timeOutError = message.type === 'timeout' ? new WorkflowOperationError('Workflow execution timed out!') : new WorkflowOperationError('Workflow-Execution has been canceled!');
 
 					// If there is any data send it to parent process, if execution timedout add the error
 					await childWorkflowExecute.workflowExecute.processSuccessExecution(workflowRunner.childExecutions[executionId].startedAt, childWorkflowExecute.workflow, timeOutError);
@@ -324,7 +325,7 @@ process.on('message', async (message: IProcessMessage) => {
 				// Workflow started already executing
 				runData = workflowRunner.workflowExecute.getFullRunData(workflowRunner.startedAt);
 
-				const timeOutError = message.type === 'timeout' ? new WorkflowOperationError('Workflow execution timed out!') : undefined;
+				const timeOutError = message.type === 'timeout' ? new WorkflowOperationError('Workflow execution timed out!') : new WorkflowOperationError('Workflow-Execution has been canceled!');
 
 				// If there is any data send it to parent process, if execution timedout add the error
 				await workflowRunner.workflowExecute.processSuccessExecution(workflowRunner.startedAt, workflowRunner.workflow!, timeOutError);
@@ -336,8 +337,8 @@ process.on('message', async (message: IProcessMessage) => {
 							runData: {},
 						},
 					},
-					finished: message.type !== 'timeout',
-					mode: workflowRunner.data!.executionMode,
+					finished: false,
+					mode: workflowRunner.data ? workflowRunner.data!.executionMode : 'own' as WorkflowExecuteMode,
 					startedAt: workflowRunner.startedAt,
 					stoppedAt: new Date(),
 				};
diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/WorkflowExecute.ts
index 5c73d4c9ef..b893b85cb0 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/WorkflowExecute.ts
@@ -807,7 +807,7 @@ export class WorkflowExecute {
 			})()
 			.then(async () => {
 				if (gotCancel && executionError === undefined) {
-					return this.processSuccessExecution(startedAt, workflow, new WorkflowOperationError('Workflow has been canceled!'));
+					return this.processSuccessExecution(startedAt, workflow, new WorkflowOperationError('Workflow has been canceled or timed out!'));
 				}
 				return this.processSuccessExecution(startedAt, workflow, executionError);
 			})
@@ -844,7 +844,11 @@ export class WorkflowExecute {
 
 		if (executionError !== undefined) {
 			Logger.verbose(`Workflow execution finished with error`, { error: executionError, workflowId: workflow.id });
-			fullRunData.data.resultData.error = executionError;
+			fullRunData.data.resultData.error = {
+				...executionError,
+				message: executionError.message,
+				stack: executionError.stack,
+			} as ExecutionError;
 		} else {
 			Logger.verbose(`Workflow execution finished successfully`, { workflowId: workflow.id });
 			fullRunData.finished = true;
diff --git a/packages/editor-ui/src/components/mixins/pushConnection.ts b/packages/editor-ui/src/components/mixins/pushConnection.ts
index 038335a904..4c500b59ee 100644
--- a/packages/editor-ui/src/components/mixins/pushConnection.ts
+++ b/packages/editor-ui/src/components/mixins/pushConnection.ts
@@ -213,33 +213,16 @@ export const pushConnection = mixins(
 
 					const runDataExecuted = pushData.data;
 
-					let runDataExecutedErrorMessage;
+					const runDataExecutedErrorMessage = this.$getExecutionError(runDataExecuted.data.resultData.error);
+
 					// @ts-ignore
 					const workflow = this.getWorkflow();
 					if (runDataExecuted.finished !== true) {
-						// There was a problem with executing the workflow
-						let errorMessage = 'There was a problem executing the workflow!';
-
-						if (runDataExecuted.data.resultData.error && runDataExecuted.data.resultData.error.message) {
-							let nodeName: string | undefined;
-							if (runDataExecuted.data.resultData.error.node) {
-								nodeName = typeof runDataExecuted.data.resultData.error.node === 'string'
-									? runDataExecuted.data.resultData.error.node
-									: runDataExecuted.data.resultData.error.node.name;
-							}
-
-							const receivedError = nodeName
-								? `${nodeName}: ${runDataExecuted.data.resultData.error.message}`
-								: runDataExecuted.data.resultData.error.message;
-							errorMessage = `There was a problem executing the workflow:<br /><strong>"${receivedError}"</strong>`;
-						}
-
-						runDataExecutedErrorMessage = errorMessage;
-
 						this.$titleSet(workflow.name as string, 'ERROR');
+
 						this.$showMessage({
 							title: 'Problem executing workflow',
-							message: errorMessage,
+							message: runDataExecutedErrorMessage,
 							type: 'error',
 						});
 					} else {
diff --git a/packages/editor-ui/src/components/mixins/showMessage.ts b/packages/editor-ui/src/components/mixins/showMessage.ts
index 6ed718ca52..67bb9301a8 100644
--- a/packages/editor-ui/src/components/mixins/showMessage.ts
+++ b/packages/editor-ui/src/components/mixins/showMessage.ts
@@ -3,6 +3,7 @@ import { ElNotificationOptions } from 'element-ui/types/notification';
 import mixins from 'vue-typed-mixins';
 
 import { externalHooks } from '@/components/mixins/externalHooks';
+import { ExecutionError } from 'n8n-workflow';
 
 export const showMessage = mixins(externalHooks).extend({
 	methods: {
@@ -15,6 +16,27 @@ export const showMessage = mixins(externalHooks).extend({
 			return Notification(messageData);
 		},
 
+		$getExecutionError(error?: ExecutionError) {
+			// There was a problem with executing the workflow
+			let errorMessage = 'There was a problem executing the workflow!';
+
+			if (error && error.message) {
+				let nodeName: string | undefined;
+				if (error.node) {
+					nodeName = typeof error.node === 'string'
+						? error.node
+						: error.node.name;
+				}
+
+				const receivedError = nodeName
+					? `${nodeName}: ${error.message}`
+					: error.message;
+				errorMessage = `There was a problem executing the workflow:<br /><strong>"${receivedError}"</strong>`;
+			}
+
+			return errorMessage;
+		},
+
 		$showError(error: Error, title: string, message?: string) {
 			const messageLine = message ? `${message}<br/>` : '';
 			this.$showMessage({
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 7904b4eb0e..5bc946cd77 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -375,6 +375,39 @@ export default mixins(
 				});
 
 				this.$externalHooks().run('execution.open', { workflowId: data.workflowData.id, workflowName: data.workflowData.name, executionId });
+
+				if (data.finished !== true && data.data.resultData.error) {
+					// Check if any node contains an error
+					let nodeErrorFound = false;
+					if (data.data.resultData.runData) {
+						const runData = data.data.resultData.runData;
+						errorCheck:
+						for (const nodeName of Object.keys(runData)) {
+							for (const taskData of runData[nodeName]) {
+								if (taskData.error) {
+									nodeErrorFound = true;
+									break errorCheck;
+								}
+							}
+						}
+					}
+
+					if (nodeErrorFound === false) {
+						const errorMessage = this.$getExecutionError(data.data.resultData.error);
+						this.$showMessage({
+							title: 'Failed execution',
+							message: errorMessage,
+							type: 'error',
+						});
+
+						if (data.data.resultData.error.stack) {
+							// Display some more information for now in console to make debugging easier
+							// TODO: Improve this in the future by displaying in UI
+							console.error(`Execution ${executionId} error:`);
+							console.error(data.data.resultData.error.stack);
+						}
+					}
+				}
 			},
 			async openWorkflowTemplate (templateId: string) {
 				this.setLoadingText('Loading template');

From e2aa8ae9b860850107293f07785433ec71f32dac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Sat, 10 Jul 2021 11:38:45 +0200
Subject: [PATCH 41/74] :hammer: Standardize the simple response option (#1813)

---
 .../nodes/ActiveCampaign/GenericFunctions.ts  |  4 ++--
 .../Aws/Comprehend/AwsComprehend.node.ts      |  4 ++--
 .../nodes/Discourse/SearchDescription.ts      |  4 ++--
 packages/nodes-base/nodes/Egoi/Egoi.node.ts   |  4 ++--
 .../Google/Analytics/ReportDescription.ts     |  4 ++--
 .../Google/BigQuery/RecordDescription.ts      |  2 +-
 .../CloudFirestore/DocumentDescription.ts     | 16 +++++++--------
 .../nodes/Mautic/CompanyDescription.ts        | 20 +++++++++----------
 .../nodes/Notion/DatabasePageDescription.ts   |  4 ++--
 .../nodes/ProfitWell/MetricDescription.ts     |  4 ++--
 .../nodes/QuickBase/RecordDescription.ts      | 12 +++++------
 .../descriptions/CompanyDescription.ts        |  6 +++---
 .../descriptions/IndustryDescription.ts       |  4 ++--
 13 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts b/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
index 215d31934c..172cbd37ec 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
@@ -163,7 +163,7 @@ export function activeCampaignDefaultGetAllProperties(resource: string, operatio
 			description: 'How many results to return.',
 		},
 		{
-			displayName: 'Simple',
+			displayName: 'Simplify Response',
 			name: 'simple',
 			type: 'boolean',
 			displayOptions: {
@@ -177,7 +177,7 @@ export function activeCampaignDefaultGetAllProperties(resource: string, operatio
 				},
 			},
 			default: true,
-			description: 'When set to true a simplify version of the response will be used else the raw data.',
+			description: 'Return a simplified version of the response instead of the raw data.',
 		},
 	];
 }
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts b/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts
index 7223ddc282..e611586aa9 100644
--- a/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts
+++ b/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts
@@ -158,7 +158,7 @@ export class AwsComprehend implements INodeType {
 				description: 'The text to send.',
 			},
 			{
-				displayName: 'Simple',
+				displayName: 'Simplify Response',
 				name: 'simple',
 				type: 'boolean',
 				displayOptions: {
@@ -172,7 +172,7 @@ export class AwsComprehend implements INodeType {
 					},
 				},
 				default: true,
-				description: 'When set to true a simplify version of the response will be used else the raw data.',
+				description: 'Return a simplified version of the response instead of the raw data.',
 			},
 			{
 				displayName: 'Additional Fields',
diff --git a/packages/nodes-base/nodes/Discourse/SearchDescription.ts b/packages/nodes-base/nodes/Discourse/SearchDescription.ts
index f9bc7b9756..91846f3a36 100644
--- a/packages/nodes-base/nodes/Discourse/SearchDescription.ts
+++ b/packages/nodes-base/nodes/Discourse/SearchDescription.ts
@@ -50,7 +50,7 @@ export const searchFields: INodeProperties[] = [
 		description: 'Term to search for.',
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -64,6 +64,6 @@ export const searchFields: INodeProperties[] = [
 			},
 		},
 		default: true,
-		description: 'When set to true a simplify version of the response will be used else the raw data.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 ];
diff --git a/packages/nodes-base/nodes/Egoi/Egoi.node.ts b/packages/nodes-base/nodes/Egoi/Egoi.node.ts
index 88151f10b8..ab96a1bfdd 100644
--- a/packages/nodes-base/nodes/Egoi/Egoi.node.ts
+++ b/packages/nodes-base/nodes/Egoi/Egoi.node.ts
@@ -515,7 +515,7 @@ export class Egoi implements INodeType {
 				description: 'How many results to return.',
 			},
 			{
-				displayName: 'Simple',
+				displayName: 'Simplify Response',
 				name: 'simple',
 				type: 'boolean',
 				displayOptions: {
@@ -530,7 +530,7 @@ export class Egoi implements INodeType {
 					},
 				},
 				default: true,
-				description: 'When set to true a simple version of the response will be returned else the RAW data.',
+				description: 'Return a simplified version of the response instead of the raw data.',
 			},
 		],
 	};
diff --git a/packages/nodes-base/nodes/Google/Analytics/ReportDescription.ts b/packages/nodes-base/nodes/Google/Analytics/ReportDescription.ts
index abb20b1b5a..7b18604762 100644
--- a/packages/nodes-base/nodes/Google/Analytics/ReportDescription.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/ReportDescription.ts
@@ -91,7 +91,7 @@ export const reportFields = [
 		description: 'How many results to return.',
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -105,7 +105,7 @@ export const reportFields = [
 			},
 		},
 		default: true,
-		description: 'When set to true a simplify version of the response will be used else the raw data.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 	{
 		displayName: 'Additional Fields',
diff --git a/packages/nodes-base/nodes/Google/BigQuery/RecordDescription.ts b/packages/nodes-base/nodes/Google/BigQuery/RecordDescription.ts
index 3f490ee648..dcae15e41f 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/RecordDescription.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/RecordDescription.ts
@@ -287,7 +287,7 @@ export const recordFields = [
 		description: 'How many results to return.',
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/DocumentDescription.ts b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/DocumentDescription.ts
index b8f74c82a5..fb95476a8a 100644
--- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/DocumentDescription.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/DocumentDescription.ts
@@ -137,7 +137,7 @@ export const documentFields = [
 		placeholder: 'productId, modelName, description',
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -151,7 +151,7 @@ export const documentFields = [
 			},
 		},
 		default: true,
-		description: 'When set to true a simplify version of the response will be used else the raw data.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -233,7 +233,7 @@ export const documentFields = [
 		required: true,
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -247,7 +247,7 @@ export const documentFields = [
 			},
 		},
 		default: true,
-		description: 'When set to true a simplify version of the response will be used else the raw data.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -353,7 +353,7 @@ export const documentFields = [
 		description: 'How many results to return.',
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -367,7 +367,7 @@ export const documentFields = [
 			},
 		},
 		default: true,
-		description: 'When set to true a simplify version of the response will be used else the raw data.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -726,7 +726,7 @@ export const documentFields = [
 		placeholder: '{"structuredQuery": {"where": {"fieldFilter": {"field": {"fieldPath": "age"},"op": "EQUAL", "value": {"integerValue": 28}}}, "from": [{"collectionId": "users-collection"}]}}',
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -740,6 +740,6 @@ export const documentFields = [
 			},
 		},
 		default: true,
-		description: 'When set to true a simplify version of the response will be used else the raw data.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Mautic/CompanyDescription.ts b/packages/nodes-base/nodes/Mautic/CompanyDescription.ts
index 4a8ed49440..36bd1ee5cf 100644
--- a/packages/nodes-base/nodes/Mautic/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/Mautic/CompanyDescription.ts
@@ -69,7 +69,7 @@ export const companyFields = [
 		description: 'The name of the company to create.',
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -83,7 +83,7 @@ export const companyFields = [
 			},
 		},
 		default: true,
-		description: 'When set to true a simplify version of the response will be used else the raw data.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 	{
 		displayName: 'Additional Fields',
@@ -139,7 +139,7 @@ export const companyFields = [
 		description: 'The ID of the company to update.',
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -153,7 +153,7 @@ export const companyFields = [
 			},
 		},
 		default: true,
-		description: 'When set to true a simplify version of the response will be used else the raw data.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 	{
 		displayName: 'Update Fields',
@@ -216,7 +216,7 @@ export const companyFields = [
 		description: 'The ID of the company to return.',
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -230,7 +230,7 @@ export const companyFields = [
 			},
 		},
 		default: true,
-		description: 'When set to true a simplify version of the response will be used else the raw data.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 
 	/* -------------------------------------------------------------------------- */
@@ -278,7 +278,7 @@ export const companyFields = [
 		description: 'How many results to return.',
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -292,7 +292,7 @@ export const companyFields = [
 			},
 		},
 		default: true,
-		description: 'When set to true a simplify version of the response will be used else the raw data.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 	{
 		displayName: 'Additional Fields',
@@ -368,7 +368,7 @@ export const companyFields = [
 		description: 'The ID of the company to delete.',
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -382,6 +382,6 @@ export const companyFields = [
 			},
 		},
 		default: true,
-		description: 'When set to true a simplify version of the response will be used else the raw data.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 ] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts b/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts
index 3a868247e7..9fd9a3901f 100644
--- a/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts
+++ b/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts
@@ -432,7 +432,7 @@ export const databasePageFields = [
 		description: 'The ID of the databasePage to update.',
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -446,7 +446,7 @@ export const databasePageFields = [
 			},
 		},
 		default: true,
-		description: 'When set to true a simplify version of the response will be used else the raw data.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 	{
 		displayName: 'Properties',
diff --git a/packages/nodes-base/nodes/ProfitWell/MetricDescription.ts b/packages/nodes-base/nodes/ProfitWell/MetricDescription.ts
index 8602711f32..74ed1329e1 100644
--- a/packages/nodes-base/nodes/ProfitWell/MetricDescription.ts
+++ b/packages/nodes-base/nodes/ProfitWell/MetricDescription.ts
@@ -84,7 +84,7 @@ export const metricFields = [
 		description: 'Can only be the current or previous month. Format should be YYYY-MM',
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		default: true,
@@ -98,7 +98,7 @@ export const metricFields = [
 				],
 			},
 		},
-		description: 'When set to true a simplify version of the response will be used else the raw data.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 	{
 		displayName: 'Options',
diff --git a/packages/nodes-base/nodes/QuickBase/RecordDescription.ts b/packages/nodes-base/nodes/QuickBase/RecordDescription.ts
index 7b572fe837..bd08835843 100644
--- a/packages/nodes-base/nodes/QuickBase/RecordDescription.ts
+++ b/packages/nodes-base/nodes/QuickBase/RecordDescription.ts
@@ -88,7 +88,7 @@ export const recordFields = [
 		description: 'Comma separated list of the properties which should used as columns for the new rows.',
 	},
 	{
-		displayName: 'Simplified Response',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -102,7 +102,7 @@ export const recordFields = [
 			},
 		},
 		default: true,
-		description: 'When set to true a simplify version of the response will be used else the raw data.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 	{
 		displayName: 'Options',
@@ -385,7 +385,7 @@ export const recordFields = [
 		description: 'update can use the key field on the table, or any other supported unique field.',
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -399,7 +399,7 @@ export const recordFields = [
 			},
 		},
 		default: true,
-		description: 'When set to true a simplify version of the response will be used else the raw data.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 	{
 		displayName: 'Options',
@@ -532,7 +532,7 @@ export const recordFields = [
 		choosing the field in the app table that holds unique matching values. This is called a merge field.`,
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -546,7 +546,7 @@ export const recordFields = [
 			},
 		},
 		default: true,
-		description: 'When set to true a simplify version of the response will be used else the raw data.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 	{
 		displayName: 'Options',
diff --git a/packages/nodes-base/nodes/SecurityScorecard/descriptions/CompanyDescription.ts b/packages/nodes-base/nodes/SecurityScorecard/descriptions/CompanyDescription.ts
index a2509495b6..5b26ca780d 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/descriptions/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/SecurityScorecard/descriptions/CompanyDescription.ts
@@ -135,7 +135,7 @@ export const companyFields = [
 		description: 'Number of results to return.',
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -150,7 +150,7 @@ export const companyFields = [
 			},
 		},
 		default: true,
-		description: 'Simplify the response.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 
 	// company:getFactor
@@ -188,7 +188,7 @@ export const companyFields = [
 			},
 		],
 	},
-	
+
 	// company:getFactorHistorical
 	// company:getHistoricalScore
 	{
diff --git a/packages/nodes-base/nodes/SecurityScorecard/descriptions/IndustryDescription.ts b/packages/nodes-base/nodes/SecurityScorecard/descriptions/IndustryDescription.ts
index 665c4bdd28..3d9dbc8b43 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/descriptions/IndustryDescription.ts
+++ b/packages/nodes-base/nodes/SecurityScorecard/descriptions/IndustryDescription.ts
@@ -118,7 +118,7 @@ export const industryFields = [
 		description: 'Number of results to return.',
 	},
 	{
-		displayName: 'Simple',
+		displayName: 'Simplify Response',
 		name: 'simple',
 		type: 'boolean',
 		displayOptions: {
@@ -133,7 +133,7 @@ export const industryFields = [
 			},
 		},
 		default: true,
-		description: 'Simplify the response.',
+		description: 'Return a simplified version of the response instead of the raw data.',
 	},
 	{
 		displayName: 'Options',

From a3ec24e912b42758ccd54a58e98e54357fd26cb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Sat, 10 Jul 2021 12:36:21 +0200
Subject: [PATCH 42/74] :zap: Add message deletion to Telegram node (#1980)

* :zap: Add deleteMessage to Telegram node

* :zap: Fix order

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../nodes/Telegram/Telegram.node.ts           | 60 +++++++++++++++----
 1 file changed, 49 insertions(+), 11 deletions(-)

diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.ts b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
index 8f5ee6a254..f07cce57e8 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.ts
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
@@ -200,6 +200,11 @@ export class Telegram implements INodeType {
 					},
 				},
 				options: [
+					{
+						name: 'Delete Chat Message',
+						value: 'deleteMessage',
+						description: 'Delete a chat message',
+					},
 					{
 						name: 'Edit Message Text',
 						value: 'editMessageText',
@@ -210,11 +215,6 @@ export class Telegram implements INodeType {
 						value: 'pinChatMessage',
 						description: 'Pin a chat message',
 					},
-					{
-						name: 'Unpin Chat Message',
-						value: 'unpinChatMessage',
-						description: 'Unpin a chat message',
-					},
 					{
 						name: 'Send Animation',
 						value: 'sendAnimation',
@@ -240,16 +240,16 @@ export class Telegram implements INodeType {
 						value: 'sendLocation',
 						description: 'Send a location',
 					},
-					{
-						name: 'Send Message',
-						value: 'sendMessage',
-						description: 'Send a text message',
-					},
 					{
 						name: 'Send Media Group',
 						value: 'sendMediaGroup',
 						description: 'Send group of photos or videos to album',
 					},
+					{
+						name: 'Send Message',
+						value: 'sendMessage',
+						description: 'Send a text message',
+					},
 					{
 						name: 'Send Photo',
 						value: 'sendPhoto',
@@ -265,6 +265,11 @@ export class Telegram implements INodeType {
 						value: 'sendVideo',
 						description: 'Send a video',
 					},
+					{
+						name: 'Unpin Chat Message',
+						value: 'unpinChatMessage',
+						description: 'Unpin a chat message',
+					},
 				],
 				default: 'sendMessage',
 				description: 'The operation to perform.',
@@ -283,11 +288,11 @@ export class Telegram implements INodeType {
 				displayOptions: {
 					show: {
 						operation: [
+							'deleteMessage',
 							'get',
 							'leave',
 							'member',
 							'pinChatMessage',
-							'unpinChatMessage',
 							'setDescription',
 							'setTitle',
 							'sendAnimation',
@@ -300,6 +305,7 @@ export class Telegram implements INodeType {
 							'sendPhoto',
 							'sendSticker',
 							'sendVideo',
+							'unpinChatMessage',
 						],
 						resource: [
 							'chat',
@@ -311,6 +317,28 @@ export class Telegram implements INodeType {
 				description: 'Unique identifier for the target chat or username of the target<br />channel (in the format @channelusername).',
 			},
 
+			// ----------------------------------
+			//       message:deleteMessage
+			// ----------------------------------
+			{
+				displayName: 'Message ID',
+				name: 'messageId',
+				type: 'string',
+				default: '',
+				displayOptions: {
+					show: {
+						operation: [
+							'deleteMessage',
+						],
+						resource: [
+							'message',
+						],
+					},
+				},
+				required: true,
+				description: 'Unique identifier of the message to delete.',
+			},
+
 			// ----------------------------------
 			//       message:pinChatMessage
 			// ----------------------------------
@@ -1849,6 +1877,16 @@ export class Telegram implements INodeType {
 					// Add additional fields and replyMarkup
 					addAdditionalFields.call(this, body, i);
 
+				} else if (operation === 'deleteMessage') {
+					// ----------------------------------
+					//       message:deleteMessage
+					// ----------------------------------
+
+					endpoint = 'deleteMessage';
+
+					body.chat_id = this.getNodeParameter('chatId', i) as string;
+					body.message_id = this.getNodeParameter('messageId', i) as string;
+
 				} else if (operation === 'pinChatMessage') {
 					// ----------------------------------
 					//        message:pinChatMessage

From b4f4ecc77e5669eedeba1584e750a01b5ea1e85b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Sat, 10 Jul 2021 13:15:14 +0200
Subject: [PATCH 43/74] :sparkles: Add Stripe regular node (#1470)

* :tada: Register node

* :art: Add SVG icon

* :zap: Add preliminary node stub

* :zap: Add resource description stubs

* :art: Fix SVG size and position

* :zap: Implement charge operations

* :zap: Implement customer operations

* :art: Apply cosmetic changes

* :zap: Fix customer address fields

* :zap: Add stub and fields for invoice

* :zap: Add invoice item stubs

* :zap: Implement source operations

* :zap: Reduce scope per feedback

* :zap: Add continueOnFail functionality

* :art: Prettify error thrown

* :fire: Remove unused resource

* :zap: Replace source in card with token

* :hammer: Remove logging

* :wrench: Fix shipping address in charge:create

* :wrench: Load update fields for charge:update

* :zap: Implement token:create to ease testing

* :zap: Simplify card token fields

* :zap: Update description parameters

* :wrench: Fix field adjusters

* :zap: Remove unused source options

* :wrench: Fix shipping fields adjuster

* :fire: Remove PNG icon

* :fire: Remove logging

* :hammer: Reorder address fields

* :bug: Fix shipping field in charge:update

* :lipstick: Apply cosmetic change

* :zap: Small improvements

* :zap: Fix lintings in main file

* :zap: Lint all descriptions

* :zap: Add target="_blank" attribute

* :zap: Fix various lintings for charge

* :zap: Fix lintings for coupon

* :zap: Fix lintings for customer

* :zap: Fix lintings for source

* :zap: Fix lintings for token

* :zap: Reorder address fields

* :zap: Fix casing in credentials

* :hammer: Place recipient name above address in shipping

* :zap: Remove references to string in descriptions

* :zap: Apply minor renamings

* :fire: Remove logging

* :hammer: Simplify error handling

* :zap: Fix indentation

* :zap: Move cardFields to root level for Token creation

Co-authored-by: ricardo <ricardoespinoza105@gmail.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../credentials/StripeApi.credentials.ts      |   2 +-
 .../nodes/Google/Calendar/GenericFunctions.ts |   1 +
 .../nodes-base/nodes/Stripe/Stripe.node.ts    | 506 ++++++++++++++
 .../Stripe/descriptions/BalanceDescription.ts |  27 +
 .../Stripe/descriptions/ChargeDescription.ts  | 509 ++++++++++++++
 .../Stripe/descriptions/CouponDescription.ts  | 213 ++++++
 .../descriptions/CustomerCardDescription.ts   | 160 +++++
 .../descriptions/CustomerDescription.ts       | 649 ++++++++++++++++++
 .../Stripe/descriptions/SourceDescription.ts  | 246 +++++++
 .../Stripe/descriptions/TokenDescription.ts   | 130 ++++
 .../nodes/Stripe/descriptions/index.ts        |   7 +
 packages/nodes-base/nodes/Stripe/helpers.ts   | 140 +++-
 packages/nodes-base/nodes/Stripe/stripe.svg   |  23 +-
 packages/nodes-base/package.json              |   1 +
 14 files changed, 2609 insertions(+), 5 deletions(-)
 create mode 100644 packages/nodes-base/nodes/Stripe/Stripe.node.ts
 create mode 100644 packages/nodes-base/nodes/Stripe/descriptions/BalanceDescription.ts
 create mode 100644 packages/nodes-base/nodes/Stripe/descriptions/ChargeDescription.ts
 create mode 100644 packages/nodes-base/nodes/Stripe/descriptions/CouponDescription.ts
 create mode 100644 packages/nodes-base/nodes/Stripe/descriptions/CustomerCardDescription.ts
 create mode 100644 packages/nodes-base/nodes/Stripe/descriptions/CustomerDescription.ts
 create mode 100644 packages/nodes-base/nodes/Stripe/descriptions/SourceDescription.ts
 create mode 100644 packages/nodes-base/nodes/Stripe/descriptions/TokenDescription.ts
 create mode 100644 packages/nodes-base/nodes/Stripe/descriptions/index.ts

diff --git a/packages/nodes-base/credentials/StripeApi.credentials.ts b/packages/nodes-base/credentials/StripeApi.credentials.ts
index b6aef0d814..991af27fab 100644
--- a/packages/nodes-base/credentials/StripeApi.credentials.ts
+++ b/packages/nodes-base/credentials/StripeApi.credentials.ts
@@ -6,7 +6,7 @@ import {
 
 export class StripeApi implements ICredentialType {
 	name = 'stripeApi';
-	displayName = 'Stripe Api';
+	displayName = 'Stripe API';
 	documentationUrl = 'stripe';
 	properties: INodeProperties[] = [
 		// The credentials to get from user and save encrypted.
diff --git a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
index 4b9eff2928..503263ad64 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
@@ -30,6 +30,7 @@ export async function googleApiRequest(this: IExecuteFunctions | IExecuteSingleF
 		if (Object.keys(body).length === 0) {
 			delete options.body;
 		}
+		console.log(options);
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'googleCalendarOAuth2Api', options);
 	} catch (error) {
diff --git a/packages/nodes-base/nodes/Stripe/Stripe.node.ts b/packages/nodes-base/nodes/Stripe/Stripe.node.ts
new file mode 100644
index 0000000000..06eb3577ab
--- /dev/null
+++ b/packages/nodes-base/nodes/Stripe/Stripe.node.ts
@@ -0,0 +1,506 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	isEmpty,
+} from 'lodash';
+
+import {
+	adjustChargeFields,
+	adjustCustomerFields,
+	adjustMetadata,
+	handleListing,
+	loadResource,
+	stripeApiRequest,
+} from './helpers';
+
+import {
+	balanceOperations,
+	chargeFields,
+	chargeOperations,
+	couponFields,
+	couponOperations,
+	customerCardFields,
+	customerCardOperations,
+	customerFields,
+	customerOperations,
+	sourceFields,
+	sourceOperations,
+	tokenFields,
+	tokenOperations,
+} from './descriptions';
+
+export class Stripe implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Stripe',
+		name: 'stripe',
+		icon: 'file:stripe.svg',
+		group: ['transform'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume the Stripe API',
+		defaults: {
+			name: 'Stripe',
+			color: '#6772e5',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'stripeApi',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Balance',
+						value: 'balance',
+					},
+					{
+						name: 'Charge',
+						value: 'charge',
+					},
+					{
+						name: 'Coupon',
+						value: 'coupon',
+					},
+					{
+						name: 'Customer',
+						value: 'customer',
+					},
+					{
+						name: 'Customer Card',
+						value: 'customerCard',
+					},
+					{
+						name: 'Source',
+						value: 'source',
+					},
+					{
+						name: 'Token',
+						value: 'token',
+					},
+				],
+				default: 'balance',
+				description: 'Resource to consume',
+			},
+			...balanceOperations,
+			...customerCardOperations,
+			...customerCardFields,
+			...chargeOperations,
+			...chargeFields,
+			...couponOperations,
+			...couponFields,
+			...customerOperations,
+			...customerFields,
+			...sourceOperations,
+			...sourceFields,
+			...tokenOperations,
+			...tokenFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			async getCustomers(this: ILoadOptionsFunctions) {
+				return await loadResource.call(this, 'customer');
+			},
+			async getCurrencies(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const { data } = await stripeApiRequest.call(this, 'GET', '/country_specs', {});
+				for (const currency of data[0].supported_payment_currencies) {
+					returnData.push({
+						name: currency.toUpperCase(),
+						value: currency,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+
+		let responseData;
+		const returnData: IDataObject[] = [];
+
+		for (let i = 0; i < items.length; i++) {
+
+			try {
+
+				if (resource === 'balance') {
+
+					// *********************************************************************
+					//                             balance
+					// *********************************************************************
+
+					// https://stripe.com/docs/api/balance
+
+					if (operation === 'get') {
+
+						// ----------------------------------
+						//       balance: get
+						// ----------------------------------
+
+						responseData = await stripeApiRequest.call(this, 'GET', '/balance', {}, {});
+
+					}
+
+				} else if (resource === 'customerCard') {
+
+					// *********************************************************************
+					//                           customer card
+					// *********************************************************************
+
+					// https://stripe.com/docs/api/cards
+
+					if (operation === 'add') {
+
+						// ----------------------------------
+						//         customerCard: add
+						// ----------------------------------
+
+						const body = {
+							source: this.getNodeParameter('token', i),
+						} as IDataObject;
+
+						const customerId = this.getNodeParameter('customerId', i);
+						const endpoint = `/customers/${customerId}/sources`;
+						responseData = await stripeApiRequest.call(this, 'POST', endpoint, body, {});
+
+					} else if (operation === 'remove') {
+
+						// ----------------------------------
+						//       customerCard: remove
+						// ----------------------------------
+
+						const customerId = this.getNodeParameter('customerId', i);
+						const cardId = this.getNodeParameter('cardId', i);
+						const endpoint = `/customers/${customerId}/sources/${cardId}`;
+						responseData = await stripeApiRequest.call(this, 'DELETE', endpoint, {}, {});
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------
+						//        customerCard: get
+						// ----------------------------------
+
+						const customerId = this.getNodeParameter('customerId', i);
+						const sourceId = this.getNodeParameter('sourceId', i);
+						const endpoint = `/customers/${customerId}/sources/${sourceId}`;
+						responseData = await stripeApiRequest.call(this, 'GET', endpoint, {}, {});
+
+					}
+
+				} else if (resource === 'charge') {
+
+					// *********************************************************************
+					//                             charge
+					// *********************************************************************
+
+					// https://stripe.com/docs/api/charges
+
+					if (operation === 'create') {
+
+						// ----------------------------------
+						//          charge: create
+						// ----------------------------------
+
+						const body = {
+							customer: this.getNodeParameter('customerId', i),
+							currency: (this.getNodeParameter('currency', i) as string).toLowerCase(),
+							amount: this.getNodeParameter('amount', i),
+							source: this.getNodeParameter('source', i),
+						} as IDataObject;
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (!isEmpty(additionalFields)) {
+							Object.assign(body, adjustChargeFields(additionalFields));
+						}
+
+						responseData = await stripeApiRequest.call(this, 'POST', '/charges', body, {});
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------
+						//           charge: get
+						// ----------------------------------
+
+						const chargeId = this.getNodeParameter('chargeId', i);
+						responseData = await stripeApiRequest.call(this, 'GET', `/charges/${chargeId}`, {}, {});
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------
+						//          charge: getAll
+						// ----------------------------------
+
+						responseData = await handleListing.call(this, resource);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------
+						//         charge: update
+						// ----------------------------------
+
+						const body = {} as IDataObject;
+
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (isEmpty(updateFields)) {
+							throw new Error(`Please enter at least one field to update for the ${resource}.`);
+						}
+
+						Object.assign(body, adjustChargeFields(updateFields));
+
+						const chargeId = this.getNodeParameter('chargeId', i);
+						responseData = await stripeApiRequest.call(this, 'POST', `/charges/${chargeId}`, body, {});
+
+					}
+
+				} else if (resource === 'coupon') {
+
+					// *********************************************************************
+					//                             coupon
+					// *********************************************************************
+
+					// https://stripe.com/docs/api/coupons
+
+					if (operation === 'create') {
+
+						// ----------------------------------
+						//          coupon: create
+						// ----------------------------------
+
+						const body = {
+							duration: this.getNodeParameter('duration', i),
+						} as IDataObject;
+
+						const type = this.getNodeParameter('type', i);
+
+						if (type === 'fixedAmount') {
+							body.amount_off = this.getNodeParameter('amountOff', i);
+							body.currency = this.getNodeParameter('currency', i);
+						} else {
+							body.percent_off = this.getNodeParameter('percentOff', i);
+						}
+
+						responseData = await stripeApiRequest.call(this, 'POST', '/coupons', body, {});
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------
+						//          coupon: getAll
+						// ----------------------------------
+
+						responseData = await handleListing.call(this, resource);
+
+					}
+
+				} else if (resource === 'customer') {
+
+					// *********************************************************************
+					//                             customer
+					// *********************************************************************
+
+					// https://stripe.com/docs/api/customers
+
+					if (operation === 'create') {
+
+						// ----------------------------------
+						//         customer: create
+						// ----------------------------------
+
+						const body = {
+							name: this.getNodeParameter('name', i),
+						} as IDataObject;
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (!isEmpty(additionalFields)) {
+							Object.assign(body, adjustCustomerFields(additionalFields));
+						}
+
+						responseData = await stripeApiRequest.call(this, 'POST', '/customers', body, {});
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------
+						//         customer: delete
+						// ----------------------------------
+
+						const customerId = this.getNodeParameter('customerId', i);
+						responseData = await stripeApiRequest.call(this, 'DELETE', `/customers/${customerId}`, {}, {});
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------
+						//          customer: get
+						// ----------------------------------
+
+						const customerId = this.getNodeParameter('customerId', i);
+						responseData = await stripeApiRequest.call(this, 'GET', `/customers/${customerId}`, {}, {});
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------
+						//        customer: getAll
+						// ----------------------------------
+
+						const qs = {} as IDataObject;
+						const filters = this.getNodeParameter('filters', i) as IDataObject;
+
+						if (!isEmpty(filters)) {
+							qs.email = filters.email;
+						}
+
+						responseData = await handleListing.call(this, resource, qs);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------
+						//        customer: update
+						// ----------------------------------
+
+						const body = {} as IDataObject;
+
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (isEmpty(updateFields)) {
+							throw new Error(`Please enter at least one field to update for the ${resource}.`);
+						}
+
+						Object.assign(body, adjustCustomerFields(updateFields));
+
+						const customerId = this.getNodeParameter('customerId', i);
+						responseData = await stripeApiRequest.call(this, 'POST', `/customers/${customerId}`, body, {});
+
+					}
+
+				} else if (resource === 'source') {
+
+					// *********************************************************************
+					//                             source
+					// *********************************************************************
+
+					// https://stripe.com/docs/api/sources
+
+					if (operation === 'create') {
+
+						// ----------------------------------
+						//         source: create
+						// ----------------------------------
+
+						const customerId = this.getNodeParameter('customerId', i);
+
+						const body = {
+							type: this.getNodeParameter('type', i),
+							amount: this.getNodeParameter('amount', i),
+							currency: this.getNodeParameter('currency', i),
+						} as IDataObject;
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (!isEmpty(additionalFields)) {
+							Object.assign(body, adjustMetadata(additionalFields));
+						}
+
+						responseData = await stripeApiRequest.call(this, 'POST', '/sources', body, {});
+
+						// attach source to customer
+						const endpoint = `/customers/${customerId}/sources`;
+						await stripeApiRequest.call(this, 'POST', endpoint, { source: responseData.id }, {});
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------
+						//          source: delete
+						// ----------------------------------
+
+						const sourceId = this.getNodeParameter('sourceId', i);
+						const customerId = this.getNodeParameter('customerId', i);
+						const endpoint = `/customers/${customerId}/sources/${sourceId}`;
+						responseData = await stripeApiRequest.call(this, 'DELETE', endpoint, {}, {});
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------
+						//          source: get
+						// ----------------------------------
+
+						const sourceId = this.getNodeParameter('sourceId', i);
+						responseData = await stripeApiRequest.call(this, 'GET', `/sources/${sourceId}`, {}, {});
+
+					}
+
+				} else if (resource === 'token') {
+
+					// *********************************************************************
+					//                             token
+					// *********************************************************************
+
+					// https://stripe.com/docs/api/tokens
+
+					if (operation === 'create') {
+
+						// ----------------------------------
+						//          token: create
+						// ----------------------------------
+
+						const type = this.getNodeParameter('type', i);
+						const body = {} as IDataObject;
+
+						if (type !== 'cardToken') {
+							throw new Error('Only card token creation implemented.');
+						}
+
+						body.card = {
+							number: this.getNodeParameter('number', i),
+							exp_month: this.getNodeParameter('expirationMonth', i),
+							exp_year: this.getNodeParameter('expirationYear', i),
+							cvc: this.getNodeParameter('cvc', i),
+						};
+
+						responseData = await stripeApiRequest.call(this, 'POST', '/tokens', body, {});
+					}
+
+				}
+
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ error: error.message });
+					continue;
+				}
+
+				throw error;
+			}
+
+			Array.isArray(responseData)
+				? returnData.push(...responseData)
+				: returnData.push(responseData);
+		}
+
+		return [this.helpers.returnJsonArray(returnData)];
+
+	}
+}
diff --git a/packages/nodes-base/nodes/Stripe/descriptions/BalanceDescription.ts b/packages/nodes-base/nodes/Stripe/descriptions/BalanceDescription.ts
new file mode 100644
index 0000000000..34dc2d55cb
--- /dev/null
+++ b/packages/nodes-base/nodes/Stripe/descriptions/BalanceDescription.ts
@@ -0,0 +1,27 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const balanceOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		default: 'get',
+		description: 'Operation to perform',
+		options: [
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a balance',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'balance',
+				],
+			},
+		},
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Stripe/descriptions/ChargeDescription.ts b/packages/nodes-base/nodes/Stripe/descriptions/ChargeDescription.ts
new file mode 100644
index 0000000000..d26f367839
--- /dev/null
+++ b/packages/nodes-base/nodes/Stripe/descriptions/ChargeDescription.ts
@@ -0,0 +1,509 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const chargeOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		default: 'get',
+		description: 'Operation to perform',
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a charge',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a charge',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all charges',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a charge',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'charge',
+				],
+			},
+		},
+	},
+] as INodeProperties[];
+
+export const chargeFields = [
+	// ----------------------------------
+	//       charge: create
+	// ----------------------------------
+	{
+		displayName: 'Customer ID',
+		name: 'customerId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the customer to be associated with this charge',
+		displayOptions: {
+			show: {
+				resource: [
+					'charge',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Amount',
+		name: 'amount',
+		type: 'number',
+		required: true,
+		default: 0,
+		description: 'Amount in cents to be collected for this charge, e.g. enter <code>100</code> for $1.00',
+		typeOptions: {
+			minValue: 0,
+			maxValue: 99999999,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'charge',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Currency',
+		name: 'currency',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCurrencies',
+		},
+		required: true,
+		default: '',
+		description: 'Three-letter ISO currency code, e.g. <code>USD</code> or <code>EUR</code>. It must be a <a target="_blank" href="https://stripe.com/docs/currencies">Stripe-supported currency</a>',
+		displayOptions: {
+			show: {
+				resource: [
+					'charge',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Source ID',
+		name: 'source',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the customer\'s payment source to be charged',
+		displayOptions: {
+			show: {
+				resource: [
+					'charge',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'charge',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'Arbitrary text to describe the charge to create',
+			},
+			{
+				displayName: 'Metadata',
+				name: 'metadata',
+				type: 'fixedCollection',
+				default: [],
+				placeholder: 'Add Metadata Item',
+				description: 'Set of key-value pairs to attach to the charge to create',
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						displayName: 'Metadata Properties',
+						name: 'metadataProperties',
+						values: [
+							{
+								displayName: 'Key',
+								name: 'key',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Receipt Email',
+				name: 'receipt_email',
+				type: 'string',
+				default: '',
+				description: 'Email address to which the receipt for this charge will be sent',
+			},
+			{
+				displayName: 'Shipping',
+				name: 'shipping',
+				type: 'fixedCollection',
+				description: 'Shipping information for the charge',
+				placeholder: 'Add Field',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: [],
+				options: [
+					{
+						displayName: 'Shipping Properties',
+						name: 'shippingProperties',
+						values: [
+							{
+								displayName: 'Recipient Name',
+								name: 'name',
+								type: 'string',
+								description: 'Name of the person who will receive the shipment',
+								default: '',
+							},
+							{
+								displayName: 'Address',
+								name: 'address',
+								type: 'fixedCollection',
+								default: {},
+								placeholder: 'Add Field',
+								options: [
+									{
+										displayName: 'Details',
+										name: 'details',
+										values: [
+											{
+												displayName: 'Line 1',
+												name: 'line1',
+												description: 'Address line 1 (e.g. street, PO Box, or company name)',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'Line 2',
+												name: 'line2',
+												description: 'Address line 2 (e.g. apartment, suite, unit, or building)',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'City',
+												name: 'city',
+												description: 'City, district, suburb, town, or village',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'State',
+												name: 'state',
+												description: 'State, county, province, or region',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'Country',
+												name: 'country',
+												description: 'Two-letter country code (<a target="_blank" href="https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2">ISO 3166-1 alpha-2</a>)',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'Postal Code',
+												name: 'postal_code',
+												description: 'ZIP or postal code',
+												type: 'string',
+												default: '',
+											},
+										],
+									},
+								],
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+
+	// ----------------------------------
+	//       charge: get
+	// ----------------------------------
+	{
+		displayName: 'Charge ID',
+		name: 'chargeId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the charge to retrieve.',
+		displayOptions: {
+			show: {
+				resource: [
+					'charge',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------
+	//       charge: getAll
+	// ----------------------------------
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+		displayOptions: {
+			show: {
+				resource: [
+					'charge',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		default: 50,
+		description: 'How many results to return',
+		typeOptions: {
+			minValue: 1,
+			maxValue: 1000,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'charge',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+	},
+
+	// ----------------------------------
+	//          charge: update
+	// ----------------------------------
+	{
+		displayName: 'Charge ID',
+		name: 'chargeId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the charge to update',
+		displayOptions: {
+			show: {
+				resource: [
+					'charge',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'charge',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'Arbitrary text to describe the charge to update',
+			},
+			{
+				displayName: 'Metadata',
+				name: 'metadata',
+				type: 'fixedCollection',
+				placeholder: 'Add Metadata Item',
+				description: 'Set of key-value pairs to attach to the charge to update',
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						displayName: 'Metadata Properties',
+						name: 'metadataProperties',
+						values: [
+							{
+								displayName: 'Key',
+								name: 'key',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Receipt Email',
+				name: 'receipt_email',
+				type: 'string',
+				default: '',
+				description: 'The email address to which the receipt for this charge will be sent',
+			},
+			{
+				displayName: 'Shipping',
+				name: 'shipping',
+				type: 'fixedCollection',
+				description: 'Shipping information for the charge',
+				placeholder: 'Add Field',
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						displayName: 'Shipping Properties',
+						name: 'shippingProperties',
+						default: {},
+						values: [
+							{
+								displayName: 'Recipient Name',
+								name: 'name',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Recipient Address',
+								name: 'address',
+								type: 'fixedCollection',
+								default: {},
+								placeholder: 'Add Address Details',
+								options: [
+									{
+										displayName: 'Details',
+										name: 'details',
+										values: [
+											{
+												displayName: 'Line 1',
+												name: 'line1',
+												description: 'Address line 1 (e.g. street, PO Box, or company name)',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'Line 2',
+												name: 'line2',
+												description: 'Address line 2 (e.g. apartment, suite, unit, or building)',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'City',
+												name: 'city',
+												description: 'City, district, suburb, town, or village',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'State',
+												name: 'state',
+												description: 'State, county, province, or region',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'Country',
+												name: 'country',
+												description: 'Two-letter country code (<a target="_blank" href="https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2">ISO 3166-1 alpha-2</a>)',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'Postal Code',
+												name: 'postal_code',
+												description: 'ZIP or postal code',
+												type: 'string',
+												default: '',
+											},
+										],
+									},
+								],
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Stripe/descriptions/CouponDescription.ts b/packages/nodes-base/nodes/Stripe/descriptions/CouponDescription.ts
new file mode 100644
index 0000000000..efc041fc73
--- /dev/null
+++ b/packages/nodes-base/nodes/Stripe/descriptions/CouponDescription.ts
@@ -0,0 +1,213 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const couponOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		default: 'create',
+		description: 'Operation to perform',
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a coupon',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all coupons',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'coupon',
+				],
+			},
+		},
+	},
+] as INodeProperties[];
+
+export const couponFields = [
+	// ----------------------------------
+	//       coupon: create
+	// ----------------------------------
+	{
+		displayName: 'Apply',
+		name: 'duration',
+		type: 'options',
+		required: true,
+		default: 'once',
+		description: 'How long the discount will be in effect',
+		options: [
+			{
+				name: 'Forever',
+				value: 'forever',
+			},
+			{
+				name: 'Once',
+				value: 'once',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'coupon',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Discount Type',
+		name: 'type',
+		type: 'options',
+		required: true,
+		default: 'percent',
+		description: 'Whether the coupon discount is a percentage or a fixed amount',
+		options: [
+			{
+				name: 'Fixed Amount (in Cents)',
+				value: 'fixedAmount',
+			},
+			{
+				name: 'Percent',
+				value: 'percent',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'coupon',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Amount Off',
+		name: 'amountOff',
+		type: 'number',
+		required: true,
+		default: 0,
+		description: 'Amount in cents to subtract from an invoice total, e.g. enter <code>100</code> for $1.00',
+		typeOptions: {
+			minValue: 0,
+			maxValue: 99999999,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'coupon',
+				],
+				operation: [
+					'create',
+				],
+				type: [
+					'fixedAmount',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Currency',
+		name: 'currency',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCurrencies',
+		},
+		required: true,
+		default: '',
+		description: 'Three-letter ISO currency code, e.g. <code>USD</code> or <code>EUR</code>. It must be a <a target="_blank" href="https://stripe.com/docs/currencies">Stripe-supported currency</a>',
+		displayOptions: {
+			show: {
+				resource: [
+					'coupon',
+				],
+				operation: [
+					'create',
+				],
+				type: [
+					'fixedAmount',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Percent Off',
+		name: 'percentOff',
+		type: 'number',
+		required: true,
+		default: 1,
+		description: 'Percentage to apply with the coupon',
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'coupon',
+				],
+				operation: [
+					'create',
+				],
+				type: [
+					'percent',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------
+	//       coupon: getAll
+	// ----------------------------------
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+		displayOptions: {
+			show: {
+				resource: [
+					'coupon',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		default: 50,
+		description: 'How many results to return',
+		typeOptions: {
+			minValue: 1,
+			maxValue: 1000,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'coupon',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Stripe/descriptions/CustomerCardDescription.ts b/packages/nodes-base/nodes/Stripe/descriptions/CustomerCardDescription.ts
new file mode 100644
index 0000000000..68d4a44980
--- /dev/null
+++ b/packages/nodes-base/nodes/Stripe/descriptions/CustomerCardDescription.ts
@@ -0,0 +1,160 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const customerCardOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		default: 'get',
+		description: 'Operation to perform',
+		options: [
+			{
+				name: 'Add',
+				value: 'add',
+				description: 'Add a customer card',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a customer card',
+			},
+			{
+				name: 'Remove',
+				value: 'remove',
+				description: 'Remove a customer card',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'customerCard',
+				],
+			},
+		},
+	},
+] as INodeProperties[];
+
+export const customerCardFields = [
+	// ----------------------------------
+	//        customerCard: add
+	// ----------------------------------
+	{
+		displayName: 'Customer ID',
+		name: 'customerId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the customer to be associated with this card',
+		displayOptions: {
+			show: {
+				resource: [
+					'customerCard',
+				],
+				operation: [
+					'add',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Card Token',
+		name: 'token',
+		type: 'string',
+		required: true,
+		default: '',
+		placeholder: 'tok_1IMfKdJhRTnqS5TKQVG1LI9o',
+		description: 'Token representing sensitive card information',
+		displayOptions: {
+			show: {
+				resource: [
+					'customerCard',
+				],
+				operation: [
+					'add',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------
+	//       customerCard: remove
+	// ----------------------------------
+	{
+		displayName: 'Customer ID',
+		name: 'customerId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the customer whose card to remove',
+		displayOptions: {
+			show: {
+				resource: [
+					'customerCard',
+				],
+				operation: [
+					'remove',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Card ID',
+		name: 'cardId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the card to remove',
+		displayOptions: {
+			show: {
+				resource: [
+					'customerCard',
+				],
+				operation: [
+					'remove',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------
+	//         customerCard: get
+	// ----------------------------------
+	{
+		displayName: 'Customer ID',
+		name: 'customerId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the customer whose card to retrieve',
+		displayOptions: {
+			show: {
+				resource: [
+					'customerCard',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Source ID',
+		name: 'sourceId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the source to retrieve',
+		displayOptions: {
+			show: {
+				resource: [
+					'customerCard',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Stripe/descriptions/CustomerDescription.ts b/packages/nodes-base/nodes/Stripe/descriptions/CustomerDescription.ts
new file mode 100644
index 0000000000..26e49fc489
--- /dev/null
+++ b/packages/nodes-base/nodes/Stripe/descriptions/CustomerDescription.ts
@@ -0,0 +1,649 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const customerOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		default: 'get',
+		description: 'Operation to perform',
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a customer',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a customer',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a customer',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all customers',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a customer',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'customer',
+				],
+			},
+		},
+	},
+] as INodeProperties[];
+
+export const customerFields = [
+	// ----------------------------------
+	//       customer: create
+	// ----------------------------------
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'Full name or business name of the customer to create',
+		displayOptions: {
+			show: {
+				resource: [
+					'customer',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'customer',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Address',
+				name: 'address',
+				type: 'fixedCollection',
+				description: 'Address of the customer to create',
+				placeholder: 'Add Field',
+				default: {},
+				options: [
+					{
+						displayName: 'Details',
+						name: 'details',
+						values: [
+							{
+								displayName: 'Line 1',
+								name: 'line1',
+								description: 'Address line 1 (e.g. street, PO Box, or company name)',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Line 2',
+								name: 'line2',
+								description: 'Address line 2 (e.g. apartment, suite, unit, or building)',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'City',
+								name: 'city',
+								description: 'City, district, suburb, town, or village',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'State',
+								name: 'state',
+								description: 'State, county, province, or region',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Country',
+								name: 'country',
+								description: 'Two-letter country code (<a target="_blank" href="https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2">ISO 3166-1 alpha-2</a>)',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Postal Code',
+								name: 'postal_code',
+								description: 'ZIP or postal code',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'Arbitrary text to describe the customer to create',
+			},
+			{
+				displayName: 'Email',
+				name: 'email',
+				type: 'string',
+				default: '',
+				description: 'Email of the customer to create',
+			},
+			{
+				displayName: 'Metadata',
+				name: 'metadata',
+				type: 'fixedCollection',
+				default: {},
+				placeholder: 'Add Metadata Item',
+				description: 'Set of key-value pairs to attach to the customer to create',
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						displayName: 'Metadata Properties',
+						name: 'metadataProperties',
+						values: [
+							{
+								displayName: 'Key',
+								name: 'key',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Phone',
+				name: 'phone',
+				type: 'string',
+				default: '',
+				description: 'Telephone number of the customer to create',
+			},
+			{
+				displayName: 'Shipping',
+				name: 'shipping',
+				type: 'fixedCollection',
+				description: 'Shipping information for the customer',
+				typeOptions: {
+					multipleValues: true,
+				},
+				placeholder: 'Add Field',
+				options: [
+					{
+						displayName: 'Shipping Properties',
+						name: 'shippingProperties',
+						values: [
+							{
+								displayName: 'Recipient Name',
+								name: 'name',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Recipient Address',
+								name: 'address',
+								type: 'fixedCollection',
+								default: {},
+								placeholder: 'Add Address Details',
+								options: [
+									{
+										displayName: 'Details',
+										name: 'details',
+										values: [
+											{
+												displayName: 'Line 1',
+												name: 'line1',
+												description: 'Address line 1 (e.g. street, PO Box, or company name)',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'Line 2',
+												name: 'line2',
+												description: 'Address line 2 (e.g. apartment, suite, unit, or building)',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'City',
+												name: 'city',
+												description: 'City, district, suburb, town, or village',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'State',
+												name: 'state',
+												description: 'State, county, province, or region',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'Country',
+												name: 'country',
+												description: 'Two-letter country code (<a target="_blank" href="https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2">ISO 3166-1 alpha-2</a>)',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'Postal Code',
+												name: 'postal_code',
+												description: 'ZIP or postal code',
+												type: 'string',
+												default: '',
+											},
+										],
+									},
+								],
+							},
+							{
+								displayName: 'Recipient Phone',
+								name: 'phone',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+
+	// ----------------------------------
+	//          customer: delete
+	// ----------------------------------
+	{
+		displayName: 'Customer ID',
+		name: 'customerId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the customer to delete',
+		displayOptions: {
+			show: {
+				resource: [
+					'customer',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------
+	//          customer: get
+	// ----------------------------------
+	{
+		displayName: 'Customer ID',
+		name: 'customerId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the customer to retrieve',
+		displayOptions: {
+			show: {
+				resource: [
+					'customer',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------
+	//       customer: getAll
+	// ----------------------------------
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+		displayOptions: {
+			show: {
+				resource: [
+					'customer',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		default: 50,
+		description: 'How many results to return',
+		typeOptions: {
+			minValue: 1,
+			maxValue: 1000,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'customer',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'customer',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Email',
+				name: 'email',
+				type: 'string',
+				default: '',
+				description: 'Customer\'s email to filter by',
+			},
+		],
+	},
+
+	// ----------------------------------
+	//         customer: update
+	// ----------------------------------
+	{
+		displayName: 'Customer ID',
+		name: 'customerId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the customer to update',
+		displayOptions: {
+			show: {
+				resource: [
+					'customer',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'customer',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Address',
+				name: 'address',
+				type: 'fixedCollection',
+				description: 'Address of the customer to update',
+				placeholder: 'Add Field',
+				default: {},
+				options: [
+					{
+						displayName: 'Details',
+						name: 'details',
+						values: [
+							{
+								displayName: 'Line 1',
+								name: 'line1',
+								description: 'Address line 1 (e.g. street, PO Box, or company name)',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Line 2',
+								name: 'line2',
+								description: 'Address line 2 (e.g. apartment, suite, unit, or building)',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'City',
+								name: 'city',
+								description: 'City, district, suburb, town, or village',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'State',
+								name: 'state',
+								description: 'State, county, province, or region',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Country',
+								name: 'country',
+								description: 'Two-letter country code (<a target="_blank" href="https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2">ISO 3166-1 alpha-2</a>)',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Postal Code',
+								name: 'postal_code',
+								description: 'ZIP or postal code',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'Arbitrary text to describe the customer to create',
+			},
+			{
+				displayName: 'Email',
+				name: 'email',
+				type: 'string',
+				default: '',
+				description: 'Email of the customer to create',
+			},
+			{
+				displayName: 'Metadata',
+				name: 'metadata',
+				type: 'fixedCollection',
+				placeholder: 'Add Metadata Item',
+				description: 'Set of key-value pairs to attach to the customer to create',
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						displayName: 'Metadata Properties',
+						name: 'metadataProperties',
+						values: [
+							{
+								displayName: 'Key',
+								name: 'key',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				description: 'Full name or business name of the customer to create',
+			},
+			{
+				displayName: 'Phone',
+				name: 'phone',
+				type: 'string',
+				default: '',
+				description: 'Telephone number of this customer',
+			},
+			{
+				displayName: 'Shipping',
+				name: 'shipping',
+				type: 'fixedCollection',
+				description: 'Shipping information for the customer',
+				placeholder: 'Add Field',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						displayName: 'Shipping Properties',
+						name: 'shippingProperties',
+						values: [
+							{
+								displayName: 'Recipient Name',
+								name: 'name',
+								type: 'string',
+								default: '',
+								description: 'Name of the person who will receive the shipment',
+							},
+							{
+								displayName: 'Recipient Address',
+								name: 'address',
+								type: 'fixedCollection',
+								default: {},
+								placeholder: 'Add Address Details',
+								options: [
+									{
+										displayName: 'Details',
+										name: 'details',
+										values: [
+											{
+												displayName: 'Line 1',
+												name: 'line1',
+												description: 'Address line 1 (e.g. street, PO Box, or company name)',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'Line 2',
+												name: 'line2',
+												description: 'Address line 2 (e.g. apartment, suite, unit, or building)',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'City',
+												name: 'city',
+												description: 'City, district, suburb, town, or village',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'State',
+												name: 'state',
+												description: 'State, county, province, or region',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'Country',
+												name: 'country',
+												description: 'Two-letter country code (<a target="_blank" href="https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2">ISO 3166-1 alpha-2</a>)',
+												type: 'string',
+												default: '',
+											},
+											{
+												displayName: 'Postal Code',
+												name: 'postal_code',
+												description: 'ZIP or postal code',
+												type: 'string',
+												default: '',
+											},
+										],
+									},
+								],
+							},
+							{
+								displayName: 'Recipient Phone',
+								name: 'phone',
+								type: 'string',
+								default: '',
+								description: 'Phone number of the person who will receive the shipment',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Stripe/descriptions/SourceDescription.ts b/packages/nodes-base/nodes/Stripe/descriptions/SourceDescription.ts
new file mode 100644
index 0000000000..9cd3a27cf5
--- /dev/null
+++ b/packages/nodes-base/nodes/Stripe/descriptions/SourceDescription.ts
@@ -0,0 +1,246 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const sourceOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		default: 'get',
+		description: 'Operation to perform',
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a source',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a source',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a source',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'source',
+				],
+			},
+		},
+	},
+] as INodeProperties[];
+
+export const sourceFields = [
+	// ----------------------------------
+	//       source: create
+	// ----------------------------------
+	{
+		displayName: 'Customer ID',
+		name: 'customerId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the customer to attach the source to',
+		displayOptions: {
+			show: {
+				resource: [
+					'source',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Type',
+		name: 'type',
+		type: 'options',
+		required: true,
+		default: 'wechat',
+		description: 'Type of source (payment instrument) to create',
+		options: [
+			{
+				name: 'WeChat',
+				value: 'wechat',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'source',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Amount',
+		name: 'amount',
+		type: 'number',
+		default: 0,
+		description: 'Amount in cents to be collected for this charge, e.g. enter <code>100</code> for $1.00',
+		typeOptions: {
+			minValue: 0,
+			maxValue: 99999999,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'source',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Currency',
+		name: 'currency',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getCurrencies',
+		},
+		default: '',
+		description: 'Three-letter ISO currency code, e.g. <code>USD</code> or <code>EUR</code>. It must be a <a target="_blank" href="https://stripe.com/docs/currencies">Stripe-supported currency</a>',
+		displayOptions: {
+			show: {
+				resource: [
+					'source',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'source',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Metadata',
+				name: 'metadata',
+				type: 'fixedCollection',
+				placeholder: 'Add Metadata Item',
+				description: 'Set of key-value pairs to attach to the source to create',
+				default: {},
+				typeOptions: {
+					multipleValues: true,
+				},
+				options: [
+					{
+						displayName: 'Metadata Properties',
+						name: 'metadataProperties',
+						values: [
+							{
+								displayName: 'Key',
+								name: 'key',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Statement Descriptor',
+				name: 'statement_descriptor',
+				type: 'string',
+				default: '',
+				description: 'Arbitrary text to display on the customer\'s statement',
+			},
+		],
+	},
+
+	// ----------------------------------
+	//          source: delete
+	// ----------------------------------
+	{
+		displayName: 'Customer ID',
+		name: 'customerId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the customer whose source to delete',
+		displayOptions: {
+			show: {
+				resource: [
+					'source',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Source ID',
+		name: 'sourceId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the source to delete',
+		displayOptions: {
+			show: {
+				resource: [
+					'source',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------
+	//          source: get
+	// ----------------------------------
+	{
+		displayName: 'Source ID',
+		name: 'sourceId',
+		type: 'string',
+		required: true,
+		default: '',
+		description: 'ID of the source to retrieve',
+		displayOptions: {
+			show: {
+				resource: [
+					'source',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Stripe/descriptions/TokenDescription.ts b/packages/nodes-base/nodes/Stripe/descriptions/TokenDescription.ts
new file mode 100644
index 0000000000..83bbea55d4
--- /dev/null
+++ b/packages/nodes-base/nodes/Stripe/descriptions/TokenDescription.ts
@@ -0,0 +1,130 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const tokenOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		default: 'create',
+		description: 'Operation to perform',
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a token',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'token',
+				],
+			},
+		},
+	},
+] as INodeProperties[];
+
+export const tokenFields = [
+	// ----------------------------------
+	//          token: create
+	// ----------------------------------
+	{
+		displayName: 'Type',
+		name: 'type',
+		type: 'options',
+		required: true,
+		default: 'cardToken',
+		description: 'Type of token to create',
+		options: [
+			{
+				name: 'Card Token',
+				value: 'cardToken',
+			},
+		],
+	},
+	{
+		displayName: 'Card Number',
+		name: 'number',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'token',
+				],
+				operation: [
+					'create',
+				],
+				type: [
+					'cardToken'
+				],
+			},
+		},
+		placeholder: '4242424242424242',
+		default: '',
+	},
+	{
+		displayName: 'CVC',
+		name: 'cvc',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'token',
+				],
+				operation: [
+					'create',
+				],
+				type: [
+					'cardToken'
+				],
+			},
+		},
+		default: '',
+		placeholder: '314',
+		description: 'Security code printed on the back of the card',
+	},
+	{
+		displayName: 'Expiration Month',
+		description: 'Number of the month when the card will expire',
+		name: 'expirationMonth',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'token',
+				],
+				operation: [
+					'create',
+				],
+				type: [
+					'cardToken'
+				],
+			},
+		},
+		default: '',
+		placeholder: '10',
+	},
+	{
+		displayName: 'Expiration Year',
+		description: 'Year when the card will expire',
+		name: 'expirationYear',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'token',
+				],
+				operation: [
+					'create',
+				],
+				type: [
+					'cardToken'
+				],
+			},
+		},
+		default: '',
+		placeholder: '2022',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Stripe/descriptions/index.ts b/packages/nodes-base/nodes/Stripe/descriptions/index.ts
new file mode 100644
index 0000000000..cadbadefbd
--- /dev/null
+++ b/packages/nodes-base/nodes/Stripe/descriptions/index.ts
@@ -0,0 +1,7 @@
+export * from './BalanceDescription';
+export * from './CustomerCardDescription';
+export * from './ChargeDescription';
+export * from './CouponDescription';
+export * from './CustomerDescription';
+export * from './SourceDescription';
+export * from './TokenDescription';
diff --git a/packages/nodes-base/nodes/Stripe/helpers.ts b/packages/nodes-base/nodes/Stripe/helpers.ts
index 0fb8ebdb97..c4d5e06c65 100644
--- a/packages/nodes-base/nodes/Stripe/helpers.ts
+++ b/packages/nodes-base/nodes/Stripe/helpers.ts
@@ -2,7 +2,23 @@ import {
 	IExecuteFunctions,
 	IHookFunctions,
 } from 'n8n-core';
-import { NodeApiError, NodeOperationError, } from 'n8n-workflow';
+
+import {
+	NodeApiError,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+import {
+	flow,
+	isEmpty,
+	omit,
+} from 'lodash';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodePropertyOptions,
+} from 'n8n-workflow';
 
 /**
  * Make an API request to Stripe
@@ -13,7 +29,13 @@ import { NodeApiError, NodeOperationError, } from 'n8n-workflow';
  * @param {object} body
  * @returns {Promise<any>}
  */
-export async function stripeApiRequest(this: IHookFunctions | IExecuteFunctions, method: string, endpoint: string, body: object, query?: object): Promise<any> { // tslint:disable-line:no-any
+export async function stripeApiRequest(
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
+	method: string,
+	endpoint: string,
+	body: object,
+	query?: object,
+) {
 	const credentials = this.getCredentials('stripeApi');
 	if (credentials === undefined) {
 		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
@@ -30,9 +52,121 @@ export async function stripeApiRequest(this: IHookFunctions | IExecuteFunctions,
 		json: true,
 	};
 
+	if (options.qs && Object.keys(options.qs).length === 0) {
+		delete options.qs;
+	}
+
 	try {
-		return await this.helpers.request(options);
+		return await this.helpers.request!.call(this, options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error);
 	}
 }
+
+/**
+ * Make n8n's charge fields compliant with the Stripe API request object.
+ */
+export const adjustChargeFields = flow([
+	adjustShipping,
+	adjustMetadata,
+]);
+
+/**
+ * Make n8n's customer fields compliant with the Stripe API request object.
+ */
+export const adjustCustomerFields = flow([
+	adjustShipping,
+	adjustAddress,
+	adjustMetadata,
+]);
+
+/**
+ * Convert n8n's address object into a Stripe API request shipping object.
+ */
+function adjustAddress(
+	addressFields: { address: { details: IDataObject } },
+) {
+	if (!addressFields.address) return addressFields;
+
+	return {
+		...omit(addressFields, ['address']),
+		address: addressFields.address.details,
+	};
+}
+
+/**
+ * Convert n8n's `fixedCollection` metadata object into a Stripe API request metadata object.
+ */
+export function adjustMetadata(
+	fields: { metadata?: { metadataProperties: Array<{ key: string; value: string }> } },
+) {
+	if (!fields.metadata || isEmpty(fields.metadata)) return fields;
+
+	let adjustedMetadata = {};
+
+	fields.metadata.metadataProperties.forEach(pair => {
+		adjustedMetadata = { ...adjustedMetadata, ...pair };
+	});
+
+	return {
+		...omit(fields, ['metadata']),
+		metadata: adjustedMetadata,
+	};
+}
+
+/**
+ * Convert n8n's shipping object into a Stripe API request shipping object.
+ */
+function adjustShipping(
+	shippingFields: { shipping?: { shippingProperties: Array<{ address: { details: IDataObject }; name: string }> } },
+) {
+	const shippingProperties = shippingFields.shipping?.shippingProperties[0];
+
+	if (!shippingProperties?.address || isEmpty(shippingProperties.address)) return shippingFields;
+
+	return {
+		...omit(shippingFields, ['shipping']),
+		shipping: {
+			...omit(shippingProperties, ['address']),
+			address: shippingProperties.address.details,
+		},
+	};
+}
+
+/**
+ * Load a resource so it can be selected by name from a dropdown.
+ */
+export async function loadResource(
+	this: ILoadOptionsFunctions,
+	resource: 'charge' | 'customer' | 'source',
+): Promise<INodePropertyOptions[]> {
+	const responseData = await stripeApiRequest.call(this, 'GET', `/${resource}s`, {}, {});
+
+	return responseData.data.map(({ name, id }: { name: string, id: string }) => ({
+		name,
+		value: id,
+	}));
+}
+
+/**
+ * Handles a Stripe listing by returning all items or up to a limit.
+ */
+export async function handleListing(
+	this: IExecuteFunctions,
+	resource: string,
+	qs: IDataObject = {},
+) {
+	let responseData;
+
+	responseData = await stripeApiRequest.call(this, 'GET', `/${resource}s`, qs, {});
+	responseData = responseData.data;
+
+	const returnAll = this.getNodeParameter('returnAll', 0) as boolean;
+
+	if (!returnAll) {
+		const limit = this.getNodeParameter('limit', 0) as number;
+		responseData = responseData.slice(0, limit);
+	}
+
+	return responseData;
+}
diff --git a/packages/nodes-base/nodes/Stripe/stripe.svg b/packages/nodes-base/nodes/Stripe/stripe.svg
index 063b3994a4..e5419a6d1d 100644
--- a/packages/nodes-base/nodes/Stripe/stripe.svg
+++ b/packages/nodes-base/nodes/Stripe/stripe.svg
@@ -1 +1,22 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="54 -80 360 360"><style>.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#635bff}</style><path class="st0" d="M414 113.4c0-25.6-12.4-45.8-36.1-45.8-23.8 0-38.2 20.2-38.2 45.6 0 30.1 17 45.3 41.4 45.3 11.9 0 20.9-2.7 27.7-6.5v-20c-6.8 3.4-14.6 5.5-24.5 5.5-9.7 0-18.3-3.4-19.4-15.2h48.9c0-1.3.2-6.5.2-8.9zm-49.4-9.5c0-11.3 6.9-16 13.2-16 6.1 0 12.6 4.7 12.6 16h-25.8zM301.1 67.6c-9.8 0-16.1 4.6-19.6 7.8l-1.3-6.2h-22v116.6l25-5.3.1-28.3c3.6 2.6 8.9 6.3 17.7 6.3 17.9 0 34.2-14.4 34.2-46.1-.1-29-16.6-44.8-34.1-44.8zm-6 68.9c-5.9 0-9.4-2.1-11.8-4.7l-.1-37.1c2.6-2.9 6.2-4.9 11.9-4.9 9.1 0 15.4 10.2 15.4 23.3 0 13.4-6.2 23.4-15.4 23.4zM223.8 61.7l25.1-5.4V36l-25.1 5.3zM223.8 69.3h25.1v87.5h-25.1zM196.9 76.7l-1.6-7.4h-21.6v87.5h25V97.5c5.9-7.7 15.9-6.3 19-5.2v-23c-3.2-1.2-14.9-3.4-20.8 7.4zM146.9 47.6l-24.4 5.2-.1 80.1c0 14.8 11.1 25.7 25.9 25.7 8.2 0 14.2-1.5 17.5-3.3V135c-3.2 1.3-19 5.9-19-8.9V90.6h19V69.3h-19l.1-21.7zM79.3 94.7c0-3.9 3.2-5.4 8.5-5.4 7.6 0 17.2 2.3 24.8 6.4V72.2c-8.3-3.3-16.5-4.6-24.8-4.6C67.5 67.6 54 78.2 54 95.9c0 27.6 38 23.2 38 35.1 0 4.6-4 6.1-9.6 6.1-8.3 0-18.9-3.4-27.3-8v23.8c9.3 4 18.7 5.7 27.3 5.7 20.8 0 35.1-10.3 35.1-28.2-.1-29.8-38.2-24.5-38.2-35.7z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="54 -80 360 360">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#635BFF;}
+</style>
+<g>
+	<path class="st0" d="M414,113.4c0-25.6-12.4-45.8-36.1-45.8c-23.8,0-38.2,20.2-38.2,45.6c0,30.1,17,45.3,41.4,45.3
+		c11.9,0,20.9-2.7,27.7-6.5v-20c-6.8,3.4-14.6,5.5-24.5,5.5c-9.7,0-18.3-3.4-19.4-15.2h48.9C413.8,121,414,115.8,414,113.4z
+		 M364.6,103.9c0-11.3,6.9-16,13.2-16c6.1,0,12.6,4.7,12.6,16H364.6z"/>
+	<path class="st0" d="M301.1,67.6c-9.8,0-16.1,4.6-19.6,7.8l-1.3-6.2h-22v116.6l25-5.3l0.1-28.3c3.6,2.6,8.9,6.3,17.7,6.3
+		c17.9,0,34.2-14.4,34.2-46.1C335.1,83.4,318.6,67.6,301.1,67.6z M295.1,136.5c-5.9,0-9.4-2.1-11.8-4.7l-0.1-37.1
+		c2.6-2.9,6.2-4.9,11.9-4.9c9.1,0,15.4,10.2,15.4,23.3C310.5,126.5,304.3,136.5,295.1,136.5z"/>
+	<polygon class="st0" points="223.8,61.7 248.9,56.3 248.9,36 223.8,41.3 	"/>
+	<rect x="223.8" y="69.3" class="st0" width="25.1" height="87.5"/>
+	<path class="st0" d="M196.9,76.7l-1.6-7.4h-21.6v87.5h25V97.5c5.9-7.7,15.9-6.3,19-5.2v-23C214.5,68.1,202.8,65.9,196.9,76.7z"/>
+	<path class="st0" d="M146.9,47.6l-24.4,5.2l-0.1,80.1c0,14.8,11.1,25.7,25.9,25.7c8.2,0,14.2-1.5,17.5-3.3V135
+		c-3.2,1.3-19,5.9-19-8.9V90.6h19V69.3h-19L146.9,47.6z"/>
+	<path class="st0" d="M79.3,94.7c0-3.9,3.2-5.4,8.5-5.4c7.6,0,17.2,2.3,24.8,6.4V72.2c-8.3-3.3-16.5-4.6-24.8-4.6
+		C67.5,67.6,54,78.2,54,95.9c0,27.6,38,23.2,38,35.1c0,4.6-4,6.1-9.6,6.1c-8.3,0-18.9-3.4-27.3-8v23.8c9.3,4,18.7,5.7,27.3,5.7
+		c20.8,0,35.1-10.3,35.1-28.2C117.4,100.6,79.3,105.9,79.3,94.7z"/>
+</g>
+</svg>
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 3c42c04fd1..4d7363c412 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -530,6 +530,7 @@
       "dist/nodes/Strapi/Strapi.node.js",
       "dist/nodes/Strava/Strava.node.js",
       "dist/nodes/Strava/StravaTrigger.node.js",
+      "dist/nodes/Stripe/Stripe.node.js",
       "dist/nodes/Stripe/StripeTrigger.node.js",
       "dist/nodes/Switch.node.js",
       "dist/nodes/Salesmate/Salesmate.node.js",

From 477b3598eaf30704e8a87833850d19c8f356040f Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Sat, 10 Jul 2021 07:44:23 -0400
Subject: [PATCH 44/74] :sparkles: Add Home AssistantIO node (#1974)

* :sparkles: Add Home Assistant io node

* Implement continueOnFail

* Add Camera Proxy resource

* Clean up

* Minor improvements

* Remove 'Io' from the node name & code

* Fix generic functions naming

* :zap: Improvements

* Apply review changes & fix minor bugs

* Reduce nesting for additional attributes

* Minor changes

* :zap: Minor improvements and deactivate "Event" resource

Co-authored-by: dali <servfrdali@yahoo.fr>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../HomeAssistantApi.credentials.ts           |  36 ++
 .../HomeAssistant/CameraProxyDescription.ts   |  69 ++++
 .../nodes/HomeAssistant/ConfigDescription.ts  |  32 ++
 .../nodes/HomeAssistant/EventDescription.ts   | 144 +++++++
 .../nodes/HomeAssistant/GenericFunctions.ts   |  42 ++
 .../nodes/HomeAssistant/HistoryDescription.ts | 128 ++++++
 .../HomeAssistant/HomeAssistant.node.json     |  20 +
 .../nodes/HomeAssistant/HomeAssistant.node.ts | 377 ++++++++++++++++++
 .../nodes/HomeAssistant/LogDescription.ts     |  78 ++++
 .../nodes/HomeAssistant/ServiceDescription.ts | 159 ++++++++
 .../nodes/HomeAssistant/StateDescription.ts   | 187 +++++++++
 .../HomeAssistant/TemplateDescription.ts      |  52 +++
 .../nodes/HomeAssistant/homeAssistant.svg     |  16 +
 packages/nodes-base/package.json              |   2 +
 14 files changed, 1342 insertions(+)
 create mode 100644 packages/nodes-base/credentials/HomeAssistantApi.credentials.ts
 create mode 100644 packages/nodes-base/nodes/HomeAssistant/CameraProxyDescription.ts
 create mode 100644 packages/nodes-base/nodes/HomeAssistant/ConfigDescription.ts
 create mode 100644 packages/nodes-base/nodes/HomeAssistant/EventDescription.ts
 create mode 100644 packages/nodes-base/nodes/HomeAssistant/GenericFunctions.ts
 create mode 100644 packages/nodes-base/nodes/HomeAssistant/HistoryDescription.ts
 create mode 100644 packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.json
 create mode 100644 packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
 create mode 100644 packages/nodes-base/nodes/HomeAssistant/LogDescription.ts
 create mode 100644 packages/nodes-base/nodes/HomeAssistant/ServiceDescription.ts
 create mode 100644 packages/nodes-base/nodes/HomeAssistant/StateDescription.ts
 create mode 100644 packages/nodes-base/nodes/HomeAssistant/TemplateDescription.ts
 create mode 100644 packages/nodes-base/nodes/HomeAssistant/homeAssistant.svg

diff --git a/packages/nodes-base/credentials/HomeAssistantApi.credentials.ts b/packages/nodes-base/credentials/HomeAssistantApi.credentials.ts
new file mode 100644
index 0000000000..802561ba98
--- /dev/null
+++ b/packages/nodes-base/credentials/HomeAssistantApi.credentials.ts
@@ -0,0 +1,36 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class HomeAssistantApi implements ICredentialType {
+	name = 'homeAssistantApi';
+	displayName = 'Home Assistant API';
+	documentationUrl = 'homeAssistant';
+	properties = [
+		{
+			displayName: 'Host',
+			name: 'host',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+		{
+			displayName: 'Port',
+			name: 'port',
+			type: 'number' as NodePropertyTypes,
+			default: 8123,
+		},
+		{
+			displayName: 'SSL',
+			name: 'ssl',
+			type: 'boolean' as NodePropertyTypes,
+			default: false,
+		},
+		{
+			displayName: 'Access Token',
+			name: 'accessToken',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+		},
+	];
+}
diff --git a/packages/nodes-base/nodes/HomeAssistant/CameraProxyDescription.ts b/packages/nodes-base/nodes/HomeAssistant/CameraProxyDescription.ts
new file mode 100644
index 0000000000..35764bfc2a
--- /dev/null
+++ b/packages/nodes-base/nodes/HomeAssistant/CameraProxyDescription.ts
@@ -0,0 +1,69 @@
+import {
+	INodeProperties
+} from 'n8n-workflow';
+
+export const cameraProxyOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'cameraProxy',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get Screenshot',
+				value: 'getScreenshot',
+				description: 'Get the camera screenshot',
+			},
+		],
+		default: 'getScreenshot',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const cameraProxyFields = [
+	/* -------------------------------------------------------------------------- */
+	/*                       cameraProxy:getScreenshot                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Camera Entity ID',
+		name: 'cameraEntityId',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: [
+					'getScreenshot',
+				],
+				resource: [
+					'cameraProxy',
+				],
+			},
+		},
+		description: 'The camera entity ID.',
+	},
+	{
+		displayName: 'Binary Property',
+		name: 'binaryPropertyName',
+		type: 'string',
+		required: true,
+		default: 'data',
+		displayOptions: {
+			show: {
+				operation: [
+					'getScreenshot',
+				],
+				resource: [
+					'cameraProxy',
+				],
+			},
+		},
+		description: 'Name of the binary property to which to<br />write the data of the read file.',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/HomeAssistant/ConfigDescription.ts b/packages/nodes-base/nodes/HomeAssistant/ConfigDescription.ts
new file mode 100644
index 0000000000..1606ab4df5
--- /dev/null
+++ b/packages/nodes-base/nodes/HomeAssistant/ConfigDescription.ts
@@ -0,0 +1,32 @@
+import {
+	INodeProperties
+} from 'n8n-workflow';
+
+export const configOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'config',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get the configuration',
+			},
+			{
+				name: 'Check Configuration',
+				value: 'check',
+				description: 'Check the configuration',
+			},
+		],
+		default: 'get',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/HomeAssistant/EventDescription.ts b/packages/nodes-base/nodes/HomeAssistant/EventDescription.ts
new file mode 100644
index 0000000000..8a5dfb76f9
--- /dev/null
+++ b/packages/nodes-base/nodes/HomeAssistant/EventDescription.ts
@@ -0,0 +1,144 @@
+import {
+	INodeProperties
+} from 'n8n-workflow';
+
+export const eventOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'event',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all events',
+			},
+			{
+				name: 'Post',
+				value: 'post',
+				description: 'Post an event',
+			},
+		],
+		default: 'getAll',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const eventFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                event:getAll                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'event',
+				],
+			},
+		},
+		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: [
+					'event',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                event:post                                  */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Event Type',
+		name: 'eventType',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'post',
+				],
+				resource: [
+					'event',
+				],
+			},
+		},
+		required: true,
+		default: '',
+		description: 'The Entity ID for which an event will be created.',
+	},
+	{
+		displayName: 'Event Attributes',
+		name: 'eventAttributes',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		placeholder: 'Add Attribute',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'event',
+				],
+				operation: [
+					'post',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Attributes',
+				name: 'attributes',
+				values: [
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						default: '',
+						description: 'Name of the attribute.',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+						description: 'Value of the attribute.',
+					},
+				],
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/HomeAssistant/GenericFunctions.ts b/packages/nodes-base/nodes/HomeAssistant/GenericFunctions.ts
new file mode 100644
index 0000000000..a4e6b3f9d5
--- /dev/null
+++ b/packages/nodes-base/nodes/HomeAssistant/GenericFunctions.ts
@@ -0,0 +1,42 @@
+import {
+	OptionsWithUri
+} from 'request';
+
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	NodeApiError,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+export async function homeAssistantApiRequest(this: IExecuteFunctions, method: string, resource: string, body: IDataObject = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}) {
+	const credentials = this.getCredentials('homeAssistantApi');
+
+	if (credentials === undefined) {
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
+	}
+
+	let options: OptionsWithUri = {
+		headers: {
+			Authorization: `Bearer ${credentials.accessToken}`,
+		},
+		method,
+		qs,
+		body,
+		uri: uri ?? `${credentials.ssl === true ? 'https' : 'http'}://${credentials.host}:${credentials.port}/api${resource}`,
+		json: true,
+	};
+
+	options = Object.assign({}, options, option);
+	if (Object.keys(options.body).length === 0) {
+		delete options.body;
+	}
+	try {
+		return await this.helpers.request(options);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error);
+	}
+}
diff --git a/packages/nodes-base/nodes/HomeAssistant/HistoryDescription.ts b/packages/nodes-base/nodes/HomeAssistant/HistoryDescription.ts
new file mode 100644
index 0000000000..53b466d6e4
--- /dev/null
+++ b/packages/nodes-base/nodes/HomeAssistant/HistoryDescription.ts
@@ -0,0 +1,128 @@
+import {
+	INodeProperties
+} from 'n8n-workflow';
+
+export const historyOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'history',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all state changes',
+			},
+		],
+		default: 'getAll',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const historyFields = [
+	/* -------------------------------------------------------------------------- */
+	/*                                history:getLogbookEntries                   */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'history',
+				],
+			},
+		},
+		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: [
+					'history',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'history',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'End Time',
+				name: 'endTime',
+				type: 'dateTime',
+				default: '',
+				description: 'The end of the period.',
+			},
+			{
+				displayName: 'Entity IDs',
+				name: 'entityIds',
+				type: 'string',
+				default: '',
+				description: 'The entities IDs separated by comma.',
+			},
+			{
+				displayName: 'Minimal Response',
+				name: 'minimalResponse',
+				type: 'boolean',
+				default: false,
+				description: 'To only return <code>last_changed</code> and state for states.',
+			},
+			{
+				displayName: 'Significant Changes Only',
+				name: 'significantChangesOnly',
+				type: 'boolean',
+				default: false,
+				description: 'Only return significant state changes.',
+			},
+			{
+				displayName: 'Start Time',
+				name: 'startTime',
+				type: 'dateTime',
+				default: '',
+				description: 'The beginning of the period.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.json b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.json
new file mode 100644
index 0000000000..d5b99fa9af
--- /dev/null
+++ b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.json
@@ -0,0 +1,20 @@
+{
+	"node": "n8n-nodes-base.homeAssistant",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": [
+		"Miscellaneous"
+	],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/homeAssistant"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.homeAssistant/"
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
new file mode 100644
index 0000000000..e8508685e9
--- /dev/null
+++ b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
@@ -0,0 +1,377 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	configOperations,
+} from './ConfigDescription';
+
+import {
+	serviceFields,
+	serviceOperations,
+} from './ServiceDescription';
+
+import {
+	stateFields,
+	stateOperations,
+} from './StateDescription';
+
+import {
+	eventFields,
+	eventOperations,
+} from './EventDescription';
+
+import {
+	logFields,
+	logOperations,
+} from './LogDescription';
+
+import {
+	templateFields,
+	templateOperations,
+} from './TemplateDescription';
+
+import {
+	historyFields,
+	historyOperations,
+} from './HistoryDescription';
+
+import {
+	cameraProxyFields,
+	cameraProxyOperations,
+} from './CameraProxyDescription';
+
+import {
+	homeAssistantApiRequest,
+} from './GenericFunctions';
+
+export class HomeAssistant implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Home Assistant',
+		name: 'homeAssistant',
+		icon: 'file:homeAssistant.svg',
+		group: ['output'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume Home Assistant API',
+		defaults: {
+			name: 'Home Assistant',
+			color: '#3578e5',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'homeAssistantApi',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Camera Proxy',
+						value: 'cameraProxy',
+					},
+					{
+						name: 'Config',
+						value: 'config',
+					},
+					// {
+					// 	name: 'Event',
+					// 	value: 'event',
+					// },
+					// {
+					// 	name: 'History',
+					// 	value: 'history',
+					// },
+					{
+						name: 'Log',
+						value: 'log',
+					},
+					{
+						name: 'Service',
+						value: 'service',
+					},
+					{
+						name: 'State',
+						value: 'state',
+					},
+					{
+						name: 'Template',
+						value: 'template',
+					},
+				],
+				default: 'config',
+				description: 'Resource to consume.',
+			},
+			...cameraProxyOperations,
+			...cameraProxyFields,
+			...configOperations,
+			...eventOperations,
+			...eventFields,
+			...historyOperations,
+			...historyFields,
+			...logOperations,
+			...logFields,
+			...serviceOperations,
+			...serviceFields,
+			...stateOperations,
+			...stateFields,
+			...templateOperations,
+			...templateFields,
+		],
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		const length = items.length;
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+		const qs: IDataObject = {};
+		let responseData;
+		for (let i = 0; i < length; i++) {
+			try {
+				if (resource === 'config') {
+					if (operation === 'get') {
+						responseData = await homeAssistantApiRequest.call(this, 'GET', '/config');
+					} else if (operation === 'check') {
+						responseData = await homeAssistantApiRequest.call(this, 'POST', '/config/core/check_config');
+					}
+				} else if (resource === 'service') {
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+						responseData = await homeAssistantApiRequest.call(this, 'GET', '/services') as IDataObject[];
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', i) as number;
+							responseData = responseData.slice(0, limit);
+						}
+					} else if (operation === 'call') {
+						const domain = this.getNodeParameter('domain', i) as string;
+						const service = this.getNodeParameter('service', i) as string;
+						const serviceAttributes = this.getNodeParameter('serviceAttributes', i) as {
+							attributes: IDataObject[],
+						};
+
+						const body: IDataObject = {};
+
+						if (Object.entries(serviceAttributes).length) {
+							if (serviceAttributes.attributes !== undefined) {
+								serviceAttributes.attributes.map(
+									attribute => {
+										// @ts-ignore
+										body[attribute.name as string] = attribute.value;
+									},
+								);
+							}
+						}
+
+						responseData = await homeAssistantApiRequest.call(this, 'POST', `/services/${domain}/${service}`, body);
+						if (Array.isArray(responseData) && responseData.length === 0) {
+							responseData = {};
+						}
+					}
+				} else if (resource === 'state') {
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+						responseData = await homeAssistantApiRequest.call(this, 'GET', '/states') as IDataObject[];
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', i) as number;
+							responseData = responseData.slice(0, limit);
+						}
+					} else if (operation === 'get') {
+						const entityId = this.getNodeParameter('entityId', i) as string;
+						responseData = await homeAssistantApiRequest.call(this, 'GET', `/states/${entityId}`);
+					} else if (operation === 'upsert') {
+						const entityId = this.getNodeParameter('entityId', i) as string;
+						const state = this.getNodeParameter('state', i) as string;
+						const stateAttributes = this.getNodeParameter('stateAttributes', i) as {
+							attributes: IDataObject[],
+						};
+
+						const body = {
+							state,
+							attributes: {},
+						};
+
+						if (Object.entries(stateAttributes).length) {
+							if (stateAttributes.attributes !== undefined) {
+								stateAttributes.attributes.map(
+									attribute => {
+										// @ts-ignore
+										body.attributes[attribute.name as string] = attribute.value;
+									},
+								);
+							}
+						}
+
+						responseData = await homeAssistantApiRequest.call(this, 'POST', `/states/${entityId}`, body);
+					}
+				} else if (resource === 'event') {
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+						responseData = await homeAssistantApiRequest.call(this, 'GET', '/events') as IDataObject[];
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', i) as number;
+							responseData = responseData.slice(0, limit);
+						}
+					} else if (operation === 'post') {
+						const eventType = this.getNodeParameter('eventType', i) as string;
+						const eventAttributes = this.getNodeParameter('eventAttributes', i) as {
+							attributes: IDataObject[],
+						};
+
+						const body = {};
+
+						if (Object.entries(eventAttributes).length) {
+							if (eventAttributes.attributes !== undefined) {
+								eventAttributes.attributes.map(
+									attribute => {
+										// @ts-ignore
+										body[attribute.name as string] = attribute.value;
+									},
+								);
+							}
+						}
+
+						responseData = await homeAssistantApiRequest.call(this, 'POST', `/events/${eventType}`, body);
+
+					}
+				} else if (resource === 'log') {
+					if (operation === 'getErroLogs') {
+						responseData = await homeAssistantApiRequest.call(this, 'GET', '/error_log');
+						if (responseData) {
+							responseData = {
+								errorLog: responseData,
+							};
+						}
+					} else if (operation === 'getLogbookEntries') {
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+						let endpoint = '/logbook';
+
+						if (Object.entries(additionalFields).length) {
+							if (additionalFields.startTime) {
+								endpoint = `/logbook/${additionalFields.startTime}`;
+							}
+							if (additionalFields.endTime) {
+								qs.end_time = additionalFields.endTime;
+							}
+							if (additionalFields.entityId) {
+								qs.entity = additionalFields.entityId;
+							}
+						}
+
+						responseData = await homeAssistantApiRequest.call(this, 'GET', endpoint, {}, qs);
+
+					}
+				} else if (resource === 'template') {
+					if (operation === 'create') {
+						const body = {
+							template: this.getNodeParameter('template', i) as string,
+						};
+						responseData = await homeAssistantApiRequest.call(this, 'POST', '/template', body);
+						if (responseData) {
+							responseData = { renderedTemplate: responseData };
+						}
+					}
+				} else if (resource === 'history') {
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+						let endpoint = '/history/period';
+
+						if (Object.entries(additionalFields).length) {
+							if (additionalFields.startTime) {
+								endpoint = `/history/period/${additionalFields.startTime}`;
+							}
+							if (additionalFields.endTime) {
+								qs.end_time = additionalFields.endTime;
+							}
+							if (additionalFields.entityIds) {
+								qs.filter_entity_id = additionalFields.entityIds;
+							}
+							if (additionalFields.minimalResponse === true) {
+								qs.minimal_response = additionalFields.minimalResponse;
+							}
+							if (additionalFields.significantChangesOnly === true) {
+								qs.significant_changes_only = additionalFields.significantChangesOnly;
+							}
+						}
+
+						responseData = await homeAssistantApiRequest.call(this, 'GET', endpoint, {}, qs) as IDataObject[];
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', i) as number;
+							responseData = responseData.slice(0, limit);
+						}
+					}
+				} else if (resource === 'cameraProxy') {
+					if (operation === 'getScreenshot') {
+						const cameraEntityId = this.getNodeParameter('cameraEntityId', i) as string;
+						const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i) as string;
+						const endpoint = `/camera_proxy/${cameraEntityId}`;
+
+						let mimeType: string | undefined;
+
+						responseData = await homeAssistantApiRequest.call(this, 'GET', endpoint, {}, {}, undefined, {
+							encoding: null,
+							resolveWithFullResponse: true,
+						});
+
+						const newItem: INodeExecutionData = {
+							json: items[i].json,
+							binary: {},
+						};
+
+						if (mimeType === undefined && responseData.headers['content-type']) {
+							mimeType = responseData.headers['content-type'];
+						}
+
+						if (items[i].binary !== undefined) {
+							// Create a shallow copy of the binary data so that the old
+							// data references which do not get changed still stay behind
+							// but the incoming data does not get changed.
+							Object.assign(newItem.binary, items[i].binary);
+						}
+
+						items[i] = newItem;
+
+						const data = Buffer.from(responseData.body as string);
+
+						items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(data, 'screenshot.jpg', mimeType);
+					}
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					if (resource === 'cameraProxy' && operation === 'get') {
+						items[i].json = { error: error.message };
+					} else {
+						returnData.push({ error: error.message });
+					}
+					continue;
+				}
+				throw error;
+			}
+
+			Array.isArray(responseData)
+				? returnData.push(...responseData)
+				: returnData.push(responseData);
+		}
+
+		if (resource === 'cameraProxy' && operation === 'getScreenshot') {
+			return this.prepareOutputData(items);
+		} else {
+			return [this.helpers.returnJsonArray(returnData)];
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/HomeAssistant/LogDescription.ts b/packages/nodes-base/nodes/HomeAssistant/LogDescription.ts
new file mode 100644
index 0000000000..ba1d5c651f
--- /dev/null
+++ b/packages/nodes-base/nodes/HomeAssistant/LogDescription.ts
@@ -0,0 +1,78 @@
+import {
+	INodeProperties
+} from 'n8n-workflow';
+
+export const logOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'log',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get Error Logs',
+				value: 'getErroLogs',
+				description: 'Get a log for a specific entity',
+			},
+			{
+				name: 'Get Logbook Entries',
+				value: 'getLogbookEntries',
+				description: 'Get all logs',
+			},
+		],
+		default: 'getErroLogs',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const logFields = [
+	/* -------------------------------------------------------------------------- */
+	/*                                log:getLogbookEntries                       */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'log',
+				],
+				operation: [
+					'getLogbookEntries',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'End Time',
+				name: 'endTime',
+				type: 'dateTime',
+				default: '',
+				description: 'The end of the period.',
+			},
+			{
+				displayName: 'Entity ID',
+				name: 'entityId',
+				type: 'string',
+				default: '',
+				description: 'The entity ID.',
+			},
+			{
+				displayName: 'Start Time',
+				name: 'startTime',
+				type: 'dateTime',
+				default: '',
+				description: 'The beginning of the period.',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/HomeAssistant/ServiceDescription.ts b/packages/nodes-base/nodes/HomeAssistant/ServiceDescription.ts
new file mode 100644
index 0000000000..d278d47227
--- /dev/null
+++ b/packages/nodes-base/nodes/HomeAssistant/ServiceDescription.ts
@@ -0,0 +1,159 @@
+import {
+	INodeProperties
+} from 'n8n-workflow';
+
+export const serviceOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'service',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Call',
+				value: 'call',
+				description: 'Call a service within a specific domain',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all services',
+			},
+		],
+		default: 'getAll',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const serviceFields = [
+	/* -------------------------------------------------------------------------- */
+	/*                                service:getAll                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'service',
+				],
+			},
+		},
+		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: [
+					'service',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                service:Call                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Domain',
+		name: 'domain',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'service',
+				],
+				operation: [
+					'call',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Service',
+		name: 'service',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'service',
+				],
+				operation: [
+					'call',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Service Attributes',
+		name: 'serviceAttributes',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		placeholder: 'Add Attribute',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'service',
+				],
+				operation: [
+					'call',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'attributes',
+				displayName: 'Attributes',
+				values: [
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						default: '',
+						description: 'Name of the field.',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+						description: 'Value of the field.',
+					},
+				],
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/HomeAssistant/StateDescription.ts b/packages/nodes-base/nodes/HomeAssistant/StateDescription.ts
new file mode 100644
index 0000000000..aa356f1c7a
--- /dev/null
+++ b/packages/nodes-base/nodes/HomeAssistant/StateDescription.ts
@@ -0,0 +1,187 @@
+import {
+	INodeProperties
+} from 'n8n-workflow';
+
+export const stateOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'state',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create or update',
+				value: 'upsert',
+				description: 'Create a new record, or update the current one if it already exists (upsert)',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a state for a specific entity',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all states',
+			},
+		],
+		default: 'get',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const stateFields = [
+	/* -------------------------------------------------------------------------- */
+	/*                                state:get                                   */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Entity ID',
+		name: 'entityId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+				resource: [
+					'state',
+				],
+			},
+		},
+		required: true,
+		default: '',
+		description: 'The entity ID.',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                state:getAll                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'state',
+				],
+			},
+		},
+		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: [
+					'state',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'How many results to return.',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                state:upsert                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Entity ID',
+		name: 'entityId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'upsert',
+				],
+				resource: [
+					'state',
+				],
+			},
+		},
+		required: true,
+		default: '',
+		description: 'The entity ID for which a state will be created.',
+	},
+	{
+		displayName: 'State',
+		name: 'state',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'state',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'State Attributes',
+		name: 'stateAttributes',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+		},
+		placeholder: 'Add Attribute',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'state',
+				],
+				operation: [
+					'upsert',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Attributes',
+				name: 'attributes',
+				values: [
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						default: '',
+						description: 'Name of the attribute.',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+						description: 'Value of the attribute.',
+					},
+				],
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/HomeAssistant/TemplateDescription.ts b/packages/nodes-base/nodes/HomeAssistant/TemplateDescription.ts
new file mode 100644
index 0000000000..9f35155c6a
--- /dev/null
+++ b/packages/nodes-base/nodes/HomeAssistant/TemplateDescription.ts
@@ -0,0 +1,52 @@
+import {
+	INodeProperties
+} from 'n8n-workflow';
+
+export const templateOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'template',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'create a template',
+			},
+		],
+		default: 'create',
+		description: 'The operation to perform.',
+	},
+] as INodeProperties[];
+
+export const templateFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                template:create                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Template',
+		name: 'template',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'template',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		required: true,
+		default: '',
+		description: 'Render a Home Assistant template. <a href="https://www.home-assistant.io/docs/configuration/templating/" target="_blank">See template docs for more information.</a>',
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/HomeAssistant/homeAssistant.svg b/packages/nodes-base/nodes/HomeAssistant/homeAssistant.svg
new file mode 100644
index 0000000000..9e25b23da5
--- /dev/null
+++ b/packages/nodes-base/nodes/HomeAssistant/homeAssistant.svg
@@ -0,0 +1,16 @@
+<svg viewBox="0 0 500 500" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <path d="M44.041 343.222V209.58H9.288a9.333 9.333 0 0 1-6.655-15.876L189.639 3.497c4.517-4.594 11.903-4.657 16.498-.14l.12.12 97.601 98.794V83.974a7.778 7.778 0 0 1 7.778-7.778h32.41a7.778 7.778 0 0 1 7.779 7.778v67.138l41.568 42.618a9.333 9.333 0 0 1-6.682 15.85h-34.886v133.642a7.778 7.778 0 0 1-7.778 7.778H51.819a7.778 7.778 0 0 1-7.778-7.778zm206.393-163.26a15.029 15.029 0 0 0 1.46-6.486c0-8.308-6.71-15.043-14.989-15.043-8.278 0-14.989 6.735-14.989 15.043s6.711 15.044 14.99 15.044c2.314 0 4.505-.527 6.462-1.467l21.518 21.596v20.918l-26.981 27.078v-19.84a15.046 15.046 0 0 0 9.993-14.187c0-8.308-6.711-15.044-14.99-15.044-8.278 0-14.99 6.736-14.99 15.044 0 6.55 4.172 12.122 9.994 14.187v29.868l-24.983 25.073V144.464l20.519-20.592a14.886 14.886 0 0 0 6.462 1.466c8.279 0 14.99-6.735 14.99-15.044 0-8.308-6.711-15.043-14.99-15.043-8.278 0-14.989 6.735-14.989 15.043 0 2.323.524 4.522 1.46 6.486l-18.448 18.515-18.449-18.515a15.029 15.029 0 0 0 1.46-6.486c0-8.308-6.71-15.043-14.989-15.043-8.278 0-14.989 6.735-14.989 15.043 0 8.309 6.711 15.044 14.99 15.044 2.314 0 4.505-.527 6.462-1.466l20.518 20.592v105.16l-35.974-36.104v-28.865a15.046 15.046 0 0 0 9.993-14.187c0-8.309-6.711-15.044-14.99-15.044-8.278 0-14.99 6.735-14.99 15.044 0 6.55 4.172 12.122 9.994 14.187v18.837l-27.98-28.081v-27.863a15.046 15.046 0 0 0 9.993-14.187c0-8.308-6.711-15.044-14.99-15.044-8.278 0-14.99 6.736-14.99 15.044 0 6.55 4.172 12.122 9.994 14.187v32.017l30.907 31.018h-17.77c-2.058-5.843-7.61-10.029-14.137-10.029-8.278 0-14.99 6.735-14.99 15.043 0 8.309 6.712 15.044 14.99 15.044 6.527 0 12.08-4.186 14.137-10.03h27.763l43.04 43.196v75.074l-22.983-23.066v-28.866a15.046 15.046 0 0 0 9.993-14.187c0-8.308-6.711-15.043-14.99-15.043-8.278 0-14.99 6.735-14.99 15.043 0 6.55 4.172 12.122 9.994 14.187v18.837l-33.439-33.558a15.029 15.029 0 0 0 1.461-6.486c0-8.308-6.71-15.043-14.99-15.043-8.278 0-14.989 6.735-14.989 15.043s6.711 15.043 14.99 15.043c2.314 0 4.506-.526 6.462-1.466l33.439 33.559h-17.77c-2.058-5.843-7.61-10.03-14.137-10.03-8.278 0-14.99 6.736-14.99 15.044s6.712 15.043 14.99 15.043c6.527 0 12.079-4.186 14.137-10.029h27.763l27.98 28.081h14.132l28.98-29.083h26.763c2.058 5.842 7.61 10.028 14.137 10.028 8.278 0 14.99-6.735 14.99-15.043s-6.712-15.043-14.99-15.043c-6.527 0-12.079 4.186-14.137 10.029H229.84l-26.91 27.006V305.93l32.049-32.164h51.746c2.058 5.843 7.61 10.029 14.136 10.029 8.279 0 14.99-6.735 14.99-15.043 0-8.309-6.711-15.044-14.99-15.044-6.526 0-12.078 4.186-14.136 10.03H244.97l29.908-30.016v-25.072l21.517-21.596a14.886 14.886 0 0 0 6.463 1.467c8.278 0 14.99-6.736 14.99-15.044s-6.712-15.043-14.99-15.043-14.99 6.735-14.99 15.043c0 2.323.525 4.522 1.461 6.486l-14.451 14.504V148.55a15.046 15.046 0 0 0 9.993-14.187c0-8.309-6.711-15.044-14.99-15.044-8.278 0-14.99 6.735-14.99 15.044 0 6.55 4.172 12.122 9.994 14.187v45.915l-14.452-14.504zM120.987 323.909c-3.311 0-5.996-2.694-5.996-6.017 0-3.323 2.685-6.017 5.996-6.017 3.312 0 5.996 2.694 5.996 6.017 0 3.323-2.684 6.017-5.996 6.017zm43.97-45.13c-3.312 0-5.997-2.694-5.997-6.017 0-3.323 2.685-6.017 5.996-6.017 3.312 0 5.996 2.694 5.996 6.017 0 3.323-2.684 6.017-5.996 6.017zm-51.964-7.02c-3.312 0-5.996-2.694-5.996-6.017 0-3.323 2.684-6.017 5.996-6.017 3.311 0 5.996 2.694 5.996 6.017 0 3.323-2.685 6.017-5.996 6.017zm-4.997-50.144c-3.311 0-5.995-2.694-5.995-6.018 0-3.323 2.684-6.017 5.995-6.017 3.312 0 5.996 2.694 5.996 6.017 0 3.324-2.684 6.018-5.996 6.018zm124.912 7.02c-3.311 0-5.995-2.694-5.995-6.017 0-3.324 2.684-6.018 5.995-6.018 3.312 0 5.996 2.694 5.996 6.018 0 3.323-2.684 6.017-5.996 6.017zm67.952 46.133c-3.31 0-5.995-2.694-5.995-6.017 0-3.324 2.684-6.018 5.995-6.018 3.312 0 5.996 2.694 5.996 6.018 0 3.323-2.684 6.017-5.996 6.017zm-25.981 48.138c-3.312 0-5.996-2.694-5.996-6.017 0-3.323 2.684-6.017 5.996-6.017 3.311 0 5.996 2.694 5.996 6.017 0 3.323-2.685 6.017-5.996 6.017zm27.98-143.412c-3.311 0-5.996-2.695-5.996-6.018s2.685-6.017 5.996-6.017c3.311 0 5.996 2.694 5.996 6.017 0 3.323-2.685 6.018-5.996 6.018zm-32.977-39.113c-3.311 0-5.996-2.694-5.996-6.017 0-3.324 2.685-6.018 5.996-6.018 3.312 0 5.996 2.694 5.996 6.018 0 3.323-2.684 6.017-5.996 6.017zm-39.972-24.07c-3.311 0-5.995-2.693-5.995-6.017 0-3.323 2.684-6.017 5.995-6.017 3.312 0 5.996 2.694 5.996 6.017 0 3.324-2.684 6.018-5.996 6.018zm-63.955 0c-3.31 0-5.995-2.693-5.995-6.017 0-3.323 2.684-6.017 5.995-6.017 3.312 0 5.996 2.694 5.996 6.017 0 3.324-2.684 6.018-5.996 6.018zm-51.963 23.067c-3.311 0-5.996-2.694-5.996-6.017 0-3.324 2.685-6.018 5.996-6.018 3.311 0 5.996 2.694 5.996 6.018 0 3.323-2.685 6.017-5.996 6.017zm37.973 37.107c-3.311 0-5.995-2.694-5.995-6.017 0-3.324 2.684-6.018 5.995-6.018 3.312 0 5.996 2.694 5.996 6.018 0 3.323-2.684 6.017-5.996 6.017zm84.94 3.009c-3.31 0-5.995-2.695-5.995-6.018s2.684-6.017 5.995-6.017c3.312 0 5.996 2.694 5.996 6.017 0 3.323-2.684 6.018-5.996 6.018z" id="a"/>
+  </defs>
+  <g fill="none" fill-rule="evenodd">
+    <path d="M0 0h500v500H0z" fill="#41BDF5"/>
+    <g transform="translate(52 70)">
+      <mask id="b" fill="#fff">
+        <use xlink:href="#a"/>
+      </mask>
+      <g mask="url(#b)" fill="#FFF">
+        <path d="M0 0h396v351H0z"/>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 4d7363c412..d4fbd2eba1 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -119,6 +119,7 @@
       "dist/credentials/HarvestApi.credentials.js",
       "dist/credentials/HarvestOAuth2Api.credentials.js",
       "dist/credentials/HelpScoutOAuth2Api.credentials.js",
+      "dist/credentials/HomeAssistantApi.credentials.js",
       "dist/credentials/HttpBasicAuth.credentials.js",
       "dist/credentials/HttpDigestAuth.credentials.js",
       "dist/credentials/HttpHeaderAuth.credentials.js",
@@ -403,6 +404,7 @@
       "dist/nodes/Harvest/Harvest.node.js",
       "dist/nodes/HelpScout/HelpScout.node.js",
       "dist/nodes/HelpScout/HelpScoutTrigger.node.js",
+      "dist/nodes/HomeAssistant/HomeAssistant.node.js",
       "dist/nodes/HtmlExtract/HtmlExtract.node.js",
       "dist/nodes/HttpRequest.node.js",
       "dist/nodes/Hubspot/Hubspot.node.js",

From de3b5608ca225cb46b6bf74c186df89c223d6204 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 10 Jul 2021 13:50:04 +0200
Subject: [PATCH 45/74] :shirt: Fix lint issue

---
 .../nodes/Stripe/descriptions/TokenDescription.ts         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nodes-base/nodes/Stripe/descriptions/TokenDescription.ts b/packages/nodes-base/nodes/Stripe/descriptions/TokenDescription.ts
index 83bbea55d4..591a438dd0 100644
--- a/packages/nodes-base/nodes/Stripe/descriptions/TokenDescription.ts
+++ b/packages/nodes-base/nodes/Stripe/descriptions/TokenDescription.ts
@@ -57,7 +57,7 @@ export const tokenFields = [
 					'create',
 				],
 				type: [
-					'cardToken'
+					'cardToken',
 				],
 			},
 		},
@@ -77,7 +77,7 @@ export const tokenFields = [
 					'create',
 				],
 				type: [
-					'cardToken'
+					'cardToken',
 				],
 			},
 		},
@@ -99,7 +99,7 @@ export const tokenFields = [
 					'create',
 				],
 				type: [
-					'cardToken'
+					'cardToken',
 				],
 			},
 		},
@@ -120,7 +120,7 @@ export const tokenFields = [
 					'create',
 				],
 				type: [
-					'cardToken'
+					'cardToken',
 				],
 			},
 		},

From 922880f93d109391cb50db2f6f94b0be153fe8a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Sat, 10 Jul 2021 23:23:19 +0200
Subject: [PATCH 46/74] :zap: Fix workflow ID type on download (#1956)

---
 packages/editor-ui/src/Interface.ts               | 4 ++--
 packages/editor-ui/src/components/MainSidebar.vue | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 2fa997a545..cc3f89b8c6 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -202,7 +202,7 @@ export interface IVariableSelectorOption {
 
 // Simple version of n8n-workflow.Workflow
 export interface IWorkflowData {
-	id?: string;
+	id?: string | number;
 	name?: string;
 	active?: boolean;
 	nodes: INode[];
@@ -212,7 +212,7 @@ export interface IWorkflowData {
 }
 
 export interface IWorkflowDataUpdate {
-	id?: string;
+	id?: string | number;
 	name?: string;
 	nodes?: INode[];
 	connections?: IConnections;
diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue
index 09faab9bc7..9a615abccc 100644
--- a/packages/editor-ui/src/components/MainSidebar.vue
+++ b/packages/editor-ui/src/components/MainSidebar.vue
@@ -408,6 +408,9 @@ export default mixins(
 					const workflowData = await this.getWorkflowDataToSave();
 
 					const {tags, ...data} = workflowData;
+					if (data.id && typeof data.id === 'string') {
+						data.id = parseInt(data.id, 10);
+					}
 					const blob = new Blob([JSON.stringify(data, null, 2)], {
 						type: 'application/json;charset=utf-8',
 					});

From 800e5ec97f2f288595f5ddf417b524d506167853 Mon Sep 17 00:00:00 2001
From: Kaito Udagawa <umireon@gmail.com>
Date: Sun, 11 Jul 2021 06:51:35 +0900
Subject: [PATCH 47/74] :zap: Add support of array in querystring (#1914)

* :zap: Add support of array in querystring

In the HTTP Request node, a parameter that appeared multiple times with the same name will be converted into an array.
Any parameters that appeared only once will be kept in the form of a string for backward compatibility.

* :zap: Prefer spread operator
---
 packages/nodes-base/nodes/HttpRequest.node.ts | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/HttpRequest.node.ts b/packages/nodes-base/nodes/HttpRequest.node.ts
index ae26e3dd98..7e4292e6cf 100644
--- a/packages/nodes-base/nodes/HttpRequest.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest.node.ts
@@ -811,8 +811,23 @@ export class HttpRequest implements INodeType {
 						// @ts-ignore
 						requestOptions[optionName] = {};
 						for (const parameterData of setUiParameter!.parameter as IDataObject[]) {
-							// @ts-ignore
-							requestOptions[optionName][parameterData!.name as string] = parameterData!.value;
+							const parameterDataName = parameterData!.name as string;
+							const newValue = parameterData!.value;
+							if (optionName === 'qs') {
+								const computeNewValue = (oldValue: unknown) => {
+									if (typeof oldValue === 'string') {
+										return [oldValue, newValue];
+									} else if (Array.isArray(oldValue)) {
+										return [...oldValue, newValue];
+									} else {
+										return newValue;
+									}
+								};
+								requestOptions[optionName][parameterDataName] = computeNewValue(requestOptions[optionName][parameterDataName]);
+							} else {
+								// @ts-ignore
+								requestOptions[optionName][parameterDataName] = newValue;
+							}
 						}
 					}
 				}

From c67a50069c304ae2b87e62ef61a5ccae58fef78b Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 11 Jul 2021 18:05:44 +0200
Subject: [PATCH 48/74] :zap: Fix another possible issue which could cause
 unknown executions

---
 packages/cli/src/WorkflowRunner.ts | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index ee928657c2..d9742fce97 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -169,7 +169,6 @@ export class WorkflowRunner {
 
 		const nodeTypes = NodeTypes();
 
-
 		// Soft timeout to stop workflow execution after current running node
 		// Changes were made by adding the `workflowTimeout` to the `additionalData`
 		// So that the timeout will also work for executions with nested workflows.
@@ -188,11 +187,11 @@ export class WorkflowRunner {
 
 		// Register the active execution
 		const executionId = await this.activeExecutions.add(data, undefined);
-		Logger.verbose(`Execution for workflow ${data.workflowData.name} was assigned id ${executionId}`, {executionId});
 		let workflowExecution: PCancelable<IRun>;
-		additionalData.hooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(data, executionId, true);
 
 		try {
+			Logger.verbose(`Execution for workflow ${data.workflowData.name} was assigned id ${executionId}`, { executionId });
+			additionalData.hooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(data, executionId, true);
 			additionalData.sendMessageToUI = WorkflowExecuteAdditionalData.sendMessageToUI.bind({sessionId: data.sessionId});
 
 			if (data.executionData !== undefined) {
@@ -264,8 +263,17 @@ export class WorkflowRunner {
 			removeOnFail: true,
 		};
 		let job: Bull.Job;
+		let hooks: WorkflowHooks;
 		try {
 			job = await this.jobQueue.add(jobData, jobOptions);
+
+			console.log('Started with ID: ' + job.id.toString());
+
+			hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerMain(data.executionMode, executionId, data.workflowData, { retryOf: data.retryOf ? data.retryOf.toString() : undefined });
+
+			// Normally also workflow should be supplied here but as it only used for sending
+			// data to editor-UI is not needed.
+			hooks.executeHookFunctions('workflowExecuteBefore', []);
 		} catch (error) {
 			// We use "getWorkflowHooksIntegrated" here as we are just integrated in the "workflowExecuteAfter"
 			// hook anyway and other get so ignored
@@ -274,14 +282,6 @@ export class WorkflowRunner {
 			return executionId;
 		}
 
-		console.log('Started with ID: ' + job.id.toString());
-
-		const hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerMain(data.executionMode, executionId, data.workflowData, { retryOf: data.retryOf ? data.retryOf.toString() : undefined });
-
-		// Normally also workflow should be supplied here but as it only used for sending
-		// data to editor-UI is not needed.
-		hooks.executeHookFunctions('workflowExecuteBefore', []);
-
 		const workflowExecution: PCancelable<IRun> = new PCancelable(async (resolve, reject, onCancel) => {
 			onCancel.shouldReject = false;
 			onCancel(async () => {
@@ -386,7 +386,6 @@ export class WorkflowRunner {
 				stoppedAt: fullExecutionData.stoppedAt,
 			} as IRun;
 
-
 			this.activeExecutions.remove(executionId, runData);
 			// Normally also static data should be supplied here but as it only used for sending
 			// data to editor-UI is not needed.

From 45e73ad62862b1dd03c3e352f691149ec8455f1e Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 11 Jul 2021 18:18:01 +0200
Subject: [PATCH 49/74] :shirt: Fix lint issue

---
 packages/editor-ui/src/views/NodeView.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 5bc946cd77..5cd1bfea05 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -403,8 +403,8 @@ export default mixins(
 						if (data.data.resultData.error.stack) {
 							// Display some more information for now in console to make debugging easier
 							// TODO: Improve this in the future by displaying in UI
-							console.error(`Execution ${executionId} error:`);
-							console.error(data.data.resultData.error.stack);
+							console.error(`Execution ${executionId} error:`); // eslint-disable-line no-console
+							console.error(data.data.resultData.error.stack); // eslint-disable-line no-console
 						}
 					}
 				}

From d0221ce625df4986ddea960e5627f168ba75dc2c Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 11 Jul 2021 16:21:37 +0000
Subject: [PATCH 50/74] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-core@0.77.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 5151bfbb5b..c011222a8a 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.76.0",
+  "version": "0.77.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 8371460c8d76fef72a4e9eb34cde40108a2c6c88 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 11 Jul 2021 16:21:53 +0000
Subject: [PATCH 51/74] :arrow_up: Set n8n-core@0.77.0 on n8n-node-dev

---
 packages/node-dev/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index e6d7bceaa9..316e071fac 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -59,7 +59,7 @@
     "change-case": "^4.1.1",
     "copyfiles": "^2.1.1",
     "inquirer": "^7.0.1",
-    "n8n-core": "~0.76.0",
+    "n8n-core": "~0.77.0",
     "n8n-workflow": "~0.63.0",
     "oauth-1.0a": "^2.2.6",
     "replace-in-file": "^6.0.0",

From 4729a8e975779cfe4df640bc869ecbea7f042518 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 11 Jul 2021 16:21:53 +0000
Subject: [PATCH 52/74] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-node-dev@0.?=
 =?UTF-8?q?17.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/node-dev/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 316e071fac..9fa927fbeb 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "CLI to simplify n8n credentials/node development",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From cfca15df347b82304f48a7d96d2f71808355b665 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 11 Jul 2021 16:22:11 +0000
Subject: [PATCH 53/74] :arrow_up: Set n8n-core@0.77.0 on n8n-nodes-base

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index d4fbd2eba1..dd51e1052d 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -652,7 +652,7 @@
     "mqtt": "4.2.6",
     "mssql": "^6.2.0",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.76.0",
+    "n8n-core": "~0.77.0",
     "node-ssh": "^11.0.0",
     "nodemailer": "^6.5.0",
     "pdf-parse": "^1.1.1",

From 0191c3371508ddd6360ce59f8c84bd7c4abc0df4 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 11 Jul 2021 16:22:11 +0000
Subject: [PATCH 54/74] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-base@?=
 =?UTF-8?q?0.125.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index dd51e1052d..ccb4579a67 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.124.0",
+  "version": "0.125.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From f625f7c3f85e40584a972885411f556f95bcb958 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 11 Jul 2021 16:23:06 +0000
Subject: [PATCH 55/74] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-editor-ui@0?=
 =?UTF-8?q?.98.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index c7b4d1489d..6d16570dea 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.97.0",
+  "version": "0.98.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 44cb99507164cf8c03527ac6a3462d6825d0295f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 11 Jul 2021 16:24:03 +0000
Subject: [PATCH 56/74] :arrow_up: Set n8n-core@0.77.0, n8n-editor-ui@0.98.0
 and n8n-nodes-base@0.125.0 on n8n

---
 packages/cli/package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 4d866ec729..d0c6bc6fb1 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -108,9 +108,9 @@
     "localtunnel": "^2.0.0",
     "lodash.get": "^4.4.2",
     "mysql2": "~2.2.0",
-    "n8n-core": "~0.76.0",
-    "n8n-editor-ui": "~0.97.0",
-    "n8n-nodes-base": "~0.124.0",
+    "n8n-core": "~0.77.0",
+    "n8n-editor-ui": "~0.98.0",
+    "n8n-nodes-base": "~0.125.0",
     "n8n-workflow": "~0.63.0",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",

From 94ad8cef2fc8d428616dbee110281fbafde031d0 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sun, 11 Jul 2021 16:24:03 +0000
Subject: [PATCH 57/74] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.128.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index d0c6bc6fb1..818ce95364 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.127.0",
+  "version": "0.128.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 2daece5f9d6cbfc661b985e20fa5772e25ba6af9 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 12 Jul 2021 09:00:55 +0200
Subject: [PATCH 58/74] :bug: Fix access right issues with download file via
 SSH

---
 packages/nodes-base/nodes/Ssh/Ssh.node.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nodes-base/nodes/Ssh/Ssh.node.ts b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
index acbb3cb2c0..3a3ed5fb30 100644
--- a/packages/nodes-base/nodes/Ssh/Ssh.node.ts
+++ b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
@@ -309,7 +309,7 @@ export class Ssh implements INodeType {
 
 				const credentials = this.getCredentials('sshPrivateKey') as IDataObject;
 
-				const { path, } = await file();
+				const { path, } = await file({ prefix: 'n8n-ssh-' });
 				temporaryFiles.push(path);
 				await writeFile(path, credentials.privateKey as string);
 
@@ -346,7 +346,7 @@ export class Ssh implements INodeType {
 							const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i) as string;
 							const parameterPath = this.getNodeParameter('path', i) as string;
 
-							const { path } = await file({ mode: 0x0777, prefix: 'prefix-' });
+							const { path } = await file({ prefix: 'n8n-ssh-' });
 							temporaryFiles.push(path);
 
 							await ssh.getFile(path, parameterPath);
@@ -389,7 +389,7 @@ export class Ssh implements INodeType {
 								throw new Error(`No binary data property "${propertyNameUpload}" does not exists on item!`);
 							}
 
-							const { path } = await file();
+							const { path } = await file({ prefix: 'n8n-ssh-' });
 							temporaryFiles.push(path);
 							await writeFile(path, Buffer.from(binaryData.data, BINARY_ENCODING));
 

From cce804a534696d49b2bc86492fb9d664f4363a23 Mon Sep 17 00:00:00 2001
From: Jan <janober@users.noreply.github.com>
Date: Mon, 12 Jul 2021 10:12:45 +0200
Subject: [PATCH 59/74] :zap: Simplify bull error handling (#1983)

---
 packages/cli/src/WorkflowRunner.ts | 48 ++++++++++--------------------
 1 file changed, 15 insertions(+), 33 deletions(-)

diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index d9742fce97..160030d748 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -275,11 +275,11 @@ export class WorkflowRunner {
 			// data to editor-UI is not needed.
 			hooks.executeHookFunctions('workflowExecuteBefore', []);
 		} catch (error) {
-			// We use "getWorkflowHooksIntegrated" here as we are just integrated in the "workflowExecuteAfter"
-			// hook anyway and other get so ignored
-			const hooks = WorkflowExecuteAdditionalData.getWorkflowHooksIntegrated(data.executionMode, executionId, data.workflowData, { retryOf: data.retryOf ? data.retryOf.toString() : undefined });
+			// We use "getWorkflowHooksWorkerExecuter" as "getWorkflowHooksWorkerMain" does not contain the
+			// "workflowExecuteAfter" which we require.
+			const hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerExecuter(data.executionMode, executionId, data.workflowData, { retryOf: data.retryOf ? data.retryOf.toString() : undefined });
 			await this.processError(error, new Date(), data.executionMode, executionId, hooks);
-			return executionId;
+			throw error;
 		}
 
 		const workflowExecution: PCancelable<IRun> = new PCancelable(async (resolve, reject, onCancel) => {
@@ -287,19 +287,14 @@ export class WorkflowRunner {
 			onCancel(async () => {
 				await Queue.getInstance().stopJob(job);
 
-				const fullRunData :IRun = {
-					data: {
-						resultData: {
-							error: new WorkflowOperationError('Workflow-Execution has been canceled!'),
-							runData: {},
-						},
-					},
-					mode: data.executionMode,
-					startedAt: new Date(),
-					stoppedAt: new Date(),
-				};
-				this.activeExecutions.remove(executionId, fullRunData);
-				resolve(fullRunData);
+				// We use "getWorkflowHooksWorkerExecuter" as "getWorkflowHooksWorkerMain" does not contain the
+				// "workflowExecuteAfter" which we require.
+				const hooksWorker = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerExecuter(data.executionMode, executionId, data.workflowData, { retryOf: data.retryOf ? data.retryOf.toString() : undefined });
+
+				const error = new WorkflowOperationError('Workflow-Execution has been canceled!');
+				await this.processError(error, new Date(), data.executionMode, executionId, hooksWorker);
+
+				reject(error);
 			});
 
 			const jobData: Promise<IBullJobResponse> = job.finished();
@@ -351,6 +346,8 @@ export class WorkflowRunner {
 					clearWatchdogInterval();
 				}
 			} catch (error) {
+				// We use "getWorkflowHooksWorkerExecuter" as "getWorkflowHooksWorkerMain" does not contain the
+				// "workflowExecuteAfter" which we require.
 				const hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerExecuter(data.executionMode, executionId, data.workflowData, { retryOf: data.retryOf ? data.retryOf.toString() : undefined });
 				Logger.error(`Problem with execution ${executionId}: ${error.message}. Aborting.`);
 				if (clearWatchdogInterval !== undefined) {
@@ -358,24 +355,9 @@ export class WorkflowRunner {
 				}
 				await this.processError(error, new Date(), data.executionMode, executionId, hooks);
 
-				const fullRunData :IRun = {
-					data: {
-						resultData: {
-							error,
-							runData: {},
-						},
-					},
-					mode: data.executionMode,
-					startedAt: new Date(),
-					stoppedAt: new Date(),
-				};
-				this.activeExecutions.remove(executionId, fullRunData);
-				resolve(fullRunData);
-				return;
+				reject(error);
 			}
 
-
-
 			const executionDb = await Db.collections.Execution!.findOne(executionId) as IExecutionFlattedDb;
 			const fullExecutionData = ResponseHelper.unflattenExecutionData(executionDb) as IExecutionResponse;
 			const runData = {

From b058aee6c1c554d97f2f49a83b6c2cb269f78391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 12 Jul 2021 13:26:21 +0200
Subject: [PATCH 60/74] :sparkles: Add Baserow node (#1938)

* Add Baserow node

* :zap: Add JWT method to credentials

* :zap: Refactor Baserow node

* :hammer: Refactor to add continueOnFail

* :zap: Extract table ID from URL

* :pencil2: Reword descriptions per feedback

* :fire: Remove API token auth per feedback

* :hammer: Reformat for readability

* :bulb: Fix issues identified by nodelinter

* :zap: Add columns param to create and update

* :zap: Refactor JWT token retrieval

* :zap: Add resource loaders

* :zap: Improvements

* :zap: Improve types

* :zap: Clean up descriptions and comments

* :zap: Make minor UX improvements

* :zap: Update input data description

* :hammer: Refactor data to send for create and update

* :zap: Add text to description

* :zap: Small improvements

* :zap: Change parameter names and descriptions

Co-authored-by: Jeremie Pardou-Piquemal <571533+jrmi@users.noreply.github.com>
Co-authored-by: ricardo <ricardoespinoza105@gmail.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../credentials/BaserowApi.credentials.ts     |  34 ++
 .../nodes/Baserow/Baserow.node.json           |  19 +
 .../nodes-base/nodes/Baserow/Baserow.node.ts  | 318 ++++++++++++
 .../nodes/Baserow/GenericFunctions.ts         | 198 ++++++++
 .../nodes/Baserow/OperationDescription.ts     | 455 ++++++++++++++++++
 packages/nodes-base/nodes/Baserow/baserow.svg | 143 ++++++
 packages/nodes-base/nodes/Baserow/types.d.ts  |  41 ++
 packages/nodes-base/package.json              |   2 +
 8 files changed, 1210 insertions(+)
 create mode 100644 packages/nodes-base/credentials/BaserowApi.credentials.ts
 create mode 100644 packages/nodes-base/nodes/Baserow/Baserow.node.json
 create mode 100644 packages/nodes-base/nodes/Baserow/Baserow.node.ts
 create mode 100644 packages/nodes-base/nodes/Baserow/GenericFunctions.ts
 create mode 100644 packages/nodes-base/nodes/Baserow/OperationDescription.ts
 create mode 100644 packages/nodes-base/nodes/Baserow/baserow.svg
 create mode 100644 packages/nodes-base/nodes/Baserow/types.d.ts

diff --git a/packages/nodes-base/credentials/BaserowApi.credentials.ts b/packages/nodes-base/credentials/BaserowApi.credentials.ts
new file mode 100644
index 0000000000..ff81c05fee
--- /dev/null
+++ b/packages/nodes-base/credentials/BaserowApi.credentials.ts
@@ -0,0 +1,34 @@
+import {
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+// https://api.baserow.io/api/redoc/#section/Authentication
+
+export class BaserowApi implements ICredentialType {
+	name = 'baserowApi';
+	displayName = 'Baserow API';
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Host',
+			name: 'host',
+			type: 'string',
+			default: 'https://api.baserow.io',
+		},
+		{
+			displayName: 'Username',
+			name: 'username',
+			type: 'string',
+			default: '',
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			type: 'string',
+			default: '',
+			typeOptions: {
+				password: true,
+			},
+		},
+	];
+}
diff --git a/packages/nodes-base/nodes/Baserow/Baserow.node.json b/packages/nodes-base/nodes/Baserow/Baserow.node.json
new file mode 100644
index 0000000000..3ab9005110
--- /dev/null
+++ b/packages/nodes-base/nodes/Baserow/Baserow.node.json
@@ -0,0 +1,19 @@
+{
+	"node": "n8n-nodes-base.baserow",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Data & Storage"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/credentials/baserow"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/nodes/n8n-nodes-base.baserow/"
+			}
+		],
+		"generic": []
+	}
+}
diff --git a/packages/nodes-base/nodes/Baserow/Baserow.node.ts b/packages/nodes-base/nodes/Baserow/Baserow.node.ts
new file mode 100644
index 0000000000..c3a26bc580
--- /dev/null
+++ b/packages/nodes-base/nodes/Baserow/Baserow.node.ts
@@ -0,0 +1,318 @@
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	baserowApiRequest,
+	baserowApiRequestAllItems,
+	getJwtToken,
+	TableFieldMapper,
+	toOptions,
+} from './GenericFunctions';
+
+import {
+	operationFields
+} from './OperationDescription';
+
+import {
+	BaserowCredentials,
+	FieldsUiValues,
+	GetAllAdditionalOptions,
+	LoadedResource,
+	Operation,
+	Row,
+} from './types';
+
+export class Baserow implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Baserow',
+		name: 'baserow',
+		icon: 'file:baserow.svg',
+		group: ['output'],
+		version: 1,
+		description: 'Consume the Baserow API',
+		subtitle: '={{$parameter["operation"] + ":" + $parameter["resource"]}}',
+		defaults: {
+			name: 'Baserow',
+			color: '#00a2ce',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'baserowApi',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Row',
+						value: 'row',
+					},
+				],
+				default: 'row',
+				description: 'Operation to perform',
+			},
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				displayOptions: {
+					show: {
+						resource: [
+							'row',
+						],
+					},
+				},
+				options: [
+					{
+						name: 'Create',
+						value: 'create',
+						description: 'Create a row',
+					},
+					{
+						name: 'Delete',
+						value: 'delete',
+						description: 'Delete a row',
+					},
+					{
+						name: 'Get',
+						value: 'get',
+						description: 'Retrieve a row',
+					},
+					{
+						name: 'Get All',
+						value: 'getAll',
+						description: 'Retrieve all rows',
+					},
+					{
+						name: 'Update',
+						value: 'update',
+						description: 'Update a row',
+					},
+				],
+				default: 'getAll',
+				description: 'Operation to perform',
+			},
+			...operationFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			async getDatabaseIds(this: ILoadOptionsFunctions) {
+				const credentials = this.getCredentials('baserowApi') as BaserowCredentials;
+				const jwtToken = await getJwtToken.call(this, credentials);
+				const endpoint = '/api/applications/';
+				const databases = await baserowApiRequest.call(this, 'GET', endpoint, {}, {}, jwtToken) as LoadedResource[];
+				return toOptions(databases);
+			},
+
+			async getTableIds(this: ILoadOptionsFunctions) {
+				const credentials = this.getCredentials('baserowApi') as BaserowCredentials;
+				const jwtToken = await getJwtToken.call(this, credentials);
+				const databaseId = this.getNodeParameter('databaseId', 0) as string;
+				const endpoint = `/api/database/tables/database/${databaseId}`;
+				const tables = await baserowApiRequest.call(this, 'GET', endpoint, {}, {}, jwtToken) as LoadedResource[];
+				return toOptions(tables);
+			},
+
+			async getTableFields(this: ILoadOptionsFunctions) {
+				const credentials = this.getCredentials('baserowApi') as BaserowCredentials;
+				const jwtToken = await getJwtToken.call(this, credentials);
+				const tableId = this.getNodeParameter('tableId', 0) as string;
+				const endpoint = `/api/database/fields/table/${tableId}/`;
+				const fields = await baserowApiRequest.call(this, 'GET', endpoint, {}, {}, jwtToken) as LoadedResource[];
+				return toOptions(fields);
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const mapper = new TableFieldMapper();
+		const returnData: IDataObject[] = [];
+		const operation = this.getNodeParameter('operation', 0) as Operation;
+
+		const tableId = this.getNodeParameter('tableId', 0) as string;
+		const credentials = this.getCredentials('baserowApi') as BaserowCredentials;
+		const jwtToken = await getJwtToken.call(this, credentials);
+		const fields = await mapper.getTableFields.call(this, tableId, jwtToken);
+		mapper.createMappings(fields);
+
+		for (let i = 0; i < items.length; i++) {
+
+			try {
+
+				if (operation === 'getAll') {
+
+					// ----------------------------------
+					//             getAll
+					// ----------------------------------
+
+					// https://api.baserow.io/api/redoc/#operation/list_database_table_rows
+
+					const { order, filters, filterType, search } = this.getNodeParameter('additionalOptions', 0) as GetAllAdditionalOptions;
+
+					const qs: IDataObject = {};
+
+					if (order?.fields) {
+						qs['order_by'] = order.fields
+							.map(({ field, direction }) => `${direction}${mapper.setField(field)}`)
+							.join(',');
+					}
+
+					if (filters?.fields) {
+						filters.fields.forEach(({ field, operator, value }) => {
+							qs[`filter__field_${mapper.setField(field)}__${operator}`] = value;
+						});
+					}
+
+					if (filterType) {
+						qs.filter_type = filterType;
+					}
+
+					if (search) {
+						qs.search = search;
+					}
+
+					const endpoint = `/api/database/rows/table/${tableId}/`;
+					const rows = await baserowApiRequestAllItems.call(this, 'GET', endpoint, {}, qs, jwtToken) as Row[];
+
+					rows.forEach(row => mapper.idsToNames(row));
+
+					returnData.push(...rows);
+
+				} else if (operation === 'get') {
+
+					// ----------------------------------
+					//             get
+					// ----------------------------------
+
+					// https://api.baserow.io/api/redoc/#operation/get_database_table_row
+
+					const rowId = this.getNodeParameter('rowId', i) as string;
+					const endpoint = `/api/database/rows/table/${tableId}/${rowId}/`;
+					const row = await baserowApiRequest.call(this, 'GET', endpoint, {}, {}, jwtToken);
+
+					mapper.idsToNames(row);
+
+					returnData.push(row);
+
+				} else if (operation === 'create') {
+
+					// ----------------------------------
+					//             create
+					// ----------------------------------
+
+					// https://api.baserow.io/api/redoc/#operation/create_database_table_row
+
+					const body: IDataObject = {};
+
+					const dataToSend = this.getNodeParameter('dataToSend', 0) as 'defineBelow' | 'autoMapColumns';
+
+					if (dataToSend === 'autoMapColumns') {
+
+						const incomingKeys = Object.keys(items[i].json);
+						const rawInputsToIgnore = this.getNodeParameter('inputDataToIgnore', i) as string;
+						const inputDataToIgnore = rawInputsToIgnore.split(',').map(c => c.trim());
+
+						for (const key of incomingKeys) {
+							if (inputDataToIgnore.includes(key)) continue;
+							body[key] = items[i].json[key];
+							mapper.namesToIds(body);
+						}
+					} else {
+						const fields = this.getNodeParameter('fieldsUi.fieldValues', i, []) as FieldsUiValues;
+						for (const field of fields) {
+							body[`field_${field.fieldId}`] = field.fieldValue;
+						}
+					}
+
+					const endpoint = `/api/database/rows/table/${tableId}/`;
+					const createdRow = await baserowApiRequest.call(this, 'POST', endpoint, body, {}, jwtToken);
+
+					mapper.idsToNames(createdRow);
+
+					returnData.push(createdRow);
+
+				} else if (operation === 'update') {
+
+					// ----------------------------------
+					//             update
+					// ----------------------------------
+
+					// https://api.baserow.io/api/redoc/#operation/update_database_table_row
+
+					const rowId = this.getNodeParameter('rowId', i) as string;
+
+					const body: IDataObject = {};
+
+					const dataToSend = this.getNodeParameter('dataToSend', 0) as 'defineBelow' | 'autoMapInputData';
+
+					if (dataToSend === 'autoMapInputData') {
+
+						const incomingKeys = Object.keys(items[i].json);
+						const rawInputsToIgnore = this.getNodeParameter('inputsToIgnore', i) as string;
+						const inputsToIgnore = rawInputsToIgnore.split(',').map(c => c.trim());
+
+						for (const key of incomingKeys) {
+							if (inputsToIgnore.includes(key)) continue;
+							body[key] = items[i].json[key];
+							mapper.namesToIds(body);
+						}
+					} else {
+						const fields = this.getNodeParameter('fieldsUi.fieldValues', i, []) as FieldsUiValues;
+						for (const field of fields) {
+							body[`field_${field.fieldId}`] = field.fieldValue;
+						}
+					}
+
+					const endpoint = `/api/database/rows/table/${tableId}/${rowId}/`;
+					const updatedRow = await baserowApiRequest.call(this, 'PATCH', endpoint, body, {}, jwtToken);
+
+					mapper.idsToNames(updatedRow);
+
+					returnData.push(updatedRow);
+
+				} else if (operation === 'delete') {
+
+					// ----------------------------------
+					//             delete
+					// ----------------------------------
+
+					// https://api.baserow.io/api/redoc/#operation/delete_database_table_row
+
+					const rowId = this.getNodeParameter('rowId', i) as string;
+
+					const endpoint = `/api/database/rows/table/${tableId}/${rowId}/`;
+					await baserowApiRequest.call(this, 'DELETE', endpoint, {}, {}, jwtToken);
+
+					returnData.push({ success: true });
+				}
+
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ error: error.message });
+					continue;
+				}
+				throw error;
+			}
+		}
+
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/Baserow/GenericFunctions.ts b/packages/nodes-base/nodes/Baserow/GenericFunctions.ts
new file mode 100644
index 0000000000..e360b6192b
--- /dev/null
+++ b/packages/nodes-base/nodes/Baserow/GenericFunctions.ts
@@ -0,0 +1,198 @@
+import {
+	IExecuteFunctions,
+} from 'n8n-core';
+
+import {
+	OptionsWithUri,
+} from 'request';
+
+import {
+	IDataObject,
+	ILoadOptionsFunctions,
+	NodeApiError,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+import {
+	Accumulator,
+	BaserowCredentials,
+	LoadedResource,
+} from './types';
+
+/**
+ * Make a request to Baserow API.
+ */
+export async function baserowApiRequest(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	method: string,
+	endpoint: string,
+	body: IDataObject = {},
+	qs: IDataObject = {},
+	jwtToken: string,
+) {
+	const credentials = this.getCredentials('baserowApi') as BaserowCredentials;
+
+	if (credentials === undefined) {
+		throw new NodeOperationError(this.getNode(), 'No credentials got returned!');
+	}
+
+	const options: OptionsWithUri = {
+		headers: {
+			Authorization: `JWT ${jwtToken}`,
+		},
+		method,
+		body,
+		qs,
+		uri: `${credentials.host}${endpoint}`,
+		json: true,
+	};
+
+	if (Object.keys(qs).length === 0) {
+		delete options.qs;
+	}
+
+	if (Object.keys(body).length === 0) {
+		delete options.body;
+	}
+
+	try {
+		return await this.helpers.request!(options);
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error);
+	}
+}
+
+/**
+ * Get all results from a paginated query to Baserow API.
+ */
+export async function baserowApiRequestAllItems(
+	this: IExecuteFunctions,
+	method: string,
+	endpoint: string,
+	body: IDataObject,
+	qs: IDataObject = {},
+	jwtToken: string,
+): Promise<IDataObject[]> {
+	const returnData: IDataObject[] = [];
+	let responseData;
+
+	qs.page = 1;
+	qs.size = 100;
+
+	const returnAll = this.getNodeParameter('returnAll', 0, false) as boolean;
+	const limit = this.getNodeParameter('limit', 0, 0) as number;
+
+	do {
+		responseData = await baserowApiRequest.call(this, method, endpoint, body, qs, jwtToken);
+		returnData.push(...responseData.results);
+
+		if (!returnAll && returnData.length > limit) {
+			return returnData.slice(0, limit);
+		}
+
+		qs.page += 1;
+	} while (responseData.next !== null);
+
+	return returnData;
+}
+
+/**
+ * Get a JWT token based on Baserow account username and password.
+ */
+export async function getJwtToken(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	{ username, password, host }: BaserowCredentials,
+) {
+	const options: OptionsWithUri = {
+		method: 'POST',
+		body: {
+			username,
+			password,
+		},
+		uri: `${host}/api/user/token-auth/`,
+		json: true,
+	};
+
+	try {
+		const { token } = await this.helpers.request!(options) as { token: string };
+		return token;
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error);
+	}
+}
+
+export async function getFieldNamesAndIds(
+	this: IExecuteFunctions,
+	tableId: string,
+	jwtToken: string,
+) {
+	const endpoint = `/api/database/fields/table/${tableId}/`;
+	const response = await baserowApiRequest.call(this, 'GET', endpoint, {}, {}, jwtToken) as LoadedResource[];
+
+	return {
+		names: response.map((field) => field.name),
+		ids: response.map((field) => `field_${field.id}`),
+	};
+}
+
+export const toOptions = (items: LoadedResource[]) =>
+	items.map(({ name, id }) => ({ name, value: id }));
+
+/**
+ * Responsible for mapping field IDs `field_n` to names and vice versa.
+ */
+export class TableFieldMapper {
+	nameToIdMapping: Record<string, string> = {};
+	idToNameMapping: Record<string, string> = {};
+	mapIds = true;
+
+	async getTableFields(
+		this: IExecuteFunctions,
+		table: string,
+		jwtToken: string,
+	): Promise<LoadedResource[]> {
+		const endpoint = `/api/database/fields/table/${table}/`;
+		return await baserowApiRequest.call(this, 'GET', endpoint, {}, {}, jwtToken);
+	}
+
+	createMappings(tableFields: LoadedResource[]) {
+		this.nameToIdMapping = this.createNameToIdMapping(tableFields);
+		this.idToNameMapping = this.createIdToNameMapping(tableFields);
+	}
+
+	private createIdToNameMapping(responseData: LoadedResource[]) {
+		return responseData.reduce<Accumulator>((acc, cur) => {
+			acc[`field_${cur.id}`] = cur.name;
+			return acc;
+		}, {});
+	}
+
+	private createNameToIdMapping(responseData: LoadedResource[]) {
+		return responseData.reduce<Accumulator>((acc, cur) => {
+			acc[cur.name] = `field_${cur.id}`;
+			return acc;
+		}, {});
+	}
+
+	setField(field: string) {
+		return this.mapIds ? field : this.nameToIdMapping[field] ?? field;
+	}
+
+	idsToNames(obj: Record<string, unknown>) {
+		Object.entries(obj).forEach(([key, value]) => {
+			if (this.idToNameMapping[key] !== undefined) {
+				delete obj[key];
+				obj[this.idToNameMapping[key]] = value;
+			}
+		});
+	}
+
+	 namesToIds(obj: Record<string, unknown>) {
+		Object.entries(obj).forEach(([key, value]) => {
+			if (this.nameToIdMapping[key] !== undefined) {
+				delete obj[key];
+				obj[this.nameToIdMapping[key]] = value;
+			}
+		});
+	}
+}
diff --git a/packages/nodes-base/nodes/Baserow/OperationDescription.ts b/packages/nodes-base/nodes/Baserow/OperationDescription.ts
new file mode 100644
index 0000000000..76d20e0dab
--- /dev/null
+++ b/packages/nodes-base/nodes/Baserow/OperationDescription.ts
@@ -0,0 +1,455 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const operationFields = [
+	// ----------------------------------
+	//             shared
+	// ----------------------------------
+	{
+		displayName: 'Database',
+		name: 'databaseId',
+		type: 'options',
+		default: '',
+		required: true,
+		description: 'Database to operate on',
+		typeOptions: {
+			loadOptionsMethod: 'getDatabaseIds',
+		},
+	},
+	{
+		displayName: 'Table',
+		name: 'tableId',
+		type: 'options',
+		default: '',
+		required: true,
+		description: 'Table to operate on',
+		typeOptions: {
+			loadOptionsDependsOn: [
+				'databaseId',
+			],
+			loadOptionsMethod: 'getTableIds',
+		},
+	},
+
+	// ----------------------------------
+	//               get
+	// ----------------------------------
+	{
+		displayName: 'Row ID',
+		name: 'rowId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'get',
+				],
+			},
+		},
+		default: '',
+		required: true,
+		description: 'ID of the row to return',
+	},
+
+	// ----------------------------------
+	//              update
+	// ----------------------------------
+	{
+		displayName: 'Row ID',
+		name: 'rowId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'update',
+				],
+			},
+		},
+		default: '',
+		required: true,
+		description: 'ID of the row to update',
+	},
+
+	// ----------------------------------
+	//             create/update
+	// ----------------------------------
+	{
+		displayName: 'Data to Send',
+		name: 'dataToSend',
+		type: 'options',
+		options: [
+			{
+				name: 'Auto-map Input Data to Columns',
+				value: 'autoMapInputData',
+				description: 'Use when node input properties match destination column names',
+			},
+			{
+				name: 'Define Below for Each Column',
+				value: 'defineBelow',
+				description: 'Set the value for each destination column',
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+					'update',
+				],
+			},
+		},
+		default: 'defineBelow',
+		description: 'Whether to insert the input data this node receives in the new row',
+	},
+	{
+		displayName: 'Inputs to Ignore',
+		name: 'inputsToIgnore',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+					'update',
+				],
+				dataToSend: [
+					'autoMapInputData',
+				],
+			},
+		},
+		default: '',
+		required: false,
+		description: 'List of input properties to avoid sending, separated by commas. Leave empty to send all properties.',
+		placeholder: 'Enter properties...',
+	},
+	{
+		displayName: 'Fields to Send',
+		name: 'fieldsUi',
+		placeholder: 'Add Field',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValueButtonText: 'Add Field to Send',
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'create',
+					'update',
+				],
+				dataToSend: [
+					'defineBelow',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Field',
+				name: 'fieldValues',
+				values: [
+					{
+						displayName: 'Field ID',
+						name: 'fieldId',
+						type: 'options',
+						typeOptions: {
+							loadOptionsDependsOn: [
+								'tableId',
+							],
+							loadOptionsMethod: 'getTableFields',
+						},
+						default: '',
+					},
+					{
+						displayName: 'Field Value',
+						name: 'fieldValue',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+
+	// ----------------------------------
+	//             delete
+	// ----------------------------------
+	{
+		displayName: 'Row ID',
+		name: 'rowId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: [
+					'delete',
+				],
+			},
+		},
+		default: '',
+		required: true,
+		description: 'ID of the row to delete',
+	},
+
+	// ----------------------------------
+	//            getAll
+	// ----------------------------------
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		default: 50,
+		description: 'How many results to return',
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Options',
+		name: 'additionalOptions',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Filters',
+				name: 'filters',
+				placeholder: 'Add Filter',
+				description: 'Filter rows based on comparison operators',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'fields',
+						displayName: 'Field',
+						values: [
+							{
+								displayName: 'Field',
+								name: 'field',
+								type: 'options',
+								default: '',
+								description: 'Field to compare',
+								typeOptions: {
+									loadOptionsDependsOn: [
+										'tableId',
+									],
+									loadOptionsMethod: 'getTableFields',
+								},
+							},
+							{
+								displayName: 'Filter',
+								name: 'operator',
+								description: 'Operator to compare field and value with',
+								type: 'options',
+								options: [
+									{
+										name: 'Equal',
+										value: 'equal',
+										description: 'Field is equal to value',
+									},
+									{
+										name: 'Not Equal',
+										value: 'not_equal',
+										description: 'Field is not equal to value',
+									},
+									{
+										name: 'Date Equal',
+										value: 'date_equal',
+										description: 'Field is date. Format: \'YYYY-MM-DD\'',
+									},
+									{
+										name: 'Date Not Equal',
+										value: 'date_not_equal',
+										description: 'Field is not date. Format: \'YYYY-MM-DD\'',
+									},
+									{
+										name: 'Date Equals Today',
+										value: 'date_equals_today',
+										description: 'Field is today. Format: string',
+									},
+									{
+										name: 'Date Equals Month',
+										value: 'date_equals_month',
+										description: 'Field in this month. Format: string',
+									},
+									{
+										name: 'Date Equals Year',
+										value: 'date_equals_year',
+										description: 'Field in this year. Format: string',
+									},
+									{
+										name: 'Contains',
+										value: 'contains',
+										description: 'Field contains value',
+									},
+									{
+										name: 'File Name Contains',
+										value: 'filename_contains',
+										description: 'Field filename contains value',
+									},
+									{
+										name: 'Contains Not',
+										value: 'contains_not',
+										description: 'Field does not contain value',
+									},
+									{
+										name: 'Higher Than',
+										value: 'higher_than',
+										description: 'Field is higher than value',
+									},
+									{
+										name: 'Lower Than',
+										value: 'lower_than',
+										description: 'Field is lower than value',
+									},
+									{
+										name: 'Single Select Equal',
+										value: 'single_select_equal',
+										description: 'Field selected option is value',
+									},
+									{
+										name: 'Single Select Not Equal',
+										value: 'single_select_not_equal',
+										description: 'Field selected option is not value',
+									},
+									{
+										name: 'Is True',
+										value: 'boolean',
+										description: 'Boolean field is true',
+									},
+									{
+										name: 'Is Empty',
+										value: 'empty',
+										description: 'Field is empty',
+									},
+									{
+										name: 'Not Empty',
+										value: 'not_empty',
+										description: 'Field is not empty',
+									},
+								],
+								default: 'equal',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Value to compare to',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Filter Type',
+				name: 'filterType',
+				type: 'options',
+				options: [
+					{
+						name: 'AND',
+						value: 'AND',
+						description: 'Indicates that the rows must match all the provided filters',
+					},
+					{
+						name: 'OR',
+						value: 'OR',
+						description: 'Indicates that the rows only have to match one of the filters',
+					},
+				],
+				default: 'AND',
+				description: 'This works only if two or more filters are provided. Defaults to <code>AND</code>',
+			},
+			{
+				displayName: 'Search Term',
+				name: 'search',
+				type: 'string',
+				default: '',
+				description: 'Text to match (can be in any column)',
+			},
+			{
+				displayName: 'Sorting',
+				name: 'order',
+				placeholder: 'Add Sort Order',
+				description: 'Set the sort order of the result rows',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'Fields',
+						displayName: 'Field',
+						values: [
+							{
+								displayName: 'Field Name',
+								name: 'field',
+								type: 'options',
+								default: '',
+								description: 'Field name to sort by',
+								typeOptions: {
+									loadOptionsDependsOn: [
+										'tableId',
+									],
+									loadOptionsMethod: 'getTableFields',
+								},
+							},
+							{
+								displayName: 'Direction',
+								name: 'direction',
+								type: 'options',
+								options: [
+									{
+										name: 'ASC',
+										value: '',
+										description: 'Sort in ascending order',
+									},
+									{
+										name: 'DESC',
+										value: '-',
+										description: 'Sort in descending order',
+									},
+								],
+								default: '',
+								description: 'Sort direction, either ascending or descending',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Baserow/baserow.svg b/packages/nodes-base/nodes/Baserow/baserow.svg
new file mode 100644
index 0000000000..a184ad4b99
--- /dev/null
+++ b/packages/nodes-base/nodes/Baserow/baserow.svg
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="60"
+   height="60"
+   viewBox="0 0 60 60.000001"
+   version="1.1"
+   id="svg14"
+   sodipodi:docname="baserow.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <svg:metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:defs
+     id="defs18" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1848"
+     inkscape:window-height="1016"
+     id="namedview16"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="2.5579745"
+     inkscape:cx="-29.906474"
+     inkscape:cy="40.001009"
+     inkscape:window-x="1512"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Group_163" />
+  <svg:g
+     id="Group_163"
+     data-name="Group 163"
+     transform="translate(-451.976,-540.719)">
+    <svg:g
+       id="Group_162"
+       data-name="Group 162"
+       transform="matrix(1.8935807,0,0,1.8935807,451.976,543.89927)"
+       style="stroke-width:0.52810001">
+      <svg:g
+         id="Group_161"
+         data-name="Group 161"
+         style="stroke-width:0.52810001">
+        <svg:rect
+           id="Rectangle_257"
+           data-name="Rectangle 257"
+           width="21.863001"
+           height="3.9920001"
+           transform="translate(6.654,24.335)"
+           x="0"
+           y="0"
+           style="fill:#566270;stroke-width:0.52810001" />
+        <svg:rect
+           id="Rectangle_258"
+           data-name="Rectangle 258"
+           width="23.955"
+           height="3.9920001"
+           transform="translate(0,18.251)"
+           x="0"
+           y="0"
+           style="fill:#4570a9;stroke-width:0.52810001" />
+        <svg:rect
+           id="Rectangle_259"
+           data-name="Rectangle 259"
+           width="6.4640002"
+           height="3.9920001"
+           transform="translate(25.222,18.251)"
+           x="0"
+           y="0"
+           style="fill:#4570a9;stroke-width:0.52810001" />
+        <svg:rect
+           id="Rectangle_260"
+           data-name="Rectangle 260"
+           width="11.597"
+           height="3.9920001"
+           transform="translate(4.563,12.167)"
+           x="0"
+           y="0"
+           style="fill:#00a2ce;stroke-width:0.52810001" />
+        <svg:rect
+           id="Rectangle_261"
+           data-name="Rectangle 261"
+           width="5.2280002"
+           height="3.9920001"
+           transform="translate(17.728,12.167)"
+           x="0"
+           y="0"
+           style="fill:#00a2ce;stroke-width:0.52810001" />
+        <svg:rect
+           id="Rectangle_262"
+           data-name="Rectangle 262"
+           width="19.392"
+           height="3.9920001"
+           transform="translate(8.365,6.084)"
+           x="0"
+           y="0"
+           style="fill:#6acaff;stroke-width:0.52810001" />
+        <svg:rect
+           id="Rectangle_263"
+           data-name="Rectangle 263"
+           width="16.35"
+           height="3.9920001"
+           transform="translate(7.319)"
+           x="0"
+           y="0"
+           style="fill:#9addff;stroke-width:0.52810001" />
+        <svg:rect
+           id="Rectangle_264"
+           data-name="Rectangle 264"
+           width="5.2280002"
+           height="3.9920001"
+           transform="translate(0.285)"
+           x="0"
+           y="0"
+           style="fill:#9addff;stroke-width:0.52810001" />
+      </svg:g>
+    </svg:g>
+  </svg:g>
+  <script />
+</svg:svg>
diff --git a/packages/nodes-base/nodes/Baserow/types.d.ts b/packages/nodes-base/nodes/Baserow/types.d.ts
new file mode 100644
index 0000000000..7999d82b0d
--- /dev/null
+++ b/packages/nodes-base/nodes/Baserow/types.d.ts
@@ -0,0 +1,41 @@
+export type BaserowCredentials = {
+	username: string;
+	password: string;
+	host: string;
+}
+
+export type GetAllAdditionalOptions = {
+	order?: {
+		fields: Array<{
+			field: string;
+			direction: string;
+		}>
+	};
+	filters?: {
+		fields: Array<{
+			field: string;
+			operator: string;
+			value: string;
+		}>;
+	};
+	filterType: string,
+	search: string,
+};
+
+export type LoadedResource = {
+	id: number;
+	name: string;
+}
+
+export type Accumulator = {
+	[key: string]: string;
+}
+
+export type Row = Record<string, string>
+
+export type FieldsUiValues = Array<{
+	fieldId: string;
+	fieldValue: string;
+}>;
+
+export type Operation = 'create' | 'delete' | 'update' | 'get' | 'getAll';
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index ccb4579a67..b585c8e098 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -43,6 +43,7 @@
       "dist/credentials/AffinityApi.credentials.js",
       "dist/credentials/BannerbearApi.credentials.js",
       "dist/credentials/BeeminderApi.credentials.js",
+      "dist/credentials/BaserowApi.credentials.js",
       "dist/credentials/BitbucketApi.credentials.js",
       "dist/credentials/BitlyApi.credentials.js",
       "dist/credentials/BitlyOAuth2Api.credentials.js",
@@ -311,6 +312,7 @@
       "dist/nodes/Aws/AwsSns.node.js",
       "dist/nodes/Aws/AwsSnsTrigger.node.js",
       "dist/nodes/Bannerbear/Bannerbear.node.js",
+      "dist/nodes/Baserow/Baserow.node.js",
       "dist/nodes/Beeminder/Beeminder.node.js",
       "dist/nodes/Bitbucket/BitbucketTrigger.node.js",
       "dist/nodes/Bitly/Bitly.node.js",

From 4582184047c673aa69652dd4e967dc8ddb0e4289 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 12 Jul 2021 11:28:55 +0000
Subject: [PATCH 61/74] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-base@?=
 =?UTF-8?q?0.126.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index b585c8e098..6e7c749831 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.125.0",
+  "version": "0.126.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 314ef7e1abe0452bc54f88ea63dd1510f1e75517 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 12 Jul 2021 11:30:02 +0000
Subject: [PATCH 62/74] :arrow_up: Set n8n-nodes-base@0.126.0 on n8n

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 818ce95364..fdefd181e0 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -110,7 +110,7 @@
     "mysql2": "~2.2.0",
     "n8n-core": "~0.77.0",
     "n8n-editor-ui": "~0.98.0",
-    "n8n-nodes-base": "~0.125.0",
+    "n8n-nodes-base": "~0.126.0",
     "n8n-workflow": "~0.63.0",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",

From 25b5d36dda5a6fc4e839b4300da15684be5dd563 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 12 Jul 2021 11:30:02 +0000
Subject: [PATCH 63/74] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.129.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index fdefd181e0..19c8102235 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.128.0",
+  "version": "0.129.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 8cceec1209e36355bbb75bf81ab3f41abb5097ac Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Wed, 14 Jul 2021 16:31:48 +0200
Subject: [PATCH 64/74] :bug: Fix issue with failed workflows being displayed
 as "running"

---
 packages/cli/src/WorkflowRunner.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index 160030d748..518b7a4e12 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -233,6 +233,8 @@ export class WorkflowRunner {
 				fullRunData.finished = false;
 			}
 			this.activeExecutions.remove(executionId, fullRunData);
+		}).catch((error) => {
+			this.processError(error, new Date(), data.executionMode, executionId, additionalData.hooks);
 		});
 
 		return executionId;

From e40f0e00a803dff58b779eac087c7c9eda94775e Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Wed, 14 Jul 2021 16:34:54 +0200
Subject: [PATCH 65/74] :zap: Reduce risk of errors causing never stopping
 workflows

---
 packages/cli/src/WorkflowRunner.ts | 38 +++++++++++++++---------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index 518b7a4e12..07f9b91fe2 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -212,31 +212,31 @@ export class WorkflowRunner {
 				workflowExecution = workflowExecute.runPartialWorkflow(workflow, data.runData, data.startNodes, data.destinationNode);
 			}
 
+			this.activeExecutions.attachWorkflowExecution(executionId, workflowExecution);
+
+			if (workflowTimeout > 0) {
+				const timeout = Math.min(workflowTimeout, config.get('executions.maxTimeout') as number) * 1000; // as seconds
+				executionTimeout = setTimeout(() => {
+					this.activeExecutions.stopExecution(executionId, 'timeout');
+				}, timeout);
+			}
+
+			workflowExecution.then((fullRunData) => {
+				clearTimeout(executionTimeout);
+				if (workflowExecution.isCanceled) {
+					fullRunData.finished = false;
+				}
+				this.activeExecutions.remove(executionId, fullRunData);
+			}).catch((error) => {
+				this.processError(error, new Date(), data.executionMode, executionId, additionalData.hooks);
+			});
+
 		} catch (error) {
 			await this.processError(error, new Date(), data.executionMode, executionId, additionalData.hooks);
 
 			throw error;
 		}
 
-		this.activeExecutions.attachWorkflowExecution(executionId, workflowExecution);
-
-		if (workflowTimeout > 0) {
-			const timeout = Math.min(workflowTimeout, config.get('executions.maxTimeout') as number) * 1000; // as seconds
-			executionTimeout = setTimeout(() => {
-				this.activeExecutions.stopExecution(executionId, 'timeout');
-			}, timeout);
-		}
-
-		workflowExecution.then((fullRunData) => {
-			clearTimeout(executionTimeout);
-			if (workflowExecution.isCanceled) {
-				fullRunData.finished = false;
-			}
-			this.activeExecutions.remove(executionId, fullRunData);
-		}).catch((error) => {
-			this.processError(error, new Date(), data.executionMode, executionId, additionalData.hooks);
-		});
-
 		return executionId;
 	}
 

From c5a1bc007f209920cb1015ef97be3f2acede9a53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 14 Jul 2021 18:51:51 +0200
Subject: [PATCH 66/74] :zap: Add sandbox option to Salesforce OAuth2
 credentials (#1979)

* :zap: Add environment dropdown to OAuth2 creds

* :zap: Add sandbox URL to OAuth2 call

* :rewind: Revert options change

* :zap: Set OAuth2 URLs with expressions

* :zap: Extract instance URL from credentials
---
 .../SalesforceOAuth2Api.credentials.ts        | 22 ++++++++++++++++---
 .../nodes/Salesforce/GenericFunctions.ts      |  5 ++---
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/packages/nodes-base/credentials/SalesforceOAuth2Api.credentials.ts b/packages/nodes-base/credentials/SalesforceOAuth2Api.credentials.ts
index 0aaba074ec..3fd9daf8d4 100644
--- a/packages/nodes-base/credentials/SalesforceOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/SalesforceOAuth2Api.credentials.ts
@@ -11,19 +11,35 @@ export class SalesforceOAuth2Api implements ICredentialType {
 	displayName = 'Salesforce OAuth2 API';
 	documentationUrl = 'salesforce';
 	properties: INodeProperties[] = [
+		{
+			displayName: 'Environment Type',
+			name: 'environment',
+			type: 'options',
+			options: [
+				{
+					name: 'Production',
+					value: 'production',
+				},
+				{
+					name: 'Sandbox',
+					value: 'sandbox',
+				},
+			],
+			default: 'production',
+		},
 		{
 			displayName: 'Authorization URL',
 			name: 'authUrl',
 			type: 'hidden',
-			default: 'https://login.salesforce.com/services/oauth2/authorize',
 			required: true,
+			default: '={{ $self["environment"] === "sandbox" ? "https://test.salesforce.com/services/oauth2/authorize" : "https://login.salesforce.com/services/oauth2/authorize" }}',
 		},
 		{
 			displayName: 'Access Token URL',
 			name: 'accessTokenUrl',
-			type: 'string',
-			default: 'https://yourcompany.salesforce.com/services/oauth2/token',
+			type: 'hidden',
 			required: true,
+			default: '={{ $self["environment"] === "sandbox" ? "https://test.salesforce.com/services/oauth2/token" : "https://login.salesforce.com/services/oauth2/token" }}',
 		},
 		{
 			displayName: 'Scope',
diff --git a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
index 49a61cc52f..1200b9e703 100644
--- a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
@@ -40,9 +40,8 @@ export async function salesforceApiRequest(this: IExecuteFunctions | IExecuteSin
 		} else {
 			// https://help.salesforce.com/articleView?id=remoteaccess_oauth_web_server_flow.htm&type=5
 			const credentialsType = 'salesforceOAuth2Api';
-			const credentials = this.getCredentials(credentialsType);
-			const subdomain = ((credentials!.accessTokenUrl as string).match(/https:\/\/(.+).salesforce\.com/) || [])[1];
-			const options = getOptions.call(this, method, (uri || endpoint), body, qs, `https://${subdomain}.salesforce.com`);
+			const credentials = this.getCredentials(credentialsType) as { oauthTokenData: { instance_url: string } };
+			const options = getOptions.call(this, method, (uri || endpoint), body, qs, credentials.oauthTokenData.instance_url);
 			Logger.debug(`Authentication for "Salesforce" node is using "OAuth2". Invoking URI ${options.uri}`);
 			//@ts-ignore
 			return await this.helpers.requestOAuth2.call(this, credentialsType, options);

From c983603306d459ccf97f4128fffc137a34dabc58 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Wed, 14 Jul 2021 13:18:46 -0400
Subject: [PATCH 67/74] :sparkles: Add custom fields to TheHive (#1985)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ⚡Add custom fields support to TheHive node

* :zap: Improvements to #1527

* :bug: Make it also work without custom fields set

Co-authored-by: Mika Luhta <12100880+mluhta@users.noreply.github.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../nodes/TheHive/GenericFunctions.ts         |  73 ++++++-
 .../nodes-base/nodes/TheHive/TheHive.node.ts  |  94 ++++++++-
 .../TheHive/descriptions/AlertDescription.ts  | 190 ++++++++++++++++++
 .../TheHive/descriptions/CaseDescription.ts   | 175 ++++++++++++++++
 4 files changed, 520 insertions(+), 12 deletions(-)

diff --git a/packages/nodes-base/nodes/TheHive/GenericFunctions.ts b/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
index 18d22ec1df..d37cf9f770 100644
--- a/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
@@ -13,6 +13,7 @@ import {
 } from 'n8n-workflow';
 
 import * as moment from 'moment';
+import { Eq } from './QueryFunctions';
 
 export async function theHiveApiRequest(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
 	const credentials = this.getCredentials('theHiveApi');
@@ -77,7 +78,10 @@ export function prepareOptional(optionals: IDataObject): IDataObject {
 	const response: IDataObject = {};
 	for (const key in optionals) {
 		if (optionals[key] !== undefined && optionals[key] !== null && optionals[key] !== '') {
-			if (moment(optionals[key] as string, moment.ISO_8601).isValid()) {
+			if (['customFieldsJson', 'customFieldsUi'].indexOf(key) > -1) {
+				continue; // Ignore customFields, they need special treatment
+			}
+			else if (moment(optionals[key] as string, moment.ISO_8601).isValid()) {
 				response[key] = Date.parse(optionals[key] as string);
 			} else if (key === 'artifacts') {
 				response[key] = JSON.parse(optionals[key] as string);
@@ -91,6 +95,73 @@ export function prepareOptional(optionals: IDataObject): IDataObject {
 	return response;
 }
 
+export async function prepareCustomFields(this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions, additionalFields: IDataObject, jsonParameters = false): Promise<IDataObject | undefined> {
+	// Check if the additionalFields object contains customFields
+	if (jsonParameters === true) {
+		const customFieldsJson = additionalFields.customFieldsJson;
+		// Delete from additionalFields as some operations (e.g. alert:update) do not run prepareOptional
+		// which would remove the extra fields
+		delete additionalFields.customFieldsJson;
+
+		if (typeof customFieldsJson === 'string') {
+			return JSON.parse(customFieldsJson);
+		} else if (typeof customFieldsJson === 'object') {
+			return customFieldsJson as IDataObject;
+		} else if (customFieldsJson) {
+			throw Error('customFieldsJson value is invalid');
+		}
+	} else if (additionalFields.customFieldsUi) {
+		// Get Custom Field Types from TheHive
+		const version = this.getCredentials('theHiveApi')?.apiVersion;
+		const endpoint = version === 'v1' ? '/customField' : '/list/custom_fields';
+
+		const requestResult = await theHiveApiRequest.call(
+			this,
+			'GET',
+			endpoint as string,
+		);
+
+		// Convert TheHive3 response to the same format as TheHive 4
+		// [{name, reference, type}]
+		const hiveCustomFields = version === 'v1' ? requestResult : Object.keys(requestResult).map(key => requestResult[key]);
+		// Build reference to type mapping object
+		const referenceTypeMapping = hiveCustomFields.reduce((acc: IDataObject, curr: IDataObject) => (acc[curr.reference as string] = curr.type, acc), {});
+
+		// Build "fieldName": {"type": "value"} objects
+		const customFieldsUi = (additionalFields.customFieldsUi as IDataObject);
+		const customFields : IDataObject = (customFieldsUi?.customFields as IDataObject[]).reduce((acc: IDataObject, curr: IDataObject) => {
+			const fieldName = curr.field as string;
+
+			// Might be able to do some type conversions here if needed, TODO
+
+			acc[fieldName] = {
+				[referenceTypeMapping[fieldName]]: curr.value,
+			};
+			return acc;
+		}, {} as IDataObject);
+
+		delete additionalFields.customFieldsUi;
+		return customFields;
+	}
+	return undefined;
+}
+
+export function buildCustomFieldSearch(customFields: IDataObject): IDataObject[] {
+	const customFieldTypes = ['boolean', 'date', 'float', 'integer', 'number', 'string'];
+	const searchQueries: IDataObject[] = [];
+	Object.keys(customFields).forEach(customFieldName => {
+		const customField = customFields[customFieldName] as IDataObject;
+
+		// Figure out the field type from the object's keys
+		const fieldType = Object.keys(customField)
+			.filter(key => customFieldTypes.indexOf(key) > -1)[0];
+		const fieldValue = customField[fieldType];
+
+		searchQueries.push(Eq(`customFields.${customFieldName}.${fieldType}`, fieldValue));
+	});
+	return searchQueries;
+}
+
 export function prepareSortQuery(sort: string, body: { query: [IDataObject] }) {
 	if (sort) {
 		const field = sort.substring(1);
diff --git a/packages/nodes-base/nodes/TheHive/TheHive.node.ts b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
index 5b3a93c7f0..0db28ce56c 100644
--- a/packages/nodes-base/nodes/TheHive/TheHive.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
@@ -56,7 +56,9 @@ import {
 } from './QueryFunctions';
 
 import {
+	buildCustomFieldSearch,
 	mapResource,
+	prepareCustomFields,
 	prepareOptional,
 	prepareRangeQuery,
 	prepareSortQuery,
@@ -180,6 +182,31 @@ export class TheHive implements INodeType {
 				}
 				return returnData;
 			},
+			async loadCustomFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const version = this.getCredentials('theHiveApi')?.apiVersion;
+				const endpoint = version === 'v1' ? '/customField' : '/list/custom_fields';
+
+				const requestResult = await theHiveApiRequest.call(
+					this,
+					'GET',
+					endpoint as string,
+				);
+
+				const returnData: INodePropertyOptions[] = [];
+
+				// Convert TheHive3 response to the same format as TheHive 4
+				const customFields = version === 'v1' ? requestResult : Object.keys(requestResult).map(key => requestResult[key]);
+
+				for (const field of customFields) {
+					returnData.push({
+						name: `${field.name}: ${field.reference}`,
+						value: field.reference,
+						description: `${field.type}: ${field.description}`,
+					} as INodePropertyOptions);
+				}
+
+				return returnData;
+			},
 			async loadObservableOptions(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				// if v1 is not used we remove 'count' option
 				const version = this.getCredentials('theHiveApi')?.apiVersion;
@@ -296,10 +323,17 @@ export class TheHive implements INodeType {
 		for (let i = 0; i < length; i++) {
 			if (resource === 'alert') {
 				if (operation === 'count') {
-					const countQueryAttributs: any = prepareOptional(this.getNodeParameter('filters', i, {}) as INodeParameters); // tslint:disable-line:no-any
-
+					const filters = this.getNodeParameter('filters', i, {}) as INodeParameters;
+					const countQueryAttributs: any = prepareOptional(filters); // tslint:disable-line:no-any
+					
 					const _countSearchQuery: IQueryObject = And();
 
+					if ('customFieldsUi' in filters) {
+						const customFields = await prepareCustomFields.call(this, filters) as IDataObject;
+						const searchQueries = buildCustomFieldSearch(customFields);
+						(_countSearchQuery['_and'] as IQueryObject[]).push(...searchQueries);
+					}
+
 					for (const key of Object.keys(countQueryAttributs)) {
 						if (key === 'tags') {
 							(_countSearchQuery['_and'] as IQueryObject[]).push(
@@ -348,6 +382,10 @@ export class TheHive implements INodeType {
 				}
 
 				if (operation === 'create') {
+					const additionalFields = this.getNodeParameter('additionalFields', i) as INodeParameters;
+					const jsonParameters = this.getNodeParameter('jsonParameters', i) as boolean;
+
+					const customFields = await prepareCustomFields.call(this, additionalFields, jsonParameters);
 					const body: IDataObject = {
 						title: this.getNodeParameter('title', i),
 						description: this.getNodeParameter('description', i),
@@ -360,7 +398,8 @@ export class TheHive implements INodeType {
 						source: this.getNodeParameter('source', i),
 						sourceRef: this.getNodeParameter('sourceRef', i),
 						follow: this.getNodeParameter('follow', i, true),
-						...prepareOptional(this.getNodeParameter('optionals', i, {}) as INodeParameters),
+						customFields,
+						...prepareOptional(additionalFields),
 					};
 
 					const artifactUi = this.getNodeParameter('artifactUi', i) as IDataObject;
@@ -497,12 +536,18 @@ export class TheHive implements INodeType {
 
 					const version = credentials.apiVersion;
 
-					const queryAttributs: any = prepareOptional(this.getNodeParameter('filters', i, {}) as INodeParameters); // tslint:disable-line:no-any
-
+					const filters = this.getNodeParameter('filters', i, {}) as INodeParameters;
+					const queryAttributs: any = prepareOptional(filters); // tslint:disable-line:no-any
 					const options = this.getNodeParameter('options', i) as IDataObject;
 
 					const _searchQuery: IQueryObject = And();
 
+					if ('customFieldsUi' in filters) {
+						const customFields = await prepareCustomFields.call(this, filters) as IDataObject;
+						const searchQueries = buildCustomFieldSearch(customFields);
+						(_searchQuery['_and'] as IQueryObject[]).push(...searchQueries);
+					}
+
 					for (const key of Object.keys(queryAttributs)) {
 						if (key === 'tags') {
 							(_searchQuery['_and'] as IQueryObject[]).push(
@@ -634,14 +679,18 @@ export class TheHive implements INodeType {
 
 				if (operation === 'update') {
 					const alertId = this.getNodeParameter('id', i) as string;
+					const jsonParameters = this.getNodeParameter('jsonParameters', i) as boolean;
 
 					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+					const customFields = await prepareCustomFields.call(this, updateFields, jsonParameters);
 
 					const artifactUi = updateFields.artifactUi as IDataObject;
 
 					delete updateFields.artifactUi;
 
-					const body: IDataObject = {};
+					const body: IDataObject = {
+						customFields,
+					};
 
 					Object.assign(body, updateFields);
 
@@ -1149,10 +1198,17 @@ export class TheHive implements INodeType {
 
 			if (resource === 'case') {
 				if (operation === 'count') {
-					const countQueryAttributs: any = prepareOptional(this.getNodeParameter('filters', i, {}) as INodeParameters); // tslint:disable-line:no-any
+					const filters = this.getNodeParameter('filters', i, {}) as INodeParameters;
+					const countQueryAttributs: any = prepareOptional(filters); // tslint:disable-line:no-any
 
 					const _countSearchQuery: IQueryObject = And();
 
+					if ('customFieldsUi' in filters) {
+						const customFields = await prepareCustomFields.call(this, filters) as IDataObject;
+						const searchQueries = buildCustomFieldSearch(customFields);
+						(_countSearchQuery['_and'] as IQueryObject[]).push(...searchQueries);
+					}
+
 					for (const key of Object.keys(countQueryAttributs)) {
 						if (key === 'tags') {
 							(_countSearchQuery['_and'] as IQueryObject[]).push(
@@ -1258,6 +1314,9 @@ export class TheHive implements INodeType {
 				}
 
 				if (operation === 'create') {
+					const options = this.getNodeParameter('options', i, {}) as INodeParameters;
+					const jsonParameters = this.getNodeParameter('jsonParameters', i) as boolean;
+					const customFields = await prepareCustomFields.call(this, options, jsonParameters);
 
 					const body: IDataObject = {
 						title: this.getNodeParameter('title', i),
@@ -1268,7 +1327,8 @@ export class TheHive implements INodeType {
 						flag: this.getNodeParameter('flag', i),
 						tlp: this.getNodeParameter('tlp', i),
 						tags: splitTags(this.getNodeParameter('tags', i) as string),
-						...prepareOptional(this.getNodeParameter('options', i, {}) as INodeParameters),
+						customFields,
+						...prepareOptional(options),
 					};
 
 					responseData = await theHiveApiRequest.call(
@@ -1333,12 +1393,19 @@ export class TheHive implements INodeType {
 
 					const version = credentials.apiVersion;
 
-					const queryAttributs: any = prepareOptional(this.getNodeParameter('filters', i, {}) as INodeParameters); // tslint:disable-line:no-any
-
+					const filters = this.getNodeParameter('filters', i, {}) as INodeParameters;
+					const queryAttributs: any = prepareOptional(filters); // tslint:disable-line:no-any
+					
 					const _searchQuery: IQueryObject = And();
 
 					const options = this.getNodeParameter('options', i) as IDataObject;
 
+					if ('customFieldsUi' in filters) {
+						const customFields = await prepareCustomFields.call(this, filters) as IDataObject;
+						const searchQueries = buildCustomFieldSearch(customFields);
+						(_searchQuery['_and'] as IQueryObject[]).push(...searchQueries);
+					}
+
 					for (const key of Object.keys(queryAttributs)) {
 						if (key === 'tags') {
 							(_searchQuery['_and'] as IQueryObject[]).push(
@@ -1419,9 +1486,14 @@ export class TheHive implements INodeType {
 
 				if (operation === 'update') {
 					const id = this.getNodeParameter('id', i) as string;
+					const updateFields = this.getNodeParameter('updateFields', i, {}) as INodeParameters;
+					const jsonParameters = this.getNodeParameter('jsonParameters', i) as boolean;
+
+					const customFields = await prepareCustomFields.call(this, updateFields, jsonParameters);
 
 					const body: IDataObject = {
-						...prepareOptional(this.getNodeParameter('updateFields', i, {}) as INodeParameters),
+						customFields,
+						...prepareOptional(updateFields),
 					};
 
 					responseData = await theHiveApiRequest.call(
diff --git a/packages/nodes-base/nodes/TheHive/descriptions/AlertDescription.ts b/packages/nodes-base/nodes/TheHive/descriptions/AlertDescription.ts
index 1c607305eb..d6d72e2361 100644
--- a/packages/nodes-base/nodes/TheHive/descriptions/AlertDescription.ts
+++ b/packages/nodes-base/nodes/TheHive/descriptions/AlertDescription.ts
@@ -468,6 +468,24 @@ export const alertFields = [
 			},
 		},
 	},
+	{
+		displayName: 'JSON Parameters',
+		name: 'jsonParameters',
+		type: 'boolean',
+		default: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'alert',
+				],
+				operation: [
+					'create',
+					'update',
+				],
+			},
+		},
+	},
+
 	// optional attributs (Create, Promote operations)
 	{
 		displayName: 'Additional Fields',
@@ -483,6 +501,89 @@ export const alertFields = [
 				],
 				operation: [
 					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Case Template',
+				name: 'caseTemplate',
+				type: 'string',
+				default: '',
+				description: `Case template to use when a case is created from this alert.`,
+			},
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				type: 'fixedCollection',
+				default: {},
+				displayOptions: {
+					show: {
+						'/jsonParameters': [
+							false,
+						],
+					},
+				},
+				typeOptions: {
+					multipleValues: true,
+				},
+				placeholder: 'Add Custom Field',
+				options: [
+					{
+						name: 'customFields',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field',
+								name: 'field',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'loadCustomFields',
+								},
+								default: 'Custom Field',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Custom Field value. Use an expression if the type is not a string.',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Custom Fields (JSON)',
+				name: 'customFieldsJson',
+				type: 'string',
+				default: '',
+				displayOptions: {
+					show: {
+						'/jsonParameters': [
+							true,
+						],
+					},
+				},
+				description: 'Custom fields in JSON format. Overrides Custom Fields UI if set.',
+			},
+		],
+	},
+	// optional attributs (Promote operation)
+
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		placeholder: 'Add Field',
+		type: 'collection',
+		required: false,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'alert',
+				],
+				operation: [
 					'promote',
 				],
 			},
@@ -581,6 +682,61 @@ export const alertFields = [
 					},
 				],
 			},
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				type: 'fixedCollection',
+				default: {},
+				typeOptions: {
+					multipleValues: true,
+				},
+				displayOptions: {
+					show: {
+						'/jsonParameters': [
+							false,
+						],
+					},
+				},
+				placeholder: 'Add Custom Field',
+				options: [
+					{
+						name: 'customFields',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field',
+								name: 'field',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'loadCustomFields',
+								},
+								default: 'Custom Field',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Custom Field value. Use an expression if the type is not a string.',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Custom Fields (JSON)',
+				name: 'customFieldsJson',
+				type: 'string',
+				displayOptions: {
+					show: {
+						'/jsonParameters': [
+							true,
+						],
+					},
+				},
+				default: '',
+				description: 'Custom fields in JSON format. Overrides Custom Fields UI if set.',
+			},
 			{
 				displayName: 'Case Template',
 				name: 'caseTemplate',
@@ -737,6 +893,40 @@ export const alertFields = [
 			},
 		},
 		options: [
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				type: 'fixedCollection',
+				default: {},
+				typeOptions: {
+					multipleValues: true,
+				},
+				placeholder: 'Add Custom Field',
+				options: [
+					{
+						name: 'customFields',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field',
+								name: 'field',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'loadCustomFields',
+								},
+								default: 'Custom Field',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Custom Field value. Use an expression if the type is not a string.',
+							},
+						],
+					},
+				],
+			},
 			{
 				displayName: 'Description',
 				name: 'description',
diff --git a/packages/nodes-base/nodes/TheHive/descriptions/CaseDescription.ts b/packages/nodes-base/nodes/TheHive/descriptions/CaseDescription.ts
index 1ff1aba4a6..60f7f8f8ca 100644
--- a/packages/nodes-base/nodes/TheHive/descriptions/CaseDescription.ts
+++ b/packages/nodes-base/nodes/TheHive/descriptions/CaseDescription.ts
@@ -295,6 +295,23 @@ export const caseFields = [
 			},
 		},
 	},
+	{
+		displayName: 'JSON Parameters',
+		name: 'jsonParameters',
+		type: 'boolean',
+		default: true,
+		displayOptions: {
+			show: {
+				resource: [
+					'case',
+				],
+				operation: [
+					'create',
+					'update',
+				],
+			},
+		},
+	},
 	// Optional fields (Create operation)
 	{
 		displayName: 'Options',
@@ -314,6 +331,61 @@ export const caseFields = [
 		required: false,
 		default: '',
 		options: [
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				type: 'fixedCollection',
+				default: {},
+				typeOptions: {
+					multipleValues: true,
+				},
+				displayOptions: {
+					show: {
+						'/jsonParameters': [
+							false,
+						],
+					},
+				},
+				placeholder: 'Add Custom Field',
+				options: [
+					{
+						name: 'customFields',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field',
+								name: 'field',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'loadCustomFields',
+								},
+								default: 'Custom Field',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Custom Field value. Use an expression if the type is not a string.',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Custom Fields (JSON)',
+				name: 'customFieldsJson',
+				type: 'string',
+				default: '',
+				displayOptions: {
+					show: {
+						'/jsonParameters': [
+							true,
+						],
+					},
+				},
+				description: 'Custom fields in JSON format. Overrides Custom Fields UI if set.',
+			},
 			{
 				displayName: 'End Date',
 				name: 'endDate',
@@ -333,6 +405,13 @@ export const caseFields = [
 				name: 'metrics',
 				default: '[]',
 				type: 'json',
+				displayOptions: {
+					show: {
+						'/jsonParameters': [
+							true,
+						],
+					},
+				},
 				description: 'List of metrics',
 			},
 		],
@@ -356,6 +435,61 @@ export const caseFields = [
 		required: false,
 		default: '',
 		options: [
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				type: 'fixedCollection',
+				default: {},
+				typeOptions: {
+					multipleValues: true,
+				},
+				displayOptions: {
+					show: {
+						'/jsonParameters': [
+							false,
+						],
+					},
+				},
+				placeholder: 'Add Custom Field',
+				options: [
+					{
+						name: 'customFields',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field',
+								name: 'field',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'loadCustomFields',
+								},
+								default: 'Custom Field',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Custom Field value. Use an expression if the type is not a string.',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Custom Fields (JSON)',
+				name: 'customFieldsJson',
+				type: 'string',
+				default: '',
+				displayOptions: {
+					show: {
+						'/jsonParameters': [
+							true,
+						],
+					},
+				},
+				description: 'Custom fields in JSON format. Overrides Custom Fields UI if set.',
+			},
 			{
 				displayName: 'Description',
 				name: 'description',
@@ -403,6 +537,13 @@ export const caseFields = [
 				name: 'metrics',
 				type: 'json',
 				default: '[]',
+				displayOptions: {
+					show: {
+						'/jsonParameters': [
+							true,
+						],
+					},
+				},
 				description: 'List of metrics',
 			},
 			{
@@ -583,6 +724,40 @@ export const caseFields = [
 			},
 		},
 		options: [
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				type: 'fixedCollection',
+				default: {},
+				typeOptions: {
+					multipleValues: true,
+				},
+				placeholder: 'Add Custom Field',
+				options: [
+					{
+						name: 'customFields',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field',
+								name: 'field',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'loadCustomFields',
+								},
+								default: 'Custom Field',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Custom Field value. Use an expression if the type is not a string.',
+							},
+						],
+					},
+				],
+			},
 			{
 				displayName: 'Description',
 				name: 'description',

From 58f0d7cffcd16d1c669046dbc00712aa18ca417f Mon Sep 17 00:00:00 2001
From: Pierre Lanvin <pierre.lanvin@gmail.com>
Date: Wed, 14 Jul 2021 20:31:43 +0200
Subject: [PATCH 68/74] :zap: Allow fromBeginning config in kafka trigger node
 (#1958)

* Allow fromBeginning config in kafka trigger node

* make sure options in defined
---
 .../nodes-base/nodes/Kafka/KafkaTrigger.node.ts     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts b/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
index 32f3b7a9c9..d83538b3d9 100644
--- a/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
@@ -70,6 +70,13 @@ export class KafkaTrigger implements INodeType {
 						default: false,
 						description: 'Allow sending message to a previously non exisiting topic .',
 					},
+					{
+						displayName: 'Read messages from beginning',
+						name: 'fromBeginning',
+						type: 'boolean',
+						default: true,
+						description: 'Read message from beginning .',
+					},					
 					{
 						displayName: 'JSON Parse Message',
 						name: 'jsonParseMessage',
@@ -140,13 +147,13 @@ export class KafkaTrigger implements INodeType {
 		const consumer = kafka.consumer({ groupId });
 
 		await consumer.connect();
+		
+		const options = this.getNodeParameter('options', {}) as IDataObject;
 
-		await consumer.subscribe({ topic, fromBeginning: true });
+		await consumer.subscribe({ topic, fromBeginning: (options.fromBeginning)? true : false });
 
 		const self = this;
 
-		const options = this.getNodeParameter('options', {}) as IDataObject;
-
 		const startConsumer = async () => {
 			await consumer.run({
 				eachMessage: async ({ topic, message }) => {

From bf6ef3bbc0dc32583af38339ffa663f16670a1ef Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Wed, 14 Jul 2021 20:34:17 +0200
Subject: [PATCH 69/74] :arrow_up: Set mqtt@4.2.8 on n8n-nodes-base and allow
 minor version change

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 6e7c749831..b3efce352b 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -651,7 +651,7 @@
     "moment": "2.29.1",
     "moment-timezone": "^0.5.28",
     "mongodb": "^3.6.9",
-    "mqtt": "4.2.6",
+    "mqtt": "~4.2.8",
     "mssql": "^6.2.0",
     "mysql2": "~2.2.0",
     "n8n-core": "~0.77.0",

From a1f0fff9fc6de58450533e9b001e8e79b470844a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 15 Jul 2021 00:02:30 +0200
Subject: [PATCH 70/74] :sparkles: Expand Taiga node (#1970)

* :sparkles: Expand Taiga node

* :zap: Make projectId consistent

* :fire: Remove logging

* :hammer: Fix user story statuses loader

* :zap: Add epics loader

* :hammer: Make projectId required for updates

* :hammer: Refactor credentials

* :zap: Small change

* :zap: Update credentials in trigger

* :fire: Remove old unused credentials

* :pencil2: Write breaking changes

Co-authored-by: ricardo <ricardoespinoza105@gmail.com>
---
 packages/cli/BREAKING-CHANGES.md              |  10 +
 ...credentials.ts => TaigaApi.credentials.ts} |  29 +-
 .../credentials/TaigaCloudApi.credentials.ts  |  24 -
 .../nodes/Taiga/GenericFunctions.ts           |  52 +-
 .../nodes-base/nodes/Taiga/IssueOperations.ts |  40 --
 .../nodes-base/nodes/Taiga/Taiga.node.json    |   3 +-
 packages/nodes-base/nodes/Taiga/Taiga.node.ts | 646 +++++++++++------
 .../nodes/Taiga/TaigaTrigger.node.json        |   3 +-
 .../nodes/Taiga/TaigaTrigger.node.ts          |  48 +-
 .../Taiga/descriptions/EpicDescription.ts     | 429 ++++++++++++
 .../Taiga/descriptions/IssueDescription.ts    | 663 ++++++++++++++++++
 .../Taiga/descriptions/TaskDescription.ts     | 609 ++++++++++++++++
 .../descriptions/UserStoryDescription.ts      | 621 ++++++++++++++++
 .../nodes/Taiga/descriptions/index.ts         |   4 +
 .../nodes/Taiga/issueOperationFields.ts       | 357 ----------
 packages/nodes-base/nodes/Taiga/taiga.png     | Bin 2240 -> 0 bytes
 packages/nodes-base/nodes/Taiga/taiga.svg     |   1 +
 packages/nodes-base/nodes/Taiga/types.d.ts    |  24 +
 packages/nodes-base/package.json              |   3 +-
 19 files changed, 2872 insertions(+), 694 deletions(-)
 rename packages/nodes-base/credentials/{TaigaServerApi.credentials.ts => TaigaApi.credentials.ts} (51%)
 delete mode 100644 packages/nodes-base/credentials/TaigaCloudApi.credentials.ts
 delete mode 100644 packages/nodes-base/nodes/Taiga/IssueOperations.ts
 create mode 100644 packages/nodes-base/nodes/Taiga/descriptions/EpicDescription.ts
 create mode 100644 packages/nodes-base/nodes/Taiga/descriptions/IssueDescription.ts
 create mode 100644 packages/nodes-base/nodes/Taiga/descriptions/TaskDescription.ts
 create mode 100644 packages/nodes-base/nodes/Taiga/descriptions/UserStoryDescription.ts
 create mode 100644 packages/nodes-base/nodes/Taiga/descriptions/index.ts
 delete mode 100644 packages/nodes-base/nodes/Taiga/issueOperationFields.ts
 delete mode 100644 packages/nodes-base/nodes/Taiga/taiga.png
 create mode 100644 packages/nodes-base/nodes/Taiga/taiga.svg
 create mode 100644 packages/nodes-base/nodes/Taiga/types.d.ts

diff --git a/packages/cli/BREAKING-CHANGES.md b/packages/cli/BREAKING-CHANGES.md
index a7ac4db33b..fb393e0f3c 100644
--- a/packages/cli/BREAKING-CHANGES.md
+++ b/packages/cli/BREAKING-CHANGES.md
@@ -2,6 +2,16 @@
 
 This list shows all the versions which include breaking changes and how to upgrade.
 
+## 0.130.0
+
+### What changed?
+
+For the Taiga regular and trigger nodes, the server and cloud credentials types are now unified into a single credentials type and the `version` param has been removed. Also, the `issue:create` operation now automatically loads the tags as `multiOptions`.
+
+### When is action necessary?
+
+If you are using the Taiga nodes, reconnect the credentials. If you are using tags in the `issue:create` operation, reselect them.
+
 ## 0.127.0
 
 ### What changed?
diff --git a/packages/nodes-base/credentials/TaigaServerApi.credentials.ts b/packages/nodes-base/credentials/TaigaApi.credentials.ts
similarity index 51%
rename from packages/nodes-base/credentials/TaigaServerApi.credentials.ts
rename to packages/nodes-base/credentials/TaigaApi.credentials.ts
index 99c7125fec..db5e7ec6ad 100644
--- a/packages/nodes-base/credentials/TaigaServerApi.credentials.ts
+++ b/packages/nodes-base/credentials/TaigaApi.credentials.ts
@@ -3,9 +3,9 @@ import {
 	INodeProperties,
 } from 'n8n-workflow';
 
-export class TaigaServerApi implements ICredentialType {
-	name = 'taigaServerApi';
-	displayName = 'Taiga Server API';
+export class TaigaApi implements ICredentialType {
+	name = 'taigaApi';
+	displayName = 'Taiga API';
 	documentationUrl = 'taiga';
 	properties: INodeProperties[] = [
 		{
@@ -20,12 +20,35 @@ export class TaigaServerApi implements ICredentialType {
 			type: 'string',
 			default: '',
 		},
+		{
+			displayName: 'Environment',
+			name: 'environment',
+			type: 'options',
+			default: 'cloud',
+			options: [
+				{
+					name: 'Cloud',
+					value: 'cloud',
+				},
+				{
+					name: 'Self-Hosted',
+					value: 'selfHosted',
+				},
+			],
+		},
 		{
 			displayName: 'URL',
 			name: 'url',
 			type: 'string',
 			default: '',
 			placeholder: 'https://taiga.yourdomain.com',
+			displayOptions: {
+				show: {
+					environment: [
+						'selfHosted',
+					],
+				},
+			},
 		},
 	];
 }
diff --git a/packages/nodes-base/credentials/TaigaCloudApi.credentials.ts b/packages/nodes-base/credentials/TaigaCloudApi.credentials.ts
deleted file mode 100644
index 2a32b29873..0000000000
--- a/packages/nodes-base/credentials/TaigaCloudApi.credentials.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import {
-	ICredentialType,
-	INodeProperties,
-} from 'n8n-workflow';
-
-export class TaigaCloudApi implements ICredentialType {
-	name = 'taigaCloudApi';
-	displayName = 'Taiga Cloud API';
-	documentationUrl = 'taiga';
-	properties: INodeProperties[] = [
-		{
-			displayName: 'Username',
-			name: 'username',
-			type: 'string',
-			default: '',
-		},
-		{
-			displayName: 'Password',
-			name: 'password',
-			type: 'string',
-			default: '',
-		},
-	];
-}
diff --git a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
index 2941bba021..d6c8a4a10c 100644
--- a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
@@ -60,16 +60,7 @@ export async function taigaApiRequest(
 	uri?: string | undefined,
 	option = {},
 ): Promise<any> { // tslint:disable-line:no-any
-
-	const version = this.getNodeParameter('version', 0, 'cloud') as string;
-
-	let credentials;
-
-	if (version === 'server') {
-		credentials = this.getCredentials('taigaServerApi') as ICredentialDataDecryptedObject;
-	} else {
-		credentials = this.getCredentials('taigaCloudApi') as ICredentialDataDecryptedObject;
-	}
+	const credentials = this.getCredentials('taigaApi') as ICredentialDataDecryptedObject;
 
 	const authToken = await getAuthorization.call(this, credentials);
 
@@ -124,3 +115,44 @@ export function getAutomaticSecret(credentials: ICredentialDataDecryptedObject)
 	const data = `${credentials.username},${credentials.password}`;
 	return createHash('md5').update(data).digest('hex');
 }
+
+export async function handleListing(
+	this: IExecuteFunctions,
+	method: string,
+	endpoint: string,
+	body: IDataObject = {},
+	qs: IDataObject = {},
+	i: number,
+) {
+	let responseData;
+	qs.project = this.getNodeParameter('projectId', i) as number;
+	const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+
+	if (returnAll) {
+		return await taigaApiRequestAllItems.call(this, method, endpoint, body, qs);
+	} else {
+		qs.limit = this.getNodeParameter('limit', i) as number;
+		responseData = await taigaApiRequestAllItems.call(this, method, endpoint, body, qs);
+		return responseData.splice(0, qs.limit);
+	}
+}
+
+export const toOptions = (items: LoadedResource[]) =>
+	items.map(({ name, id }) => ({ name, value: id }));
+
+export function throwOnEmptyUpdate(
+	this: IExecuteFunctions,
+	resource: Resource,
+) {
+	throw new NodeOperationError(
+		this.getNode(),
+		`Please enter at least one field to update for the ${resource}.`,
+	);
+}
+
+export async function getVersionForUpdate(
+	this: IExecuteFunctions,
+	endpoint: string,
+) {
+	return await taigaApiRequest.call(this, 'GET', endpoint).then(response => response.version);
+}
diff --git a/packages/nodes-base/nodes/Taiga/IssueOperations.ts b/packages/nodes-base/nodes/Taiga/IssueOperations.ts
deleted file mode 100644
index b20d1e439e..0000000000
--- a/packages/nodes-base/nodes/Taiga/IssueOperations.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import {
-	INodeProperties,
-} from 'n8n-workflow';
-
-export const issueOperations = [
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		options: [
-			{
-				name: 'Create',
-				value: 'create',
-				description: 'Create an issue',
-			},
-			{
-				name: 'Delete',
-				value: 'delete',
-				description: 'Delete an issue',
-			},
-			{
-				name: 'Get',
-				value: 'get',
-				description: 'Get an issue',
-			},
-			{
-				name: 'Get All',
-				value: 'getAll',
-				description: 'Get all issues',
-			},
-			{
-				name: 'Update',
-				value: 'update',
-				description: 'Update an issue',
-			},
-		],
-		default: 'create',
-		description: 'The operation to perform.',
-	},
-] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Taiga/Taiga.node.json b/packages/nodes-base/nodes/Taiga/Taiga.node.json
index d80ba19d79..5ed38b7bef 100644
--- a/packages/nodes-base/nodes/Taiga/Taiga.node.json
+++ b/packages/nodes-base/nodes/Taiga/Taiga.node.json
@@ -3,6 +3,7 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"categories": [
+		"Development",
 		"Productivity"
 	],
 	"resources": {
@@ -17,4 +18,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Taiga/Taiga.node.ts b/packages/nodes-base/nodes/Taiga/Taiga.node.ts
index dd888afc68..b3eed338d3 100644
--- a/packages/nodes-base/nodes/Taiga/Taiga.node.ts
+++ b/packages/nodes-base/nodes/Taiga/Taiga.node.ts
@@ -12,23 +12,29 @@ import {
 } from 'n8n-workflow';
 
 import {
+	getVersionForUpdate,
+	handleListing,
 	taigaApiRequest,
-	taigaApiRequestAllItems,
+	throwOnEmptyUpdate,
+	toOptions,
 } from './GenericFunctions';
 
 import {
+	epicFields,
+	epicOperations,
+	issueFields,
 	issueOperations,
-} from './IssueOperations';
-
-import {
-	issueOperationFields,
-} from './issueOperationFields';
+	taskFields,
+	taskOperations,
+	userStoryFields,
+	userStoryOperations,
+} from './descriptions';
 
 export class Taiga implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Taiga',
 		name: 'taiga',
-		icon: 'file:taiga.png',
+		icon: 'file:taiga.svg',
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
@@ -41,196 +47,139 @@ export class Taiga implements INodeType {
 		outputs: ['main'],
 		credentials: [
 			{
-				name: 'taigaCloudApi',
-				displayOptions: {
-					show: {
-						version: [
-							'cloud',
-						],
-					},
-				},
-				required: true,
-			},
-			{
-				name: 'taigaServerApi',
-				displayOptions: {
-					show: {
-						version: [
-							'server',
-						],
-					},
-				},
+				name: 'taigaApi',
 				required: true,
 			},
 		],
 		properties: [
-			{
-				displayName: 'Taiga Version',
-				name: 'version',
-				type: 'options',
-				options: [
-					{
-						name: 'Cloud',
-						value: 'cloud',
-					},
-					{
-						name: 'Server (Self Hosted)',
-						value: 'server',
-					},
-				],
-				default: 'cloud',
-			},
 			{
 				displayName: 'Resource',
 				name: 'resource',
 				type: 'options',
 				options: [
+					{
+						name: 'Epic',
+						value: 'epic',
+					},
 					{
 						name: 'Issue',
 						value: 'issue',
 					},
+					{
+						name: 'Task',
+						value: 'task',
+					},
+					{
+						name: 'User Story',
+						value: 'userStory',
+					},
 				],
 				default: 'issue',
-				description: 'Resource to consume.',
 			},
+			...epicOperations,
+			...epicFields,
 			...issueOperations,
-			...issueOperationFields,
+			...issueFields,
+			...taskOperations,
+			...taskFields,
+			...userStoryOperations,
+			...userStoryFields,
 		],
 	};
 
 	methods = {
 		loadOptions: {
-			// Get all the available tags to display them to user so that he can
-			// select them easily
+			async getEpics(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const project = this.getCurrentNodeParameter('projectId') as string;
+				const epics = await taigaApiRequest.call(this, 'GET', '/epics', {}, { project }) as LoadedEpic[];
+
+				return epics.map(({ subject, id }) => ({ name: subject, value: id }));
+			},
+
+			async getMilestones(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const project = this.getCurrentNodeParameter('projectId') as string;
+				const milestones = await taigaApiRequest.call(this, 'GET', '/milestones', {}, { project }) as LoadedResource[];
+
+				return toOptions(milestones);
+			},
+
+			async getPriorities(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const project = this.getCurrentNodeParameter('projectId') as string;
+				const priorities = await taigaApiRequest.call(this, 'GET', '/priorities', {}, { project }) as LoadedResource[];
+
+				return toOptions(priorities);
+			},
+
+			async getProjects(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const { id } = await taigaApiRequest.call(this, 'GET', '/users/me') as { id: string };
+				const projects = await taigaApiRequest.call(this, 'GET', '/projects', {}, { member: id }) as LoadedResource[];
+
+				return toOptions(projects);
+			},
+
+			async getRoles(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const project = this.getCurrentNodeParameter('projectId') as string;
+				const roles = await taigaApiRequest.call(this, 'GET', '/roles', {}, { project }) as LoadedResource[];
+
+				return toOptions(roles);
+			},
+
+			async getSeverities(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const project = this.getCurrentNodeParameter('projectId') as string;
+				const severities = await taigaApiRequest.call(this, 'GET', '/severities', {}, { project }) as LoadedResource[];
+
+				return toOptions(severities);
+			},
+
+			async getTags(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const project = this.getCurrentNodeParameter('projectId') as string;
+				const tags = await taigaApiRequest.call(this, 'GET', `/projects/${project}/tags_colors`) as LoadedTags;
+
+				return Object.keys(tags).map(tag => ({ name: tag, value: tag }));
+			},
+
 			async getTypes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const projectId = this.getCurrentNodeParameter('projectId') as string;
+				const project = this.getCurrentNodeParameter('projectId') as string;
+				const types = await taigaApiRequest.call(this, 'GET', '/issue-types', {}, { project }) as LoadedResource[];
 
-				const returnData: INodePropertyOptions[] = [];
-
-				const types = await taigaApiRequest.call(this, 'GET', `/issue-types?project=${projectId}`);
-				for (const type of types) {
-					const typeName = type.name;
-					const typeId = type.id;
-					returnData.push({
-						name: typeName,
-						value: typeId,
-					});
-				}
-				return returnData;
+				return toOptions(types);
 			},
 
-			// Get all the available statuses to display them to user so that he can
-			// select them easily
-			async getStatuses(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
+			async getUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const project = this.getCurrentNodeParameter('projectId') as string;
+				const users = await taigaApiRequest.call(this, 'GET', '/users', {}, { project }) as LoadedUser[];
 
-				const projectId = this.getCurrentNodeParameter('projectId') as string;
-
-				const statuses = await taigaApiRequest.call(this, 'GET', '/issue-statuses', {}, { project: projectId });
-				for (const status of statuses) {
-					const statusName = status.name;
-					const statusId = status.id;
-					returnData.push({
-						name: statusName,
-						value: statusId,
-					});
-				}
-				return returnData;
+				return users.map(({ full_name_display, id }) => ({ name: full_name_display, value: id }));
 			},
 
-			// Get all the available users to display them to user so that he can
-			// select them easily
-			async getProjectUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
+			async getUserStories(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const project = this.getCurrentNodeParameter('projectId') as string;
+				const userStories = await taigaApiRequest.call(this, 'GET', '/userstories', {}, { project }) as LoadedUserStory[];
 
-				const projectId = this.getCurrentNodeParameter('projectId') as string;
-
-				const users = await taigaApiRequest.call(this, 'GET', '/users', {}, { project: projectId });
-				for (const user of users) {
-					const userName = user.username;
-					const userId = user.id;
-					returnData.push({
-						name: userName,
-						value: userId,
-					});
-				}
-				return returnData;
+				return userStories.map(({ subject, id }) => ({ name: subject, value: id }));
 			},
 
-			// Get all the available priorities to display them to user so that he can
-			// select them easily
-			async getProjectPriorities(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
+			// statuses
 
-				const projectId = this.getCurrentNodeParameter('projectId') as string;
+			async getIssueStatuses(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const project = this.getCurrentNodeParameter('projectId') as string;
+				const statuses = await taigaApiRequest.call(this, 'GET', '/issue-statuses', {}, { project }) as LoadedResource[];
 
-				const priorities = await taigaApiRequest.call(this, 'GET', '/priorities', {}, { project: projectId });
-				for (const priority of priorities) {
-					const priorityName = priority.name;
-					const priorityId = priority.id;
-					returnData.push({
-						name: priorityName,
-						value: priorityId,
-					});
-				}
-				return returnData;
+				return toOptions(statuses);
 			},
 
-			// Get all the available severities to display them to user so that he can
-			// select them easily
-			async getProjectSeverities(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
+			async getTaskStatuses(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const project = this.getCurrentNodeParameter('projectId') as string;
+				const statuses = await taigaApiRequest.call(this, 'GET', '/task-statuses', {}, { project }) as LoadedResource[];
 
-				const projectId = this.getCurrentNodeParameter('projectId') as string;
-
-				const severities = await taigaApiRequest.call(this, 'GET', '/severities', {}, { project: projectId });
-				for (const severity of severities) {
-					const severityName = severity.name;
-					const severityId = severity.id;
-					returnData.push({
-						name: severityName,
-						value: severityId,
-					});
-				}
-				return returnData;
+				return toOptions(statuses);
 			},
 
-			// Get all the available milestones to display them to user so that he can
-			// select them easily
-			async getProjectMilestones(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
+			async getUserStoryStatuses(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const project = this.getCurrentNodeParameter('projectId') as string;
+				const statuses = await taigaApiRequest.call(this, 'GET', '/userstory-statuses', {}, { project }) as LoadedResource[];
 
-				const projectId = this.getCurrentNodeParameter('projectId') as string;
-
-				const milestones = await taigaApiRequest.call(this, 'GET', '/milestones', {}, { project: projectId });
-				for (const milestone of milestones) {
-					const milestoneName = milestone.name;
-					const milestoneId = milestone.id;
-					returnData.push({
-						name: milestoneName,
-						value: milestoneId,
-					});
-				}
-				return returnData;
-			},
-
-			// Get all the available projects to display them to user so that he can
-			// select them easily
-			async getUserProjects(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-
-				const { id } = await taigaApiRequest.call(this, 'GET', '/users/me');
-
-				const projects = await taigaApiRequest.call(this, 'GET', '/projects', {}, { member: id });
-				for (const project of projects) {
-					const projectName = project.name;
-					const projectId = project.id;
-					returnData.push({
-						name: projectName,
-						value: projectId,
-					});
-				}
-				return returnData;
+				return toOptions(statuses);
 			},
 		},
 	};
@@ -238,90 +187,365 @@ export class Taiga implements INodeType {
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 		const returnData: IDataObject[] = [];
+
+		const resource = this.getNodeParameter('resource', 0) as Resource;
+		const operation = this.getNodeParameter('operation', 0) as Operation;
+
 		let responseData;
 
-		const resource = this.getNodeParameter('resource', 0) as string;
-		const operation = this.getNodeParameter('operation', 0) as string;
-
-		const qs: IDataObject = {};
-
 		for (let i = 0; i < items.length; i++) {
-			if (resource === 'issue') {
-				if (operation === 'create') {
-					const projectId = this.getNodeParameter('projectId', i) as number;
 
-					const subject = this.getNodeParameter('subject', i) as string;
+			try {
 
-					const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+				if (resource === 'epic') {
 
-					const body: IDataObject = {
-						project: projectId,
-						subject,
-					};
+					// **********************************************************************
+					//                                  epic
+					// **********************************************************************
 
-					Object.assign(body, additionalFields);
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//               epic: create
+						// ----------------------------------------
+
+						const body = {
+							project: this.getNodeParameter('projectId', i),
+							subject: this.getNodeParameter('subject', i),
+						} as IDataObject;
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, additionalFields);
+						}
+
+						responseData = await taigaApiRequest.call(this, 'POST', '/epics', body);
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//               epic: delete
+						// ----------------------------------------
+
+						const epicId = this.getNodeParameter('epicId', i);
+
+						responseData = await taigaApiRequest.call(this, 'DELETE', `/epics/${epicId}`);
+						responseData = { success: true };
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//                epic: get
+						// ----------------------------------------
+
+						const epicId = this.getNodeParameter('epicId', i);
+
+						responseData = await taigaApiRequest.call(this, 'GET', `/epics/${epicId}`);
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//               epic: getAll
+						// ----------------------------------------
+
+						const qs = {} as IDataObject;
+						const filters = this.getNodeParameter('filters', i) as IDataObject;
+
+						if (Object.keys(filters).length) {
+							Object.assign(qs, filters);
+						}
+
+						responseData = await handleListing.call(this, 'GET', '/epics', {}, qs, i);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//               epic: update
+						// ----------------------------------------
+
+						const body = {} as IDataObject;
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, updateFields);
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const epicId = this.getNodeParameter('epicId', i);
+						body.version = await getVersionForUpdate.call(this, `/epics/${epicId}`);
+
+						responseData = await taigaApiRequest.call(this, 'PATCH', `/epics/${epicId}`, body);
 
-					if (body.tags) {
-						body.tags = (body.tags as string).split(',') as string[];
 					}
 
-					responseData = await taigaApiRequest.call(this, 'POST', '/issues', body);
-				}
+				} else if (resource === 'issue') {
 
-				if (operation === 'update') {
+					// **********************************************************************
+					//                                 issue
+					// **********************************************************************
 
-					const issueId = this.getNodeParameter('issueId', i) as string;
+					if (operation === 'create') {
 
-					const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+						// ----------------------------------------
+						//              issue: create
+						// ----------------------------------------
 
-					const body: IDataObject = {};
+						const body = {
+							project: this.getNodeParameter('projectId', i),
+							subject: this.getNodeParameter('subject', i),
+						} as IDataObject;
 
-					Object.assign(body, updateFields);
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, additionalFields);
+						}
+
+						responseData = await taigaApiRequest.call(this, 'POST', '/issues', body);
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//              issue: delete
+						// ----------------------------------------
+
+						const issueId = this.getNodeParameter('issueId', i);
+
+						responseData = await taigaApiRequest.call(this, 'DELETE', `/issues/${issueId}`);
+						responseData = { success: true };
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//                issue: get
+						// ----------------------------------------
+
+						const issueId = this.getNodeParameter('issueId', i);
+
+						responseData = await taigaApiRequest.call(this, 'GET', `/issues/${issueId}`);
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//              issue: getAll
+						// ----------------------------------------
+
+						const qs = {} as IDataObject;
+						const filters = this.getNodeParameter('filters', i) as IDataObject;
+
+						if (Object.keys(filters).length) {
+							Object.assign(qs, filters);
+						}
+
+						responseData = await handleListing.call(this, 'GET', '/issues', {}, qs, i);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//              issue: update
+						// ----------------------------------------
+
+						const body = {} as IDataObject;
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, updateFields);
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const issueId = this.getNodeParameter('issueId', i);
+						body.version = await getVersionForUpdate.call(this, `/issues/${issueId}`);
+
+						responseData = await taigaApiRequest.call(this, 'PATCH', `/issues/${issueId}`, body);
 
-					if (body.tags) {
-						body.tags = (body.tags as string).split(',') as string[];
 					}
 
-					const { version } = await taigaApiRequest.call(this, 'GET', `/issues/${issueId}`);
+				} else if (resource === 'task') {
 
-					body.version = version;
+					// **********************************************************************
+					//                                  task
+					// **********************************************************************
 
-					responseData = await taigaApiRequest.call(this, 'PATCH', `/issues/${issueId}`, body);
-				}
+					if (operation === 'create') {
 
-				if (operation === 'delete') {
-					const issueId = this.getNodeParameter('issueId', i) as string;
-					responseData = await taigaApiRequest.call(this, 'DELETE', `/issues/${issueId}`);
-					responseData = { success: true };
-				}
+						// ----------------------------------------
+						//               task: create
+						// ----------------------------------------
 
-				if (operation === 'get') {
-					const issueId = this.getNodeParameter('issueId', i) as string;
-					responseData = await taigaApiRequest.call(this, 'GET', `/issues/${issueId}`);
-				}
+						const body = {
+							project: this.getNodeParameter('projectId', i),
+							subject: this.getNodeParameter('subject', i),
+						} as IDataObject;
 
-				if (operation === 'getAll') {
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
 
-					const projectId = this.getNodeParameter('projectId', i) as number;
-					const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, additionalFields);
+						}
 
-					qs.project = projectId;
+						responseData = await taigaApiRequest.call(this, 'POST', '/tasks', body);
 
-					if (returnAll === true) {
-						responseData = await taigaApiRequestAllItems.call(this, 'GET', '/issues', {}, qs);
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//               task: delete
+						// ----------------------------------------
+
+						const taskId = this.getNodeParameter('taskId', i);
+
+						responseData = await taigaApiRequest.call(this, 'DELETE', `/tasks/${taskId}`);
+						responseData = { success: true };
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//                task: get
+						// ----------------------------------------
+
+						const taskId = this.getNodeParameter('taskId', i);
+
+						responseData = await taigaApiRequest.call(this, 'GET', `/tasks/${taskId}`);
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//               task: getAll
+						// ----------------------------------------
+
+						const qs = {} as IDataObject;
+						const filters = this.getNodeParameter('filters', i) as IDataObject;
+
+						if (Object.keys(filters).length) {
+							Object.assign(qs, filters);
+						}
+
+						responseData = await handleListing.call(this, 'GET', '/tasks', {}, qs, i);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//               task: update
+						// ----------------------------------------
+
+						const body = {} as IDataObject;
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, updateFields);
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const taskId = this.getNodeParameter('taskId', i);
+						body.version = await getVersionForUpdate.call(this, `/tasks/${taskId}`);
+
+						responseData = await taigaApiRequest.call(this, 'PATCH', `/tasks/${taskId}`, body);
 
-					} else {
-						qs.limit = this.getNodeParameter('limit', i) as number;
-						responseData = await taigaApiRequestAllItems.call(this, 'GET', '/issues', {}, qs);
-						responseData = responseData.splice(0, qs.limit);
 					}
+
+				} else if (resource === 'userStory') {
+
+					// **********************************************************************
+					//                               userStory
+					// **********************************************************************
+
+					if (operation === 'create') {
+
+						// ----------------------------------------
+						//            userStory: create
+						// ----------------------------------------
+
+						const body = {
+							project: this.getNodeParameter('projectId', i),
+							subject: this.getNodeParameter('subject', i),
+						} as IDataObject;
+
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						if (Object.keys(additionalFields).length) {
+							Object.assign(body, additionalFields);
+						}
+
+						responseData = await taigaApiRequest.call(this, 'POST', '/userstories', body);
+
+					} else if (operation === 'delete') {
+
+						// ----------------------------------------
+						//            userStory: delete
+						// ----------------------------------------
+
+						const userStoryId = this.getNodeParameter('userStoryId', i);
+
+						const endpoint = `/userstories/${userStoryId}`;
+						responseData = await taigaApiRequest.call(this, 'DELETE', endpoint);
+						responseData = { success: true };
+
+					} else if (operation === 'get') {
+
+						// ----------------------------------------
+						//              userStory: get
+						// ----------------------------------------
+
+						const userStoryId = this.getNodeParameter('userStoryId', i);
+
+						const endpoint = `/userstories/${userStoryId}`;
+						responseData = await taigaApiRequest.call(this, 'GET', endpoint);
+
+					} else if (operation === 'getAll') {
+
+						// ----------------------------------------
+						//            userStory: getAll
+						// ----------------------------------------
+
+						const qs = {} as IDataObject;
+						const filters = this.getNodeParameter('filters', i) as IDataObject;
+
+						if (Object.keys(filters).length) {
+							Object.assign(qs, filters);
+						}
+
+						responseData = await handleListing.call(this, 'GET', '/userstories', {}, qs, i);
+
+					} else if (operation === 'update') {
+
+						// ----------------------------------------
+						//            userStory: update
+						// ----------------------------------------
+
+						const body = {} as IDataObject;
+						const updateFields = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						if (Object.keys(updateFields).length) {
+							Object.assign(body, updateFields);
+						} else {
+							throwOnEmptyUpdate.call(this, resource);
+						}
+
+						const userStoryId = this.getNodeParameter('userStoryId', i);
+						body.version = await getVersionForUpdate.call(this, `/userstories/${userStoryId}`);
+
+						responseData = await taigaApiRequest.call(this, 'PATCH', `/userstories/${userStoryId}`, body);
+
+					}
+
 				}
+
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ error: error.message });
+					continue;
+				}
+
+				throw error;
 			}
-			if (Array.isArray(responseData)) {
-				returnData.push.apply(returnData, responseData as IDataObject[]);
-			} else {
-				returnData.push(responseData as IDataObject);
-			}
+
+			Array.isArray(responseData)
+				? returnData.push(...responseData)
+				: returnData.push(responseData);
+
 		}
 
 		return [this.helpers.returnJsonArray(returnData)];
diff --git a/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.json b/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.json
index 2507764e3d..2ff5e5ab94 100644
--- a/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.json
+++ b/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.json
@@ -3,6 +3,7 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"categories": [
+		"Development",
 		"Productivity"
 	],
 	"resources": {
@@ -17,4 +18,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.ts b/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.ts
index 6598b1bac2..a01ff66b4c 100644
--- a/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.ts
@@ -26,7 +26,7 @@ export class TaigaTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Taiga Trigger',
 		name: 'taigaTrigger',
-		icon: 'file:taiga.png',
+		icon: 'file:taiga.svg',
 		group: ['trigger'],
 		version: 1,
 		subtitle: '={{"project:" + $parameter["projectSlug"]}}',
@@ -39,25 +39,7 @@ export class TaigaTrigger implements INodeType {
 		outputs: ['main'],
 		credentials: [
 			{
-				name: 'taigaCloudApi',
-				displayOptions: {
-					show: {
-						version: [
-							'cloud',
-						],
-					},
-				},
-				required: true,
-			},
-			{
-				name: 'taigaServerApi',
-				displayOptions: {
-					show: {
-						version: [
-							'server',
-						],
-					},
-				},
+				name: 'taigaApi',
 				required: true,
 			},
 		],
@@ -70,22 +52,6 @@ export class TaigaTrigger implements INodeType {
 			},
 		],
 		properties: [
-			{
-				displayName: 'Taiga Version',
-				name: 'version',
-				type: 'options',
-				options: [
-					{
-						name: 'Cloud',
-						value: 'cloud',
-					},
-					{
-						name: 'Server (Self Hosted)',
-						value: 'server',
-					},
-				],
-				default: 'cloud',
-			},
 			{
 				displayName: 'Project ID',
 				name: 'projectId',
@@ -146,15 +112,7 @@ export class TaigaTrigger implements INodeType {
 				return false;
 			},
 			async create(this: IHookFunctions): Promise<boolean> {
-				const version = this.getNodeParameter('version') as string;
-
-				let credentials;
-
-				if (version === 'server') {
-					credentials = this.getCredentials('taigaServerApi') as ICredentialDataDecryptedObject;
-				} else {
-					credentials = this.getCredentials('taigaCloudApi') as ICredentialDataDecryptedObject;
-				}
+				const credentials = this.getCredentials('taigaApi') as ICredentialDataDecryptedObject;
 
 				const webhookUrl = this.getNodeWebhookUrl('default') as string;
 
diff --git a/packages/nodes-base/nodes/Taiga/descriptions/EpicDescription.ts b/packages/nodes-base/nodes/Taiga/descriptions/EpicDescription.ts
new file mode 100644
index 0000000000..69ab59ec5c
--- /dev/null
+++ b/packages/nodes-base/nodes/Taiga/descriptions/EpicDescription.ts
@@ -0,0 +1,429 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const epicOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'epic',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create an epic',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete an epic',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get an epic',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all epics',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update an epic',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const epicFields = [
+	// ----------------------------------------
+	//               epic: create
+	// ----------------------------------------
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		description: 'ID of the project to which the epic belongs',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getProjects',
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'epic',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'epic',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'epic',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assigned To',
+				name: 'assigned_to',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+				description: 'ID of the user to assign the epic to',
+			},
+			{
+				displayName: 'Blocked Note',
+				name: 'blocked_note',
+				type: 'string',
+				default: '',
+				description: 'Reason why the epic is blocked. Requires "Is Blocked" toggle to be enabled',
+			},
+			{
+				displayName: 'Color',
+				name: 'color',
+				type: 'color',
+				default: '0000FF',
+				description: 'Color code in hexadecimal notation',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Is Blocked',
+				name: 'is_blocked',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the issue is blocked',
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTags',
+				},
+				default: [],
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//               epic: delete
+	// ----------------------------------------
+	{
+		displayName: 'Epic ID',
+		name: 'epicId',
+		description: 'ID of the epic to delete',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'epic',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//                epic: get
+	// ----------------------------------------
+	{
+		displayName: 'Epic ID',
+		name: 'epicId',
+		description: 'ID of the epic to retrieve',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'epic',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//               epic: getAll
+	// ----------------------------------------
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		description: 'ID of the project to which the epic belongs',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getProjects',
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'epic',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+		displayOptions: {
+			show: {
+				resource: [
+					'epic',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		default: 50,
+		description: 'How many results to return',
+		typeOptions: {
+			minValue: 1,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'epic',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		displayOptions: {
+			show: {
+				resource: [
+					'epic',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Assigned To',
+				name: 'assigned_to',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+				description: 'ID of the user whom the epic is assigned to',
+			},
+			{
+				displayName: 'Is Closed',
+				name: 'statusIsClosed',
+				description: 'Whether the epic is closed',
+				type: 'boolean',
+				default: false,
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//               epic: update
+	// ----------------------------------------
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getProjects',
+		},
+		default: '',
+		description: 'ID of the project to set the epic to',
+		displayOptions: {
+			show: {
+				resource: [
+					'epic',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Epic ID',
+		name: 'epicId',
+		description: 'ID of the epic to update',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'epic',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'epic',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assigned To',
+				name: 'assigned_to',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+				description: 'ID of the user to whom the epic is assigned',
+			},
+			{
+				displayName: 'Blocked Note',
+				name: 'blocked_note',
+				type: 'string',
+				default: '',
+				description: 'Reason why the epic is blocked. Requires "Is Blocked" toggle to be enabled',
+			},
+			{
+				displayName: 'Color',
+				name: 'color',
+				type: 'color',
+				default: '0000FF',
+				description: 'Color code in hexadecimal notation',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Is Blocked',
+				name: 'is_blocked',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the epic is blocked',
+			},
+			{
+				displayName: 'Subject',
+				name: 'subject',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTags',
+				},
+				default: [],
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Taiga/descriptions/IssueDescription.ts b/packages/nodes-base/nodes/Taiga/descriptions/IssueDescription.ts
new file mode 100644
index 0000000000..697dc9e4e4
--- /dev/null
+++ b/packages/nodes-base/nodes/Taiga/descriptions/IssueDescription.ts
@@ -0,0 +1,663 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const issueOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create an issue',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete an issue',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get an issue',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all issues',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update an issue',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const issueFields = [
+	// ----------------------------------------
+	//              issue: create
+	// ----------------------------------------
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		description: 'ID of the project to which the issue belongs',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getProjects',
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assigned To',
+				name: 'assigned_to',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+				description: 'ID of the user to whom the issue is assigned',
+			},
+			{
+				displayName: 'Blocked Note',
+				name: 'blocked_note',
+				type: 'string',
+				default: '',
+				description: 'Reason why the issue is blocked. Requires "Is Blocked" toggle to be enabled',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Is Blocked',
+				name: 'is_blocked',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the issue is blocked',
+			},
+			{
+				displayName: 'Milestone (Sprint)',
+				name: 'milestone',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getMilestones',
+				},
+				default: '',
+				description: 'ID of the milestone of the issue',
+			},
+			{
+				displayName: 'Priority',
+				name: 'priority',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getPriorities',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Severity',
+				name: 'severity',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getSeverities',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getIssueStatuses',
+				},
+				default: '',
+				description: 'ID of the status of the issue',
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTags',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Type',
+				name: 'type',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTypes',
+				},
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//              issue: delete
+	// ----------------------------------------
+	{
+		displayName: 'Issue ID',
+		name: 'issueId',
+		description: 'ID of the issue to delete',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//                issue: get
+	// ----------------------------------------
+	{
+		displayName: 'Issue ID',
+		name: 'issueId',
+		description: 'ID of the issue to retrieve',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//              issue: getAll
+	// ----------------------------------------
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		description: 'ID of the project to which the issue belongs',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getProjects',
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		default: 50,
+		description: 'How many results to return',
+		typeOptions: {
+			minValue: 1,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Assigned To',
+				name: 'assigned_to',
+				description: 'ID of the user to assign the issue to',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Order By',
+				name: 'orderBy',
+				description: 'Field to order the issues by',
+				type: 'options',
+				options: [
+					{
+						name: 'Assigned To',
+						value: 'assigned_to',
+					},
+					{
+						name: 'Created Date',
+						value: 'created_date',
+					},
+					{
+						name: 'Modified Date',
+						value: 'modified_date',
+					},
+					{
+						name: 'Owner',
+						value: 'owner',
+					},
+					{
+						name: 'Priority',
+						value: 'priority',
+					},
+					{
+						name: 'Severity',
+						value: 'severity',
+					},
+					{
+						name: 'Status',
+						value: 'status',
+					},
+					{
+						name: 'Subject',
+						value: 'subject',
+					},
+					{
+						name: 'Type',
+						value: 'type',
+					},
+				],
+				default: 'assigned_to',
+			},
+			{
+				displayName: 'Owner',
+				name: 'owner',
+				description: 'ID of the owner of the issue',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Priority',
+				name: 'priority',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getPriorities',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Role',
+				name: 'role',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getRoles',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Severity',
+				name: 'severity',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getSeverities',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				description: 'ID of the status of the issue',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getIssueStatuses',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTags',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Type',
+				name: 'type',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTypes',
+				},
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//              issue: update
+	// ----------------------------------------
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getProjects',
+		},
+		default: '',
+		description: 'ID of the project to set the issue to',
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Issue ID',
+		name: 'issueId',
+		description: 'ID of the issue to update',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'issue',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assigned To',
+				name: 'assigned_to',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+				description: 'ID of the user whom the issue is assigned to',
+			},
+			{
+				displayName: 'Blocked Note',
+				name: 'blocked_note',
+				type: 'string',
+				default: '',
+				description: 'Reason why the issue is blocked. Requires "Is Blocked" toggle to be enabled',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Is Blocked',
+				name: 'is_blocked',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the issue is blocked',
+			},
+			{
+				displayName: 'Milestone (Sprint)',
+				name: 'milestone',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getMilestones',
+				},
+				default: '',
+				description: 'ID of the milestone of the issue',
+			},
+			{
+				displayName: 'Priority',
+				name: 'priority',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getPriorities',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Severity',
+				name: 'severity',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getSeverities',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getIssueStatuses',
+				},
+				default: '',
+				description: 'ID of the status of the issue',
+			},
+			{
+				displayName: 'Subject',
+				name: 'subject',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTags',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Type',
+				name: 'type',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTypes',
+				},
+				default: '',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Taiga/descriptions/TaskDescription.ts b/packages/nodes-base/nodes/Taiga/descriptions/TaskDescription.ts
new file mode 100644
index 0000000000..f2c90d2d32
--- /dev/null
+++ b/packages/nodes-base/nodes/Taiga/descriptions/TaskDescription.ts
@@ -0,0 +1,609 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const taskOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'task',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a task',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a task',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a task',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all tasks',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a task',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const taskFields = [
+	// ----------------------------------------
+	//               task: create
+	// ----------------------------------------
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		description: 'ID of the project to which the task belongs',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getProjects',
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'task',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'task',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'task',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assigned To',
+				name: 'assigned_to',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+				description: 'ID of the user to whom the task is assigned',
+			},
+			{
+				displayName: 'Blocked Note',
+				name: 'blocked_note',
+				type: 'string',
+				default: '',
+				description: 'Reason why the task is blocked. Requires "Is Blocked" toggle to be enabled',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Is Blocked',
+				name: 'is_blocked',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the task is blocked',
+			},
+			{
+				displayName: 'Milestone (Sprint)',
+				name: 'milestone',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getMilestones',
+				},
+				default: '',
+				description: 'ID of the milestone of the task',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTaskStatuses',
+				},
+				default: '',
+				description: 'ID of the status of the task',
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTags',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Taskboard Order',
+				name: 'taskboard_order',
+				type: 'number',
+				default: 1,
+				description: 'Order of the task in the taskboard',
+				typeOptions: {
+					minValue: 1,
+				},
+			},
+			{
+				displayName: 'User Story',
+				name: 'user_story',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUserStories',
+				},
+				default: '',
+				description: 'ID of the user story of the task',
+			},
+			{
+				displayName: 'User Story Order',
+				name: 'us_order',
+				type: 'number',
+				default: 1,
+				description: 'Order of the task in the user story',
+				typeOptions: {
+					minValue: 1,
+				},
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//               task: delete
+	// ----------------------------------------
+	{
+		displayName: 'Task ID',
+		name: 'taskId',
+		description: 'ID of the task to delete',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'task',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//                task: get
+	// ----------------------------------------
+	{
+		displayName: 'Task ID',
+		name: 'taskId',
+		description: 'ID of the task to retrieve',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'task',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//               task: getAll
+	// ----------------------------------------
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		description: 'ID of the project to which the task belongs',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getProjects',
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'task',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+		displayOptions: {
+			show: {
+				resource: [
+					'task',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		default: 50,
+		description: 'How many results to return',
+		typeOptions: {
+			minValue: 1,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'task',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		displayOptions: {
+			show: {
+				resource: [
+					'task',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Assigned To',
+				name: 'assigned_to',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+				description: 'ID of the user whom the task is assigned to',
+			},
+			{
+				displayName: 'Is Closed',
+				name: 'statusIsClosed',
+				description: 'Whether the task is closed',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Milestone (Sprint)',
+				name: 'milestone',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getMilestones',
+				},
+				default: '',
+				description: 'ID of the milestone of the task',
+			},
+			{
+				displayName: 'Owner',
+				name: 'owner',
+				description: 'ID of the owner of the task',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Role',
+				name: 'role',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getRoles',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				description: 'ID of the status of the task',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTaskStatuses',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTags',
+				},
+				default: [],
+			},
+			{
+				displayName: 'User Story',
+				name: 'userStory',
+				description: 'ID of the user story to which the task belongs',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUserStories',
+				},
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//               task: update
+	// ----------------------------------------
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		description: 'ID of the project to set the task to',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getProjects',
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'task',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Task ID',
+		name: 'taskId',
+		description: 'ID of the task to update',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'task',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'task',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assigned To',
+				name: 'assigned_to',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTypes',
+				},
+				default: '',
+				description: 'ID of the user to assign the task to',
+			},
+			{
+				displayName: 'Blocked Note',
+				name: 'blocked_note',
+				type: 'string',
+				default: '',
+				description: 'Reason why the task is blocked. Requires "Is Blocked" toggle to be enabled',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Is Blocked',
+				name: 'is_blocked',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the task is blocked',
+			},
+			{
+				displayName: 'Milestone (Sprint)',
+				name: 'milestone',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getMilestones',
+				},
+				default: '',
+				description: 'ID of the milestone of the task',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTaskStatuses',
+				},
+				default: '',
+				description: 'ID of the status of the task',
+			},
+			{
+				displayName: 'Subject',
+				name: 'subject',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'User Story',
+				name: 'user_story',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUserStories',
+				},
+				default: '',
+				description: 'ID of the user story of the task',
+			},
+			{
+				displayName: 'User Story Order',
+				name: 'us_order',
+				type: 'number',
+				default: 1,
+				typeOptions: {
+					minValue: 1,
+				},
+				description: 'Order of the task in the user story',
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTags',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Taskboard Order',
+				name: 'taskboard_order',
+				type: 'number',
+				default: 1,
+				typeOptions: {
+					minValue: 1,
+				},
+				description: 'Order of the task in the taskboard',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Taiga/descriptions/UserStoryDescription.ts b/packages/nodes-base/nodes/Taiga/descriptions/UserStoryDescription.ts
new file mode 100644
index 0000000000..9d046a934e
--- /dev/null
+++ b/packages/nodes-base/nodes/Taiga/descriptions/UserStoryDescription.ts
@@ -0,0 +1,621 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const userStoryOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'userStory',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a user story',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a user story',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get a user story',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+				description: 'Get all user stories',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a user story',
+			},
+		],
+		default: 'create',
+		description: 'Operation to perform',
+	},
+] as INodeProperties[];
+
+export const userStoryFields = [
+	// ----------------------------------------
+	//            userStory: create
+	// ----------------------------------------
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		description: 'ID of the project to which the user story belongs',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getProjects',
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'userStory',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Subject',
+		name: 'subject',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'userStory',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'userStory',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assigned To',
+				name: 'assigned_to',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+				description: 'ID of the user to whom the user story is assigned',
+			},
+			{
+				displayName: 'Backlog Order',
+				name: 'backlog_order',
+				type: 'number',
+				default: 1,
+				typeOptions: {
+					minValue: 1,
+				},
+				description: 'Order of the user story in the backlog',
+			},
+			{
+				displayName: 'Blocked Note',
+				name: 'blocked_note',
+				type: 'string',
+				default: '',
+				description: 'Reason why the user story is blocked. Requires "Is Blocked" toggle to be enabled',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Is Blocked',
+				name: 'is_blocked',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the user story is blocked',
+			},
+			{
+				displayName: 'Kanban Order',
+				name: 'kanban_order',
+				type: 'number',
+				default: 1,
+				typeOptions: {
+					minValue: 1,
+				},
+				description: 'Order of the user story in the kanban',
+			},
+			{
+				displayName: 'Milestone (Sprint)',
+				name: 'milestone',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getMilestones',
+				},
+				default: '',
+				description: 'ID of the milestone of the user story',
+			},
+			{
+				displayName: 'Sprint Order',
+				name: 'sprint_order',
+				type: 'number',
+				default: 1,
+				typeOptions: {
+					minValue: 1,
+				},
+				description: 'Order of the user story in the milestone',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUserStoryStatuses',
+				},
+				default: '',
+				description: 'ID of the status of the user story',
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTags',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Type',
+				name: 'type',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTypes',
+				},
+				default: '',
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//            userStory: delete
+	// ----------------------------------------
+	{
+		displayName: 'User Story ID',
+		name: 'userStoryId',
+		description: 'ID of the user story to delete',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'userStory',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//              userStory: get
+	// ----------------------------------------
+	{
+		displayName: 'User Story ID',
+		name: 'userStoryId',
+		description: 'ID of the user story to retrieve',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'userStory',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+	},
+
+	// ----------------------------------------
+	//            userStory: getAll
+	// ----------------------------------------
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		description: 'ID of the project to which the user story belongs',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getProjects',
+		},
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'userStory',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+		displayOptions: {
+			show: {
+				resource: [
+					'userStory',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		default: 50,
+		description: 'How many results to return',
+		typeOptions: {
+			minValue: 1,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'userStory',
+				],
+				operation: [
+					'getAll',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		displayOptions: {
+			show: {
+				resource: [
+					'userStory',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Assigned To',
+				name: 'assigned_to',
+				description: 'ID of the user whom the user story is assigned to',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Epic',
+				name: 'epic',
+				description: 'ID of the epic to which the user story belongs',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getEpics',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Is Closed',
+				name: 'statusIsClosed',
+				description: 'Whether the user story is closed',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Is Archived',
+				name: 'statusIsArchived',
+				description: 'Whether the user story has been archived',
+				type: 'boolean',
+				default: false,
+			},
+			{
+				displayName: 'Milestone (Sprint)',
+				name: 'milestone',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getMilestones',
+				},
+				default: '',
+				description: 'ID of the milestone of the user story',
+			},
+			{
+				displayName: 'Role',
+				name: 'role',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getRoles',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				description: 'ID of the status of the user story',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUserStoryStatuses',
+				},
+				default: '',
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTags',
+				},
+				default: [],
+			},
+		],
+	},
+
+	// ----------------------------------------
+	//            userStory: update
+	// ----------------------------------------
+	{
+		displayName: 'Project ID',
+		name: 'projectId',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getProjects',
+		},
+		default: '',
+		description: 'ID of the project to set the user story to',
+		displayOptions: {
+			show: {
+				resource: [
+					'userStory',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'User Story ID',
+		name: 'userStoryId',
+		description: 'ID of the user story to update',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'userStory',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: [
+					'userStory',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assigned To',
+				name: 'assigned_to',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUsers',
+				},
+				default: '',
+				description: 'ID of the user to assign the the user story to',
+			},
+			{
+				displayName: 'Backlog Order',
+				name: 'backlog_order',
+				type: 'number',
+				default: 1,
+				typeOptions: {
+					minValue: 1,
+				},
+				description: 'Order of the user story in the backlog',
+			},
+			{
+				displayName: 'Blocked Note',
+				name: 'blocked_note',
+				type: 'string',
+				default: '',
+				description: 'Reason why the user story is blocked. Requires "Is Blocked" toggle to be enabled',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Is Blocked',
+				name: 'is_blocked',
+				type: 'boolean',
+				default: false,
+				description: 'Whether the user story is blocked',
+			},
+			{
+				displayName: 'Kanban Order',
+				name: 'kanban_order',
+				type: 'number',
+				default: 1,
+				typeOptions: {
+					minValue: 1,
+				},
+				description: 'Order of the user story in the kanban',
+			},
+			{
+				displayName: 'Milestone (Sprint)',
+				name: 'milestone',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getMilestones',
+				},
+				default: '',
+				description: 'ID of the milestone of the user story',
+			},
+			{
+				displayName: 'Subject',
+				name: 'subject',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Sprint Order',
+				name: 'sprint_order',
+				type: 'number',
+				default: 1,
+				typeOptions: {
+					minValue: 1,
+				},
+				description: 'Order of the user story in the milestone',
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getUserStoryStatuses',
+				},
+				default: '',
+				description: 'ID of the status of the user story',
+			},
+			{
+				displayName: 'Tags',
+				name: 'tags',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTags',
+				},
+				default: [],
+			},
+			{
+				displayName: 'Type',
+				name: 'type',
+				type: 'options',
+				typeOptions: {
+					loadOptionsDependsOn: [
+						'projectId',
+					],
+					loadOptionsMethod: 'getTypes',
+				},
+				default: '',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Taiga/descriptions/index.ts b/packages/nodes-base/nodes/Taiga/descriptions/index.ts
new file mode 100644
index 0000000000..d0c74bae4d
--- /dev/null
+++ b/packages/nodes-base/nodes/Taiga/descriptions/index.ts
@@ -0,0 +1,4 @@
+export * from './EpicDescription';
+export * from './IssueDescription';
+export * from './TaskDescription';
+export * from './UserStoryDescription';
diff --git a/packages/nodes-base/nodes/Taiga/issueOperationFields.ts b/packages/nodes-base/nodes/Taiga/issueOperationFields.ts
deleted file mode 100644
index 1ecf033414..0000000000
--- a/packages/nodes-base/nodes/Taiga/issueOperationFields.ts
+++ /dev/null
@@ -1,357 +0,0 @@
-import {
-	INodeProperties,
-} from 'n8n-workflow';
-
-export const issueOperationFields = [
-	{
-		displayName: 'Project ID',
-		name: 'projectId',
-		type: 'options',
-		typeOptions: {
-			loadOptionsMethod: 'getUserProjects',
-		},
-		displayOptions: {
-			show: {
-				resource: [
-					'issue',
-				],
-				operation: [
-					'create',
-					'getAll',
-					'update',
-				],
-			},
-		},
-		default: '',
-		description: 'The project ID.',
-		required: true,
-	},
-	{
-		displayName: 'Subject',
-		name: 'subject',
-		type: 'string',
-		displayOptions: {
-			show: {
-				resource: [
-					'issue',
-				],
-				operation: [
-					'create',
-				],
-			},
-		},
-		default: '',
-		required: true,
-	},
-	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: [
-					'issue',
-				],
-				operation: [
-					'create',
-				],
-			},
-		},
-		options: [
-			{
-				displayName: 'Assigned To',
-				name: 'assigned_to',
-				type: 'options',
-				typeOptions: {
-					loadOptionsDependsOn: [
-						'projectId',
-					],
-					loadOptionsMethod: 'getProjectUsers',
-				},
-				default: '',
-				description: 'User id to you want assign the issue to',
-			},
-			{
-				displayName: 'Blocked Note',
-				name: 'blocked_note',
-				type: 'string',
-				default: '',
-				description: 'Reason why the issue is blocked',
-			},
-			{
-				displayName: 'Description',
-				name: 'description',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Is Blocked',
-				name: 'is_blocked',
-				type: 'boolean',
-				default: false,
-			},
-			{
-				displayName: 'Is Closed',
-				name: 'is_closed',
-				type: 'boolean',
-				default: false,
-			},
-			{
-				displayName: 'Milestone ID',
-				name: 'milestone',
-				type: 'options',
-				typeOptions: {
-					loadOptionsDependsOn: [
-						'projectSlug',
-					],
-					loadOptionsMethod: 'getProjectMilestones',
-				},
-				default: '',
-			},
-			{
-				displayName: 'Priority ID',
-				name: 'priority',
-				type: 'options',
-				typeOptions: {
-					loadOptionsDependsOn: [
-						'projectSlug',
-					],
-					loadOptionsMethod: 'getProjectPriorities',
-				},
-				default: '',
-			},
-			{
-				displayName: 'Severity ID',
-				name: 'severity',
-				type: 'options',
-				typeOptions: {
-					loadOptionsDependsOn: [
-						'projectSlug',
-					],
-					loadOptionsMethod: 'getProjectSeverities',
-				},
-				default: '',
-			},
-			{
-				displayName: 'Status ID',
-				name: 'status',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getStatuses',
-				},
-				default: '',
-			},
-			{
-				displayName: 'Tags',
-				name: 'tags',
-				type: 'string',
-				description: 'Tags separated by comma.',
-				default: '',
-				placeholder: 'product, sales',
-			},
-			{
-				displayName: 'Type ID',
-				name: 'type',
-				type: 'options',
-				typeOptions: {
-					loadOptionsDependsOn: [
-						'projectSlug',
-					],
-					loadOptionsMethod: 'getTypes',
-				},
-				default: '',
-			},
-		],
-	},
-	{
-		displayName: 'Issue ID',
-		name: 'issueId',
-		type: 'string',
-		displayOptions: {
-			show: {
-				resource: [
-					'issue',
-				],
-				operation: [
-					'update',
-					'delete',
-					'get',
-				],
-			},
-		},
-		default: '',
-		required: true,
-	},
-	{
-		displayName: 'Update Fields',
-		name: 'updateFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: [
-					'issue',
-				],
-				operation: [
-					'update',
-				],
-			},
-		},
-		options: [
-			{
-				displayName: 'Assigned To',
-				name: 'assigned_to',
-				type: 'options',
-				typeOptions: {
-					loadOptionsDependsOn: [
-						'projectId',
-					],
-					loadOptionsMethod: 'getProjectUsers',
-				},
-				default: '',
-				description: 'User id to you want assign the issue to',
-			},
-			{
-				displayName: 'Blocked Note',
-				name: 'blocked_note',
-				type: 'string',
-				default: '',
-				description: 'Reason why the issue is blocked',
-			},
-			{
-				displayName: 'Description',
-				name: 'description',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Is Blocked',
-				name: 'is_blocked',
-				type: 'boolean',
-				default: false,
-			},
-			{
-				displayName: 'Is Closed',
-				name: 'is_closed',
-				type: 'boolean',
-				default: false,
-			},
-			{
-				displayName: 'Milestone ID',
-				name: 'milestone',
-				type: 'options',
-				typeOptions: {
-					loadOptionsDependsOn: [
-						'projectSlug',
-					],
-					loadOptionsMethod: 'getProjectMilestones',
-				},
-				default: '',
-			},
-			{
-				displayName: 'Priority ID',
-				name: 'priority',
-				type: 'options',
-				typeOptions: {
-					loadOptionsDependsOn: [
-						'projectSlug',
-					],
-					loadOptionsMethod: 'getProjectPriorities',
-				},
-				default: '',
-			},
-			{
-				displayName: 'Severity ID',
-				name: 'severity',
-				type: 'options',
-				typeOptions: {
-					loadOptionsDependsOn: [
-						'projectSlug',
-					],
-					loadOptionsMethod: 'getProjectSeverities',
-				},
-				default: '',
-			},
-			{
-				displayName: 'Status ID',
-				name: 'status',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getStatuses',
-				},
-				default: '',
-			},
-			{
-				displayName: 'Subject',
-				name: 'subject',
-				type: 'string',
-				default: '',
-			},
-			{
-				displayName: 'Tags',
-				name: 'tags',
-				type: 'string',
-				description: 'Tags separated by comma.',
-				default: '',
-				placeholder: 'product, sales',
-			},
-			{
-				displayName: 'Type ID',
-				name: 'type',
-				type: 'options',
-				typeOptions: {
-					loadOptionsDependsOn: [
-						'projectSlug',
-					],
-					loadOptionsMethod: 'getTypes',
-				},
-				default: '',
-			},
-		],
-	},
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				operation: [
-					'getAll',
-				],
-				resource: [
-					'issue',
-				],
-			},
-		},
-		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: [
-					'issue',
-				],
-				returnAll: [
-					false,
-				],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 500,
-		},
-		default: 100,
-		description: 'How many results to return.',
-	},
-
-] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/Taiga/taiga.png b/packages/nodes-base/nodes/Taiga/taiga.png
deleted file mode 100644
index 3d7481cbaa66c3b3e74a04698adac4a210b7028d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2240
zcmXw52UL^U5{}@*fD2DCETXb1y1Fi+C{2n1A)!f=ASHoF3lI`w2ucq%p|=n^1V{)V
zq$swh2)lwymq1*lNG!Mlt4WZm!YaPY^Sn9dzyJJq=DRcV&D?YTY&RD>Rh2y|5C}xo
z!5-lb-WHn=RB>}h=a>})qA=s;<bedAoKhiYg`fAV*za;g2=+=+6FohWX<=-a6;qKS
z%#35D)_%BVbJjJ9RKS_xTU$AYk}1Fn+`gj#1ONfV2JQl^K(R$!*tEXk17I?#kiw2-
zzvRVKCRe@VW=5Bvvv9I9Kc8`>Eah^MrI{m>#^x;X0m|ISHjP}24I<XanqupctKV@6
zfpNsJSZYLm0x>tfHZ`AG!}*(U@94phRGd9ypU9=1HL(x&rT7LD=rN2iI>kFQ5N_&N
zJKvlWSCx7*3yE|~5o9{pc&6RWjtkFnu|wA{wQ^*9JT02uoktE%a`VAf<u!A70%{`-
z;}MoUSV#<vuVwI3$&3IWQjWL??;nH4<2e;VY$WMBCn4A<P&>#I6G6y%Qk2+`4icze
zY)!q)$QBm{V#sI$zHXr<fs+=5iA=4`PW>aJ<Q2=>!Ua$lRYK)F<pXOnKO?>_Et!{5
zx7ZS2pT>F5FQ2Wab>yDE-~%=j*y$e5ft+?h$#e|}>KTON)C&Wyk_#qEK`g*IyF>s8
zr*diRB_3Goig_RzkX80*K_#Qn)DV$G%%=_H0EJ4-_rnrQ4G@Xpxuym-rP=jZcY?P|
z2>nV4wS|U&yP;h}0f(G^!R7q;t6?;_sY7y01}-rQmq-Eob@MHGPm2LL>}4Jp53m9q
z<nX<A5WSws2VB+3T0ly*j22%K5fB3USjXg57dEAk3W0-}5faRRPdL81pcya*u=Jr^
z53hi#g2s%;dC@E?=n-d(ADX$@zEC>FD>xvENyYh*eWP*Y!UWC`KRS%gx_J%d<bN?B
zxNx$RQzNu6vEwXn@=#mc%3f-PpK$=>gOWjLb0Z|JH;0*7izbA}u&96*P)N_*o(?eR
zt5@7zP>|ur-(~gV|72A`G_on8g^$C^gDVSi=<@Q1dFkxT+c(ospEhtTOpNzxLRS_S
zWK!wGvnQif>f6`X*O!+T7Z>DG>D=pAFC-Gl#Q6C5*qB%>9vvMOiTeAyAGB9hWYJSo
zQ;6Zd7?jpdm8AtaI6yi#J3BM8dGsrZ<oPq;FY15zJC{>mo|PG9Wo~9-XmI2wZLMAF
z>#M6PayjsnOiheE5%+XFc+h_Tx}ddzU67xXmP$>G47=p*<%x22b#a0p(a~O#%jGhe
z^xfZcvokNJ#>FF|{x)6%BNylIZ*k_(KC+r`Hw3b^)B$nM!@iGId@**{IT&40)~$1p
zn78}zJtcQ841WL?b8>#(Q}W{f!h%PA5IG&a@lRJ@ZO6Q2)Q0J)FGf3eD!mx6{L3w=
zlX$(rlhB7Xn<k;uk0$-;ynk<-$*JHN8azO^d+gKNDpWCdOT^i3L)3;quMg*@Y~%5q
z(xq`zrQn|l;c_!?`{h4yMfdgf3J8a;ew}JG=nEZ2v(pT2-<l*kM9-T79|>=JA^K5(
zR2*mDS#4%?frA)UEBE*`PduO2Hmw!Z`EnzjH*0%3<_;UVzM{p<nycVv%qcjb_)fn%
zU8M0U^|hqr&$rL9hLmMPkFBhg4p}_qzWqqs`ng7_gM1Vh@yMOAV)sGk2rB+_WvyY*
zf`#hm-k(%l2b}^=KJ-i}T}ePrwu~FSzL##?B>S0MDOtc$`-gqkBV3JgF{j?O;h_2Y
zFI6m(N#2gyK9j9&)+lM~!o=G*syUI0cS~kH^E16#?e3W7bq`|3Px#*3f^qD;*y(u8
zy@c0wXB)He8d-RAfT<}|J&&Iu<Wr96KiX>`-?#zWMJm!YZ6XTe(8Q6C8tz3_S2^+*
zZHoRodItya1;<gAUcXiTs1kIQ!&(z{<{@_f`e*RsoZo?OZKzMwABP}HL03mb`*!W$
z&)i9Kz^Rz;ix8E45iAW{DdRe9JJ`$9%+3C`W&oen@|+!*cbO%L@jkIL+zN*M;`_ps
zf2|)BJboR#W1GiZsm7V;xAj{zNEc$Aj|DTZ_s!UpGTG$U0ex?lS5upJ;D3l+2GF4}
zZtvPxHM`S$&@9hchjKL$^d+)PEZx(-^ELaK>RJ<KBZZ;%@|&hCdd`oi|0V3-`<I`0
zO-x*{QL@FU@H$(IM#>NM-HY7F=(yW}Y*u*N70nn*w?{S}-cr@ZXemY5zR{9(oq%ys
z;`a?u+v)d6W#7h-g9snW=-`)2(Wn;q;XL^R=W7@DOg?GoSucGQU?O;oQg6j5QKJ7s
z1SH0J;r;VP?SV{ZhVqS(E?pb%Re#uZiEkL%(7DP`I{wLckFK#g68mCYzvJ}vpL%q+
zcSHSIJ-O!jwn3!>I@jmT6-u8edyF7-6*1evg}Y^{`;cIltHZ-y3wc;y3I_c*?oCKH
zG?d9DLK^Pcw|WUrejKGeXwo<WPr9Mu2D3fWe0XMSSy<3&voj(=Q_mC5@Z3@L=ni7{
zEuUgzMaSE1?S3%1cChL_e@x1$U!2tS9K;I}M0GE=yJ1VF+K%0H(++KaVg5prV0;6v
zdPYZPtzKSySdv2sLhFgqIbC>h#qpmVZfM*JAzMWq`yqkQ4kPuP2zkfugbn2`2@OwZ
zo}gnQaX*k6J7HxR&^t9E{v^fr&_0#{#<O|(epu##Tnzp=y+mJbH8tsX5?hV>VgzMY
z3{P45O2v&f*<S_dE-f^M9&$*-+x=nswv!|2#~YT9_k`CfoL7jo%`R$>hW=8E6s!#k
z<}#D#lv~1iBC}V;Vm-^DjBj~!F#2$m#kXuq1Z-^Q=#lRBwC8%iy9H=J_w~*+-Zj?v
bHD>x!!_h`aX7|+QuL#5e>4Fei`=|XEH+OKQ

diff --git a/packages/nodes-base/nodes/Taiga/taiga.svg b/packages/nodes-base/nodes/Taiga/taiga.svg
new file mode 100644
index 0000000000..913a5d31df
--- /dev/null
+++ b/packages/nodes-base/nodes/Taiga/taiga.svg
@@ -0,0 +1 @@
+<svg width="2500" height="2500" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMinYMin meet"><path d="M224.288 43.916l-11.963 84.2-84.2-11.963 11.963-84.2 84.2 11.963z" opacity=".8" fill="#A295AE"/><path d="M31.885 212.291l11.963-84.2 84.2 11.963-11.963 84.2-84.2-11.963z" opacity=".8" fill="#5D6F6D"/><path d="M43.848 32.065l84.2 11.962-11.963 84.2-84.2-11.963 11.963-84.2z" opacity=".8" fill="#8CD592"/><path d="M212.226 224.264l-84.2-11.963 11.963-84.2 84.2 11.963-11.963 84.2z" opacity=".8" fill="#665E74"/><path d="M119.642 255.595l-51.08-67.997 67.998-51.08 51.08 67.998-67.998 51.08z" opacity=".8" fill="#3C3647"/><path d="M255.463 136.39l-67.997 51.079-51.08-67.997 67.998-51.08 51.08 67.998z" opacity=".8" fill="#837193"/><path d="M136.437.554l51.079 67.997-67.997 51.08-51.08-67.998L136.437.553z" opacity=".8" fill="#A2F4AC"/><path d="M.463 119.7l67.998-51.08 51.079 67.998-67.997 51.08L.463 119.7z" opacity=".8" fill="#7EA685"/><path d="M127.963 95.742l32.332 32.333-32.332 32.332-32.332-32.332 32.332-32.333z" fill="#3C3647"/></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Taiga/types.d.ts b/packages/nodes-base/nodes/Taiga/types.d.ts
new file mode 100644
index 0000000000..4eafdbbe93
--- /dev/null
+++ b/packages/nodes-base/nodes/Taiga/types.d.ts
@@ -0,0 +1,24 @@
+type Resource = 'epic' | 'issue' | 'task' | 'userStory';
+
+type Operation = 'create' | 'delete' | 'update' | 'get' | 'getAll'
+
+type LoadedResource = {
+	id: string;
+	name: string;
+};
+
+type LoadedUser = {
+	id: string;
+	full_name_display: string;
+};
+
+type LoadedUserStory = {
+	id: string;
+	subject: string;
+};
+
+type LoadedEpic = LoadedUserStory;
+
+type LoadedTags = {
+	[tagName: string]: string | null; // hex color
+}
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index b3efce352b..d027c87478 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -244,8 +244,7 @@
       "dist/credentials/StrapiApi.credentials.js",
       "dist/credentials/SurveyMonkeyApi.credentials.js",
       "dist/credentials/SurveyMonkeyOAuth2Api.credentials.js",
-      "dist/credentials/TaigaCloudApi.credentials.js",
-      "dist/credentials/TaigaServerApi.credentials.js",
+      "dist/credentials/TaigaApi.credentials.js",
       "dist/credentials/TapfiliateApi.credentials.js",
       "dist/credentials/TelegramApi.credentials.js",
       "dist/credentials/TheHiveApi.credentials.js",

From ff7e035cd553bd5f45cd7869f22dd0e701e8a6af Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 15 Jul 2021 00:11:32 +0200
Subject: [PATCH 71/74] :arrow_down: Set mqtt@4.2.6 on n8n-nodes-base as new
 version seems to cause problems

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index d027c87478..1c6125e26e 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -650,7 +650,7 @@
     "moment": "2.29.1",
     "moment-timezone": "^0.5.28",
     "mongodb": "^3.6.9",
-    "mqtt": "~4.2.8",
+    "mqtt": "4.2.6",
     "mssql": "^6.2.0",
     "mysql2": "~2.2.0",
     "n8n-core": "~0.77.0",

From a376ff85b5e321499a24a80c5d67d1e01acccf40 Mon Sep 17 00:00:00 2001
From: Gabriel <83644514+gpene@users.noreply.github.com>
Date: Thu, 15 Jul 2021 14:27:39 +0300
Subject: [PATCH 72/74] :hammer: Update download tooltip (#1991)

---
 packages/nodes-base/nodes/Airtable/Airtable.node.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Airtable/Airtable.node.ts b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
index 6f9c8fe506..333183e84a 100644
--- a/packages/nodes-base/nodes/Airtable/Airtable.node.ts
+++ b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
@@ -221,7 +221,7 @@ export class Airtable implements INodeType {
 					},
 				},
 				default: '',
-				description: `Name of the fields of type 'attachment' that should be downloaded. Multiple ones can be defined separated by comma. Case sensitive.`,
+				description: `Name of the fields of type 'attachment' that should be downloaded. Multiple ones can be defined separated by comma. Case sensitive and cannot include spaces after a comma.`,
 			},
 			{
 				displayName: 'Additional Options',

From de2119564c4e9f220d154b6411d7c9ef4891aa8b Mon Sep 17 00:00:00 2001
From: MedAliMarz <servfrdali@yahoo.fr>
Date: Thu, 15 Jul 2021 19:30:59 +0200
Subject: [PATCH 73/74] :sparkles: Add ServiceNow node (#1932)

* :sparkles: ServiceNow node

* Add Table Record resource & operations

* Add Incident resource & operations

* Add User resource & operations

* Add Business Service getAll operation

* Add Business Service, Department, Dictionary and Configuration Items resources

* Improvements

* Add continueOnFail

* Fix node display name

* Fix node credentials name

* Minor improvements

* Improvements

* Add load function for fields parameter

* Add load function for incident, user and table record fields

* Fix sending input function

* Enhance ServiceNow credentials

* Apply review changes & improvements

* Minor improvements

* Minor code enhancement

* Apply review changes

* :zap: Small improvement

* Fix TableRecord update operation & add BusinessServices loading

* :zap: Small improvement

* :zap: Improve ServiceNow node

* :zap: Fix one more description

Co-authored-by: ricardo <ricardoespinoza105@gmail.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 .../ServiceNowOAuth2Api.credentials.ts        |  62 ++
 .../ServiceNow/BusinessServiceDescription.ts  | 137 +++
 .../ConfigurationItemsDescription.ts          | 137 +++
 .../nodes/ServiceNow/DepartmentDescription.ts | 137 +++
 .../nodes/ServiceNow/DictionaryDescription.ts | 137 +++
 .../nodes/ServiceNow/GenericFunctions.ts      |  98 +++
 .../nodes/ServiceNow/IncidentDescription.ts   | 673 +++++++++++++++
 .../nodes/ServiceNow/ServiceNow.node.ts       | 788 ++++++++++++++++++
 .../ServiceNow/TableRecordDescription.ts      | 555 ++++++++++++
 .../nodes/ServiceNow/UserDescription.ts       | 732 ++++++++++++++++
 .../nodes/ServiceNow/servicenow.svg           |   1 +
 packages/nodes-base/package.json              |   2 +
 12 files changed, 3459 insertions(+)
 create mode 100644 packages/nodes-base/credentials/ServiceNowOAuth2Api.credentials.ts
 create mode 100644 packages/nodes-base/nodes/ServiceNow/BusinessServiceDescription.ts
 create mode 100644 packages/nodes-base/nodes/ServiceNow/ConfigurationItemsDescription.ts
 create mode 100644 packages/nodes-base/nodes/ServiceNow/DepartmentDescription.ts
 create mode 100644 packages/nodes-base/nodes/ServiceNow/DictionaryDescription.ts
 create mode 100644 packages/nodes-base/nodes/ServiceNow/GenericFunctions.ts
 create mode 100644 packages/nodes-base/nodes/ServiceNow/IncidentDescription.ts
 create mode 100644 packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
 create mode 100644 packages/nodes-base/nodes/ServiceNow/TableRecordDescription.ts
 create mode 100644 packages/nodes-base/nodes/ServiceNow/UserDescription.ts
 create mode 100644 packages/nodes-base/nodes/ServiceNow/servicenow.svg

diff --git a/packages/nodes-base/credentials/ServiceNowOAuth2Api.credentials.ts b/packages/nodes-base/credentials/ServiceNowOAuth2Api.credentials.ts
new file mode 100644
index 0000000000..d12b0cd8f1
--- /dev/null
+++ b/packages/nodes-base/credentials/ServiceNowOAuth2Api.credentials.ts
@@ -0,0 +1,62 @@
+import {
+	ICredentialType,
+	NodePropertyTypes,
+} from 'n8n-workflow';
+
+export class ServiceNowOAuth2Api implements ICredentialType {
+	name = 'serviceNowOAuth2Api';
+	extends = [
+		'oAuth2Api',
+	];
+	displayName = 'ServiceNow OAuth2 API';
+	documentationUrl = 'serviceNow';
+	properties = [
+		{
+			displayName: 'Subdomain',
+			name: 'subdomain',
+			type: 'string' as NodePropertyTypes,
+			default: '',
+			placeholder: 'n8n',
+			description: 'The subdomain of your ServiceNow environment',
+			required: true,
+		},
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden' as NodePropertyTypes,
+			default: '=https://{{$self["subdomain"]}}.service-now.com/oauth_auth.do',
+			required: true,
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden' as NodePropertyTypes,
+			default: '=https://{{$self["subdomain"]}}.service-now.com/oauth_token.do',
+			required: true,
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'useraccount',
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'response_type=code',
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'grant_type=authorization_code',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden' as NodePropertyTypes,
+			default: 'header',
+		},
+	];
+}
diff --git a/packages/nodes-base/nodes/ServiceNow/BusinessServiceDescription.ts b/packages/nodes-base/nodes/ServiceNow/BusinessServiceDescription.ts
new file mode 100644
index 0000000000..650480e9f2
--- /dev/null
+++ b/packages/nodes-base/nodes/ServiceNow/BusinessServiceDescription.ts
@@ -0,0 +1,137 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const businessServiceOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'businessService',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get All',
+				value: 'getAll',
+			},
+		],
+		default: 'getAll',
+	},
+] as INodeProperties[];
+
+export const businessServiceFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                businessService:getAll                      */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'businessService',
+				],
+			},
+		},
+		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: [
+					'businessService',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 50,
+		description: 'The max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: [
+					'businessService',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Exclude Reference Link',
+				name: 'sysparm_exclude_reference_link',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to exclude Table API links for reference fields',
+			},
+			{
+				displayName: 'Fields',
+				name: 'sysparm_fields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getColumns',
+				},
+				default: '',
+				description: 'A list of fields to return',
+			},
+			{
+				displayName: 'Filter',
+				name: 'sysparm_query',
+				type: 'string',
+				default: '',
+				description: 'An encoded query string used to filter the results. <a href="https://developer.servicenow.com/dev.do#!/learn/learning-plans/quebec/servicenow_application_developer/app_store_learnv2_rest_quebec_more_about_query_parameters" target="_blank">More info</a>',
+			},
+			{
+				displayName: 'Return Values',
+				name: 'sysparm_display_value',
+				type: 'options',
+				options: [
+					{
+						name: 'Actual Values',
+						value: 'false',
+					},
+					{
+						name: 'Both',
+						value: 'all',
+					},
+					{
+						name: 'Display Values',
+						value: 'true',
+					},
+				],
+				default: 'false',
+				description: 'Choose which values to return',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ServiceNow/ConfigurationItemsDescription.ts b/packages/nodes-base/nodes/ServiceNow/ConfigurationItemsDescription.ts
new file mode 100644
index 0000000000..bb95b3a955
--- /dev/null
+++ b/packages/nodes-base/nodes/ServiceNow/ConfigurationItemsDescription.ts
@@ -0,0 +1,137 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const configurationItemsOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'configurationItems',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get All',
+				value: 'getAll',
+			},
+		],
+		default: 'getAll',
+	},
+] as INodeProperties[];
+
+export const configurationItemsFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                             configurationItems:getAll                      */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'configurationItems',
+				],
+			},
+		},
+		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: [
+					'configurationItems',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 50,
+		description: 'The max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: [
+					'configurationItems',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Exclude Reference Link',
+				name: 'sysparm_exclude_reference_link',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to exclude Table API links for reference fields',
+			},
+			{
+				displayName: 'Fields',
+				name: 'sysparm_fields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getColumns',
+				},
+				default: '',
+				description: 'A list of fields to return',
+			},
+			{
+				displayName: 'Filter',
+				name: 'sysparm_query',
+				type: 'string',
+				default: '',
+				description: 'An encoded query string used to filter the results. <a href="https://developer.servicenow.com/dev.do#!/learn/learning-plans/quebec/servicenow_application_developer/app_store_learnv2_rest_quebec_more_about_query_parameters" target="_blank">More info</a>',
+			},
+			{
+				displayName: 'Return Values',
+				name: 'sysparm_display_value',
+				type: 'options',
+				options: [
+					{
+						name: 'Actual Values',
+						value: 'false',
+					},
+					{
+						name: 'Both',
+						value: 'all',
+					},
+					{
+						name: 'Display Values',
+						value: 'true',
+					},
+				],
+				default: 'false',
+				description: 'Choose which values to return',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ServiceNow/DepartmentDescription.ts b/packages/nodes-base/nodes/ServiceNow/DepartmentDescription.ts
new file mode 100644
index 0000000000..cc4a3871b4
--- /dev/null
+++ b/packages/nodes-base/nodes/ServiceNow/DepartmentDescription.ts
@@ -0,0 +1,137 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const departmentOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'department',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get All',
+				value: 'getAll',
+			},
+		],
+		default: 'getAll',
+	},
+] as INodeProperties[];
+
+export const departmentFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                department:getAll                           */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'department',
+				],
+			},
+		},
+		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: [
+					'department',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 50,
+		description: 'The max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: [
+					'department',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Exclude Reference Link',
+				name: 'sysparm_exclude_reference_link',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to exclude Table API links for reference fields',
+			},
+			{
+				displayName: 'Fields',
+				name: 'sysparm_fields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getColumns',
+				},
+				default: '',
+				description: 'A list of fields to return',
+			},
+			{
+				displayName: 'Filter',
+				name: 'sysparm_query',
+				type: 'string',
+				default: '',
+				description: 'An encoded query string used to filter the results. <a href="https://developer.servicenow.com/dev.do#!/learn/learning-plans/quebec/servicenow_application_developer/app_store_learnv2_rest_quebec_more_about_query_parameters" target="_blank">More info</a>',
+			},
+			{
+				displayName: 'Return Values',
+				name: 'sysparm_display_value',
+				type: 'options',
+				options: [
+					{
+						name: 'Actual Values',
+						value: 'false',
+					},
+					{
+						name: 'Both',
+						value: 'all',
+					},
+					{
+						name: 'Display Values',
+						value: 'true',
+					},
+				],
+				default: 'false',
+				description: 'Choose which values to return',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ServiceNow/DictionaryDescription.ts b/packages/nodes-base/nodes/ServiceNow/DictionaryDescription.ts
new file mode 100644
index 0000000000..fd0f14cd4f
--- /dev/null
+++ b/packages/nodes-base/nodes/ServiceNow/DictionaryDescription.ts
@@ -0,0 +1,137 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const dictionaryOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'dictionary',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get All',
+				value: 'getAll',
+			},
+		],
+		default: 'getAll',
+	},
+] as INodeProperties[];
+
+export const dictionaryFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                dictionary:getAll                           */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'dictionary',
+				],
+			},
+		},
+		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: [
+					'dictionary',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 50,
+		description: 'The max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: [
+					'dictionary',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Exclude Reference Link',
+				name: 'sysparm_exclude_reference_link',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to exclude Table API links for reference fields',
+			},
+			{
+				displayName: 'Fields',
+				name: 'sysparm_fields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getColumns',
+				},
+				default: '',
+				description: 'A list of fields to return',
+			},
+			{
+				displayName: 'Filter',
+				name: 'sysparm_query',
+				type: 'string',
+				default: '',
+				description: 'An encoded query string used to filter the results. <a href="https://developer.servicenow.com/dev.do#!/learn/learning-plans/quebec/servicenow_application_developer/app_store_learnv2_rest_quebec_more_about_query_parameters" target="_blank">More info</a>',
+			},
+			{
+				displayName: 'Return Values',
+				name: 'sysparm_display_value',
+				type: 'options',
+				options: [
+					{
+						name: 'Actual Values',
+						value: 'false',
+					},
+					{
+						name: 'Both',
+						value: 'all',
+					},
+					{
+						name: 'Display Values',
+						value: 'true',
+					},
+				],
+				default: 'false',
+				description: 'Choose which values to return',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ServiceNow/GenericFunctions.ts b/packages/nodes-base/nodes/ServiceNow/GenericFunctions.ts
new file mode 100644
index 0000000000..4b069a4929
--- /dev/null
+++ b/packages/nodes-base/nodes/ServiceNow/GenericFunctions.ts
@@ -0,0 +1,98 @@
+import {
+	OptionsWithUri
+} from 'request';
+
+import {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	INodePropertyOptions,
+	NodeApiError,
+} from 'n8n-workflow';
+
+export async function serviceNowApiRequest(this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, qs: IDataObject = {}, uri?: string, option: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const credentials = this.getCredentials('serviceNowOAuth2Api');
+
+	const options: OptionsWithUri = {
+		headers: {},
+		method,
+		qs,
+		body,
+		uri: uri || `https://${credentials?.subdomain}.service-now.com/api${resource}`,
+		json: true,
+	};
+	if (!Object.keys(body).length) {
+		delete options.body;
+	}
+
+	if (Object.keys(option).length !== 0) {
+		Object.assign(options, option);
+	}
+
+	if (options.qs.limit) {
+		delete options.qs.limit;
+	}
+
+	try {
+
+		return await this.helpers.requestOAuth2!.call(this, 'serviceNowOAuth2Api', options);
+
+	} catch (error) {
+		throw new NodeApiError(this.getNode(), error);
+	}
+}
+
+export async function serviceNowRequestAllItems(this: IExecuteFunctions | ILoadOptionsFunctions, method: string, resource: string, body: any = {}, query: IDataObject = {}): Promise<any> { // tslint:disable-line:no-any
+
+	const returnData: IDataObject[] = [];
+	let responseData;
+
+	const page = 100;
+
+	query.sysparm_limit = page;
+
+	responseData = await serviceNowApiRequest.call(this, method, resource, body, query, undefined, { resolveWithFullResponse: true });
+	returnData.push.apply(returnData, responseData.body.result);
+
+	const quantity = responseData.headers['x-total-count'];
+	const iterations = Math.round(quantity / page) + (quantity % page ? 1 : 0);
+
+	for (let iteration = 1; iteration < iterations; iteration++) {
+		query.sysparm_limit = page;
+		query.sysparm_offset = iteration * page;
+		responseData = await serviceNowApiRequest.call(this, method, resource, body, query, undefined, { resolveWithFullResponse: true });
+
+		returnData.push.apply(returnData, responseData.body.result);
+	}
+
+	return returnData;
+}
+
+
+export const mapEndpoint = (resource: string, operation: string) => {
+	const resourceEndpoint = new Map([
+		['tableRecord', 'sys_dictionary'],
+		['businessService', 'cmdb_ci_service'],
+		['configurationItems', 'cmdb_ci'],
+		['department', 'cmn_department'],
+		['dictionary', 'sys_dictionary'],
+		['incident', 'incident'],
+		['user', 'sys_user'],
+		['userGroup', 'sys_user_group'],
+		['userRole', 'sys_user_role'],
+	]);
+	return resourceEndpoint.get(resource);
+};
+
+export const sortData = (returnData: INodePropertyOptions[]): INodePropertyOptions[] => {
+	returnData.sort((a, b) => {
+		if (a.name < b.name) { return -1; }
+		if (a.name > b.name) { return 1; }
+		return 0;
+	});
+	return returnData;
+};
diff --git a/packages/nodes-base/nodes/ServiceNow/IncidentDescription.ts b/packages/nodes-base/nodes/ServiceNow/IncidentDescription.ts
new file mode 100644
index 0000000000..41d1537ab5
--- /dev/null
+++ b/packages/nodes-base/nodes/ServiceNow/IncidentDescription.ts
@@ -0,0 +1,673 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const incidentOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'incident',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+			},
+		],
+		default: 'get',
+	},
+] as INodeProperties[];
+
+export const incidentFields = [
+	/* -------------------------------------------------------------------------- */
+	/*                                incident:create                          */
+	/* -------------------------------------------------------------------------- */
+
+	{
+		displayName: 'Short Description',
+		name: 'short_description',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'incident',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		required: true,
+		description: 'Short description of the incident',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: [
+					'incident',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Assigned To',
+				name: 'assigned_to',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getUsers',
+					loadOptionsDependsOn: [
+						'additionalFields.assignment_group',
+					],
+				},
+				default: '',
+				description: 'Which user is the incident assigned to. Requires the selection of an assignment group',
+			},
+			{
+				displayName: 'Assignment Group',
+				name: 'assignment_group',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getAssignmentGroups',
+				},
+				default: '',
+				description: 'The assignment group of the incident',
+			},
+			{
+				displayName: 'Business Service',
+				name: 'business_service',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getBusinessServices',
+				},
+				default: '',
+				description: 'The business service',
+			},
+			{
+				displayName: 'Caller ID',
+				name: 'caller_id',
+				type: 'string',
+				default: '',
+				description: 'The unique identifier of the caller of the incident',
+			},
+			{
+				displayName: 'Category',
+				name: 'category',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getIncidentCategories',
+				},
+				default: '',
+				description: 'The category of the incident',
+			},
+			{
+				displayName: 'Close Notes',
+				name: 'close_notes',
+				type: 'string',
+				default: '',
+				description: 'The close notes for the incident',
+			},
+			{
+				displayName: 'Configuration Items',
+				name: 'cmdb_ci',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getConfigurationItems',
+				},
+				default: '',
+				description: 'Configuration Items, \'cmdb_ci\' in metadata',
+			},
+			{
+				displayName: 'Contact Type',
+				name: 'contact_type',
+				type: 'options',
+				options: [
+					{
+						name: 'Email',
+						value: 'email',
+					},
+					{
+						name: 'Phone',
+						value: 'phone',
+					},
+					{
+						name: 'Self Service',
+						value: 'self-service',
+					},
+					{
+						name: 'Walk In',
+						value: 'walk-in',
+					},
+				],
+				default: '',
+				description: 'The contact type',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'The description of the incident',
+			},
+			{
+				displayName: 'Impact',
+				name: 'impact',
+				type: 'options',
+				options: [
+					{
+						name: 'Low',
+						value: 1,
+					},
+					{
+						name: 'Medium',
+						value: 2,
+					},
+					{
+						name: 'High',
+						value: 3,
+					},
+				],
+				default: '',
+				description: 'The impact of the incident',
+			},
+			{
+				displayName: 'Resolution Code',
+				name: 'close_code',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getIncidentResolutionCodes',
+				},
+				default: '',
+				description: 'The resolution code of the incident. \'close_code\' in metadata',
+			},
+			{
+				displayName: 'State',
+				name: 'state',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getIncidentStates',
+				},
+				default: '',
+				description: 'The state of the incident',
+			},
+			{
+				displayName: 'Subcategory',
+				name: 'subcategory',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getIncidentSubcategories',
+					loadOptionsDependsOn: [
+						'additionalFields.category',
+					],
+				},
+				default: '',
+				description: 'The subcategory of the incident',
+			},
+			{
+				displayName: 'Urgency',
+				name: 'urgency',
+				type: 'options',
+				options: [
+					{
+						name: 'Low',
+						value: 1,
+					},
+					{
+						name: 'Medium',
+						value: 2,
+					},
+					{
+						name: 'High',
+						value: 3,
+					},
+				],
+				default: '',
+				description: 'The urgency of the incident',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                incident:getAll                          */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'incident',
+				],
+			},
+		},
+		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: [
+					'incident',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 50,
+		description: 'The max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		displayOptions: {
+			show: {
+				resource: [
+					'incident',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Exclude Reference Link',
+				name: 'sysparm_exclude_reference_link',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to exclude Table API links for reference fields',
+			},
+			{
+				displayName: 'Fields',
+				name: 'sysparm_fields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getColumns',
+				},
+				default: '',
+				description: 'A list of fields to return',
+			},
+			{
+				displayName: 'Filter',
+				name: 'sysparm_query',
+				type: 'string',
+				default: '',
+				description: 'An encoded query string used to filter the results. <a href="https://developer.servicenow.com/dev.do#!/learn/learning-plans/quebec/servicenow_application_developer/app_store_learnv2_rest_quebec_more_about_query_parameters" target="_blank">More info</a>',
+			},
+			{
+				displayName: 'Return Values',
+				name: 'sysparm_display_value',
+				type: 'options',
+				options: [
+					{
+						name: 'Actual Values',
+						value: 'false',
+					},
+					{
+						name: 'Both',
+						value: 'all',
+					},
+					{
+						name: 'Display Values',
+						value: 'true',
+					},
+				],
+				default: 'false',
+				description: 'Choose which values to return',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                incident:get/delete                       */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Incident ID',
+		name: 'id',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'incident',
+				],
+				operation: [
+					'delete',
+					'get',
+				],
+			},
+		},
+		required: true,
+		description: 'Unique identifier of the incident',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		displayOptions: {
+			show: {
+				resource: [
+					'incident',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Exclude Reference Link',
+				name: 'sysparm_exclude_reference_link',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to exclude Table API links for reference fields',
+			},
+			{
+				displayName: 'Fields',
+				name: 'sysparm_fields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getColumns',
+				},
+				default: '',
+				description: 'A list of fields to return',
+			},
+			{
+				displayName: 'Return Values',
+				name: 'sysparm_display_value',
+				type: 'options',
+				options: [
+					{
+						name: 'Actual Values',
+						value: 'false',
+					},
+					{
+						name: 'Both',
+						value: 'all',
+					},
+					{
+						name: 'Display Values',
+						value: 'true',
+					},
+				],
+				default: 'false',
+				description: 'Choose which values to return',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                incident:update                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Incident ID',
+		name: 'id',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'incident',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		required: true,
+		description: 'Unique identifier of the incident',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: [
+					'incident',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Assigned To',
+				name: 'assigned_to',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getUsers',
+					loadOptionsDependsOn: [
+						'additionalFields.assignment_group',
+					],
+				},
+				default: '',
+				description: 'Which user is the incident assigned to. Requires the selection of an assignment group',
+			},
+			{
+				displayName: 'Assignment Group',
+				name: 'assignment_group',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getAssignmentGroups',
+				},
+				default: '',
+				description: 'The assignment group of the incident',
+			},
+			{
+				displayName: 'Business Service',
+				name: 'business_service',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getBusinessServices',
+				},
+				default: '',
+				description: 'The business service',
+			},
+			{
+				displayName: 'Caller ID',
+				name: 'caller_id',
+				type: 'string',
+				default: '',
+				description: 'The unique identifier of the caller of the incident',
+			},
+			{
+				displayName: 'Category',
+				name: 'category',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getIncidentCategories',
+				},
+				default: '',
+				description: 'The category of the incident',
+			},
+			{
+				displayName: 'Close Notes',
+				name: 'close_notes',
+				type: 'string',
+				default: '',
+				description: 'The close notes for the incident',
+			},
+			{
+				displayName: 'Configuration Items',
+				name: 'cmdb_ci',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getConfigurationItems',
+				},
+				default: '',
+				description: 'Configuration Items, \'cmdb_ci\' in metadata',
+			},
+			{
+				displayName: 'Contact Type',
+				name: 'contact_type',
+				type: 'options',
+				options: [
+					{
+						name: 'Email',
+						value: 'email',
+					},
+					{
+						name: 'Phone',
+						value: 'phone',
+					},
+					{
+						name: 'Self Service',
+						value: 'self-service',
+					},
+					{
+						name: 'Walk In',
+						value: 'walk-in',
+					},
+				],
+				default: '',
+				description: 'The contact type',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'The description of the incident',
+			},
+			{
+				displayName: 'Impact',
+				name: 'impact',
+				type: 'options',
+				options: [
+					{
+						name: 'Low',
+						value: 1,
+					},
+					{
+						name: 'Medium',
+						value: 2,
+					},
+					{
+						name: 'High',
+						value: 3,
+					},
+				],
+				default: '',
+				description: 'The impact of the incident',
+			},
+			{
+				displayName: 'Resolution Code',
+				name: 'close_code',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getIncidentResolutionCodes',
+				},
+				default: '',
+				description: 'The resolution code of the incident. \'close_code\' in metadata',
+			},
+			{
+				displayName: 'On Hold Reason',
+				name: 'hold_reason',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getIncidentHoldReasons',
+				},
+				default: '',
+				description: 'The on hold reason for the incident. It applies if the state is <code>On Hold</code>',
+			},
+			{
+				displayName: 'State',
+				name: 'state',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getIncidentStates',
+				},
+				default: '',
+				description: 'The state of the incident',
+			},
+			{
+				displayName: 'Subcategory',
+				name: 'subcategory',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getIncidentSubcategories',
+					loadOptionsDependsOn: [
+						'additionalFields.category',
+					],
+				},
+				default: '',
+				description: 'The subcategory of the incident',
+			},
+			{
+				displayName: 'Urgency',
+				name: 'urgency',
+				type: 'options',
+				options: [
+					{
+						name: 'Low',
+						value: 1,
+					},
+					{
+						name: 'Medium',
+						value: 2,
+					},
+					{
+						name: 'High',
+						value: 3,
+					},
+				],
+				default: '',
+				description: 'The urgency of the incident',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
new file mode 100644
index 0000000000..05eda728da
--- /dev/null
+++ b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
@@ -0,0 +1,788 @@
+import {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-core';
+
+import {
+	IDataObject,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+import {
+	mapEndpoint,
+	serviceNowApiRequest,
+	serviceNowRequestAllItems,
+	sortData
+} from './GenericFunctions';
+
+import {
+	businessServiceFields,
+	businessServiceOperations,
+} from './BusinessServiceDescription';
+
+import {
+	configurationItemsFields,
+	configurationItemsOperations,
+} from './ConfigurationItemsDescription';
+
+import {
+	departmentFields,
+	departmentOperations,
+} from './DepartmentDescription';
+
+import {
+	dictionaryFields,
+	dictionaryOperations,
+} from './DictionaryDescription';
+
+import {
+	incidentFields,
+	incidentOperations,
+} from './IncidentDescription';
+
+import {
+	tableRecordFields,
+	tableRecordOperations,
+} from './TableRecordDescription';
+
+import {
+	userFields,
+	userOperations,
+} from './UserDescription';
+
+import {
+	userGroupFields,
+	userGroupOperations,
+} from './UserGroupDescription';
+
+import {
+	userRoleFields,
+	userRoleOperations,
+} from './UserRoleDescription';
+
+export class ServiceNow implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'ServiceNow',
+		name: 'serviceNow',
+		icon: 'file:servicenow.svg',
+		group: ['output'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Consume ServiceNow API',
+		defaults: {
+			name: 'ServiceNow',
+			color: '#81b5a1',
+		},
+		inputs: ['main'],
+		outputs: ['main'],
+		credentials: [
+			{
+				name: 'serviceNowOAuth2Api',
+				required: true,
+			},
+		],
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [
+					{
+						name: 'Business Service',
+						value: 'businessService',
+					},
+					{
+						name: 'Configuration Items',
+						value: 'configurationItems',
+					},
+					{
+						name: 'Department',
+						value: 'department',
+					},
+					{
+						name: 'Dictionary',
+						value: 'dictionary',
+					},
+					{
+						name: 'Incident',
+						value: 'incident',
+					},
+					{
+						name: 'Table Record',
+						value: 'tableRecord',
+					},
+					{
+						name: 'User',
+						value: 'user',
+					},
+					{
+						name: 'User Group',
+						value: 'userGroup',
+					},
+					{
+						name: 'User Role',
+						value: 'userRole',
+					},
+				],
+				default: 'user',
+				description: 'Resource to consume',
+			},
+
+			// BUSINESS SERVICE
+			...businessServiceOperations,
+			...businessServiceFields,
+			// CONFIGURATION ITEMS
+			...configurationItemsOperations,
+			...configurationItemsFields,
+			// DEPARTMENT
+			...departmentOperations,
+			...departmentFields,
+			// DICTIONARY
+			...dictionaryOperations,
+			...dictionaryFields,
+			// INCIDENT
+			...incidentOperations,
+			...incidentFields,
+			// TABLE RECORD
+			...tableRecordOperations,
+			...tableRecordFields,
+			// USER
+			...userOperations,
+			...userFields,
+			// USER GROUP
+			...userGroupOperations,
+			...userGroupFields,
+			// USER ROLE
+			...userRoleOperations,
+			...userRoleFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			async getTables(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const response = await serviceNowApiRequest.call(this, 'GET', `/now/doc/table/schema`, {}, {});
+				for (const table of response.result) {
+					returnData.push({
+						name: table.label,
+						value: table.value,
+						description: table.value,
+					});
+				}
+				return sortData(returnData);
+			},
+			// Get all the table column to display them to user
+			async getColumns(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const resource = this.getNodeParameter('resource', 0) as string;
+				const operation = this.getNodeParameter('operation', 0) as string;
+				const returnData: INodePropertyOptions[] = [];
+				let tableName;
+				if (resource === 'tableRecord') {
+					tableName = this.getNodeParameter('tableName') as string;
+				} else {
+					tableName = mapEndpoint(resource, operation);
+				}
+
+				const qs = {
+					sysparm_query: `name=${tableName}`,
+					sysparm_fields: 'column_label,element',
+				};
+				const response = await serviceNowApiRequest.call(this, 'GET', `/now/table/sys_dictionary`, {}, qs);
+				for (const column of response.result) {
+					if (column.element) {
+						returnData.push({
+							name: column.column_label,
+							value: column.element,
+						});
+					}
+				}
+				return sortData(returnData);
+			},
+			async getBusinessServices(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const qs = {
+					sysparm_fields: 'name,sys_id',
+				};
+				const response = await serviceNowApiRequest.call(this, 'GET', `/now/table/cmdb_ci_service`, {}, qs);
+
+				for (const column of response.result) {
+					returnData.push({
+						name: column.name,
+						value: column.sys_id,
+					});
+				}
+				return sortData(returnData);
+			},
+			async getUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const resource = this.getNodeParameter('resource', 0) as string;
+				const operation = this.getNodeParameter('operation', 0) as string;
+
+				const qs = {
+					sysparm_fields: 'sys_id,user_name',
+				};
+				if (resource === 'incident' && operation === 'create') {
+					const additionalFields = this.getNodeParameter('additionalFields') as IDataObject;
+					const group = additionalFields.assignment_group;
+
+					const response = await serviceNowRequestAllItems.call(this, 'GET', '/now/table/sys_user_grmember', {}, {
+						sysparm_query: `group=${group}^`,
+					});
+
+					for (const column of response) {
+						if (column.user) {
+
+							const responseData = await serviceNowApiRequest.call(this, 'GET', `/now/table/sys_user/${column.user.value}`, {}, {});
+							const user = responseData.result;
+
+							returnData.push({
+								name: user.user_name,
+								value: user.sys_id,
+							});
+						}
+					}
+				} else {
+
+					const response = await serviceNowRequestAllItems.call(this, 'GET', '/now/table/sys_user', {}, qs);
+
+					for (const column of response) {
+						if (column.user_name) {
+							returnData.push({
+								name: column.user_name,
+								value: column.sys_id,
+							});
+						}
+					}
+				}
+				return sortData(returnData);
+			},
+			async getAssignmentGroups(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const qs = {
+					sysparm_fields: 'sys_id,name',
+				};
+				const response = await serviceNowRequestAllItems.call(this, 'GET', '/now/table/sys_user_group', {}, qs);
+
+				for (const column of response) {
+					if (column.name) {
+						returnData.push({
+							name: column.name,
+							value: column.sys_id,
+						});
+					}
+				}
+				return sortData(returnData);
+			},
+			async getUserRoles(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const qs = {
+					sysparm_fields: 'sys_id,name',
+				};
+				const response = await serviceNowRequestAllItems.call(this, 'GET', '/now/table/sys_user_role', {}, qs);
+
+				for (const column of response) {
+					if (column.name) {
+						returnData.push({
+							name: column.name,
+							value: column.sys_id,
+						});
+					}
+				}
+				return sortData(returnData);
+			},
+			async getConfigurationItems(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const qs = {
+					sysparm_fields: 'sys_id,name,sys_class_name',
+				};
+				const response = await serviceNowRequestAllItems.call(this, 'GET', '/now/table/cmdb_ci', {}, qs);
+
+				for (const column of response) {
+					if (column.name) {
+						returnData.push({
+							name: column.name,
+							value: column.sys_id,
+							description: column.sys_class_name,
+						});
+					}
+				}
+				return sortData(returnData);
+			},
+			async getIncidentCategories(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const qs = {
+					sysparm_fields: 'label,value',
+					sysparm_query: 'element=category^name=incident',
+				};
+				const response = await serviceNowRequestAllItems.call(this, 'GET', '/now/table/sys_choice', {}, qs);
+
+				for (const column of response) {
+					returnData.push({
+						name: column.label,
+						value: column.value,
+					});
+
+				}
+				return sortData(returnData);
+			},
+			async getIncidentSubcategories(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const operation = this.getNodeParameter('operation');
+				let category;
+				if (operation === 'update') {
+					const updateFields = this.getNodeParameter('updateFields') as IDataObject;
+					category = updateFields.category;
+				} else {
+					const additionalFields = this.getNodeParameter('additionalFields') as IDataObject;
+					category = additionalFields.category;
+				}
+				const qs = {
+					sysparm_fields: 'label,value',
+					sysparm_query: `name=incident^element=subcategory^dependent_value=${category}`,
+				};
+				const response = await serviceNowRequestAllItems.call(this, 'GET', '/now/table/sys_choice', {}, qs);
+
+				for (const column of response) {
+					returnData.push({
+						name: column.label,
+						value: column.value,
+					});
+				}
+
+				return sortData(returnData);
+			},
+			async getIncidentStates(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const qs = {
+					sysparm_fields: 'label,value',
+					sysparm_query: 'element=state^name=incident',
+				};
+				const response = await serviceNowRequestAllItems.call(this, 'GET', '/now/table/sys_choice', {}, qs);
+
+				for (const column of response) {
+					returnData.push({
+						name: column.label,
+						value: column.value,
+					});
+
+				}
+				return sortData(returnData);
+			},
+			async getIncidentResolutionCodes(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const qs = {
+					sysparm_fields: 'label,value',
+					sysparm_query: 'element=close_code^name=incident',
+				};
+				const response = await serviceNowRequestAllItems.call(this, 'GET', '/now/table/sys_choice', {}, qs);
+
+				for (const column of response) {
+					returnData.push({
+						name: column.label,
+						value: column.value,
+					});
+
+				}
+				return sortData(returnData);
+			},
+			async getIncidentHoldReasons(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const qs = {
+					sysparm_fields: 'label,value',
+					sysparm_query: 'element=hold_reason^name=incident',
+				};
+				const response = await serviceNowRequestAllItems.call(this, 'GET', '/now/table/sys_choice', {}, qs);
+
+				for (const column of response) {
+					returnData.push({
+						name: column.label,
+						value: column.value,
+					});
+
+				}
+				return sortData(returnData);
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: IDataObject[] = [];
+		const length = items.length;
+		let responseData = {};
+		let qs: IDataObject;
+		const resource = this.getNodeParameter('resource', 0) as string;
+		const operation = this.getNodeParameter('operation', 0) as string;
+
+		for (let i = 0; i < length; i++) {
+			try {
+				if (resource === 'businessService') {
+
+					if (operation === 'getAll') {
+
+						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+						qs = this.getNodeParameter('options', i) as IDataObject;
+
+						if (qs.sysparm_fields) {
+							qs.sysparm_fields = (qs.sysparm_fields as string[]).join(',');
+						}
+
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', i) as number;
+							qs.sysparm_limit = limit;
+							const response = await serviceNowApiRequest.call(this, 'GET', '/now/table/cmdb_ci_service', {}, qs);
+							responseData = response.result;
+						} else {
+							responseData = await serviceNowRequestAllItems.call(this, 'GET', '/now/table/cmdb_ci_service', {}, qs);
+						}
+
+					}
+				} else if (resource === 'configurationItems') {
+
+					if (operation === 'getAll') {
+
+						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+						qs = this.getNodeParameter('options', i) as IDataObject;
+
+						if (qs.sysparm_fields) {
+							qs.sysparm_fields = (qs.sysparm_fields as string[]).join(',');
+						}
+
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', i) as number;
+							qs.sysparm_limit = limit;
+							const response = await serviceNowApiRequest.call(this, 'GET', '/now/table/cmdb_ci', {}, qs);
+							responseData = response.result;
+						} else {
+							responseData = await serviceNowRequestAllItems.call(this, 'GET', '/now/table/cmdb_ci', {}, qs);
+						}
+
+					}
+				} else if (resource === 'department') {
+
+					if (operation === 'getAll') {
+
+						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+						qs = this.getNodeParameter('options', i) as IDataObject;
+
+						if (qs.sysparm_fields) {
+							qs.sysparm_fields = (qs.sysparm_fields as string[]).join(',');
+						}
+
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', i) as number;
+							qs.sysparm_limit = limit;
+							const response = await serviceNowApiRequest.call(this, 'GET', '/now/table/cmn_department', {}, qs);
+							responseData = response.result;
+						} else {
+							responseData = await serviceNowRequestAllItems.call(this, 'GET', '/now/table/cmn_department', {}, qs);
+						}
+
+					}
+				} else if (resource === 'dictionary') {
+
+					if (operation === 'getAll') {
+
+						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+						qs = this.getNodeParameter('options', i) as IDataObject;
+
+						if (qs.sysparm_fields) {
+							qs.sysparm_fields = (qs.sysparm_fields as string[]).join(',');
+						}
+
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', i) as number;
+							qs.sysparm_limit = limit;
+							const response = await serviceNowApiRequest.call(this, 'GET', '/now/table/sys_dictionary', {}, qs);
+							responseData = response.result;
+						} else {
+							responseData = await serviceNowRequestAllItems.call(this, 'GET', '/now/table/sys_dictionary', {}, qs);
+						}
+
+					}
+				} else if (resource === 'incident') {
+
+					if (operation === 'create') {
+
+						const shortDescription = this.getNodeParameter('short_description', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i) as IDataObject;
+						const body = {
+							short_description: shortDescription,
+							...additionalFields,
+						};
+
+						const response = await serviceNowApiRequest.call(this, 'POST', `/now/table/incident`, body);
+						responseData = response.result;
+
+					} else if (operation === 'delete') {
+
+						const id = this.getNodeParameter('id', i) as string;
+						responseData = await serviceNowApiRequest.call(this, 'DELETE', `/now/table/incident/${id}`);
+						responseData = { success: true };
+
+					} else if (operation === 'get') {
+
+						const id = this.getNodeParameter('id', i) as string;
+						qs = this.getNodeParameter('options', i) as IDataObject;
+
+						if (qs.sysparm_fields) {
+							qs.sysparm_fields = (qs.sysparm_fields as string[]).join(',');
+						}
+
+						const response = await serviceNowApiRequest.call(this, 'GET', `/now/table/incident/${id}`, {}, qs);
+						responseData = response.result;
+
+					} else if (operation === 'getAll') {
+
+						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+						qs = this.getNodeParameter('options', i) as IDataObject;
+
+						if (qs.sysparm_fields) {
+							qs.sysparm_fields = (qs.sysparm_fields as string[]).join(',');
+						}
+
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', i) as number;
+							qs.sysparm_limit = limit;
+							const response = await serviceNowApiRequest.call(this, 'GET', `/now/table/incident`, {}, qs);
+							responseData = response.result;
+						} else {
+							responseData = await serviceNowRequestAllItems.call(this, 'GET', `/now/table/incident`, {}, qs);
+						}
+
+					} else if (operation === 'update') {
+
+						const id = this.getNodeParameter('id', i) as string;
+						const body = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						const response = await serviceNowApiRequest.call(this, 'PATCH', `/now/table/incident/${id}`, body);
+						responseData = response.result;
+
+					} else {
+						throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
+					}
+				} else if (resource === 'tableRecord') {
+
+					if (operation === 'create') {
+
+						const tableName = this.getNodeParameter('tableName', i) as string;
+						const dataToSend = this.getNodeParameter('dataToSend', i) as string;
+						let body = {};
+
+						if (dataToSend === 'mapInput') {
+							const inputsToIgnore = (this.getNodeParameter('inputsToIgnore', i) as string).split(',').map(field => field.trim());
+							body = Object.entries(items[i].json)
+								.filter(([key]) => !inputsToIgnore.includes(key))
+								.reduce((obj, [key, val]) => Object.assign(obj, { [key]: val }), {});
+						} else if (dataToSend === 'columns') {
+							const fieldsToSend = this.getNodeParameter('fieldsToSend', i) as {
+								field: IDataObject[]
+							};
+							body = fieldsToSend.field.reduce((obj, field) => {
+								obj[field.column as string] = field.value;
+								return obj;
+							}, {});
+						}
+
+						const response = await serviceNowApiRequest.call(this, 'POST', `/now/table/${tableName}`, body);
+						responseData = response.result;
+
+					} else if (operation === 'delete') {
+
+						const tableName = this.getNodeParameter('tableName', i) as string;
+						const id = this.getNodeParameter('id', i) as string;
+						responseData = await serviceNowApiRequest.call(this, 'DELETE', `/now/table/${tableName}/${id}`);
+						responseData = { success: true };
+
+					} else if (operation === 'get') {
+
+						const tableName = this.getNodeParameter('tableName', i) as string;
+						const id = this.getNodeParameter('id', i) as string;
+						qs = this.getNodeParameter('options', i) as IDataObject;
+
+						if (qs.sysparm_fields) {
+							qs.sysparm_fields = (qs.sysparm_fields as string[]).join(',');
+						}
+
+						const response = await serviceNowApiRequest.call(this, 'GET', `/now/table/${tableName}/${id}`, {}, qs);
+						responseData = response.result;
+
+					} else if (operation === 'getAll') {
+
+						const tableName = this.getNodeParameter('tableName', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+						qs = this.getNodeParameter('options', i) as IDataObject;
+
+						if (qs.sysparm_fields) {
+							qs.sysparm_fields = (qs.sysparm_fields as string[]).join(',');
+						}
+
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', i) as number;
+							qs.sysparm_limit = limit;
+							const response = await serviceNowApiRequest.call(this, 'GET', `/now/table/${tableName}`, {}, qs);
+							responseData = response.result;
+						} else {
+							responseData = await serviceNowRequestAllItems.call(this, 'GET', `/now/table/${tableName}`, {}, qs);
+						}
+
+
+					} else if (operation === 'update') {
+
+						const tableName = this.getNodeParameter('tableName', i) as string;
+						const id = this.getNodeParameter('id', i) as string;
+						const dataToSend = this.getNodeParameter('dataToSend', i) as string;
+						let body = {};
+
+						if (dataToSend === 'mapInput') {
+							const inputsToIgnore = (this.getNodeParameter('inputsToIgnore', i) as string).split(',').map(field => field.trim());
+							body = Object.entries(items[i].json)
+								.filter(([key]) => !inputsToIgnore.includes(key))
+								.reduce((obj, [key, val]) => Object.assign(obj, { [key]: val }), {});
+						} else if (dataToSend === 'columns') {
+							const fieldsToSend = this.getNodeParameter('fieldsToSend', i) as {
+								field: IDataObject[]
+							};
+							body = fieldsToSend.field.reduce((obj, field) => {
+								obj[field.column as string] = field.value;
+								return obj;
+							}, {});
+						}
+
+						const response = await serviceNowApiRequest.call(this, 'PATCH', `/now/table/${tableName}/${id}`, body);
+						responseData = response.result;
+
+					} else {
+						throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
+					}
+				} else if (resource === 'user') {
+
+					if (operation === 'create') {
+
+						const body = this.getNodeParameter('additionalFields', i) as IDataObject;
+
+						const response = await serviceNowApiRequest.call(this, 'POST', '/now/table/sys_user', body);
+						responseData = response.result;
+
+					} else if (operation === 'delete') {
+
+						const id = this.getNodeParameter('id', i) as string;
+						responseData = await serviceNowApiRequest.call(this, 'DELETE', `/now/table/sys_user/${id}`);
+						responseData = { success: true };
+
+					} else if (operation === 'get') {
+
+						const getOption = this.getNodeParameter('getOption', i) as string;
+						qs = this.getNodeParameter('options', i) as IDataObject;
+
+						if (qs.sysparm_fields) {
+							qs.sysparm_fields = (qs.sysparm_fields as string[]).join(',');
+						}
+
+						if (getOption === 'id') {
+							const id = this.getNodeParameter('id', i) as string;
+							const response = await serviceNowApiRequest.call(this, 'GET', `/now/table/sys_user/${id}`, {}, qs);
+							responseData = response.result;
+						} else {
+							const userName = this.getNodeParameter('user_name', i) as string;
+							qs.sysparm_query = `user_name=${userName}`;
+							qs.sysparm_limit = 1;
+							const response = await serviceNowApiRequest.call(this, 'GET', '/now/table/sys_user', {}, qs);
+							responseData = response.result;
+						}
+
+					} else if (operation === 'getAll') {
+
+						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+						qs = this.getNodeParameter('options', i) as IDataObject;
+
+						if (qs.sysparm_fields) {
+							qs.sysparm_fields = (qs.sysparm_fields as string[]).join(',');
+						}
+
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', i) as number;
+							qs.sysparm_limit = limit;
+							const response = await serviceNowApiRequest.call(this, 'GET', '/now/table/sys_user', {}, qs);
+							responseData = response.result;
+						} else {
+							responseData = await serviceNowRequestAllItems.call(this, 'GET', '/now/table/sys_user', {}, qs);
+						}
+
+					} else if (operation === 'update') {
+
+						const id = this.getNodeParameter('id', i) as string;
+						const body = this.getNodeParameter('updateFields', i) as IDataObject;
+
+						const response = await serviceNowApiRequest.call(this, 'PATCH', `/now/table/sys_user/${id}`, body);
+						responseData = response.result;
+
+					} else {
+						throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
+					}
+				} else if (resource === 'userGroup') {
+					if (operation === 'getAll') {
+
+						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+						qs = this.getNodeParameter('options', i) as IDataObject;
+
+						if (qs.sysparm_fields) {
+							qs.sysparm_fields = (qs.sysparm_fields as string[]).join(',');
+						}
+
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', i) as number;
+							qs.sysparm_limit = limit;
+							const response = await serviceNowApiRequest.call(this, 'GET', '/now/table/sys_user_group', {}, qs);
+							responseData = response.result;
+						} else {
+							responseData = await serviceNowRequestAllItems.call(this, 'GET', '/now/table/sys_user_group', {}, qs);
+						}
+					} else {
+						throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
+					}
+				} else if (resource === 'userRole') {
+					if (operation === 'getAll') {
+
+						const returnAll = this.getNodeParameter('returnAll', i) as boolean;
+						qs = this.getNodeParameter('options', i) as IDataObject;
+
+						if (qs.sysparm_fields) {
+							qs.sysparm_fields = (qs.sysparm_fields as string[]).join(',');
+						}
+
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', i) as number;
+							qs.sysparm_limit = limit;
+							const response = await serviceNowApiRequest.call(this, 'GET', '/now/table/sys_user_role', {}, qs);
+							responseData = response.result;
+						} else {
+							responseData = await serviceNowRequestAllItems.call(this, 'GET', '/now/table/sys_user_role', {}, qs);
+						}
+					} else {
+						throw new NodeOperationError(this.getNode(), `The operation "${operation}" is not known!`);
+					}
+				} else {
+					throw new NodeOperationError(this.getNode(), `The resource "${resource}" is not known!`);
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ error: error.message });
+					continue;
+				}
+
+				throw error;
+			}
+
+			Array.isArray(responseData)
+				? returnData.push(...responseData)
+				: returnData.push(responseData);
+		}
+		return [this.helpers.returnJsonArray(returnData)];
+	}
+}
diff --git a/packages/nodes-base/nodes/ServiceNow/TableRecordDescription.ts b/packages/nodes-base/nodes/ServiceNow/TableRecordDescription.ts
new file mode 100644
index 0000000000..51c9845a44
--- /dev/null
+++ b/packages/nodes-base/nodes/ServiceNow/TableRecordDescription.ts
@@ -0,0 +1,555 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const tableRecordOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'tableRecord',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+			},
+		],
+		default: 'get',
+	},
+] as INodeProperties[];
+
+export const tableRecordFields = [
+	/* -------------------------------------------------------------------------- */
+	/*                                tableRecord:create                          */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Table Name',
+		name: 'tableName',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTables',
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'tableRecord',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		required: true,
+		description: 'The table name',
+	},
+	{
+		displayName: 'Data to Send',
+		name: 'dataToSend',
+		type: 'options',
+		options: [
+			{
+				name: 'Auto-map Input Data to Columns',
+				value: 'mapInput',
+				description: 'Use when node input names match destination field names',
+			},
+			{
+				name: 'Define Below for Each Column',
+				value: 'columns',
+				description: 'Set the value for each destination column',
+			},
+			{
+				name: 'Nothing',
+				value: 'nothing',
+				description: `Don't send any column data`,
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'tableRecord',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: 'columns',
+	},
+	{
+		displayName: 'Inputs to Ignore',
+		name: 'inputsToIgnore',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'tableRecord',
+				],
+				operation: [
+					'create',
+				],
+				dataToSend: [
+					'mapInput',
+				],
+			},
+		},
+		default: '',
+		required: false,
+		description: 'List of input properties to avoid sending, separated by commas. Leave empty to send all inputs',
+	},
+	{
+		displayName: 'Fields to Send',
+		name: 'fieldsToSend',
+		type: 'fixedCollection',
+		placeholder: 'Add field to send',
+		typeOptions: {
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'tableRecord',
+				],
+				operation: [
+					'create',
+				],
+				dataToSend: [
+					'columns',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Field',
+				name: 'field',
+				values: [
+					{
+						displayName: 'Field Name',
+						name: 'column',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getColumns',
+							loadOptionsDependsOn: [
+								'tableName',
+							],
+						},
+						default: '',
+					},
+					{
+						displayName: 'Field Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                tableRecord:getAll                          */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Table Name',
+		name: 'tableName',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTables',
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'tableRecord',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		required: true,
+		description: 'The table name',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'tableRecord',
+				],
+			},
+		},
+		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: [
+					'tableRecord',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 50,
+		description: 'The max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: [
+					'tableRecord',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Exclude Reference Link',
+				name: 'sysparm_exclude_reference_link',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to exclude Table API links for reference fields',
+			},
+			{
+				displayName: 'Fields',
+				name: 'sysparm_fields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getColumns',
+					loadOptionsDependsOn: [
+						'tableName',
+					],
+				},
+				default: '',
+				description: 'A list of fields to return',
+			},
+			{
+				displayName: 'Filter',
+				name: 'sysparm_query',
+				type: 'string',
+				default: '',
+				description: 'An encoded query string used to filter the results. <a href="https://developer.servicenow.com/dev.do#!/learn/learning-plans/quebec/servicenow_application_developer/app_store_learnv2_rest_quebec_more_about_query_parameters" target="_blank">More info</a>',
+			},
+			{
+				displayName: 'Return Values',
+				name: 'sysparm_display_value',
+				type: 'options',
+				options: [
+					{
+						name: 'Actual Values',
+						value: 'false',
+					},
+					{
+						name: 'Both',
+						value: 'all',
+					},
+					{
+						name: 'Display Values',
+						value: 'true',
+					},
+				],
+				default: 'false',
+				description: 'Choose which values to return',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                tableRecord:get/delete                       */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Table Name',
+		name: 'tableName',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTables',
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'tableRecord',
+				],
+				operation: [
+					'delete',
+					'get',
+				],
+			},
+		},
+		required: true,
+		description: 'Name of the table in which the record exists',
+	},
+	{
+		displayName: 'Table Record ID',
+		name: 'id',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'tableRecord',
+				],
+				operation: [
+					'delete',
+					'get',
+				],
+			},
+		},
+		required: true,
+		description: 'Unique identifier of the record',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: [
+					'tableRecord',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Exclude Reference Link',
+				name: 'sysparm_exclude_reference_link',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to exclude Table API links for reference fields',
+			},
+			{
+				displayName: 'Fields',
+				name: 'sysparm_fields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getColumns',
+					loadOptionsDependsOn: [
+						'tableName',
+					],
+				},
+				default: '',
+				description: 'A list of fields to return',
+			},
+			{
+				displayName: 'Return Values',
+				name: 'sysparm_display_value',
+				type: 'options',
+				options: [
+					{
+						name: 'Actual Values',
+						value: 'false',
+					},
+					{
+						name: 'Both',
+						value: 'all',
+					},
+					{
+						name: 'Display Values',
+						value: 'true',
+					},
+				],
+				default: 'false',
+				description: 'Choose which values to return',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                tableRecord:update                          */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Table Name',
+		name: 'tableName',
+		type: 'options',
+		typeOptions: {
+			loadOptionsMethod: 'getTables',
+		},
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'tableRecord',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		required: true,
+		description: 'The table name',
+	},
+	{
+		displayName: 'Table Record ID',
+		name: 'id',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'tableRecord',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		required: true,
+		description: 'Unique identifier of the record',
+	},
+	{
+		displayName: 'Data to Send',
+		name: 'dataToSend',
+		type: 'options',
+		options: [
+			{
+				name: 'Auto-map Input Data to Columns',
+				value: 'mapInput',
+				description: 'Use when node input names match destination field names',
+			},
+			{
+				name: 'Define Below for Each Column',
+				value: 'columns',
+				description: 'Set the value for each destination column',
+			},
+			{
+				name: 'Nothing',
+				value: 'nothing',
+				description: `Don't send any column data`,
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'tableRecord',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		default: 'columns',
+	},
+	{
+		displayName: 'Inputs to Ignore',
+		name: 'inputsToIgnore',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: [
+					'tableRecord',
+				],
+				operation: [
+					'update',
+				],
+				dataToSend: [
+					'mapInput',
+				],
+			},
+		},
+		default: '',
+		required: false,
+		description: 'List of input properties to avoid sending, separated by commas. Leave empty to send all inputs',
+	},
+	{
+		displayName: 'Fields to Send',
+		name: 'fieldsToSend',
+		type: 'fixedCollection',
+		placeholder: 'Add field to send',
+		typeOptions: {
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				resource: [
+					'tableRecord',
+				],
+				operation: [
+					'update',
+				],
+				dataToSend: [
+					'columns',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Field',
+				name: 'field',
+				values: [
+					{
+						displayName: 'Field Name',
+						name: 'column',
+						type: 'options',
+						typeOptions: {
+							loadOptionsMethod: 'getColumns',
+							loadOptionsDependsOn: [
+								'tableName',
+							],
+						},
+						default: '',
+					},
+					{
+						displayName: 'Field Value',
+						name: 'value',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ServiceNow/UserDescription.ts b/packages/nodes-base/nodes/ServiceNow/UserDescription.ts
new file mode 100644
index 0000000000..645d7efa75
--- /dev/null
+++ b/packages/nodes-base/nodes/ServiceNow/UserDescription.ts
@@ -0,0 +1,732 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const userOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+			},
+			{
+				name: 'Get All',
+				value: 'getAll',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+			},
+		],
+		default: 'get',
+	},
+] as INodeProperties[];
+
+export const userFields = [
+	/* -------------------------------------------------------------------------- */
+	/*                                user:create                          */
+	/* -------------------------------------------------------------------------- */
+
+	{
+		displayName: 'Short Description',
+		name: 'short_description',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		required: true,
+		description: 'Short description of the user',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+				operation: [
+					'create',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Active',
+				name: 'active',
+				type: 'boolean',
+				default: '',
+				description: 'Whether to activate the user',
+			},
+			{
+				displayName: 'Building',
+				name: 'building',
+				type: 'string',
+				default: '',
+				description: 'The Building address',
+			},
+			{
+				displayName: 'City',
+				name: 'city',
+				type: 'string',
+				default: '',
+				description: 'City of the user',
+			},
+			{
+				displayName: 'Company',
+				name: 'company',
+				type: 'string',
+				default: '',
+				description: 'The name of the company for the user',
+			},
+			{
+				displayName: 'Country',
+				name: 'country',
+				type: 'string',
+				default: '',
+				description: 'Country of the user',
+			},
+			{
+				displayName: 'Department',
+				name: 'department',
+				type: 'string',
+				default: '',
+				description: 'Department of the user',
+			},
+			{
+				displayName: 'Email',
+				name: 'email',
+				type: 'string',
+				default: '',
+				description: 'The email address associated with the user',
+			},
+			{
+				displayName: 'First Name',
+				name: 'first_name',
+				type: 'string',
+				default: '',
+				description: 'The first name of the user',
+			},
+			{
+				displayName: 'Gender',
+				name: 'gender',
+				type: 'string',
+				default: '',
+				description: 'The gender of the user',
+			},
+			{
+				displayName: 'Home Phone',
+				name: 'home_phone',
+				type: 'string',
+				default: '',
+				description: 'Home phone of the user',
+			},
+			{
+				displayName: 'Last Name',
+				name: 'last_name',
+				type: 'string',
+				default: '',
+				description: 'The last name of the user',
+			},
+			{
+				displayName: 'Location',
+				name: 'location',
+				type: 'string',
+				default: '',
+				description: 'Location of the user',
+			},
+			{
+				displayName: 'Manager',
+				name: 'manager',
+				type: 'string',
+				default: '',
+				description: 'Manager of the user',
+			},
+			{
+				displayName: 'Middle Name',
+				name: 'middle_name',
+				type: 'string',
+				default: '',
+				description: 'The middle name of the user',
+			},
+			{
+				displayName: 'Mobile Phone',
+				name: 'mobile_phone',
+				type: 'string',
+				default: '',
+				description: 'Mobile phone number of the user',
+			},
+			{
+				displayName: 'Password',
+				name: 'user_password',
+				type: 'string',
+				default: '',
+				description: 'The user\'s password',
+			},
+			{
+				displayName: 'Password Needs Reset',
+				name: 'password_needs_reset',
+				type: 'boolean',
+				default: '',
+				description: 'Whether to require a password reset when the user logs in',
+			},
+			{
+				displayName: 'Phone',
+				name: 'phone',
+				type: 'string',
+				default: '',
+				description: 'The main phone number of the user',
+			},
+			{
+				displayName: 'Roles',
+				name: 'roles',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getUserRoles',
+				},
+				default: '',
+				description: 'Roles of the user',
+			},
+			{
+				displayName: 'Source',
+				name: 'source',
+				type: 'string',
+				default: '',
+				description: 'The source',
+			},
+			{
+				displayName: 'State',
+				name: 'state',
+				type: 'string',
+				default: '',
+				description: 'State for the user',
+			},
+			{
+				displayName: 'Street',
+				name: 'street',
+				type: 'string',
+				default: '',
+				description: 'Street information for the user separated by comma',
+			},
+			{
+				displayName: 'Username',
+				name: 'user_name',
+				type: 'string',
+				default: '',
+				description: 'A username associated with the user (e.g. user_name.123)',
+			},
+			{
+				displayName: 'Zip Code',
+				name: 'zip',
+				type: 'string',
+				default: '',
+				description: 'Zip code for the user',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                user:getAll                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'user',
+				],
+			},
+		},
+		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: [
+					'user',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 50,
+		description: 'The max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Exclude Reference Link',
+				name: 'sysparm_exclude_reference_link',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to exclude Table API links for reference fields',
+			},
+			{
+				displayName: 'Fields',
+				name: 'sysparm_fields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getColumns',
+					loadOptionsDependsOn: [
+						'operation',
+					],
+				},
+				default: '',
+				description: 'A list of fields to return',
+			},
+			{
+				displayName: 'Filter',
+				name: 'sysparm_query',
+				type: 'string',
+				default: '',
+				description: 'An encoded query string used to filter the results. <a href="https://developer.servicenow.com/dev.do#!/learn/learning-plans/quebec/servicenow_application_developer/app_store_learnv2_rest_quebec_more_about_query_parameters" target="_blank">More info</a>',
+			},
+			{
+				displayName: 'Return Values',
+				name: 'sysparm_display_value',
+				type: 'options',
+				options: [
+					{
+						name: 'Actual Values',
+						value: 'false',
+					},
+					{
+						name: 'Both',
+						value: 'all',
+					},
+					{
+						name: 'Display Values',
+						value: 'true',
+					},
+				],
+				default: 'false',
+				description: 'Choose which values to return',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                user:get/delete                       */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Retrieve Identifier',
+		name: 'getOption',
+		type: 'options',
+		default: 'id',
+		options: [
+			{
+				name: 'ID',
+				value: 'id',
+			},
+			{
+				name: 'Username',
+				value: 'user_name',
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+		required: true,
+		description: 'Unique identifier of the user',
+	},
+	{
+		displayName: 'Username',
+		name: 'user_name',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+				operation: [
+					'get',
+				],
+				getOption: [
+					'user_name',
+				],
+			},
+		},
+		required: true,
+		description: 'Unique identifier of the user',
+	},
+	{
+		displayName: 'User ID',
+		name: 'id',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+				operation: [
+					'get',
+				],
+				getOption: [
+					'id',
+				],
+			},
+		},
+		required: true,
+		description: 'Unique identifier of the user',
+	},
+	{
+		displayName: 'User ID',
+		name: 'id',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+				operation: [
+					'delete',
+				],
+			},
+		},
+		required: true,
+		description: 'Unique identifier of the user',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+				operation: [
+					'get',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Exclude Reference Link',
+				name: 'sysparm_exclude_reference_link',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to exclude Table API links for reference fields',
+			},
+			{
+				displayName: 'Fields',
+				name: 'sysparm_fields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getColumns',
+					loadOptionsDependsOn: [
+						'operation',
+					],
+				},
+				default: '',
+				description: 'A list of fields to return',
+			},
+			{
+				displayName: 'Return Values',
+				name: 'sysparm_display_value',
+				type: 'options',
+				options: [
+					{
+						name: 'Actual Values',
+						value: 'false',
+					},
+					{
+						name: 'Both',
+						value: 'all',
+					},
+					{
+						name: 'Display Values',
+						value: 'true',
+					},
+				],
+				default: 'false',
+				description: 'Choose which values to return',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                user:update                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'User ID',
+		name: 'id',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		required: true,
+		description: 'Unique identifier of the user',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: [
+					'user',
+				],
+				operation: [
+					'update',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Active',
+				name: 'active',
+				type: 'boolean',
+				default: '',
+				description: 'Whether to activate the user',
+			},
+			{
+				displayName: 'Building',
+				name: 'building',
+				type: 'string',
+				default: '',
+				description: 'The Building address',
+			},
+			{
+				displayName: 'City',
+				name: 'city',
+				type: 'string',
+				default: '',
+				description: 'City of the user',
+			},
+			{
+				displayName: 'Company',
+				name: 'company',
+				type: 'string',
+				default: '',
+				description: 'The name of the company for the user',
+			},
+			{
+				displayName: 'Country',
+				name: 'country',
+				type: 'string',
+				default: '',
+				description: 'Country of the user',
+			},
+			{
+				displayName: 'Department',
+				name: 'department',
+				type: 'string',
+				default: '',
+				description: 'Department of the user',
+			},
+			{
+				displayName: 'Email',
+				name: 'email',
+				type: 'string',
+				default: '',
+				description: 'The email address associated with the user',
+			},
+			{
+				displayName: 'First Name',
+				name: 'first_name',
+				type: 'string',
+				default: '',
+				description: 'The first name of the user',
+			},
+			{
+				displayName: 'Gender',
+				name: 'gender',
+				type: 'string',
+				default: '',
+				description: 'The gender of the user',
+			},
+			{
+				displayName: 'Home Phone',
+				name: 'home_phone',
+				type: 'string',
+				default: '',
+				description: 'Home phone of the user',
+			},
+			{
+				displayName: 'Last Name',
+				name: 'last_name',
+				type: 'string',
+				default: '',
+				description: 'The last name of the user',
+			},
+			{
+				displayName: 'Location',
+				name: 'location',
+				type: 'string',
+				default: '',
+				description: 'Location of the user',
+			},
+			{
+				displayName: 'Manager',
+				name: 'manager',
+				type: 'string',
+				default: '',
+				description: 'Manager of the user',
+			},
+			{
+				displayName: 'Middle Name',
+				name: 'middle_name',
+				type: 'string',
+				default: '',
+				description: 'The middle name of the user',
+			},
+			{
+				displayName: 'Mobile Phone',
+				name: 'mobile_phone',
+				type: 'string',
+				default: '',
+				description: 'Mobile phone number of the user',
+			},
+			{
+				displayName: 'Password',
+				name: 'user_password',
+				type: 'string',
+				default: '',
+				description: 'The user\'s password',
+			},
+			{
+				displayName: 'Password Needs Reset',
+				name: 'password_needs_reset',
+				type: 'boolean',
+				default: '',
+				description: 'Whether to require a password reset when the user logs in',
+			},
+			{
+				displayName: 'Phone',
+				name: 'phone',
+				type: 'string',
+				default: '',
+				description: 'The main phone number of the user',
+			},
+			{
+				displayName: 'Roles',
+				name: 'roles',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getUserRoles',
+				},
+				default: '',
+				description: 'Roles of the user',
+			},
+			{
+				displayName: 'Source',
+				name: 'source',
+				type: 'string',
+				default: '',
+				description: 'The source',
+			},
+			{
+				displayName: 'State',
+				name: 'state',
+				type: 'string',
+				default: '',
+				description: 'State for the user',
+			},
+			{
+				displayName: 'Street',
+				name: 'street',
+				type: 'string',
+				default: '',
+				description: 'Street information for the user separated by comma',
+			},
+			{
+				displayName: 'Username',
+				name: 'user_name',
+				type: 'string',
+				default: '',
+				description: 'A username associated with the user (e.g. user_name.123)',
+			},
+			{
+				displayName: 'Zip Code',
+				name: 'zip',
+				type: 'string',
+				default: '',
+				description: 'Zip code for the user',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ServiceNow/servicenow.svg b/packages/nodes-base/nodes/ServiceNow/servicenow.svg
new file mode 100644
index 0000000000..e5567e562c
--- /dev/null
+++ b/packages/nodes-base/nodes/ServiceNow/servicenow.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 66 59" fill="#fff" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-linejoin="round"><use xlink:href="#A" x=".5" y=".5"/><symbol id="A" overflow="visible"><path d="M32.196 0A32.27 32.27 0 0 0 2.312 20.275 32.27 32.27 0 0 0 9.95 55.571c2.27 2.167 5.782 2.349 8.264.43 8.15-6.045 19.295-6.045 27.445 0 2.507 1.985 6.098 1.8 8.389-.43A32.27 32.27 0 0 0 32.196 0m-.18 48.275a15.63 15.63 0 0 1-16.133-16.026c-.196-5.857 2.816-11.355 7.858-14.341s11.311-2.987 16.353 0 8.055 8.485 7.858 14.341c.115 4.284-1.537 8.428-4.568 11.458s-7.174 4.682-11.458 4.568" stroke="none" fill="#81b5a1"/></symbol></svg>
\ No newline at end of file
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 1c6125e26e..7bbd5fc8f0 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -220,6 +220,7 @@
       "dist/credentials/SentryIoApi.credentials.js",
       "dist/credentials/SentryIoServerApi.credentials.js",
       "dist/credentials/SentryIoOAuth2Api.credentials.js",
+      "dist/credentials/ServiceNowOAuth2Api.credentials.js",
       "dist/credentials/ShopifyApi.credentials.js",
       "dist/credentials/Signl4Api.credentials.js",
       "dist/credentials/SlackApi.credentials.js",
@@ -515,6 +516,7 @@
       "dist/nodes/Set.node.js",
       "dist/nodes/SentryIo/SentryIo.node.js",
       "dist/nodes/SendGrid/SendGrid.node.js",
+      "dist/nodes/ServiceNow/ServiceNow.node.js",
       "dist/nodes/Shopify/Shopify.node.js",
       "dist/nodes/Shopify/ShopifyTrigger.node.js",
       "dist/nodes/Signl4/Signl4.node.js",

From 73edf058045df41a8786fa9435dc2c6ae72c1cb6 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 15 Jul 2021 19:41:42 +0200
Subject: [PATCH 74/74] :zap: Add missing files of ServiceNow node

---
 .../nodes/ServiceNow/UserGroupDescription.ts  | 137 ++++++++++++++++++
 .../nodes/ServiceNow/UserRoleDescription.ts   | 137 ++++++++++++++++++
 2 files changed, 274 insertions(+)
 create mode 100644 packages/nodes-base/nodes/ServiceNow/UserGroupDescription.ts
 create mode 100644 packages/nodes-base/nodes/ServiceNow/UserRoleDescription.ts

diff --git a/packages/nodes-base/nodes/ServiceNow/UserGroupDescription.ts b/packages/nodes-base/nodes/ServiceNow/UserGroupDescription.ts
new file mode 100644
index 0000000000..99c5a81776
--- /dev/null
+++ b/packages/nodes-base/nodes/ServiceNow/UserGroupDescription.ts
@@ -0,0 +1,137 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const userGroupOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'userGroup',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get All',
+				value: 'getAll',
+			},
+		],
+		default: 'getAll',
+	},
+] as INodeProperties[];
+
+export const userGroupFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                userGroup:getAll                      */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'userGroup',
+				],
+			},
+		},
+		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: [
+					'userGroup',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 50,
+		description: 'The max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: [
+					'userGroup',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Exclude Reference Link',
+				name: 'sysparm_exclude_reference_link',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to exclude Table API links for reference fields',
+			},
+			{
+				displayName: 'Fields',
+				name: 'sysparm_fields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getColumns',
+				},
+				default: '',
+				description: 'A list of fields to return',
+			},
+			{
+				displayName: 'Filter',
+				name: 'sysparm_query',
+				type: 'string',
+				default: '',
+				description: 'An encoded query string used to filter the results. <a href="https://developer.servicenow.com/dev.do#!/learn/learning-plans/quebec/servicenow_application_developer/app_store_learnv2_rest_quebec_more_about_query_parameters" target="_blank">More info</a>',
+			},
+			{
+				displayName: 'Return Values',
+				name: 'sysparm_display_value',
+				type: 'options',
+				options: [
+					{
+						name: 'Actual Values',
+						value: 'false',
+					},
+					{
+						name: 'Both',
+						value: 'all',
+					},
+					{
+						name: 'Display Values',
+						value: 'true',
+					},
+				],
+				default: 'false',
+				description: 'Choose which values to return',
+			},
+		],
+	},
+] as INodeProperties[];
diff --git a/packages/nodes-base/nodes/ServiceNow/UserRoleDescription.ts b/packages/nodes-base/nodes/ServiceNow/UserRoleDescription.ts
new file mode 100644
index 0000000000..d3cbb25f33
--- /dev/null
+++ b/packages/nodes-base/nodes/ServiceNow/UserRoleDescription.ts
@@ -0,0 +1,137 @@
+import {
+	INodeProperties,
+} from 'n8n-workflow';
+
+export const userRoleOperations = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: [
+					'userRole',
+				],
+			},
+		},
+		options: [
+			{
+				name: 'Get All',
+				value: 'getAll',
+			},
+		],
+		default: 'getAll',
+	},
+] as INodeProperties[];
+
+export const userRoleFields = [
+
+	/* -------------------------------------------------------------------------- */
+	/*                                userRole:getAll                      */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: [
+					'getAll',
+				],
+				resource: [
+					'userRole',
+				],
+			},
+		},
+		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: [
+					'userRole',
+				],
+				returnAll: [
+					false,
+				],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 50,
+		description: 'The max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		displayOptions: {
+			show: {
+				resource: [
+					'userRole',
+				],
+				operation: [
+					'getAll',
+				],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Exclude Reference Link',
+				name: 'sysparm_exclude_reference_link',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to exclude Table API links for reference fields',
+			},
+			{
+				displayName: 'Fields',
+				name: 'sysparm_fields',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getColumns',
+				},
+				default: '',
+				description: 'A list of fields to return',
+			},
+			{
+				displayName: 'Filter',
+				name: 'sysparm_query',
+				type: 'string',
+				default: '',
+				description: 'An encoded query string used to filter the results. <a href="https://developer.servicenow.com/dev.do#!/learn/learning-plans/quebec/servicenow_application_developer/app_store_learnv2_rest_quebec_more_about_query_parameters" target="_blank">More info</a>',
+			},
+			{
+				displayName: 'Return Values',
+				name: 'sysparm_display_value',
+				type: 'options',
+				options: [
+					{
+						name: 'Actual Values',
+						value: 'false',
+					},
+					{
+						name: 'Both',
+						value: 'all',
+					},
+					{
+						name: 'Display Values',
+						value: 'true',
+					},
+				],
+				default: 'false',
+				description: 'Choose which values to return',
+			},
+		],
+	},
+] as INodeProperties[];