Skip to content

Commit dc0401e

Browse files
Fixed kanban filter on kanban field metadata item (#12367)
This PR fixes an edge case where we couldn't apply a filter on the field metadata item that is used by a kanban. As this has already been fixed for tables with groups, this PR just uses the same technique. Fixes #12311 Co-authored-by: Félix Malfait <felix.malfait@gmail.com>
1 parent 4485e8e commit dc0401e

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexBoardColumn.ts

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { useRecordBoardRecordGqlFields } from '@/object-record/record-index/hook
1515
import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
1616
import { currentRecordSortsComponentState } from '@/object-record/record-sort/states/currentRecordSortsComponentState';
1717

18+
import { combineFilters } from '@/object-record/record-filter/utils/combineFilters';
1819
import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';
1920
import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
2021
import { isDefined } from 'twenty-shared/utils';
@@ -70,16 +71,18 @@ export const useLoadRecordIndexBoardColumn = ({
7071
recordBoardId,
7172
});
7273

73-
const recordIndexKanbanFieldMetadataFilter = {
74-
[kanbanFieldMetadataItem.name]: isDefined(recordGroupDefinition?.value)
75-
? { in: [recordGroupDefinition.value] }
76-
: { is: 'NULL' },
77-
};
74+
const recordIndexKanbanFieldMetadataFilterValue = isDefined(
75+
recordGroupDefinition?.value,
76+
)
77+
? { in: [recordGroupDefinition?.value] }
78+
: { is: 'NULL' };
7879

79-
const filter = {
80-
...requestFilters,
81-
...recordIndexKanbanFieldMetadataFilter,
82-
};
80+
const combinedFilters = combineFilters([
81+
requestFilters,
82+
{
83+
[kanbanFieldMetadataItem.name]: recordIndexKanbanFieldMetadataFilterValue,
84+
},
85+
]);
8386

8487
const {
8588
records,
@@ -89,7 +92,7 @@ export const useLoadRecordIndexBoardColumn = ({
8992
hasNextPage,
9093
} = useFindManyRecords({
9194
objectNameSingular,
92-
filter,
95+
filter: combinedFilters,
9396
orderBy,
9497
recordGqlFields,
9598
limit: 10,

0 commit comments

Comments
 (0)