Fix CSV export missing last page (#7167)

twentyhq · Sep 20, 2024 · 7781d70 · 7781d70
1 parent b1889e4
commit 7781d70
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 230 deletions.
diff --git a/packages/twenty-front/src/modules/object-record/record-index/options/hooks/useTableData.ts b/packages/twenty-front/src/modules/object-record/record-index/options/hooks/useTableData.ts
@@ -142,10 +142,6 @@ export const useTableData = ({
   });
 
   useEffect(() => {
-    const MAXIMUM_REQUESTS = isDefined(totalCount)
-      ? Math.min(maximumRequests, totalCount / pageSize)
-      : maximumRequests;
-
     const fetchNextPage = async () => {
       setInflight(true);
       setPreviousRecordCount(records.length);
@@ -167,8 +163,8 @@ export const useTableData = ({
     }
 
     if (
-      pageCount >= MAXIMUM_REQUESTS ||
-      (isDefined(totalCount) && records.length === totalCount)
+      pageCount >= maximumRequests ||
+      (isDefined(totalCount) && records.length >= totalCount)
     ) {
       setPageCount(0);
 

diff --git a/...ql-query-parsers/graphql-query-filter/__tests__/graphql-query-filter-field.parser.spec.ts b/...ql-query-parsers/graphql-query-filter/__tests__/graphql-query-filter-field.parser.spec.ts
diff --git a/...query-parsers/graphql-query-filter/__tests__/graphql-query-filter-operator.parser.spec.ts b/...query-parsers/graphql-query-filter/__tests__/graphql-query-filter-operator.parser.spec.ts
diff --git a/...ry-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts b/...ry-runner/graphql-query-parsers/graphql-query-filter/graphql-query-filter-field.parser.ts
@@ -1,3 +1,4 @@
+import { isArray } from 'class-validator';
 import { ObjectLiteral, WhereExpressionBuilder } from 'typeorm';
 
 import { FieldMetadataInterface } from 'src/engine/metadata-modules/field-metadata/interfaces/field-metadata.interface';
@@ -48,6 +49,10 @@ export class GraphqlQueryFilterFieldParser {
     }
     const [[operator, value]] = Object.entries(filterValue);
 
+    if (operator === 'in' && (!isArray(value) || value.length === 0)) {
+      return;
+    }
+
     const { sql, params } = this.computeWhereConditionParts(
       fieldMetadata,
       operator,

diff --git a/...er/graphql-query-parsers/graphql-query-order/__tests__/graphql-query-order.parser.spec.ts b/...er/graphql-query-parsers/graphql-query-order/__tests__/graphql-query-order.parser.spec.ts