Skip to content

The open alternative to Salesforce, designed for AI.

perf(api): drop NULLS FIRST from the id pagination tiebreaker (#27176)

Charles Bochetd520eb282280
diff --git a/packages/twenty-front/src/modules/object-record/record-selection/states/lastSelectedRecordIndexComponentState.ts b/packages/twenty-front/src/modules/object-record/record-selection/states/lastSelectedRecordIndexComponentState.ts
deleted file mode 100644
index dee1af4909c..00000000000
--- a/packages/twenty-front/src/modules/object-record/record-selection/states/lastSelectedRecordIndexComponentState.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { RecordSelectionComponentInstanceContext } from '@/object-record/record-selection/states/contexts/RecordSelectionComponentInstanceContext';
-import { createAtomComponentState } from '@/ui/utilities/state/jotai/utils/createAtomComponentState';
-
-export const lastSelectedRecordIndexComponentState = createAtomComponentState<
- number | null | undefined
->({
- key: 'lastSelectedRecordIndexComponentState',
- defaultValue: null,
- componentInstanceContext: RecordSelectionComponentInstanceContext,
-});
diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts
index 6a7ed65bcab..508cbd86265 100644
--- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts
+++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-find-many-query-runner.service.ts
@@ -6,7 +6,7 @@ import {
QUERY_MAX_RECORDS,
QUERY_MAX_RECORDS_FROM_RELATION,
} from 'twenty-shared/constants';
-import { ObjectRecord, OrderByDirection } from 'twenty-shared/types';
+import { ObjectRecord } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { FindOptionsRelations, ObjectLiteral } from 'typeorm';
@@ -16,6 +16,7 @@ import {
} from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
import { CommonBaseQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-base-query-runner.service';
+import { DEFAULT_ID_ORDER_BY_TIEBREAKER } from 'src/engine/api/common/constants/default-id-order-by-tiebreaker.constant';
import {
CommonQueryRunnerException,
CommonQueryRunnerExceptionCode,
@@ -95,7 +96,7 @@ export class CommonFindManyQueryRunnerService extends CommonBaseQueryRunnerServi
const orderByLeaves = resolveOrderByLeaves({
orderBy: [
...(args.orderBy ?? []),
- { id: OrderByDirection.AscNullsFirst },
+ DEFAULT_ID_ORDER_BY_TIEBREAKER,
] as ObjectRecordOrderBy,
flatObjectMetadata,
flatObjectMetadataMaps,
diff --git a/packages/twenty-server/src/engine/api/common/constants/default-id-order-by-tiebreaker.constant.ts b/packages/twenty-server/src/engine/api/common/constants/default-id-order-by-tiebreaker.constant.ts
new file mode 100644
index 00000000000..8bc3adbfaaa
--- /dev/null
+++ b/packages/twenty-server/src/engine/api/common/constants/default-id-order-by-tiebreaker.constant.ts
@@ -0,0 +1,5 @@
+import { OrderByDirection } from 'twenty-shared/types';
+
+export const DEFAULT_ID_ORDER_BY_TIEBREAKER = {
+ id: OrderByDirection.AscNullsLast,
+};
diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-parser-utils/__tests__/parse-order-by-rest-request.util.spec.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-parser-utils/__tests__/parse-order-by-rest-request.util.spec.ts
index 5589286f479..a8d615a2961 100644
--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-parser-utils/__tests__/parse-order-by-rest-request.util.spec.ts
+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-parser-utils/__tests__/parse-order-by-rest-request.util.spec.ts
@@ -8,7 +8,7 @@ describe('parseOrderByRestRequest', () => {
expect(parseOrderByRestRequest(request)).toEqual([
{},
- { id: OrderByDirection.AscNullsFirst },
+ { id: OrderByDirection.AscNullsLast },
]);
});
@@ -22,7 +22,7 @@ describe('parseOrderByRestRequest', () => {
expect(parseOrderByRestRequest(request)).toEqual([
{ fieldNumber: OrderByDirection.AscNullsFirst },
{ fieldText: OrderByDirection.DescNullsLast },
- { id: OrderByDirection.AscNullsFirst },
+ { id: OrderByDirection.AscNullsLast },
]);
});
@@ -35,7 +35,7 @@ describe('parseOrderByRestRequest', () => {
expect(parseOrderByRestRequest(request)).toEqual([
{ fieldNumber: OrderByDirection.AscNullsFirst },
- { id: OrderByDirection.AscNullsFirst },
+ { id: OrderByDirection.AscNullsLast },
]);
});
@@ -48,7 +48,7 @@ describe('parseOrderByRestRequest', () => {
expect(parseOrderByRestRequest(request)).toEqual([
{ fieldCurrency: { amountMicros: OrderByDirection.AscNullsFirst } },
- { id: OrderByDirection.AscNullsFirst },
+ { id: OrderByDirection.AscNullsLast },
]);
});
@@ -61,7 +61,7 @@ describe('parseOrderByRestRequest', () => {
expect(parseOrderByRestRequest(request)).toEqual([
{ fieldCurrency: { amountMicros: OrderByDirection.DescNullsLast } },
- { id: OrderByDirection.AscNullsFirst },
+ { id: OrderByDirection.AscNullsLast },
]);
});
@@ -76,7 +76,7 @@ describe('parseOrderByRestRequest', () => {
expect(parseOrderByRestRequest(request)).toEqual([
{ fieldCurrency: { amountMicros: OrderByDirection.DescNullsLast } },
{ fieldText: { label: OrderByDirection.AscNullsLast } },
- { id: OrderByDirection.AscNullsFirst },
+ { id: OrderByDirection.AscNullsLast },
]);
});
diff --git a/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-parser-utils/add-default-order-by-id.util.ts b/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-parser-utils/add-default-order-by-id.util.ts
index 78a7db7b22f..673cc6589fa 100644
--- a/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-parser-utils/add-default-order-by-id.util.ts
+++ b/packages/twenty-server/src/engine/api/rest/input-request-parsers/order-by-parser-utils/add-default-order-by-id.util.ts
@@ -1,11 +1,8 @@
-import { OrderByDirection } from 'twenty-shared/types';
-
+import { DEFAULT_ID_ORDER_BY_TIEBREAKER } from 'src/engine/api/common/constants/default-id-order-by-tiebreaker.constant';
import { type ObjectRecordOrderBy } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
export const addDefaultOrderById = (orderBy: ObjectRecordOrderBy) => {
const hasIdOrder = orderBy.some((o) => Object.keys(o).includes('id'));
- return hasIdOrder
- ? orderBy
- : [...orderBy, { id: OrderByDirection.AscNullsFirst }];
+ return hasIdOrder ? orderBy : [...orderBy, DEFAULT_ID_ORDER_BY_TIEBREAKER];
};
diff --git a/packages/twenty-server/src/engine/core-modules/record-crud/services/find-records.service.ts b/packages/twenty-server/src/engine/core-modules/record-crud/services/find-records.service.ts
index 3e131df6a75..3f2d7ec09e2 100644
--- a/packages/twenty-server/src/engine/core-modules/record-crud/services/find-records.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/record-crud/services/find-records.service.ts
@@ -1,12 +1,13 @@
import { Injectable, Logger } from '@nestjs/common';
import { QUERY_MAX_RECORDS } from 'twenty-shared/constants';
-import { OrderByDirection, type ObjectRecord } from 'twenty-shared/types';
+import { type ObjectRecord } from 'twenty-shared/types';
import { type ObjectRecordOrderBy } from 'src/engine/api/graphql/workspace-query-builder/interfaces/object-record.interface';
import { isNonEmptyArray } from '@sniptt/guards';
import { CommonFindManyQueryRunnerService } from 'src/engine/api/common/common-query-runners/common-find-many-query-runner.service';
+import { DEFAULT_ID_ORDER_BY_TIEBREAKER } from 'src/engine/api/common/constants/default-id-order-by-tiebreaker.constant';
import { getRelationsSelectFields } from 'src/engine/api/common/common-select-fields/utils/get-relations-select-fields.util';
import { CommonApiContextBuilderService } from 'src/engine/core-modules/record-crud/services/common-api-context-builder.service';
import { type FindRecordsParams } from 'src/engine/core-modules/record-crud/types/find-records-params.type';
@@ -88,7 +89,7 @@ export class FindRecordsService {
// Add id to orderBy for consistent pagination
const orderByWithIdCondition: ObjectRecordOrderBy = [
...(orderBy ?? []).filter((item) => item !== undefined),
- { id: OrderByDirection.AscNullsFirst },
+ DEFAULT_ID_ORDER_BY_TIEBREAKER,
];
const {