feat: record group fetch more

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

@@ -142,7 +142,7 @@ export const useFetchMoreRecordsWithPagination = <
                 const pageInfo =
                   fetchMoreResult?.[objectMetadataItem.namePlural]?.pageInfo;
 
-                if (isDefined(data?.[objectMetadataItem.namePlural])) {
+                if (isDefined(pageInfo)) {
                   set(
                     cursorFamilyState(queryIdentifier),
                     pageInfo.endCursor ?? '',
@@ -201,7 +201,6 @@ export const useFetchMoreRecordsWithPagination = <
       fetchMore,
       filter,
       orderBy,
-      data,
       onCompleted,
       handleFindManyRecordsError,
       queryIdentifier,

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

@@ -67,7 +67,7 @@ export const useLazyFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
       onError: handleFindManyRecordsError,
     });
 
-  const { fetchMoreRecords, totalCount, records } =
+  const { fetchMoreRecords, totalCount, records, hasNextPage } =
     useFetchMoreRecordsWithPagination<T>({
       objectNameSingular,
       filter,
@@ -108,8 +108,9 @@ export const useLazyFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
     loading,
     error,
     fetchMore,
-    fetchMoreRecordsWithPagination: fetchMoreRecords,
+    fetchMoreRecords,
     queryStateIdentifier: queryIdentifier,
     findManyRecords: findManyRecordsLazy,
+    hasNextPage,
   };
 };

packages/twenty-front/src/modules/object-record/record-group/states/selectors/visibleRecordGroupIdsComponentSelector.ts

@@ -2,7 +2,7 @@ import { recordGroupDefinitionFamilyState } from '@/object-record/record-group/s
 import { recordGroupIdsComponentState } from '@/object-record/record-group/states/recordGroupIdsComponentState';
 import { RecordGroupDefinition } from '@/object-record/record-group/types/RecordGroupDefinition';
 import { RecordGroupSort } from '@/object-record/record-group/types/RecordGroupSort';
-import { sortedInsert } from '@/object-record/record-group/utils/sortedInsert';
+import { recordGroupSortedInsert } from '@/object-record/record-group/utils/recordGroupSortedInsert';
 import { recordIndexRecordGroupSortComponentState } from '@/object-record/record-index/states/recordIndexRecordGroupSortComponentState';
 
 import { createComponentSelectorV2 } from '@/ui/utilities/state/component-state/utils/createComponentSelectorV2';
@@ -54,7 +54,7 @@ export const visibleRecordGroupIdsComponentSelector = createComponentSelectorV2<
           isDefined(recordGroupDefinition) &&
           recordGroupDefinition.isVisible
         ) {
-          sortedInsert(result, recordGroupDefinition, comparator);
+          recordGroupSortedInsert(result, recordGroupDefinition, comparator);
         }
       }
 

packages/twenty-front/src/modules/object-record/record-group/utils/__tests__/recordGroupSortedInsert.test.ts

@@ -0,0 +1,66 @@
+// export const recordGroupSortedInsert = <T>(
+//   array: T[],
+//   item: T,
+//   comparator: (a: T, b: T) => number,
+// ) => {
+//   let low = 0;
+//   let high = array.length;
+
+import { expect } from '@storybook/test';
+
+//   while (low < high) {
+//     const mid = Math.floor((low + high) / 2);
+
+//     if (comparator(item, array[mid]) < 0) {
+//       high = mid;
+//     } else {
+//       low = mid + 1;
+//     }
+//   }
+
+//   array.splice(low, 0, item);
+// };
+
+import { recordGroupSortedInsert } from '../recordGroupSortedInsert';
+
+describe('recordGroupSortedInsert', () => {
+  it('should insert an item into an empty array', () => {
+    const array: number[] = [];
+    const item = 1;
+    const comparator = (a: number, b: number) => a - b;
+
+    recordGroupSortedInsert(array, item, comparator);
+
+    expect(array).toEqual([1]);
+  });
+
+  it('should insert an item at the beginning of the array', () => {
+    const array = [2, 3, 4];
+    const item = 1;
+    const comparator = (a: number, b: number) => a - b;
+
+    recordGroupSortedInsert(array, item, comparator);
+
+    expect(array).toEqual([1, 2, 3, 4]);
+  });
+
+  it('should insert an item at the end of the array', () => {
+    const array = [1, 2, 3];
+    const item = 4;
+    const comparator = (a: number, b: number) => a - b;
+
+    recordGroupSortedInsert(array, item, comparator);
+
+    expect(array).toEqual([1, 2, 3, 4]);
+  });
+
+  it('should insert an item in the middle of the array', () => {
+    const array = [1, 3, 4];
+    const item = 2;
+    const comparator = (a: number, b: number) => a - b;
+
+    recordGroupSortedInsert(array, item, comparator);
+
+    expect(array).toEqual([1, 2, 3, 4]);
+  });
+});

packages/twenty-front/src/modules/object-record/record-group/utils/sortedInsert.ts → packages/twenty-front/src/modules/object-record/record-group/utils/recordGroupSortedInsert.ts

@@ -1,4 +1,4 @@
-export const sortedInsert = <T>(
+export const recordGroupSortedInsert = <T>(
   array: T[],
   item: T,
   comparator: (a: T, b: T) => number,

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

@@ -6,7 +6,7 @@ import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadata
 import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
 import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { RecordIndexRootPropsContext } from '@/object-record/record-index/contexts/RecordIndexRootPropsContext';
-import { useFindManyParams } from '@/object-record/record-index/hooks/useLoadRecordIndexTable';
+import { useFindManyRecordIndexTableParams } from '@/object-record/record-index/hooks/useFindManyRecordIndexTableParams';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useSetRecoilComponentStateV2 } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentStateV2';
 import { useContext, useEffect } from 'react';
@@ -31,7 +31,7 @@ export const RecordIndexContainerContextStoreNumberOfSelectedRecordsEffect =
       objectNameSingular,
     });
 
-    const findManyRecordsParams = useFindManyParams(
+    const findManyRecordsParams = useFindManyRecordIndexTableParams(
       objectMetadataItem?.nameSingular ?? '',
       objectMetadataItem?.namePlural ?? '',
     );

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

@@ -13,7 +13,7 @@ import { useLazyFindManyRecords } from '@/object-record/hooks/useLazyFindManyRec
 import { EXPORT_TABLE_DATA_DEFAULT_PAGE_SIZE } from '@/object-record/object-options-dropdown/constants/ExportTableDataDefaultPageSize';
 import { useObjectOptionsForBoard } from '@/object-record/object-options-dropdown/hooks/useObjectOptionsForBoard';
 import { recordGroupFieldMetadataComponentState } from '@/object-record/record-group/states/recordGroupFieldMetadataComponentState';
-import { useFindManyParams } from '@/object-record/record-index/hooks/useLoadRecordIndexTable';
+import { useFindManyRecordIndexTableParams } from '@/object-record/record-index/hooks/useFindManyRecordIndexTableParams';
 import { visibleTableColumnsComponentSelector } from '@/object-record/record-table/states/selectors/visibleTableColumnsComponentSelector';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { ViewType } from '@/views/types/ViewType';
@@ -94,29 +94,24 @@ export const useExportFetchRecords = ({
     objectMetadataItem,
   );
 
-  const findManyRecordsParams = useFindManyParams(
+  const findManyRecordsParams = useFindManyRecordIndexTableParams(
     objectMetadataItem.nameSingular,
     recordIndexId,
   );
 
-  const {
-    findManyRecords,
-    totalCount,
-    records,
-    fetchMoreRecordsWithPagination,
-    loading,
-  } = useLazyFindManyRecords({
-    ...findManyRecordsParams,
-    filter: queryFilter,
-    limit: pageSize,
-  });
+  const { findManyRecords, totalCount, records, fetchMoreRecords, loading } =
+    useLazyFindManyRecords({
+      ...findManyRecordsParams,
+      filter: queryFilter,
+      limit: pageSize,
+    });
 
   useEffect(() => {
     const fetchNextPage = async () => {
       setInflight(true);
       setPreviousRecordCount(records.length);
 
-      await fetchMoreRecordsWithPagination();
+      await fetchMoreRecords();
 
       setPageCount((state) => state + 1);
       setProgress({
@@ -166,7 +161,7 @@ export const useExportFetchRecords = ({
     }
   }, [
     delayMs,
-    fetchMoreRecordsWithPagination,
+    fetchMoreRecords,
     inflight,
     isDownloading,
     pageCount,

packages/twenty-front/src/modules/object-record/record-index/hooks/useLoadRecordIndexTable.ts → packages/twenty-front/src/modules/object-record/record-index/hooks/useFindManyRecordIndexTableParams.ts

@@ -1,25 +1,15 @@
-import { useRecoilValue } from 'recoil';
-
-import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
-import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { turnSortsIntoOrderBy } from '@/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy';
 import { computeViewRecordGqlOperationFilter } from '@/object-record/record-filter/utils/computeViewRecordGqlOperationFilter';
 import { useCurrentRecordGroupDefinition } from '@/object-record/record-group/hooks/useCurrentRecordGroupDefinition';
-import { useRecordTableRecordGqlFields } from '@/object-record/record-index/hooks/useRecordTableRecordGqlFields';
-import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
 import { tableFiltersComponentState } from '@/object-record/record-table/states/tableFiltersComponentState';
 import { tableSortsComponentState } from '@/object-record/record-table/states/tableSortsComponentState';
 import { tableViewFilterGroupsComponentState } from '@/object-record/record-table/states/tableViewFilterGroupsComponentState';
-import { SIGN_IN_BACKGROUND_MOCK_COMPANIES } from '@/sign-in-background-mock/constants/SignInBackgroundMockCompanies';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
-import { isNull } from '@sniptt/guards';
 import { useMemo } from 'react';
 import { isDefined } from 'twenty-ui';
-import { WorkspaceActivationStatus } from '~/generated/graphql';
 
-export const useFindManyParams = (
+export const useFindManyRecordIndexTableParams = (
   objectNameSingular: string,
   recordTableId?: string,
 ) => {
@@ -84,51 +74,7 @@ export const useFindManyParams = (
       ...recordGroupFilter,
     },
     orderBy,
-  };
-};
-
-export const useLoadRecordIndexTable = (objectNameSingular: string) => {
-  const { objectMetadataItem } = useObjectMetadataItem({
-    objectNameSingular,
-  });
-
-  const { setRecordTableData, setIsRecordTableInitialLoading } =
-    useRecordTable();
-  const currentWorkspace = useRecoilValue(currentWorkspaceState);
-  const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
-  const params = useFindManyParams(objectNameSingular);
-
-  const recordGqlFields = useRecordTableRecordGqlFields({ objectMetadataItem });
-
-  const {
-    records,
-    loading,
-    totalCount,
-    fetchMoreRecords,
-    queryStateIdentifier,
-    hasNextPage,
-  } = useFindManyRecords({
-    ...params,
-    recordGqlFields,
-    onCompleted: () => {
-      setIsRecordTableInitialLoading(false);
-    },
-    onError: () => {
-      setIsRecordTableInitialLoading(false);
-    },
-    skip: isNull(currentWorkspaceMember),
-  });
-
-  return {
-    records:
-      currentWorkspace?.activationStatus === WorkspaceActivationStatus.Active
-        ? records
-        : SIGN_IN_BACKGROUND_MOCK_COMPANIES,
-    totalCount: totalCount,
-    loading,
-    fetchMoreRecords,
-    queryStateIdentifier,
-    setRecordTableData,
-    hasNextPage,
+    // If we have a current record group definition, we only want to fetch 8 records by page
+    ...(currentRecordGroupDefinition ? { limit: 8 } : {}),
   };
 };