Merge pull request #2 from n8n-io/master

Update

cypress/composables/ndv.ts

@@ -59,7 +59,7 @@ export function setCredentialByName(name: string) {
 
 export function clickCreateNewCredential() {
 	openCredentialSelect();
-	getCreateNewCredentialOption().click();
+	getCreateNewCredentialOption().click({ force: true });
 }
 
 export function clickGetBackToCanvas() {

cypress/composables/workflow.ts

@@ -144,6 +144,12 @@ export function addToolNodeToParent(nodeName: string, parentNodeName: string) {
 export function addOutputParserNodeToParent(nodeName: string, parentNodeName: string) {
 	addSupplementalNodeToParent(nodeName, 'ai_outputParser', parentNodeName);
 }
+export function addVectorStoreNodeToParent(nodeName: string, parentNodeName: string) {
+	addSupplementalNodeToParent(nodeName, 'ai_vectorStore', parentNodeName);
+}
+export function addRetrieverNodeToParent(nodeName: string, parentNodeName: string) {
+	addSupplementalNodeToParent(nodeName, 'ai_retriever', parentNodeName);
+}
 
 export function clickExecuteWorkflowButton() {
 	getExecuteWorkflowButton().click();

cypress/e2e/1-workflows.cy.ts

@@ -73,4 +73,28 @@ describe('Workflows', () => {
 
 		WorkflowsPage.getters.newWorkflowButtonCard().should('be.visible');
 	});
+
+	it('should respect tag querystring filter when listing workflows', () => {
+		WorkflowsPage.getters.newWorkflowButtonCard().click();
+
+		cy.createFixtureWorkflow('Test_workflow_2.json', getUniqueWorkflowName('My New Workflow'));
+
+		cy.visit(WorkflowsPage.url);
+
+		WorkflowsPage.getters.createWorkflowButton().click();
+
+		cy.createFixtureWorkflow('Test_workflow_1.json', 'Empty State Card Workflow');
+
+		cy.visit(WorkflowsPage.url);
+
+		WorkflowsPage.getters.workflowFilterButton().click();
+
+		WorkflowsPage.getters.workflowTagsDropdown().click();
+
+		WorkflowsPage.getters.workflowTagItem('some-tag-1').click();
+
+		cy.reload();
+
+		WorkflowsPage.getters.workflowCards().should('have.length', 1);
+	});
 });

cypress/e2e/13-pinning.cy.ts

@@ -1,3 +1,6 @@
+import { nanoid } from 'nanoid';
+
+import { simpleWebhookCall, waitForWebhook } from './16-webhook-node.cy';
 import {
 	HTTP_REQUEST_NODE_NAME,
 	MANUAL_TRIGGER_NODE_NAME,
@@ -7,6 +10,7 @@ import {
 } from '../constants';
 import { WorkflowPage, NDV } from '../pages';
 import { errorToast } from '../pages/notifications';
+import { getVisiblePopper } from '../utils';
 
 const workflowPage = new WorkflowPage();
 const ndv = new NDV();
@@ -212,6 +216,42 @@ describe('Data pinning', () => {
 			},
 		);
 	});
+
+	it('should show pinned data tooltip', () => {
+		const { callEndpoint } = simpleWebhookCall({
+			method: 'GET',
+			webhookPath: nanoid(),
+			executeNow: false,
+		});
+
+		ndv.actions.close();
+		workflowPage.actions.executeWorkflow();
+		cy.wait(waitForWebhook);
+
+		// hide other visible popper on workflow execute button
+		workflowPage.getters.canvasNodes().eq(0).click();
+
+		callEndpoint((response) => {
+			expect(response.status).to.eq(200);
+			getVisiblePopper().should('have.length', 1);
+			getVisiblePopper()
+				.eq(0)
+				.should(
+					'have.text',
+					'You can pin this output instead of waiting for a test event. Open node to do so.',
+				);
+		});
+	});
+
+	it('should not show pinned data tooltip', () => {
+		cy.createFixtureWorkflow('Pinned_webhook_node.json', 'Test');
+		workflowPage.actions.executeWorkflow();
+
+		// hide other visible popper on workflow execute button
+		workflowPage.getters.canvasNodes().eq(0).click();
+
+		getVisiblePopper().should('have.length', 0);
+	});
 });
 
 function setExpressionOnStringValueInSet(expression: string) {

cypress/e2e/16-form-trigger-node.cy.ts

@@ -16,12 +16,14 @@ describe('n8n Form Trigger', () => {
 		ndv.getters.parameterInput('formDescription').type('Test Form Description');
 		ndv.getters.parameterInput('fieldLabel').type('Test Field 1');
 		ndv.getters.backToCanvas().click();
-		workflowPage.getters.nodeIssuesByName('n8n Form Trigger').should('not.exist');
+		workflowPage.getters.nodeIssuesByName('On form submission').should('not.exist');
 	});
 
 	it('should fill up form fields', () => {
-		workflowPage.actions.addInitialNodeToCanvas('n8n Form Trigger');
-		workflowPage.getters.canvasNodes().first().dblclick();
+		workflowPage.actions.addInitialNodeToCanvas('n8n Form Trigger', {
+			isTrigger: true,
+			action: 'On new n8n Form event',
+		});
 		ndv.getters.parameterInput('formTitle').type('Test Form');
 		ndv.getters.parameterInput('formDescription').type('Test Form Description');
 		//fill up first field of type number
@@ -96,6 +98,6 @@ describe('n8n Form Trigger', () => {
 			.type('Your test form was successfully submitted');
 
 		ndv.getters.backToCanvas().click();
-		workflowPage.getters.nodeIssuesByName('n8n Form Trigger').should('not.exist');
+		workflowPage.getters.nodeIssuesByName('On form submission').should('not.exist');
 	});
 });

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

@@ -9,7 +9,7 @@ const workflowPage = new WorkflowPage();
 const ndv = new NDV();
 const credentialsModal = new CredentialsModal();
 
-const waitForWebhook = 500;
+export const waitForWebhook = 500;
 
 interface SimpleWebhookCallOptions {
 	method: string;
@@ -21,7 +21,7 @@ interface SimpleWebhookCallOptions {
 	authentication?: string;
 }
 
-const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
+export const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
 	const {
 		authentication,
 		method,
@@ -65,15 +65,23 @@ const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
 		getVisibleSelect().find('.option-headline').contains(responseData).click();
 	}
 
+	const callEndpoint = (cb: (response: Cypress.Response<unknown>) => void) => {
+		cy.request(method, `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`).then(cb);
+	};
+
 	if (executeNow) {
 		ndv.actions.execute();
 		cy.wait(waitForWebhook);
 
-		cy.request(method, `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`).then((response) => {
+		callEndpoint((response) => {
 			expect(response.status).to.eq(200);
 			ndv.getters.outputPanel().contains('headers');
 		});
 	}
+
+	return {
+		callEndpoint,
+	};
 };
 
 describe('Webhook Trigger node', () => {

cypress/e2e/26-resource-locator.cy.ts

@@ -65,7 +65,7 @@ describe('Resource Locator', () => {
 	});
 
 	it('should show appropriate errors when search filter is required', () => {
-		workflowPage.actions.addNodeToCanvas('Github', true, true, 'On Pull Request');
+		workflowPage.actions.addNodeToCanvas('Github', true, true, 'On pull request');
 		ndv.getters.resourceLocator('owner').should('be.visible');
 		ndv.getters.resourceLocatorInput('owner').click();
 		ndv.getters.resourceLocatorErrorMessage().should('contain', NO_CREDENTIALS_MESSAGE);

cypress/e2e/4-node-creator.cy.ts

@@ -1,3 +1,9 @@
+import {
+	addNodeToCanvas,
+	addRetrieverNodeToParent,
+	addVectorStoreNodeToParent,
+	getNodeCreatorItems,
+} from '../composables/workflow';
 import { IF_NODE_NAME } from '../constants';
 import { NodeCreator } from '../pages/features/node-creator';
 import { NDV } from '../pages/ndv';
@@ -504,4 +510,38 @@ describe('Node Creator', () => {
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type('gith');
 		nodeCreatorFeature.getters.nodeItemName().first().should('have.text', 'GitHub');
 	});
+
+	it('should show vector stores actions', () => {
+		const actions = [
+			'Get ranked documents from vector store',
+			'Add documents to vector store',
+			'Retrieve documents for AI processing',
+		];
+
+		nodeCreatorFeature.actions.openNodeCreator();
+
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('Vector Store');
+
+		getNodeCreatorItems().then((items) => {
+			const vectorStores = items.map((_i, el) => el.innerText);
+
+			// Loop over all vector stores and check if they have the three actions
+			vectorStores.each((_i, vectorStore) => {
+				nodeCreatorFeature.getters.getCreatorItem(vectorStore).click();
+				actions.forEach((action) => {
+					nodeCreatorFeature.getters.getCreatorItem(action).should('be.visible');
+				});
+				cy.realPress('ArrowLeft');
+			});
+		});
+	});
+
+	it('should add node directly for sub-connection', () => {
+		addNodeToCanvas('Question and Answer Chain', true);
+		addRetrieverNodeToParent('Vector Store Retriever', 'Question and Answer Chain');
+		cy.realPress('Escape');
+		addVectorStoreNodeToParent('In-Memory Vector Store', 'Vector Store Retriever');
+		cy.realPress('Escape');
+		WorkflowPage.getters.canvasNodes().should('have.length', 4);
+	});
 });