Skip to content

The open alternative to Salesforce, designed for AI.

Fix non-idempotent application sync for viewSorts (subFieldName undefined vs null) (#22505)

martmull13be2188cc6f
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-view-sort-manifest-to-universal-flat-view-sort.util.spec.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-view-sort-manifest-to-universal-flat-view-sort.util.spec.ts
index 23e9a043432..485f9654dc3 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-view-sort-manifest-to-universal-flat-view-sort.util.spec.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/__tests__/from-view-sort-manifest-to-universal-flat-view-sort.util.spec.ts
@@ -29,6 +29,23 @@ describe('fromViewSortManifestToUniversalFlatViewSort', () => {
expect(result.createdAt).toBe(now);
expect(result.updatedAt).toBe(now);
expect(result.deletedAt).toBeNull();
+ expect(result.subFieldName).toBeNull();
+ });
+
+ it('should pass through subFieldName when provided', () => {
+ const result = fromViewSortManifestToUniversalFlatViewSort({
+ viewSortManifest: {
+ universalIdentifier: 'vsort-uuid-3',
+ fieldMetadataUniversalIdentifier: 'field-uuid-3',
+ direction: ViewSortDirection.ASC,
+ subFieldName: 'amountMicros',
+ },
+ viewUniversalIdentifier,
+ applicationUniversalIdentifier,
+ now,
+ });
+
+ expect(result.subFieldName).toBe('amountMicros');
});
it('should convert a view sort manifest with DESC direction', () => {
diff --git a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-sort-manifest-to-universal-flat-view-sort.util.ts b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-sort-manifest-to-universal-flat-view-sort.util.ts
index e34d56cf145..6f970ba9cf9 100644
--- a/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-sort-manifest-to-universal-flat-view-sort.util.ts
+++ b/packages/twenty-server/src/engine/core-modules/application/application-manifest/converters/from-view-sort-manifest-to-universal-flat-view-sort.util.ts
@@ -20,6 +20,7 @@ export const fromViewSortManifestToUniversalFlatViewSort = ({
viewSortManifest.fieldMetadataUniversalIdentifier,
viewUniversalIdentifier,
direction: viewSortManifest.direction,
+ subFieldName: viewSortManifest.subFieldName ?? null,
createdAt: now,
updatedAt: now,
deletedAt: null,
diff --git a/packages/twenty-shared/src/application/viewManifestType.ts b/packages/twenty-shared/src/application/viewManifestType.ts
index e788e8d5c7d..834521579c0 100644
--- a/packages/twenty-shared/src/application/viewManifestType.ts
+++ b/packages/twenty-shared/src/application/viewManifestType.ts
@@ -61,6 +61,7 @@ export type ViewFieldGroupManifest = SyncableEntityOptions & {
export type ViewSortManifest = SyncableEntityOptions & {
fieldMetadataUniversalIdentifier: string;
direction: ViewSortDirection;
+ subFieldName?: string;
};
export type ViewManifest = SyncableEntityOptions & {