The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Fetch load more on group by (#18811)
Thomas Trompettebdaff0b7e29c
diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexTableFetchMore.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexTableLazyQuery.tssimilarity index 93%rename from packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexTableFetchMore.tsrename to packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexTableLazyQuery.tsindex 73c99ab1041..da937a3a9ba 100644--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexTableFetchMore.ts+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexTableLazyQuery.ts@@ -3,7 +3,7 @@ import { useLazyFindManyRecords } from '@/object-record/hooks/useLazyFindManyRecimport { useRelevantRecordsGqlFields } from '@/object-record/record-field/hooks/useRelevantRecordsGqlFields';import { useFindManyRecordIndexTableParams } from '@/object-record/record-index/hooks/useFindManyRecordIndexTableParams';-export const useRecordIndexTableFetchMore = (objectNameSingular: string) => {+export const useRecordIndexTableLazyQuery = (objectNameSingular: string) => {const params = useFindManyRecordIndexTableParams(objectNameSingular);const { objectMetadataItem } = useObjectMetadataItem({diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexTableQuery.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexTableQuery.tsindex 884d8b0b999..66eeb5a3935 100644--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexTableQuery.ts+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useRecordIndexTableQuery.ts@@ -18,12 +18,18 @@ export const useRecordIndexTableQuery = (objectNameSingular: string) => {objectMetadataItem,});- const { records, hasNextPage, queryIdentifier, loading, totalCount } =- useFindManyRecords({- ...params,- recordGqlFields,- skip: showAuthModal,- });+ const {+ records,+ hasNextPage,+ queryIdentifier,+ loading,+ totalCount,+ fetchMoreRecords,+ } = useFindManyRecords({+ ...params,+ recordGqlFields,+ skip: showAuthModal,+ });return {records: showAuthModal ? SIGN_IN_BACKGROUND_MOCK_COMPANIES : records,@@ -31,5 +37,6 @@ export const useRecordIndexTableQuery = (objectNameSingular: string) => {hasNextPage,queryIdentifier,totalCount,+ fetchMoreRecords,};};diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionLoadMore.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionLoadMore.tsxindex 57a9c6ff1b3..f10488ec70e 100644--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionLoadMore.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-section/components/RecordTableRecordGroupSectionLoadMore.tsx@@ -1,5 +1,5 @@import { useCurrentRecordGroupId } from '@/object-record/record-group/hooks/useCurrentRecordGroupId';-import { useRecordIndexTableFetchMore } from '@/object-record/record-index/hooks/useRecordIndexTableFetchMore';+import { useRecordIndexTableQuery } from '@/object-record/record-index/hooks/useRecordIndexTableQuery';import { recordIndexHasFetchedAllRecordsByGroupComponentState } from '@/object-record/record-index/states/recordIndexHasFetchedAllRecordsByGroupComponentState';import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';import { RecordTableActionRow } from '@/object-record/record-table/record-table-row/components/RecordTableActionRow';@@ -12,8 +12,7 @@ export const RecordTableRecordGroupSectionLoadMore = () => {const currentRecordGroupId = useCurrentRecordGroupId();- const { fetchMoreRecordsLazy } =- useRecordIndexTableFetchMore(objectNameSingular);+ const { fetchMoreRecords } = useRecordIndexTableQuery(objectNameSingular);const recordIndexHasFetchedAllRecordsByGroup =useAtomComponentFamilyStateValue(@@ -22,7 +21,7 @@ export const RecordTableRecordGroupSectionLoadMore = () => {);const handleLoadMore = () => {- fetchMoreRecordsLazy();+ fetchMoreRecords();};if (recordIndexHasFetchedAllRecordsByGroup) {diff --git a/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableVirtualizedInitialDataLoadEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableVirtualizedInitialDataLoadEffect.tsxindex 8762406ac22..291c1a3e36d 100644--- a/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableVirtualizedInitialDataLoadEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/virtualization/components/RecordTableVirtualizedInitialDataLoadEffect.tsx@@ -1,4 +1,4 @@-import { useRecordIndexTableFetchMore } from '@/object-record/record-index/hooks/useRecordIndexTableFetchMore';+import { useRecordIndexTableLazyQuery } from '@/object-record/record-index/hooks/useRecordIndexTableLazyQuery';import { useRecordTableContextOrThrow } from '@/object-record/record-table/contexts/RecordTableContext';import { visibleRecordFieldsComponentSelector } from '@/object-record/record-field/states/visibleRecordFieldsComponentSelector';@@ -20,7 +20,7 @@ import { useEffect } from 'react';export const RecordTableVirtualizedInitialDataLoadEffect = () => {const { recordTableId, objectNameSingular } = useRecordTableContextOrThrow();- const { queryIdentifier } = useRecordIndexTableFetchMore(objectNameSingular);+ const { queryIdentifier } = useRecordIndexTableLazyQuery(objectNameSingular);const [lastRecordTableQueryIdentifier, setLastRecordTableQueryIdentifier] =useAtomComponentState(lastRecordTableQueryIdentifierComponentState);diff --git a/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useTriggerInitialRecordTableDataLoad.ts b/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useTriggerInitialRecordTableDataLoad.tsindex 85620863743..2b752f4a53a 100644--- a/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useTriggerInitialRecordTableDataLoad.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/virtualization/hooks/useTriggerInitialRecordTableDataLoad.ts@@ -1,7 +1,7 @@import { useCallback } from 'react';import { useStore } from 'jotai';-import { useRecordIndexTableFetchMore } from '@/object-record/record-index/hooks/useRecordIndexTableFetchMore';+import { useRecordIndexTableLazyQuery } from '@/object-record/record-index/hooks/useRecordIndexTableLazyQuery';import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';import { RECORD_TABLE_HORIZONTAL_SCROLL_SHADOW_VISIBILITY_CSS_VARIABLE_NAME } from '@/object-record/record-table/constants/RecordTableHorizontalScrollShadowVisibilityCssVariableName';@@ -39,7 +39,7 @@ export const useTriggerInitialRecordTableDataLoad = () => {const showAuthModal = useShowAuthModal();const { findManyRecordsLazy } =- useRecordIndexTableFetchMore(objectNameSingular);+ useRecordIndexTableLazyQuery(objectNameSingular);const isInitializingVirtualTableDataLoadingCallbackState =useAtomComponentStateCallbackState(