Merge branch 'master' into node-1434-bug-loadoptions-continues-to-sho…

…w-loading-placeholder-after
n8n-io · Jun 24, 2024 · 256611b · 256611b
2 parents 42a99f6 + e51de9d
commit 256611b
Show file tree

Hide file tree

Showing 39 changed files with 2,856 additions and 1,040 deletions.
diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts
@@ -174,16 +174,22 @@ describe('Data mapping', () => {
 		workflowPage.actions.zoomToFit();
 		workflowPage.actions.openNode('Set1');
 
-		ndv.actions.selectInputNode(SCHEDULE_TRIGGER_NODE_NAME);
-
-		ndv.getters.inputDataContainer().find('span').contains('count').realMouseDown();
+		ndv.actions.executePrevious();
+		ndv.actions.expandSchemaViewNode(SCHEDULE_TRIGGER_NODE_NAME);
 
+		const dataPill = ndv.getters
+			.inputDataContainer()
+			.findChildByTestId('run-data-schema-item')
+			.contains('count')
+			.should('be.visible');
+		dataPill.realMouseDown();
 		ndv.actions.mapToParameter('value');
 		ndv.getters
 			.inlineExpressionEditorInput()
 			.should('have.text', `{{ $('${SCHEDULE_TRIGGER_NODE_NAME}').item.json.input[0].count }}`);
 
 		ndv.actions.switchInputMode('Table');
+		ndv.actions.selectInputNode(SCHEDULE_TRIGGER_NODE_NAME);
 		ndv.actions.mapDataFromHeader(1, 'value');
 		ndv.getters
 			.inlineExpressionEditorInput()
@@ -194,7 +200,6 @@ describe('Data mapping', () => {
 
 		ndv.actions.selectInputNode('Set');
 
-		ndv.actions.executePrevious();
 		ndv.getters.executingLoader().should('not.exist');
 		ndv.getters.inputDataContainer().should('exist');
 		ndv.actions.validateExpressionPreview('value', '0 [object Object]');
@@ -291,14 +296,8 @@ describe('Data mapping', () => {
 		ndv.actions.executePrevious();
 		ndv.getters.executingLoader().should('not.exist');
 		ndv.getters.inputDataContainer().should('exist');
-		ndv.getters
-			.inputDataContainer()
-			.should('exist')
-			.find('span')
-			.contains('test_name')
-			.realMouseDown();
-		ndv.actions.mapToParameter('value');
-
+		ndv.actions.switchInputMode('Table');
+		ndv.actions.mapDataFromHeader(1, 'value');
 		ndv.actions.validateExpressionPreview('value', 'test_value');
 		ndv.actions.selectInputNode(SCHEDULE_TRIGGER_NODE_NAME);
 		ndv.actions.validateExpressionPreview('value', 'test_value');

diff --git a/cypress/e2e/24-ndv-paired-item.cy.ts b/cypress/e2e/24-ndv-paired-item.cy.ts
@@ -112,6 +112,9 @@ describe('NDV', () => {
 		workflowPage.actions.executeWorkflow();
 		workflowPage.actions.openNode('Set3');
 
+		ndv.actions.switchInputMode('Table');
+		ndv.actions.switchOutputMode('Table');
+
 		ndv.getters
 			.inputRunSelector()
 			.should('exist')
@@ -123,9 +126,6 @@ describe('NDV', () => {
 			.find('input')
 			.should('include.value', '2 of 2 (6 items)');
 
-		ndv.actions.switchInputMode('Table');
-		ndv.actions.switchOutputMode('Table');
-
 		ndv.actions.changeOutputRunSelector('1 of 2 (6 items)');
 		ndv.getters.inputRunSelector().find('input').should('include.value', '1 of 2 (6 items)');
 		ndv.getters.outputRunSelector().find('input').should('include.value', '1 of 2 (6 items)');

diff --git a/cypress/e2e/32-node-io-filter.cy.ts b/cypress/e2e/32-node-io-filter.cy.ts
@@ -15,13 +15,13 @@ describe('Node IO Filter', () => {
 		workflowPage.getters.canvasNodes().first().dblclick();
 		ndv.actions.close();
 		workflowPage.getters.canvasNodes().first().dblclick();
-		cy.wait(500);
 		ndv.getters.outputDataContainer().should('be.visible');
+		ndv.getters.outputPanel().findChildByTestId('ndv-search').should('exist');
 		cy.document().trigger('keyup', { key: '/' });
 
 		const searchInput = ndv.getters.searchInput();
 
-		searchInput.filter(':focus').should('exist');
+		searchInput.should('have.focus');
 		ndv.getters.pagination().find('li').should('have.length', 3);
 		ndv.getters.outputDataContainer().find('mark').should('not.exist');
 
@@ -36,19 +36,18 @@ describe('Node IO Filter', () => {
 
 	it('should filter input/output data separately', () => {
 		workflowPage.getters.canvasNodes().eq(1).dblclick();
-		cy.wait(500);
 		ndv.getters.outputDataContainer().should('be.visible');
 		ndv.getters.inputDataContainer().should('be.visible');
 		ndv.actions.switchInputMode('Table');
+		ndv.getters.outputPanel().findChildByTestId('ndv-search').should('exist');
 		cy.document().trigger('keyup', { key: '/' });
 
-		ndv.getters.outputPanel().findChildByTestId('ndv-search').filter(':focus').should('not.exist');
+		ndv.getters.outputPanel().findChildByTestId('ndv-search').should('not.have.focus');
 
 		let focusedInput = ndv.getters
 			.inputPanel()
 			.findChildByTestId('ndv-search')
-			.filter(':focus')
-			.should('exist');
+			.should('have.focus');
 
 		const getInputPagination = () =>
 			ndv.getters.inputPanel().findChildByTestId('ndv-data-pagination');
@@ -82,13 +81,9 @@ describe('Node IO Filter', () => {
 
 		ndv.getters.outputDataContainer().trigger('mouseover');
 		cy.document().trigger('keyup', { key: '/' });
-		ndv.getters.inputPanel().findChildByTestId('ndv-search').filter(':focus').should('not.exist');
+		ndv.getters.inputPanel().findChildByTestId('ndv-search').should('not.have.focus');
 
-		focusedInput = ndv.getters
-			.outputPanel()
-			.findChildByTestId('ndv-search')
-			.filter(':focus')
-			.should('exist');
+		focusedInput = ndv.getters.outputPanel().findChildByTestId('ndv-search').should('have.focus');
 
 		getInputPagination().find('li').should('have.length', 3);
 		getInputCounter().contains('21 items').should('exist');

diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
@@ -57,9 +57,10 @@ describe('NDV', () => {
 		cy.createFixtureWorkflow('NDV-test-select-input.json', 'NDV test select input');
 		workflowPage.actions.zoomToFit();
 		workflowPage.getters.canvasNodes().last().dblclick();
+		ndv.actions.switchInputMode('Table');
 		ndv.getters.inputSelect().click();
 		ndv.getters.inputOption().last().click();
-		ndv.getters.inputDataContainer().find('[class*=schema_]').should('exist');
+		ndv.getters.inputDataContainer().should('be.visible');
 		ndv.getters.inputDataContainer().should('contain', 'start');
 		ndv.getters.backToCanvas().click();
 		ndv.getters.container().should('not.be.visible');
@@ -252,6 +253,9 @@ describe('NDV', () => {
 		workflowPage.actions.executeWorkflow();
 		workflowPage.actions.openNode('Set3');
 
+		ndv.actions.switchInputMode('Table');
+		ndv.actions.switchOutputMode('Table');
+
 		ndv.getters
 			.inputRunSelector()
 			.should('exist')
@@ -263,9 +267,6 @@ describe('NDV', () => {
 			.find('input')
 			.should('include.value', '2 of 2 (6 items)');
 
-		ndv.actions.switchInputMode('Table');
-		ndv.actions.switchOutputMode('Table');
-
 		ndv.actions.changeOutputRunSelector('1 of 2 (6 items)');
 		ndv.getters.inputRunSelector().find('input').should('include.value', '1 of 2 (6 items)');
 		ndv.getters.inputTbodyCell(1, 0).should('have.text', '1111');

diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
@@ -133,6 +133,8 @@ export class NDV extends BasePage {
 		nodeRunErrorDescription: () => cy.getByTestId('node-error-description'),
 		fixedCollectionParameter: (paramName: string) =>
 			cy.getByTestId(`fixed-collection-${paramName}`),
+		schemaViewNode: () => cy.getByTestId('run-data-schema-node'),
+		schemaViewNodeName: () => cy.getByTestId('run-data-schema-node-name'),
 	};
 
 	actions = {
@@ -214,6 +216,9 @@ export class NDV extends BasePage {
 			this.getters.inputSelect().find('.el-select').click();
 			this.getters.inputOption().contains(nodeName).click();
 		},
+		expandSchemaViewNode: (nodeName: string) => {
+			this.getters.schemaViewNodeName().contains(nodeName).click();
+		},
 		addDefaultPinnedData: () => {
 			this.actions.editPinnedData();
 			this.actions.savePinnedData();

diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
@@ -42,13 +42,9 @@ Cypress.Commands.add(
 	},
 );
 
-Cypress.Commands.add(
-	'findChildByTestId',
-	{ prevSubject: true },
-	(subject: Cypress.Chainable<JQuery<HTMLElement>>, childTestId) => {
-		return subject.find(`[data-test-id="${childTestId}"]`);
-	},
-);
+Cypress.Commands.addQuery('findChildByTestId', function (testId: string) {
+	return (subject: Cypress.Chainable) => subject.find(`[data-test-id="${testId}"]`);
+});
 
 Cypress.Commands.add('waitForLoad', (waitForIntercepts = true) => {
 	// These aliases are set-up before each test in cypress/support/e2e.ts

diff --git a/package.json b/package.json
@@ -77,7 +77,7 @@
       "semver": "^7.5.4",
       "tslib": "^2.6.2",
       "tsconfig-paths": "^4.2.0",
-      "typescript": "^5.4.2",
+      "typescript": "^5.5.2",
       "ws": ">=8.17.1"
     },
     "patchedDependencies": {

diff --git a/packages/cli/src/ExternalSecrets/ExternalSecretsManager.ee.ts b/packages/cli/src/ExternalSecrets/ExternalSecretsManager.ee.ts
@@ -116,7 +116,7 @@ export class ExternalSecretsManager {
 			)
 		).map((i) => (i.status === 'rejected' ? null : i.value));
 		this.providers = Object.fromEntries(
-			(providers.filter((p) => p !== null) as SecretsProvider[]).map((s) => [s.name, s]),
+			providers.filter((p): p is SecretsProvider => p !== null).map((s) => [s.name, s]),
 		);
 		this.cachedSettings = settings;
 		await this.updateSecrets();

diff --git a/packages/cli/src/ExternalSecrets/providers/vault.ts b/packages/cli/src/ExternalSecrets/providers/vault.ts
@@ -458,7 +458,7 @@ export class VaultProvider extends SecretsProvider {
 				)
 			)
 				.map((i) => (i.status === 'rejected' ? null : i.value))
-				.filter((v) => v !== null) as Array<[string, IDataObject]>,
+				.filter((v): v is [string, IDataObject] => v !== null),
 		);
 		const name = path.substring(0, path.length - 1);
 		return [name, data];
@@ -480,7 +480,7 @@ export class VaultProvider extends SecretsProvider {
 						return [basePath.substring(0, basePath.length - 1), value[1]];
 					}),
 				)
-			).filter((v) => v !== null) as Array<[string, IDataObject]>,
+			).filter((v): v is [string, IDataObject] => v !== null),
 		);
 		this.cachedSecrets = secrets;
 	}

diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -1047,10 +1047,8 @@ function getWorkflowHooksIntegrated(
 	const hookFunctions = hookFunctionsSave();
 	const preExecuteFunctions = hookFunctionsPreExecute();
 	for (const key of Object.keys(preExecuteFunctions)) {
-		if (hookFunctions[key] === undefined) {
-			hookFunctions[key] = [];
-		}
-		hookFunctions[key]!.push.apply(hookFunctions[key], preExecuteFunctions[key]);
+		const hooks = hookFunctions[key] ?? [];
+		hooks.push.apply(hookFunctions[key], preExecuteFunctions[key]);
 	}
 	return new WorkflowHooks(hookFunctions, mode, executionId, workflowData);
 }
@@ -1069,10 +1067,8 @@ export function getWorkflowHooksWorkerExecuter(
 	const hookFunctions = hookFunctionsSaveWorker();
 	const preExecuteFunctions = hookFunctionsPreExecute();
 	for (const key of Object.keys(preExecuteFunctions)) {
-		if (hookFunctions[key] === undefined) {
-			hookFunctions[key] = [];
-		}
-		hookFunctions[key]!.push.apply(hookFunctions[key], preExecuteFunctions[key]);
+		const hooks = hookFunctions[key] ?? [];
+		hooks.push.apply(hookFunctions[key], preExecuteFunctions[key]);
 	}
 
 	return new WorkflowHooks(hookFunctions, mode, executionId, workflowData, optionalParameters);
@@ -1139,18 +1135,14 @@ export function getWorkflowHooksMain(
 	const hookFunctions = hookFunctionsSave();
 	const pushFunctions = hookFunctionsPush();
 	for (const key of Object.keys(pushFunctions)) {
-		if (hookFunctions[key] === undefined) {
-			hookFunctions[key] = [];
-		}
-		hookFunctions[key]!.push.apply(hookFunctions[key], pushFunctions[key]);
+		const hooks = hookFunctions[key] ?? [];
+		hooks.push.apply(hookFunctions[key], pushFunctions[key]);
 	}
 
 	const preExecuteFunctions = hookFunctionsPreExecute();
 	for (const key of Object.keys(preExecuteFunctions)) {
-		if (hookFunctions[key] === undefined) {
-			hookFunctions[key] = [];
-		}
-		hookFunctions[key]!.push.apply(hookFunctions[key], preExecuteFunctions[key]);
+		const hooks = hookFunctions[key] ?? [];
+		hooks.push.apply(hookFunctions[key], preExecuteFunctions[key]);
 	}
 
 	if (!hookFunctions.nodeExecuteBefore) hookFunctions.nodeExecuteBefore = [];

diff --git a/packages/cli/src/commands/executeBatch.ts b/packages/cli/src/commands/executeBatch.ts
@@ -737,8 +737,10 @@ export class ExecuteBatch extends BaseCommand {
 												return;
 											}
 
-											if (nodeEdgeCases[nodeName].capResults !== undefined) {
-												executionDataArray.splice(nodeEdgeCases[nodeName].capResults!);
+											const capResults = nodeEdgeCases[nodeName].capResults;
+
+											if (capResults !== undefined) {
+												executionDataArray.splice(capResults);
 											}
 
 											if (nodeEdgeCases[nodeName].ignoredProperties !== undefined) {

diff --git a/packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlExport.service.ee.ts
@@ -235,13 +235,14 @@ export class SourceControlExportService {
 		data: ICredentialDataDecryptedObject,
 	): ICredentialDataDecryptedObject => {
 		for (const [key] of Object.entries(data)) {
+			const value = data[key];
 			try {
-				if (data[key] === null) {
+				if (value === null) {
 					delete data[key]; // remove invalid null values
-				} else if (typeof data[key] === 'object') {
-					data[key] = this.replaceCredentialData(data[key] as ICredentialDataDecryptedObject);
-				} else if (typeof data[key] === 'string') {
-					data[key] = stringContainsExpression(data[key] as string) ? data[key] : '';
+				} else if (typeof value === 'object') {
+					data[key] = this.replaceCredentialData(value as ICredentialDataDecryptedObject);
+				} else if (typeof value === 'string') {
+					data[key] = stringContainsExpression(value) ? data[key] : '';
 				} else if (typeof data[key] === 'number') {
 					// TODO: leaving numbers in for now, but maybe we should remove them
 					continue;

diff --git a/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts b/packages/cli/src/environments/sourceControl/sourceControlImport.service.ee.ts
@@ -84,8 +84,8 @@ export class SourceControlImportService {
 			}),
 		);
 		return remoteWorkflowFilesParsed.filter(
-			(e) => e !== undefined,
-		) as SourceControlWorkflowVersionId[];
+			(e): e is SourceControlWorkflowVersionId => e !== undefined,
+		);
 	}
 
 	public async getLocalVersionIdsFromDb(): Promise<SourceControlWorkflowVersionId[]> {

diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
@@ -148,13 +148,15 @@ export class Telemetry {
 				properties.success ? 'success' : 'error'
 			}`;
 
-			if (!this.executionCountsBuffer[workflowId][key]) {
+			const executionTrackDataKey = this.executionCountsBuffer[workflowId][key];
+
+			if (!executionTrackDataKey) {
 				this.executionCountsBuffer[workflowId][key] = {
 					count: 1,
 					first: execTime,
 				};
 			} else {
-				this.executionCountsBuffer[workflowId][key]!.count++;
+				executionTrackDataKey.count++;
 			}
 
 			if (

diff --git a/packages/core/src/ActiveWorkflows.ts b/packages/core/src/ActiveWorkflows.ts
@@ -85,6 +85,7 @@ export class ActiveWorkflows {
 				if (triggerResponse !== undefined) {
 					// If a response was given save it
 
+					// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
 					this.activeWorkflows[workflowId].triggerResponses!.push(triggerResponse);
 				}
 			} catch (e) {
@@ -105,6 +106,7 @@ export class ActiveWorkflows {
 
 		for (const pollNode of pollingNodes) {
 			try {
+				// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
 				this.activeWorkflows[workflowId].pollResponses!.push(
 					await this.activatePolling(
 						pollNode,

diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
@@ -3679,7 +3679,7 @@ export function getExecuteFunctions(
 					});
 				}
 
-				return inputData[inputName][inputIndex] as INodeExecutionData[];
+				return inputData[inputName][inputIndex];
 			},
 			getInputSourceData: (inputIndex = 0, inputName = 'main') => {
 				if (executeData?.source === null) {

diff --git a/packages/design-system/src/css/_tokens.dark.scss b/packages/design-system/src/css/_tokens.dark.scss
@@ -240,6 +240,9 @@
 	--color-mfa-recovery-code-color: var(--color-text-dark);
 	--color-mfa-lose-access-text-color: var(--color-danger);
 
+	// Text highlight
+	--color-text-highlight-background: var(--prim-color-alt-d-shade-600);
+
 	// AI
 	--node-type-background-l: 20%;
 	--node-type-supplemental-label-color-h: 235;

diff --git a/packages/design-system/src/css/_tokens.scss b/packages/design-system/src/css/_tokens.scss
@@ -305,6 +305,9 @@
 	--color-mfa-recovery-code-color: var(--prim-gray-490);
 	--color-mfa-lose-access-text-color: var(--color-danger);
 
+	// Text highlight
+	--color-text-highlight-background: var(--prim-color-alt-d-shade-150);
+
 	// AI
 	--node-type-background-l: 95%;
 	--node-type-supplemental-label-color-h: 235;

diff --git a/packages/design-system/src/css/reset.scss b/packages/design-system/src/css/reset.scss
@@ -207,7 +207,7 @@ ins {
 }
 
 mark {
-	background-color: var(--color-warning);
+	background-color: var(--color-text-highlight-background);
 	color: var(--color-text-dark);
 	font-style: italic;
 	font-weight: bold;