The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Skip standby aggregate queries when refetching after record changes (#27691)
Félix Malfaitdfd542817348
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useRefetchAggregateQueries.test.tsx b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useRefetchAggregateQueries.test.tsxindex 1a4dfe1aebf..e86b4306519 100644--- a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useRefetchAggregateQueries.test.tsx+++ b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useRefetchAggregateQueries.test.tsx@@ -32,9 +32,24 @@ describe('useRefetchAggregateQueries', () => {expect(mockRefetchQueries).toHaveBeenCalledTimes(1);expect(mockRefetchQueries).toHaveBeenCalledWith({include: [expectedQueryName, expectedQueryNameGroupBy],+ onQueryUpdated: expect.any(Function),});});+ it('should not refetch skipped queries', async () => {+ const { result } = renderHook(() => useRefetchAggregateQueries());+ await result.current.refetchAggregateQueries({+ objectMetadataNamePlural: 'opportunities',+ });++ const { onQueryUpdated } = mockRefetchQueries.mock.calls[0][0];++ expect(onQueryUpdated({ options: { fetchPolicy: 'standby' } })).toBe(false);+ expect(onQueryUpdated({ options: { fetchPolicy: 'cache-first' } })).toBe(+ true,+ );+ });+it('should handle errors during refetch', async () => {const error = new Error('Refetch failed');mockRefetchQueries.mockRejectedValue(error);diff --git a/packages/twenty-front/src/modules/object-record/hooks/useRefetchAggregateQueries.ts b/packages/twenty-front/src/modules/object-record/hooks/useRefetchAggregateQueries.tsindex cffd0a83fbd..362b9cca8d3 100644--- a/packages/twenty-front/src/modules/object-record/hooks/useRefetchAggregateQueries.ts+++ b/packages/twenty-front/src/modules/object-record/hooks/useRefetchAggregateQueries.ts@@ -18,6 +18,10 @@ export const useRefetchAggregateQueries = () => {await apolloCoreClient.refetchQueries({include: [queryName, groupByAggregateQueryName],+ // Matching by name also picks up skipped (standby) queries, such as the+ // footer cell of every table column that has no aggregate operation+ onQueryUpdated: (observableQuery) =>+ observableQuery.options.fetchPolicy !== 'standby',});};diff --git a/packages/twenty-front/src/modules/object-record/hooks/useRefetchAggregateQueriesForObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-record/hooks/useRefetchAggregateQueriesForObjectMetadataItem.tsindex dd5f75aa6c4..ae0fb7ca694 100644--- a/packages/twenty-front/src/modules/object-record/hooks/useRefetchAggregateQueriesForObjectMetadataItem.ts+++ b/packages/twenty-front/src/modules/object-record/hooks/useRefetchAggregateQueriesForObjectMetadataItem.ts@@ -1,23 +1,17 @@-import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';-import { getGroupByAggregateQueryName } from '@/object-record/record-aggregate/utils/getGroupByAggregateQueryName';-import { getAggregateQueryName } from '@/object-record/utils/getAggregateQueryName';+import { useRefetchAggregateQueries } from '@/object-record/hooks/useRefetchAggregateQueries';export const useRefetchAggregateQueriesForObjectMetadataItem = () => {- const apolloCoreClient = useApolloCoreClient();+ const { refetchAggregateQueries } = useRefetchAggregateQueries();const refetchAggregateQueriesForObjectMetadataItem = async ({objectMetadataItem,}: {objectMetadataItem: EnrichedObjectMetadataItem;}) => {- const queryName = getAggregateQueryName(objectMetadataItem.namePlural);- const groupByAggregateQueryName = getGroupByAggregateQueryName({+ await refetchAggregateQueries({objectMetadataNamePlural: objectMetadataItem.namePlural,});- await apolloCoreClient.refetchQueries({- include: [queryName, groupByAggregateQueryName],- });};return {