fix(filters): unify combinedFilter for queries and bulk delete (#13952)

Issue: https://github.com/twentyhq/twenty/issues/13913

Motivation/Problem:
Bulk delete and query paths were composing filters differently, causing
mismatches. In some cases this led to invalid or empty GraphQL filters
(e.g. {"and":[{}]}), breaking delete operations.

Fix:
Unify filter composition (combinedFilter) across queries and bulk
delete, ensuring consistent handling of base filters + soft-deleted
clause. Also adjusted record filter grouping logic to avoid dropping
filters when no groups exist.

Result:
Filtered queries and bulk deletes now behave consistently and reliably
without producing broken filters.

---------

Co-authored-by: root <root@DESKTOP-E2VOJGE>
Co-authored-by: Charles Bochet <charles@twenty.com>

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

@@ -15,6 +15,8 @@ import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { type OnFindManyRecordsCompleted } from '@/object-record/types/OnFindManyRecordsCompleted';
 import { getQueryIdentifier } from '@/object-record/utils/getQueryIdentifier';
 
+import { type RecordGqlOperationFilter } from '@/object-record/graphql/types/RecordGqlOperationFilter';
+
 export type UseFindManyRecordsParams<T> = ObjectMetadataItemIdentifier &
   RecordGqlOperationVariables & {
     onError?: (error?: Error) => void;
@@ -53,9 +55,19 @@ export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
     handleError: onError,
   });
 
+  const softDeleteFilter: RecordGqlOperationFilter = {
+    or: [{ deletedAt: { is: 'NULL' } }, { deletedAt: { is: 'NOT_NULL' } }],
+  };
+
+  const withSoftDeleteFilter = withSoftDeleted
+    ? {
+        and: [...(filter ? [filter] : []), softDeleteFilter],
+      }
+    : filter;
+
   const queryIdentifier = getQueryIdentifier({
     objectNameSingular,
-    filter,
+    filter: withSoftDeleteFilter,
     orderBy,
     limit,
   });
@@ -66,10 +78,6 @@ export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
     onCompleted,
   });
 
-  const withSoftDeleterFilter = {
-    or: [{ deletedAt: { is: 'NULL' } }, { deletedAt: { is: 'NOT_NULL' } }],
-  };
-
   const objectPermissions = useObjectPermissionsForObject(
     objectMetadataItem.id,
   );
@@ -80,14 +88,7 @@ export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
     useQuery<RecordGqlOperationFindManyResult>(findManyRecordsQuery, {
       skip: skip || !objectMetadataItem || !hasReadPermission,
       variables: {
-        filter: withSoftDeleted
-          ? {
-              and: [
-                ...(filter ? [filter] : []),
-                ...(withSoftDeleted ? [withSoftDeleterFilter] : []),
-              ],
-            }
-          : filter,
+        filter: withSoftDeleteFilter,
         orderBy,
         lastCursor: cursorFilter?.cursor ?? undefined,
         limit,
@@ -101,7 +102,7 @@ export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
   const { fetchMoreRecords, records, hasNextPage } =
     useFetchMoreRecordsWithPagination<T>({
       objectNameSingular,
-      filter,
+      filter: withSoftDeleteFilter,
       orderBy,
       limit,
       fetchMore,

packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexContainerContextStoreNumberOfSelectedRecordsEffect.tsx

@@ -1,4 +1,5 @@
 import { contextStoreAnyFieldFilterValueComponentState } from '@/context-store/states/contextStoreAnyFieldFilterValueComponentState';
+import { contextStoreFilterGroupsComponentState } from '@/context-store/states/contextStoreFilterGroupsComponentState';
 import { contextStoreFiltersComponentState } from '@/context-store/states/contextStoreFiltersComponentState';
 import { contextStoreNumberOfSelectedRecordsComponentState } from '@/context-store/states/contextStoreNumberOfSelectedRecordsComponentState';
 import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
@@ -41,24 +42,31 @@ export const RecordIndexContainerContextStoreNumberOfSelectedRecordsEffect =
       contextStoreFiltersComponentState,
     );
 
+    const contextStoreFilterGroups = useRecoilComponentValue(
+      contextStoreFilterGroupsComponentState,
+    );
+
     const contextStoreAnyFieldFilterValue = useRecoilComponentValue(
       contextStoreAnyFieldFilterValueComponentState,
     );
 
     const { filterValueDependencies } = useFilterValueDependencies();
 
+    const computedFilter = computeContextStoreFilters({
+      contextStoreTargetedRecordsRule,
+      contextStoreFilters,
+      contextStoreFilterGroups,
+      objectMetadataItem,
+      filterValueDependencies,
+      contextStoreAnyFieldFilterValue,
+    });
+
     const { totalCount } = useFindManyRecords({
       ...findManyRecordsParams,
       recordGqlFields: {
         id: true,
       },
-      filter: computeContextStoreFilters(
-        contextStoreTargetedRecordsRule,
-        contextStoreFilters,
-        objectMetadataItem,
-        filterValueDependencies,
-        contextStoreAnyFieldFilterValue,
-      ),
+      filter: computedFilter,
       limit: 1,
       skip: contextStoreTargetedRecordsRule.mode === 'selection',
     });

packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexFiltersToContextStoreEffect.tsx

@@ -1,8 +1,10 @@
 import { useEffect } from 'react';
 
 import { contextStoreAnyFieldFilterValueComponentState } from '@/context-store/states/contextStoreAnyFieldFilterValueComponentState';
+import { contextStoreFilterGroupsComponentState } from '@/context-store/states/contextStoreFilterGroupsComponentState';
 import { contextStoreFiltersComponentState } from '@/context-store/states/contextStoreFiltersComponentState';
 import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
+import { currentRecordFilterGroupsComponentState } from '@/object-record/record-filter-group/states/currentRecordFilterGroupsComponentState';
 import { anyFieldFilterValueComponentState } from '@/object-record/record-filter/states/anyFieldFilterValueComponentState';
 import { currentRecordFiltersComponentState } from '@/object-record/record-filter/states/currentRecordFiltersComponentState';
 import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
@@ -20,6 +22,11 @@ export const RecordIndexFiltersToContextStoreEffect = () => {
     recordIndexId,
   );
 
+  const recordIndexFilterGroups = useRecoilComponentValue(
+    currentRecordFilterGroupsComponentState,
+    recordIndexId,
+  );
+
   const setContextStoreTargetedRecords = useSetRecoilComponentState(
     contextStoreTargetedRecordsRuleComponentState,
   );
@@ -68,13 +75,23 @@ export const RecordIndexFiltersToContextStoreEffect = () => {
     contextStoreFiltersComponentState,
   );
 
+  const setContextStoreFilterGroups = useSetRecoilComponentState(
+    contextStoreFilterGroupsComponentState,
+  );
+
   useEffect(() => {
     setContextStoreFilters(recordIndexFilters);
+    setContextStoreFilterGroups(recordIndexFilterGroups);
 
     return () => {
       setContextStoreFilters([]);
     };
-  }, [recordIndexFilters, setContextStoreFilters]);
+  }, [
+    recordIndexFilterGroups,
+    recordIndexFilters,
+    setContextStoreFilterGroups,
+    setContextStoreFilters,
+  ]);
 
   const setContextStoreAnyFieldFilterValue = useSetRecoilComponentState(
     contextStoreAnyFieldFilterValueComponentState,

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

@@ -3,6 +3,7 @@ import { type ColumnDefinition } from '@/object-record/record-table/types/Column
 import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
 
 import { contextStoreAnyFieldFilterValueComponentState } from '@/context-store/states/contextStoreAnyFieldFilterValueComponentState';
+import { contextStoreFilterGroupsComponentState } from '@/context-store/states/contextStoreFilterGroupsComponentState';
 import { contextStoreFiltersComponentState } from '@/context-store/states/contextStoreFiltersComponentState';
 import { contextStoreTargetedRecordsRuleComponentState } from '@/context-store/states/contextStoreTargetedRecordsRuleComponentState';
 import { computeContextStoreFilters } from '@/context-store/utils/computeContextStoreFilters';
@@ -73,6 +74,10 @@ export const useRecordIndexLazyFetchRecords = ({
     contextStoreFiltersComponentState,
   );
 
+  const contextStoreFilterGroups = useRecoilComponentValue(
+    contextStoreFilterGroupsComponentState,
+  );
+
   const contextStoreAnyFieldFilterValue = useRecoilComponentValue(
     contextStoreAnyFieldFilterValueComponentState,
   );
@@ -83,13 +88,14 @@ export const useRecordIndexLazyFetchRecords = ({
     objectMetadataItem.nameSingular,
   );
 
-  const queryFilter = computeContextStoreFilters(
+  const queryFilter = computeContextStoreFilters({
     contextStoreTargetedRecordsRule,
     contextStoreFilters,
+    contextStoreFilterGroups,
     objectMetadataItem,
     filterValueDependencies,
     contextStoreAnyFieldFilterValue,
-  );
+  });
 
   const finalColumns = [
     ...columns,