mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-12-25 12:44:07 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(editor): Fix deletion of last execution at execution preview (#7883)

Browse source 
https://linear.app/n8n/issue/PAY-1062
This commit is contained in:
Iván Ovejero 2023-11-30 12:12:26 +01:00 committed by GitHub
parent e834f14991
commit ce2d388f05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cypress/e2e/19-execution.cy.ts
View file

@ -1,7 +1,8 @@
import { v4 as uuid } from 'uuid'; import { v4 as uuid } from 'uuid';
import { NDV, WorkflowPage as WorkflowPageClass, WorkflowsPage } from '../pages'; import { NDV, WorkflowExecutionsTab, WorkflowPage as WorkflowPageClass } from '../pages';
const workflowPage = new WorkflowPageClass(); const workflowPage = new WorkflowPageClass();
const executionsTab = new WorkflowExecutionsTab();
const ndv = new NDV(); const ndv = new NDV();
describe('Execution', () => { describe('Execution', () => {
@ -274,4 +275,17 @@ describe('Execution', () => {
// Check success toast (works because Cypress waits enough for the element to show after the http request node has finished) // Check success toast (works because Cypress waits enough for the element to show after the http request node has finished)
workflowPage.getters.successToast().should('be.visible'); workflowPage.getters.successToast().should('be.visible');
}); });
describe('execution preview', () => {
it('when deleting the last execution, it should show empty state', () => {
workflowPage.actions.addInitialNodeToCanvas('Manual Trigger');
workflowPage.actions.executeWorkflow();
executionsTab.actions.switchToExecutionsTab();
executionsTab.actions.deleteExecutionInPreview();
executionsTab.getters.successfulExecutionListItems().should('have.length', 0);
workflowPage.getters.successToast().contains('Execution deleted');
});
});
}); });

5
cypress/pages/workflow-executions-tab.ts
View file

@ -14,6 +14,7 @@ export class WorkflowExecutionsTab extends BasePage {
failedExecutionListItems: () => cy.get('[data-test-execution-status="error"]'), failedExecutionListItems: () => cy.get('[data-test-execution-status="error"]'),
executionCard: (executionId: string) => cy.getByTestId(`execution-details-${executionId}`), executionCard: (executionId: string) => cy.getByTestId(`execution-details-${executionId}`),
executionPreviewDetails: () => cy.get('[data-test-id^="execution-preview-details-"]'), executionPreviewDetails: () => cy.get('[data-test-id^="execution-preview-details-"]'),
executionPreviewDeleteButton: () => cy.get('[data-test-id="execution-preview-delete-button"]'),
executionPreviewDetailsById: (executionId: string) => executionPreviewDetailsById: (executionId: string) =>
cy.getByTestId(`execution-preview-details-${executionId}`), cy.getByTestId(`execution-preview-details-${executionId}`),
executionPreviewTime: () => executionPreviewTime: () =>
@ -42,5 +43,9 @@ export class WorkflowExecutionsTab extends BasePage {
switchToEditorTab: () => { switchToEditorTab: () => {
workflowPage.getters.editorTabButton().click(); workflowPage.getters.editorTabButton().click();
}, },
deleteExecutionInPreview: () => {
this.getters.executionPreviewDeleteButton().click();
cy.get('button.btn--confirm').click();
},
}; };
} }

3
packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
View file

@ -282,6 +282,7 @@ export default defineComponent({
this.executions[0]; this.executions[0];
await this.workflowsStore.deleteExecutions({ ids: [this.$route.params.executionId] }); await this.workflowsStore.deleteExecutions({ ids: [this.$route.params.executionId] });
this.workflowsStore.deleteExecution(this.executions[executionIndex]);
if (this.temporaryExecution?.id === this.$route.params.executionId) { if (this.temporaryExecution?.id === this.$route.params.executionId) {
this.temporaryExecution = null; this.temporaryExecution = null;
} }
@ -293,6 +294,7 @@ export default defineComponent({
}) })
.catch(() => {}); .catch(() => {});
this.workflowsStore.activeWorkflowExecution = nextExecution; this.workflowsStore.activeWorkflowExecution = nextExecution;
await this.setExecutions();
} else { } else {
// If there are no executions left, show empty state and clear active execution from the store // If there are no executions left, show empty state and clear active execution from the store
this.workflowsStore.activeWorkflowExecution = null; this.workflowsStore.activeWorkflowExecution = null;
@ -301,7 +303,6 @@ export default defineComponent({
params: { name: this.currentWorkflow }, params: { name: this.currentWorkflow },
}); });
} }
await this.setExecutions();
} catch (error) { } catch (error) {
this.loading = false; this.loading = false;
this.showError( this.showError(