Skip to content

The open alternative to Salesforce, designed for AI.

fix(front): keep empty values at the bottom for ascending sorts (#24366)

Félix Malfaitcedc57f61f67
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/__tests__/turnSortsIntoOrderBy.test.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/__tests__/turnSortsIntoOrderBy.test.ts
index cb24128ce74..36d7bac5a2a 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/__tests__/turnSortsIntoOrderBy.test.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/__tests__/turnSortsIntoOrderBy.test.ts
@@ -98,7 +98,7 @@ const turnSortsIntoOrderByTestUseCases: TurnSortsIntoOrderTestContext[] = [
direction: ViewSortDirection.ASC,
},
],
- expected: [{ field1: 'AscNullsFirst' }, { position: 'AscNullsFirst' }],
+ expected: [{ field1: 'AscNullsLast' }, { position: 'AscNullsFirst' }],
},
},
{
@@ -121,7 +121,7 @@ const turnSortsIntoOrderByTestUseCases: TurnSortsIntoOrderTestContext[] = [
},
],
expected: [
- { field1: 'AscNullsFirst' },
+ { field1: 'AscNullsLast' },
{ field2: 'DescNullsLast' },
{ position: 'AscNullsFirst' },
],
@@ -281,7 +281,7 @@ describe('turnSortsIntoOrderBy', () => {
]);
expect(result).toEqual([
- { company: { name: 'AscNullsFirst' } },
+ { company: { name: 'AscNullsLast' } },
{ position: 'AscNullsFirst' },
]);
});
@@ -317,7 +317,7 @@ describe('turnSortsIntoOrderBy', () => {
const result = turnSortsIntoOrderBy(personObjectMetadataItem, sorts, []);
expect(result).toEqual([
- { companyId: 'AscNullsFirst' },
+ { companyId: 'AscNullsLast' },
{ position: 'AscNullsFirst' },
]);
});
diff --git a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy.ts b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy.ts
index c9765b74265..dbf19573603 100644
--- a/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy.ts
+++ b/packages/twenty-front/src/modules/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy.ts
@@ -36,9 +36,10 @@ export const turnSortsIntoOrderBy = (
return undefined;
}
+ // Nulls last in both directions so a sparse column doesn't open with a wall of empty rows
const direction: OrderBy =
sort.direction === ViewSortDirection.ASC
- ? 'AscNullsFirst'
+ ? 'AscNullsLast'
: 'DescNullsLast';
if (correspondingField.type === FieldMetadataType.RELATION) {