mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(editor): Fix workflows list status filter (#13621)

Browse source 
Co-authored-by: Charlie Kolb <charlie@n8n.io>
This commit is contained in:
Milorad FIlipović 2025-03-03 10:37:20 +01:00 committed by GitHub
parent 6ef8d34f96
commit 4067fb0b12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 40 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cypress/e2e/1-workflows.cy.ts
View file

@ -64,13 +64,17 @@ describe('Workflows', () => {
it('should delete all the workflows', () => {
WorkflowsPage.getters.workflowCards().should('have.length', multipleWorkflowsCount + 1);
WorkflowsPage.getters.workflowCards().each(($el) => {
const workflowName = $el.find('[data-test-id="workflow-card-name"]').text();
WorkflowsPage.getters.workflowCards().then(($cards) => {
const workflowNames = $cards
.map((_, $el) => Cypress.$($el).find('[data-test-id="workflow-card-name"]').text())
.get();
WorkflowsPage.getters.workflowCardActions(workflowName).click();
WorkflowsPage.getters.workflowDeleteButton().click();
workflowNames.forEach((workflowName) => {
WorkflowsPage.getters.workflowCardActions(workflowName).click();
WorkflowsPage.getters.workflowDeleteButton().click();
cy.get('button').contains('delete').click();
cy.get('button').contains('delete').click();
});
});
WorkflowsPage.getters.newWorkflowButtonCard().should('be.visible');

22
packages/frontend/editor-ui/src/views/WorkflowsView.test.ts
View file

@ -177,7 +177,7 @@ describe('WorkflowsView', () => {
);
});
it('should set status filter based on query parameters', async () => {
it('should set active status filter based on query parameters', async () => {
await router.replace({ query: { status: 'true' } });
workflowsStore.fetchWorkflowsPage.mockResolvedValue([]);
@ -197,6 +197,26 @@ describe('WorkflowsView', () => {
);
});
it('should set deactivated status filter based on query parameters', async () => {
await router.replace({ query: { status: 'false' } });
workflowsStore.fetchWorkflowsPage.mockResolvedValue([]);
renderComponent({ pinia });
await waitAllPromises();
expect(workflowsStore.fetchWorkflowsPage).toHaveBeenCalledWith(
expect.any(String),
expect.any(Number),
expect.any(Number),
expect.any(String),
expect.objectContaining({
active: false,
}),
expect.any(Boolean),
);
});
it('should reset filters', async () => {
await router.replace({ query: { status: 'true' } });

17
packages/frontend/editor-ui/src/views/WorkflowsView.vue
View file

@ -64,8 +64,8 @@ interface Filters extends BaseFilters {
}
const StatusFilter = {
ACTIVE: true,
DEACTIVATED: false,
ACTIVE: 'active',
DEACTIVATED: 'deactivated',
ALL: '',
};
@ -364,7 +364,10 @@ const fetchWorkflows = async () => {
currentSort.value,
{
name: filters.value.search || undefined,
active: filters.value.status ? Boolean(filters.value.status) : undefined,
active:
filters.value.status === StatusFilter.ALL
? undefined
: filters.value.status === StatusFilter.ACTIVE,
tags: filters.value.tags.map((tagId) => tagsStore.tagsById[tagId]?.name),
parentFolderId: parentFolder ?? '0', // 0 is the root folder in the API
},
@ -453,8 +456,8 @@ const saveFiltersOnQueryString = () => {
delete currentQuery.search;
}
if (typeof filters.value.status !== 'string') {
currentQuery.status = filters.value.status.toString();
if (filters.value.status !== StatusFilter.ALL) {
currentQuery.status = (filters.value.status === StatusFilter.ACTIVE).toString();
} else {
delete currentQuery.status;
}
@ -523,10 +526,10 @@ const setFiltersFromQueryString = async () => {
}
// Handle status
const validStatusValues = [StatusFilter.ACTIVE.toString(), StatusFilter.DEACTIVATED.toString()];
const validStatusValues = ['true', 'false'];
if (isValidString(status) && validStatusValues.includes(status)) {
newQuery.status = status;
filters.value.status = status === 'true';
filters.value.status = status === 'true' ? StatusFilter.ACTIVE : StatusFilter.DEACTIVATED;
} else {
delete newQuery.status;
}