From 35a4b07bc231f5c183a9134a0981ed6a20d8c3f5 Mon Sep 17 00:00:00 2001 From: Lucas Bordeau Date: Fri, 30 May 2025 12:16:55 +0200 Subject: [PATCH] Fixed non advanced filter creation from table header dropdown (#12369) This PR fixes a edge case where the user tries to create a non-advanced filter that already exists in advanced filters, from the table header drodpown. This was because the hook that handles the creation was checking for duplicate filters but without discerning between advanced and non-advanced, and we want to be able to create non-advanced filters no matter what we have in advanced filters. Fixes https://github.com/twentyhq/twenty/issues/12316 --- .../hooks/useOpenRecordFilterChipFromTableHeader.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useOpenRecordFilterChipFromTableHeader.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useOpenRecordFilterChipFromTableHeader.ts index c888d755e..c2ccc2766 100644 --- a/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useOpenRecordFilterChipFromTableHeader.ts +++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-header/hooks/useOpenRecordFilterChipFromTableHeader.ts @@ -37,13 +37,15 @@ export const useOpenRecordFilterChipFromTableHeader = () => { ); } - const existingRecordFilter = currentRecordFilters.find( - (recordFilter) => recordFilter.fieldMetadataId === fieldMetadataItemId, + const existingNonAdvancedRecordFilter = currentRecordFilters.find( + (recordFilter) => + recordFilter.fieldMetadataId === fieldMetadataItemId && + !isDefined(recordFilter.recordFilterGroupId), ); - if (isDefined(existingRecordFilter)) { - setEditableFilterChipDropdownStates(existingRecordFilter); - openDropdownFromOutside(existingRecordFilter.id); + if (isDefined(existingNonAdvancedRecordFilter)) { + setEditableFilterChipDropdownStates(existingNonAdvancedRecordFilter); + openDropdownFromOutside(existingNonAdvancedRecordFilter.id); return; }