From 5327febcbe0ccaef679530ef7cf51a02a81d8036 Mon Sep 17 00:00:00 2001 From: Paul Rastoin <45004772+prastoin@users.noreply.github.com> Date: Wed, 26 Feb 2025 18:28:55 +0100 Subject: [PATCH] [REFACTOR] remove `isRemote` assertion from `hasFieldPosition` util (#10519) Following this discussion https://github.com/twentyhq/twenty/pull/10510#discussion_r1971845556 with @ijreilly --- .../utils/hasObjectMetadataItemPositionField.ts | 1 - .../object-sort-dropdown/utils/turnSortsIntoOrderBy.ts | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/twenty-front/src/modules/object-metadata/utils/hasObjectMetadataItemPositionField.ts b/packages/twenty-front/src/modules/object-metadata/utils/hasObjectMetadataItemPositionField.ts index ec518d5b5..2d2b61106 100644 --- a/packages/twenty-front/src/modules/object-metadata/utils/hasObjectMetadataItemPositionField.ts +++ b/packages/twenty-front/src/modules/object-metadata/utils/hasObjectMetadataItemPositionField.ts @@ -4,7 +4,6 @@ import { FieldMetadataType } from 'twenty-shared'; export const hasObjectMetadataItemPositionField = ( objectMetadataItem: ObjectMetadataItem, ) => - !objectMetadataItem.isRemote && objectMetadataItem.fields.some( (field) => field.type === FieldMetadataType.POSITION, ); 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 48c9ac425..230b848cc 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 @@ -35,7 +35,10 @@ export const turnSortsIntoOrderBy = ( }) .filter(isDefined); - if (hasObjectMetadataItemPositionField(objectMetadataItem)) { + if ( + !objectMetadataItem.isRemote && + hasObjectMetadataItemPositionField(objectMetadataItem) + ) { const positionOrderBy = [ { position: 'AscNullsFirst',