Do not load more if error

twentyhq · May 21, 2024 · ac9fac4 · ac9fac4
1 parent d9012d6
commit ac9fac4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecords.ts b/packages/twenty-front/src/modules/object-record/hooks/useFindManyRecords.ts
@@ -124,7 +124,7 @@ export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
 
   const fetchMoreRecords = useCallback(async () => {
     // Remote objects does not support hasNextPage. We cannot rely on it to fetch more records.
-    if (hasNextPage || !isAggregationEnabled(objectMetadataItem)) {
+    if (hasNextPage || (!isAggregationEnabled(objectMetadataItem) && !error)) {
       setIsFetchingMoreObjects(true);
 
       try {
@@ -202,6 +202,7 @@ export const useFindManyRecords = <T extends ObjectRecord = ObjectRecord>({
   }, [
     hasNextPage,
     objectMetadataItem,
+    error,
     setIsFetchingMoreObjects,
     fetchMore,
     filter,

diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerDropdown.tsx
@@ -15,9 +15,9 @@ import { ViewPickerListContent } from '@/views/view-picker/components/ViewPicker
 import { VIEW_PICKER_DROPDOWN_ID } from '@/views/view-picker/constants/ViewPickerDropdownId';
 import { useViewPickerMode } from '@/views/view-picker/hooks/useViewPickerMode';
 import { useViewPickerPersistView } from '@/views/view-picker/hooks/useViewPickerPersistView';
+import { isDefined } from '~/utils/isDefined';
 
 import { useViewStates } from '../../hooks/internal/useViewStates';
-import { isDefined } from '~/utils/isDefined';
 
 const StyledDropdownLabelAdornments = styled.span`
   align-items: center;