diff --git a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.test.tsx b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.test.tsx index a6f05c8ef0..9d15b2ae6b 100644 --- a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.test.tsx +++ b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.test.tsx @@ -256,3 +256,40 @@ test('renders lifecycle quick filters', async () => { await screen.findByText(/Rollout production/); await screen.findByText(/Cleanup/); }); + +test('clears lifecycle filter when switching to archived view', async () => { + setupApi(); + testServerRoute(server, '/api/admin/ui-config', { + flags: { + flagCreator: true, + flagsUiFilterRefactor: true, + }, + }); + + render( + + + } + /> + , + { + route: '/projects/default?lifecycle=IS%3Alive', + }, + ); + + expect(window.location.href).toContain('lifecycle=IS%3Alive'); + + await screen.findByText('featureA'); + const viewArchived = await screen.findByRole('button', { + name: /View archived flags/i, + }); + fireEvent.click(viewArchived); + + expect(window.location.href).not.toContain('lifecycle=IS%3Alive'); + expect(window.location.href).toContain('archived=IS%3Atrue'); +}); diff --git a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx index 469ad4df45..36637bd135 100644 --- a/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx +++ b/frontend/src/component/project/Project/PaginatedProjectFeatureToggles/ProjectFeatureToggles.tsx @@ -215,7 +215,10 @@ export const ProjectFeatureToggles = ({ if (showArchived) { setTableState({ archived: undefined }); } else { - setTableState({ archived: { operator: 'IS', values: ['true'] } }); + setTableState({ + archived: { operator: 'IS', values: ['true'] }, + lifecycle: undefined, + }); } }; const environments = showArchived ? [] : availableEnvironments;