admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix optimistic effect for implicit and filters (#9935)

Browse Source 
The optimistic effect for record creations and updates wasn't working
properly for `and filters` without explicit `and`.
The problem was located inside `isRecordMatchingFilter` which didn't
consider implicit `and filters` as `and filters`. This caused queries to
be updated by the optimistic effect even if they didn't match the root
query filter.

I also removed `fetchPolicy: 'cache-and-network'` from a query. This was
a temporary fix for this issue.

Co-authored-by: Lucas Bordeau <bordeau.lucas@gmail.com>
This commit is contained in:
Raphaël Bosi
2025-01-30 17:31:02 +01:00
committed by GitHub
parent 460253ab98
commit 625466f38d
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/twenty-front/src/modules/context-store/hooks/useFindManyRecordsSelectedInContextStore.ts
View File

@ -53,7 +53,6 @@ export const useFindManyRecordsSelectedInContextStore = ({
contextStoreTargetedRecordsRule.mode === 'selection' && contextStoreTargetedRecordsRule.mode === 'selection' &&
contextStoreTargetedRecordsRule.selectedRecordIds.length === 0, contextStoreTargetedRecordsRule.selectedRecordIds.length === 0,
limit, limit,
fetchPolicy: 'cache-and-network',
}); });
return { return {

13
packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.ts
View File

@ -50,6 +50,9 @@ const isAndFilter = (
filter: RecordGqlOperationFilter, filter: RecordGqlOperationFilter,
): filter is AndObjectRecordFilter => 'and' in filter && !!filter.and; ): filter is AndObjectRecordFilter => 'and' in filter && !!filter.and;
const isImplicitAndFilter = (filter: RecordGqlOperationFilter) =>
Object.keys(filter).length > 1;
const isOrFilter = ( const isOrFilter = (
filter: RecordGqlOperationFilter, filter: RecordGqlOperationFilter,
): filter is OrObjectRecordFilter => 'or' in filter && !!filter.or; ): filter is OrObjectRecordFilter => 'or' in filter && !!filter.or;
@ -71,6 +74,16 @@ export const isRecordMatchingFilter = ({
return true; return true;
} }
if (isImplicitAndFilter(filter)) {
return Object.entries(filter).every(([filterKey, value]) =>
isRecordMatchingFilter({
record,
filter: { [filterKey]: value },
objectMetadataItem,
}),
);
}
if (isAndFilter(filter)) { if (isAndFilter(filter)) {
const filterValue = filter.and; const filterValue = filter.and;