Merge branch 'master' into sql-editor-support-expressions

* master: (34 commits)
  feat(editor): Replace root events with event bus events (no-changelog) (#6454)
  feat(DebugHelper Node): Fix and include in main app (#6406)
  feat(Webhook Node): Stream binary response in `lastNode.firstEntryBinary` mode (#6463)
  fix(editor): Update git repo URL validation to prevent using https protocol (#6475)
  fix(editor): Remove tooltip about SMTP being required to invite user (no-changelog) (#6474)
  feat: Add support for large files with declarative nodes (#6461)
  fix(core): Fix the url sent in the password-reset emails (#6466)
  fix(HTML Node): Prevent XSS in execution-data preview (#6432)
  fix(Snowflake Node): Upgrade snowflake-sdk to address CVE-2023-34232 (no-changelog) (#6458)
  refactor(core): Replace lodash's "soft-deprecated" individual packages with `lodash` to resolve CVE (no-changelog) (#6450)
  fix(editor): Remove `$if`, `$min` and `$max` from code node autocomplete (#6460)
  fix(editor): Fix DNV header disappearing when scrolling the code editor content (#6459)
  feat: Remove vue-fragment (no-changelog) (#6456)
  ci: Prevent e2e failure on `commented` type review (no-changelog) (#6452)
  fix(LinkedIn Node): Remove unsupported description from image posts (#6446)
  fix(Split In Batches Node): Add "done" context to allow simple reset (#6437)
  feat(Gmail Node): Add reply to email (#6453)
  fix: Remove Vue.component usage and refactor plugins into Vue Plugins (no-changelog) (#6445)
  fix(editor): Show confirm on pull only when http response status is 409 (#6451)
  fix(editor): Update data pinning tooltip to match current behaviour (#6436)
  ...

# Conflicts:
#	packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
#	packages/nodes-base/nodes/Merge/v2/GenericFunctions.ts

.gitattributes

@@ -0,0 +1 @@
+*.sh text eol=lf

.github/workflows/e2e-tests-pr.yml

@@ -47,5 +47,5 @@ jobs:
         run: exit 0
 
       - name: Fail job if run-e2e-tests failed
-        if: ${{ github.event.review.state != 'approved' || needs.run-e2e-tests.result == 'failure' }}
+        if: ${{ (github.event.review.state != 'approved' && github.event.review.state != 'commented') || needs.run-e2e-tests.result == 'failure' }}
         run: exit 1

CHANGELOG.md

@@ -1,3 +1,47 @@
+# [0.233.0](https://github.com/n8n-io/n8n/compare/[email protected]@0.233.0) (2023-06-14)
+
+
+### Bug Fixes
+
+* **core:** Allow all executions to be stopped ([#6386](https://github.com/n8n-io/n8n/issues/6386)) ([cc44af9](https://github.com/n8n-io/n8n/commit/cc44af9243457a5dfa904c205ad5428f793104b4))
+* **core:** Prevent arbitrary code execution via expressions ([#6420](https://github.com/n8n-io/n8n/issues/6420)) ([da7ae2b](https://github.com/n8n-io/n8n/commit/da7ae2beef0375aa914aee251aeff5f7ff334b34))
+* **editor:** Hide version control main menu component if no feature flag ([#6419](https://github.com/n8n-io/n8n/issues/6419)) ([75c0ab0](https://github.com/n8n-io/n8n/commit/75c0ab03f8379bb5426cef87045b67b458c97d70))
+* **LinkedIn Node:** Fix issue with posting as user or organization ([#6414](https://github.com/n8n-io/n8n/issues/6414)) ([d041602](https://github.com/n8n-io/n8n/commit/d041602754a694e67e81c1bbff87c13bf91bdd5d))
+* **Schedule Trigger Node:** Follow the correct Unix cron format for month and days of the week ([#6401](https://github.com/n8n-io/n8n/issues/6401)) ([2aef9de](https://github.com/n8n-io/n8n/commit/2aef9de14830c56199fd19bc09382424c55a2b9b))
+
+
+
+# [0.232.0](https://github.com/n8n-io/n8n/compare/[email protected]@0.232.0) (2023-06-07)
+
+
+### Bug Fixes
+
+* **core:** RMC boolean value fix ([#6397](https://github.com/n8n-io/n8n/issues/6397)) ([28bb797](https://github.com/n8n-io/n8n/commit/28bb797bb0ea59b66a7641fc116f47c25564c21a))
+* **Date & Time Node:** Reset responseData at end of loop ([#6385](https://github.com/n8n-io/n8n/issues/6385)) ([eaa8648](https://github.com/n8n-io/n8n/commit/eaa8648f2bf61074eae6dcd7355f8f107a31388e))
+* **editor:** Add button to refresh branches ([#6387](https://github.com/n8n-io/n8n/issues/6387)) ([ce57816](https://github.com/n8n-io/n8n/commit/ce578162f4e44a6cc1774ab217967110b254ab3f))
+* **editor:** Add secondary icon to menu items ([#6351](https://github.com/n8n-io/n8n/issues/6351)) ([3dd2601](https://github.com/n8n-io/n8n/commit/3dd260168eb627fd7fbed740bc97fa7f6289628f))
+* **editor:** Add Set up version control CTA ([#6356](https://github.com/n8n-io/n8n/issues/6356)) ([e72521d](https://github.com/n8n-io/n8n/commit/e72521d5ec7a5e57dc311defb70f1fe19054b0f0))
+* **editor:** Adding branch color ([#6380](https://github.com/n8n-io/n8n/issues/6380)) ([dba3f44](https://github.com/n8n-io/n8n/commit/dba3f44bc00de68113cc98db9afc6267f56ec04c))
+* **editor:** Fix an issue with connections breaking during renaming ([#6358](https://github.com/n8n-io/n8n/issues/6358)) ([0f2bc6b](https://github.com/n8n-io/n8n/commit/0f2bc6b73711597fdf008ee54665d9bed82a1a9e))
+* **editor:** Fix hard-coded parameter names for code editors ([#6372](https://github.com/n8n-io/n8n/issues/6372)) ([f61b776](https://github.com/n8n-io/n8n/commit/f61b776beac961fa58c6c69371c69ae1e74ef83e))
+* **editor:** Fix typing `$` in inline expression field reloading node parameters form ([#6374](https://github.com/n8n-io/n8n/issues/6374)) ([4c0d4eb](https://github.com/n8n-io/n8n/commit/4c0d4ebd9917e52512e85a5cad2c93b554e0e212))
+* **editor:** Pin all data regardless of pagination ([#6346](https://github.com/n8n-io/n8n/issues/6346)) ([f88029f](https://github.com/n8n-io/n8n/commit/f88029f308356c1c8271d7345ecbbd6e91c41b3d))
+* **editor:** Remove explicit parameter name scanning for code editors ([#6390](https://github.com/n8n-io/n8n/issues/6390)) ([97295f6](https://github.com/n8n-io/n8n/commit/97295f67f0f8509ac6ba0d4ce38ce12582dff074))
+* **editor:** Remove root level tag selector from css module to avoid making it a global style ([#6392](https://github.com/n8n-io/n8n/issues/6392)) ([cc37f21](https://github.com/n8n-io/n8n/commit/cc37f21aa27f3536f2043b5ff5da944388ac5504))
+* **editor:** Update version control setup CTA tooltip ([#6393](https://github.com/n8n-io/n8n/issues/6393)) ([385b3e8](https://github.com/n8n-io/n8n/commit/385b3e871a9307c36428f8239a5db318d71948c1))
+* Improve executions list polling performance ([#6355](https://github.com/n8n-io/n8n/issues/6355)) ([b5cabfe](https://github.com/n8n-io/n8n/commit/b5cabfef54e186f59580112a90566099bb79305e))
+* **Ldap Node:** Add DN field to update operation ([#6371](https://github.com/n8n-io/n8n/issues/6371)) ([9396e7e](https://github.com/n8n-io/n8n/commit/9396e7eb585ab9d6fda742b0d234c4262570af93))
+* Show actual execution data for production executions even if pin data exists ([#6302](https://github.com/n8n-io/n8n/issues/6302)) ([4eb8437](https://github.com/n8n-io/n8n/commit/4eb8437196a298a64f039aff51ba030dc21abb08))
+
+
+### Features
+
+* **Crypto Node:** Add support for hash and hmac on binary data ([#6359](https://github.com/n8n-io/n8n/issues/6359)) ([406a405](https://github.com/n8n-io/n8n/commit/406a405dd153833057286a27d04278ef71ceef3d))
+* **editor:** Make WF name a link on /executions ([#6354](https://github.com/n8n-io/n8n/issues/6354)) ([6ddf161](https://github.com/n8n-io/n8n/commit/6ddf16128b4ab47db716eeab89f7526558073f56))
+* New trigger PostgreSQL  ([#5495](https://github.com/n8n-io/n8n/issues/5495)) ([4488f93](https://github.com/n8n-io/n8n/commit/4488f93c39b0ec0b4a0eff98391b46db6a2eed78))
+* Version control mvp ([#6271](https://github.com/n8n-io/n8n/issues/6271)) ([1b32141](https://github.com/n8n-io/n8n/commit/1b321416c0ba5371e0016398ae660ce298b8cdd6))
+
+
 # [0.231.0](https://github.com/n8n-io/n8n/compare/[email protected]@0.231.0) (2023-05-31)
 
 

cypress/constants.ts

@@ -1,3 +1,5 @@
+export const BACKEND_BASE_URL = 'http://localhost:5678';
+
 export const N8N_AUTH_COOKIE = 'n8n-auth';
 
 export const DEFAULT_USER_EMAIL = '[email protected]';

cypress/e2e/12-canvas.cy.ts

@@ -29,7 +29,6 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		WorkflowPage.actions.visit();
 	});
 
-
 	it('should add switch node and test connections', () => {
 		WorkflowPage.actions.addNodeToCanvas(SWITCH_NODE_NAME, true);
 
@@ -114,7 +113,7 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		WorkflowPage.actions.zoomToFit();
 
 		cy.get('.plus-draggable-endpoint').filter(':visible').should('not.have.class', 'ep-success');
-		cy.get('.jtk-connector.success').should('have.length', 3);
+		cy.get('.jtk-connector.success').should('have.length', 4);
 		cy.get('.jtk-connector').should('have.length', 4);
 	});
 

cypress/e2e/14-mapping.cy.ts

@@ -16,12 +16,10 @@ describe('Data mapping', () => {
 	beforeEach(() => {
 		workflowPage.actions.visit();
 
-		cy.window().then(
-			(win) => {
-				// @ts-ignore
-				win.preventNodeViewBeforeUnload = true;
-			},
-		);
+		cy.window().then((win) => {
+			// @ts-ignore
+			win.preventNodeViewBeforeUnload = true;
+		});
 	});
 
 	it('maps expressions from table header', () => {
@@ -303,19 +301,28 @@ describe('Data mapping', () => {
 
 		ndv.getters.parameterInput('keepOnlySet').find('input[type="checkbox"]').should('exist');
 		ndv.getters.parameterInput('keepOnlySet').find('input[type="text"]').should('not.exist');
-		ndv.getters.inputDataContainer().should('exist').find('span').contains('count').realMouseDown().realMouseMove(100, 100);
+		ndv.getters
+			.inputDataContainer()
+			.should('exist')
+			.find('span')
+			.contains('count')
+			.realMouseDown()
+			.realMouseMove(100, 100);
 		cy.wait(50);
 
 		ndv.getters.parameterInput('keepOnlySet').find('input[type="checkbox"]').should('not.exist');
-		ndv.getters.parameterInput('keepOnlySet').find('input[type="text"]')
+		ndv.getters
+			.parameterInput('keepOnlySet')
+			.find('input[type="text"]')
 			.should('exist')
 			.invoke('css', 'border')
 			.then((border) => expect(border).to.include('dashed rgb(90, 76, 194)'));
 
-		ndv.getters.parameterInput('value').find('input[type="text"]')
-		.should('exist')
-		.invoke('css', 'border')
-		.then((border) => expect(border).to.include('dashed rgb(90, 76, 194)'));
+		ndv.getters
+			.parameterInput('value')
+			.find('input[type="text"]')
+			.should('exist')
+			.invoke('css', 'border')
+			.then((border) => expect(border).to.include('dashed rgb(90, 76, 194)'));
 	});
-
 });

cypress/e2e/15-scheduler-node.cy.ts

@@ -1,4 +1,5 @@
 import { WorkflowPage, WorkflowsPage, NDV } from '../pages';
+import { BACKEND_BASE_URL } from '../constants';
 
 const workflowsPage = new WorkflowsPage();
 const workflowPage = new WorkflowPage();
@@ -39,44 +40,34 @@ describe('Schedule Trigger node', async () => {
 		workflowPage.actions.activateWorkflow();
 		workflowPage.getters.activatorSwitch().should('have.class', 'is-checked');
 
-		cy.request('GET', '/rest/workflows')
-			.then((response) => {
+		cy.url().then((url) => {
+			const workflowId = url.split('/').pop();
+
+			cy.wait(1200);
+			cy.request('GET', `${BACKEND_BASE_URL}/rest/executions`).then((response) => {
 				expect(response.status).to.eq(200);
-				expect(response.body.data).to.have.length(1);
-				const workflowId = response.body.data[0].id.toString();
-				expect(workflowId).to.not.be.empty;
-				return workflowId;
-			})
-			.then((workflowId) => {
+				expect(workflowId).to.not.be.undefined;
+				expect(response.body.data.results.length).to.be.greaterThan(0);
+				const matchingExecutions = response.body.data.results.filter(
+					(execution: any) => execution.workflowId === workflowId,
+				);
+				expect(matchingExecutions).to.have.length(1);
+
 				cy.wait(1200);
-				cy.request('GET', '/rest/executions')
-					.then((response) => {
-						expect(response.status).to.eq(200);
-						expect(response.body.data.results.length).to.be.greaterThan(0);
-						const matchingExecutions = response.body.data.results.filter(
-							(execution: any) => execution.workflowId === workflowId,
-						);
-						expect(matchingExecutions).to.have.length(1);
-						return workflowId;
-					})
-					.then((workflowId) => {
-						cy.wait(1200);
-						cy.request('GET', '/rest/executions')
-							.then((response) => {
-								expect(response.status).to.eq(200);
-								expect(response.body.data.results.length).to.be.greaterThan(0);
-								const matchingExecutions = response.body.data.results.filter(
-									(execution: any) => execution.workflowId === workflowId,
-								);
-								expect(matchingExecutions).to.have.length(2);
-							})
-							.then(() => {
-								workflowPage.actions.activateWorkflow();
-								workflowPage.getters.activatorSwitch().should('not.have.class', 'is-checked');
-								cy.visit(workflowsPage.url);
-								workflowsPage.actions.deleteWorkFlow('Schedule Trigger Workflow');
-							});
-					});
+				cy.request('GET', `${BACKEND_BASE_URL}/rest/executions`).then((response) => {
+					expect(response.status).to.eq(200);
+					expect(response.body.data.results.length).to.be.greaterThan(0);
+					const matchingExecutions = response.body.data.results.filter(
+						(execution: any) => execution.workflowId === workflowId,
+					);
+					expect(matchingExecutions).to.have.length(2);
+
+					workflowPage.actions.activateWorkflow();
+					workflowPage.getters.activatorSwitch().should('not.have.class', 'is-checked');
+					cy.visit(workflowsPage.url);
+					workflowsPage.actions.deleteWorkFlow('Schedule Trigger Workflow');
+				});
 			});
+		});
 	});
 });

cypress/e2e/16-webhook-node.cy.ts

@@ -1,6 +1,7 @@
 import { WorkflowPage, NDV, CredentialsModal } from '../pages';
 import { v4 as uuid } from 'uuid';
 import { cowBase64 } from '../support/binaryTestFiles';
+import { BACKEND_BASE_URL } from '../constants';
 
 const workflowPage = new WorkflowPage();
 const ndv = new NDV();
@@ -83,7 +84,7 @@ const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
 		ndv.actions.execute();
 		cy.wait(waitForWebhook);
 
-		cy.request(method, '/webhook-test/' + webhookPath).then((response) => {
+		cy.request(method, `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`).then((response) => {
 			expect(response.status).to.eq(200);
 			ndv.getters.outputPanel().contains('headers');
 		});
@@ -98,12 +99,10 @@ describe('Webhook Trigger node', async () => {
 	beforeEach(() => {
 		workflowPage.actions.visit();
 
-		cy.window().then(
-			(win) => {
-				// @ts-ignore
-				win.preventNodeViewBeforeUnload = true;
-			},
-		);
+		cy.window().then((win) => {
+			// @ts-ignore
+			win.preventNodeViewBeforeUnload = true;
+		});
 	});
 
 	it('should listen for a GET request', () => {
@@ -154,7 +153,7 @@ describe('Webhook Trigger node', async () => {
 		workflowPage.actions.executeWorkflow();
 		cy.wait(waitForWebhook);
 
-		cy.request('GET', '/webhook-test/' + webhookPath).then((response) => {
+		cy.request('GET', `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`).then((response) => {
 			expect(response.status).to.eq(200);
 			expect(response.body.MyValue).to.eq(1234);
 		});
@@ -172,7 +171,7 @@ describe('Webhook Trigger node', async () => {
 		ndv.actions.execute();
 		cy.wait(waitForWebhook);
 
-		cy.request('GET', '/webhook-test/' + webhookPath).then((response) => {
+		cy.request('GET', `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`).then((response) => {
 			expect(response.status).to.eq(201);
 		});
 	});
@@ -201,7 +200,7 @@ describe('Webhook Trigger node', async () => {
 		workflowPage.actions.executeWorkflow();
 		cy.wait(waitForWebhook);
 
-		cy.request('GET', '/webhook-test/' + webhookPath).then((response) => {
+		cy.request('GET', `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`).then((response) => {
 			expect(response.status).to.eq(200);
 			expect(response.body.MyValue).to.eq(1234);
 		});
@@ -246,7 +245,7 @@ describe('Webhook Trigger node', async () => {
 		workflowPage.actions.executeWorkflow();
 		cy.wait(waitForWebhook);
 
-		cy.request('GET', '/webhook-test/' + webhookPath).then((response) => {
+		cy.request('GET', `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`).then((response) => {
 			expect(response.status).to.eq(200);
 			expect(Object.keys(response.body).includes('data')).to.be.true;
 		});
@@ -263,7 +262,7 @@ describe('Webhook Trigger node', async () => {
 		});
 		ndv.actions.execute();
 		cy.wait(waitForWebhook);
-		cy.request('GET', '/webhook-test/' + webhookPath).then((response) => {
+		cy.request('GET', `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`).then((response) => {
 			expect(response.status).to.eq(200);
 			expect(response.body.MyValue).to.be.undefined;
 		});
@@ -287,7 +286,7 @@ describe('Webhook Trigger node', async () => {
 		cy.wait(waitForWebhook);
 		cy.request({
 			method: 'GET',
-			url: '/webhook-test/' + webhookPath,
+			url: `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`,
 			auth: {
 				user: 'username',
 				pass: 'password',
@@ -300,7 +299,7 @@ describe('Webhook Trigger node', async () => {
 			.then(() => {
 				cy.request({
 					method: 'GET',
-					url: '/webhook-test/' + webhookPath,
+					url: `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`,
 					auth: {
 						user: 'test',
 						pass: 'test',
@@ -330,7 +329,7 @@ describe('Webhook Trigger node', async () => {
 		cy.wait(waitForWebhook);
 		cy.request({
 			method: 'GET',
-			url: '/webhook-test/' + webhookPath,
+			url: `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`,
 			headers: {
 				test: 'wrong',
 			},
@@ -342,7 +341,7 @@ describe('Webhook Trigger node', async () => {
 			.then(() => {
 				cy.request({
 					method: 'GET',
-					url: '/webhook-test/' + webhookPath,
+					url: `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`,
 					headers: {
 						test: 'test',
 					},