Skip to content

The open alternative to Salesforce, designed for AI.

fix(view): keep view sorts in creation order in the flat view cache (#25448)

Sagar Kewatd8de6c94f0e9
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view/services/workspace-flat-view-map-cache.service.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view/services/workspace-flat-view-map-cache.service.ts
index 90df1ff433a..c80a0799bf3 100644
--- a/packages/twenty-server/src/engine/metadata-modules/flat-view/services/workspace-flat-view-map-cache.service.ts
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-view/services/workspace-flat-view-map-cache.service.ts
@@ -5,6 +5,7 @@ import { MetadataFlatEntityMapsCacheProvider } from 'src/engine/workspace-cache/
import { createEmptyFlatEntityMaps } from 'src/engine/metadata-modules/flat-entity/constant/create-empty-flat-entity-maps.constant';
import { type FlatViewMaps } from 'src/engine/metadata-modules/flat-view/types/flat-view-maps.type';
import { fromViewEntityToFlatView } from 'src/engine/metadata-modules/flat-view/utils/from-view-entity-to-flat-view.util';
+import { sortViewSortsByCreation } from 'src/engine/metadata-modules/flat-view/utils/sort-view-sorts-by-creation.util';
import { WorkspaceCache } from 'src/engine/workspace-cache/decorators/workspace-cache.decorator';
import { type WorkspaceCacheProviderContext } from 'src/engine/workspace-cache/types/workspace-cache-provider-context.type';
import { createIdToUniversalIdentifierMap } from 'src/engine/workspace-cache/utils/create-id-to-universal-identifier-map.util';
@@ -32,7 +33,7 @@ const FLAT_VIEW_ROWS_REQUIREMENT = {
groupBy: ['viewId'],
},
viewSort: {
- columns: ['id', 'universalIdentifier'],
+ columns: ['id', 'universalIdentifier', 'createdAt'],
groupBy: ['viewId'],
},
viewFieldGroup: {
@@ -86,7 +87,9 @@ export class WorkspaceFlatViewMapCacheService extends MetadataFlatEntityMapsCach
viewFilters: viewFilters.byViewId.get(viewEntity.id) || [],
viewGroups: viewGroups.byViewId.get(viewEntity.id) || [],
viewFilterGroups: viewFilterGroups.byViewId.get(viewEntity.id) || [],
- viewSorts: viewSorts.byViewId.get(viewEntity.id) || [],
+ viewSorts: sortViewSortsByCreation(
+ viewSorts.byViewId.get(viewEntity.id) || [],
+ ),
viewFieldGroups: viewFieldGroups.byViewId.get(viewEntity.id) || [],
navigationMenuItems:
navigationMenuItems.byViewId.get(viewEntity.id) || [],
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/__tests__/sort-view-sorts-by-creation.util.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/__tests__/sort-view-sorts-by-creation.util.spec.ts
new file mode 100644
index 00000000000..4f9e0a207ce
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/__tests__/sort-view-sorts-by-creation.util.spec.ts
@@ -0,0 +1,42 @@
+import { sortViewSortsByCreation } from 'src/engine/metadata-modules/flat-view/utils/sort-view-sorts-by-creation.util';
+
+describe('sortViewSortsByCreation', () => {
+ it('gives the oldest sort highest priority regardless of input order', () => {
+ const viewSorts = [
+ { id: 'newest-sort', createdAt: new Date('2026-01-03T00:00:00.000Z') },
+ { id: 'oldest-sort', createdAt: new Date('2026-01-01T00:00:00.000Z') },
+ { id: 'middle-sort', createdAt: new Date('2026-01-02T00:00:00.000Z') },
+ ];
+
+ expect(sortViewSortsByCreation(viewSorts).map(({ id }) => id)).toEqual([
+ 'oldest-sort',
+ 'middle-sort',
+ 'newest-sort',
+ ]);
+ });
+
+ it('orders sorts with equal creation timestamps by ID', () => {
+ const createdAt = new Date('2026-01-01T00:00:00.000Z');
+
+ expect(
+ sortViewSortsByCreation([
+ { id: 'sort-b', createdAt },
+ { id: 'sort-a', createdAt },
+ ]).map(({ id }) => id),
+ ).toEqual(['sort-a', 'sort-b']);
+ });
+
+ it('leaves the supplied array unchanged', () => {
+ const viewSorts = [
+ { id: 'middle-sort', createdAt: new Date('2026-01-02T00:00:00.000Z') },
+ { id: 'oldest-sort', createdAt: new Date('2026-01-01T00:00:00.000Z') },
+ ];
+
+ sortViewSortsByCreation(viewSorts);
+
+ expect(viewSorts.map(({ id }) => id)).toEqual([
+ 'middle-sort',
+ 'oldest-sort',
+ ]);
+ });
+});
diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/sort-view-sorts-by-creation.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/sort-view-sorts-by-creation.util.ts
new file mode 100644
index 00000000000..f0582b9d5f7
--- /dev/null
+++ b/packages/twenty-server/src/engine/metadata-modules/flat-view/utils/sort-view-sorts-by-creation.util.ts
@@ -0,0 +1,10 @@
+export const sortViewSortsByCreation = <
+ TViewSort extends { id: string; createdAt: Date },
+>(
+ viewSorts: TViewSort[],
+): TViewSort[] =>
+ [...viewSorts].sort(
+ (firstViewSort, secondViewSort) =>
+ firstViewSort.createdAt.getTime() - secondViewSort.createdAt.getTime() ||
+ firstViewSort.id.localeCompare(secondViewSort.id),
+ );