feat(editor): Refactor and unify executions views (no-changelog) (#8538)

n8n-io · Apr 19, 2024 · a3eea3a · a3eea3a
1 parent eab0187
commit a3eea3a
Show file tree

Hide file tree

Showing 65 changed files with 3,596 additions and 2,955 deletions.
diff --git a/cypress/e2e/20-workflow-executions.cy.ts b/cypress/e2e/20-workflow-executions.cy.ts
@@ -16,11 +16,12 @@ describe('Current Workflow Executions', () => {
 	it('should render executions tab correctly', () => {
 		createMockExecutions();
 		cy.intercept('GET', '/rest/executions?filter=*').as('getExecutions');
-		cy.intercept('GET', '/rest/executions/active?filter=*').as('getActiveExecutions');
 
 		executionsTab.actions.switchToExecutionsTab();
 
-		cy.wait(['@getExecutions', '@getActiveExecutions']);
+		cy.wait(['@getExecutions']);
+
+		executionsTab.getters.executionsList().scrollTo(0, 500).wait(0);
 
 		executionsTab.getters.executionListItems().should('have.length', 11);
 		executionsTab.getters.successfulExecutionListItems().should('have.length', 9);

diff --git a/cypress/e2e/28-debug.cy.ts b/cypress/e2e/28-debug.cy.ts
@@ -19,7 +19,6 @@ describe('Debug', () => {
 	it('should be able to debug executions', () => {
 		cy.intercept('GET', '/rest/executions?filter=*').as('getExecutions');
 		cy.intercept('GET', '/rest/executions/*').as('getExecution');
-		cy.intercept('GET', '/rest/executions/active?filter=*').as('getActiveExecutions');
 		cy.intercept('POST', '/rest/workflows/run').as('postWorkflowRun');
 
 		cy.signin({ email: INSTANCE_OWNER.email, password: INSTANCE_OWNER.password });
@@ -41,7 +40,7 @@ describe('Debug', () => {
 
 		executionsTab.actions.switchToExecutionsTab();
 
-		cy.wait(['@getExecutions', '@getActiveExecutions']);
+		cy.wait(['@getExecutions']);
 
 		executionsTab.getters.executionDebugButton().should('have.text', 'Debug in editor').click();
 		cy.url().should('include', '/debug');
@@ -66,7 +65,7 @@ describe('Debug', () => {
 
 		executionsTab.actions.switchToExecutionsTab();
 
-		cy.wait(['@getExecutions', '@getActiveExecutions']);
+		cy.wait(['@getExecutions']);
 
 		executionsTab.getters.executionListItems().should('have.length', 2).first().click();
 		cy.wait(['@getExecution']);
@@ -77,7 +76,7 @@ describe('Debug', () => {
 		confirmDialog.find('li').should('have.length', 2);
 		confirmDialog.get('.btn--cancel').click();
 
-		cy.wait(['@getExecutions', '@getActiveExecutions']);
+		cy.wait(['@getExecutions']);
 
 		executionsTab.getters.executionListItems().should('have.length', 2).first().click();
 		cy.wait(['@getExecution']);
@@ -108,7 +107,7 @@ describe('Debug', () => {
 		cy.url().should('not.include', '/debug');
 
 		executionsTab.actions.switchToExecutionsTab();
-		cy.wait(['@getExecutions', '@getActiveExecutions']);
+		cy.wait(['@getExecutions']);
 		executionsTab.getters.executionDebugButton().should('have.text', 'Copy to editor').click();
 
 		confirmDialog = cy.get('.matching-pinned-nodes-confirmation').filter(':visible');
@@ -130,7 +129,7 @@ describe('Debug', () => {
 		workflowPage.actions.deleteNode(IF_NODE_NAME);
 
 		executionsTab.actions.switchToExecutionsTab();
-		cy.wait(['@getExecutions', '@getActiveExecutions']);
+		cy.wait(['@getExecutions']);
 		executionsTab.getters.executionListItems().should('have.length', 3).first().click();
 		cy.wait(['@getExecution']);
 		executionsTab.getters.executionDebugButton().should('have.text', 'Copy to editor').click();

diff --git a/cypress/e2e/30-editor-after-route-changes.cy.ts b/cypress/e2e/30-editor-after-route-changes.cy.ts
@@ -136,10 +136,9 @@ describe('Editor actions should work', () => {
 
 	it('after switching between Editor and Executions', () => {
 		cy.intercept('GET', '/rest/executions?filter=*').as('getExecutions');
-		cy.intercept('GET', '/rest/executions/active?filter=*').as('getActiveExecutions');
 
 		executionsTab.actions.switchToExecutionsTab();
-		cy.wait(['@getExecutions', '@getActiveExecutions']);
+		cy.wait(['@getExecutions']);
 		cy.wait(500);
 		executionsTab.actions.switchToEditorTab();
 		editWorkflowAndDeactivate();
@@ -149,15 +148,14 @@ describe('Editor actions should work', () => {
 	it('after switching between Editor and Debug', () => {
 		cy.intercept('GET', '/rest/executions?filter=*').as('getExecutions');
 		cy.intercept('GET', '/rest/executions/*').as('getExecution');
-		cy.intercept('GET', '/rest/executions/active?filter=*').as('getActiveExecutions');
 		cy.intercept('POST', '/rest/workflows/run').as('postWorkflowRun');
 
 		editWorkflowAndDeactivate();
 		workflowPage.actions.executeWorkflow();
 		cy.wait(['@postWorkflowRun']);
 
 		executionsTab.actions.switchToExecutionsTab();
-		cy.wait(['@getExecutions', '@getActiveExecutions']);
+		cy.wait(['@getExecutions']);
 
 		executionsTab.getters.executionListItems().should('have.length', 1).first().click();
 		cy.wait(['@getExecution']);

diff --git a/cypress/e2e/7-workflow-actions.cy.ts b/cypress/e2e/7-workflow-actions.cy.ts
@@ -111,16 +111,19 @@ describe('Workflow Actions', () => {
 		// This happens when users click save button from workflow name input
 		// In this case blur on the input saves the workflow and then click on the button saves it again
 		WorkflowPage.actions.visit();
-		WorkflowPage.getters.workflowNameInput().invoke('val').then((oldName) => {
-			WorkflowPage.getters.workflowNameInputContainer().click();
-			WorkflowPage.getters.workflowNameInput().type('{selectall}');
-			WorkflowPage.getters.workflowNameInput().type('Test');
-			WorkflowPage.getters.saveButton().click();
-			WorkflowPage.getters.workflowNameInput().should('have.value', 'Test');
-			cy.visit(WorkflowPages.url);
-			// There should be no workflow with the old name (duplicate save)
-			WorkflowPages.getters.workflowCards().contains(String(oldName)).should('not.exist');
-		});
+		WorkflowPage.getters
+			.workflowNameInput()
+			.invoke('val')
+			.then((oldName) => {
+				WorkflowPage.getters.workflowNameInputContainer().click();
+				WorkflowPage.getters.workflowNameInput().type('{selectall}');
+				WorkflowPage.getters.workflowNameInput().type('Test');
+				WorkflowPage.getters.saveButton().click();
+				WorkflowPage.getters.workflowNameInput().should('have.value', 'Test');
+				cy.visit(WorkflowPages.url);
+				// There should be no workflow with the old name (duplicate save)
+				WorkflowPages.getters.workflowCards().contains(String(oldName)).should('not.exist');
+			});
 	});
 
 	it('should copy nodes', () => {
@@ -252,7 +255,6 @@ describe('Workflow Actions', () => {
 
 	it('should keep endpoint click working when switching between execution and editor tab', () => {
 		cy.intercept('GET', '/rest/executions?filter=*').as('getExecutions');
-		cy.intercept('GET', '/rest/executions/active?filter=*').as('getActiveExecutions');
 
 		WorkflowPage.actions.addInitialNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME);
@@ -263,7 +265,7 @@ describe('Workflow Actions', () => {
 		cy.get('body').type('{esc}');
 
 		executionsTab.actions.switchToExecutionsTab();
-		cy.wait(['@getExecutions', '@getActiveExecutions']);
+		cy.wait(['@getExecutions']);
 		cy.wait(500);
 		executionsTab.actions.switchToEditorTab();
 

diff --git a/packages/cli/src/ActiveExecutions.ts b/packages/cli/src/ActiveExecutions.ts
@@ -21,6 +21,9 @@ import { Logger } from '@/Logger';
 
 @Service()
 export class ActiveExecutions {
+	/**
+	 * Active executions in the current process, not globally.
+	 */
 	private activeExecutions: {
 		[executionId: string]: IExecutingWorkflowData;
 	} = {};

diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
@@ -171,7 +171,7 @@ export interface IExecutionsListResponse {
 	estimated: boolean;
 }
 
-export interface IExecutionsStopData {
+export interface ExecutionStopResult {
 	finished?: boolean;
 	mode: WorkflowExecuteMode;
 	startedAt: Date;

diff --git a/packages/cli/src/WaitTracker.ts b/packages/cli/src/WaitTracker.ts
@@ -4,7 +4,7 @@ import {
 	WorkflowOperationError,
 } from 'n8n-workflow';
 import { Container, Service } from 'typedi';
-import type { IExecutionsStopData, IWorkflowExecutionDataProcess } from '@/Interfaces';
+import type { ExecutionStopResult, IWorkflowExecutionDataProcess } from '@/Interfaces';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import { ExecutionRepository } from '@db/repositories/execution.repository';
 import { OwnershipService } from '@/services/ownership.service';
@@ -99,7 +99,7 @@ export class WaitTracker {
 		}
 	}
 
-	async stopExecution(executionId: string): Promise<IExecutionsStopData> {
+	async stopExecution(executionId: string): Promise<ExecutionStopResult> {
 		if (this.waitingExecutions[executionId] !== undefined) {
 			// The waiting execution was already scheduled to execute.
 			// So stop timer and remove.