diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexBoardColumn.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexBoardColumn.ts index 659e19ba5..61a400240 100644 --- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexBoardColumn.ts +++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexBoardColumn.ts @@ -15,6 +15,7 @@ import { useRecordBoardRecordGqlFields } from '@/object-record/record-index/hook import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem'; import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState'; +import { combineFilters } from '@/object-record/record-filter/utils/combineFilters'; import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore'; import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2'; import { isDefined } from 'twenty-shared/utils'; @@ -70,16 +71,18 @@ export const useLoadRecordIndexBoardColumn = ({ recordBoardId, }); - const recordIndexKanbanFieldMetadataFilter = { - [kanbanFieldMetadataItem.name]: isDefined(recordGroupDefinition?.value) - ? { in: [recordGroupDefinition.value] } - : { is: 'NULL' }, - }; + const recordIndexKanbanFieldMetadataFilterValue = isDefined( + recordGroupDefinition?.value, + ) + ? { in: [recordGroupDefinition?.value] } + : { is: 'NULL' }; - const filter = { - ...requestFilters, - ...recordIndexKanbanFieldMetadataFilter, - }; + const combinedFilters = combineFilters([ + requestFilters, + { + [kanbanFieldMetadataItem.name]: recordIndexKanbanFieldMetadataFilterValue, + }, + ]); const { records, @@ -89,7 +92,7 @@ export const useLoadRecordIndexBoardColumn = ({ hasNextPage, } = useFindManyRecords({ objectNameSingular, - filter, + filter: combinedFilters, orderBy, recordGqlFields, limit: 10,