From d0bc9a94c08be1f323dd8226f52fe432c3724f2e Mon Sep 17 00:00:00 2001 From: Paul Rastoin <45004772+prastoin@users.noreply.github.com> Date: Mon, 26 Jan 2026 14:33:07 +0100 Subject: [PATCH] `[OBJECT_CACHE_FLUSH_REQUIRED_WHEN_RELEASED]` Remove `FlatObjectMetadata` custom `fieldMetadataIds` fk aggregator property (#17438) # Introduction Currently refactoring `flatEntity` typing, encountering some tsc errors due to this fk aggregator custom override It shall now follow generic pattern leading to be named `fieldIds` Needs to flush object cache when released --- .../1-13-migrate-standard-invalid-entities.command.ts | 2 +- .../1-13/1-13-rename-index.command.ts | 2 +- .../1-15/1-15-backfill-updated-by-field.command.ts | 2 +- .../1-16/1-16-backfill-opportunity-owner-field.command.ts | 2 +- .../1-16/1-16-update-task-on-delete-action.command.ts | 2 +- .../common-selected-fields.handler.ts | 2 +- .../utils/__tests__/get-conflicting-fields.util.spec.ts | 2 +- .../__mocks__/mockPersonObjectMetadata.ts | 2 +- .../graphql-query-order-group-by.parser.ts | 2 +- .../graphql-selected-fields-aggregate.parser.ts | 2 +- .../graphql-selected-fields.parser.ts | 2 +- .../object-records-to-graphql-connection.helper.ts | 2 +- .../utils/__tests__/build-columns-to-select.spec.ts | 4 ++-- .../graphql-query-runner/utils/build-columns-to-select.ts | 2 +- .../get-flat-fields-for-flat-object-metadata.util.ts | 2 +- .../selected-fields-handler.ts | 2 +- .../__tests__/get-all-selectable-fields.util.spec.ts | 2 +- .../utils/get-all-selectable-fields.util.ts | 2 +- .../__tests__/compute-cursor-arg-filter.utils.spec.ts | 2 +- .../core-modules/__mocks__/mockFlatObjectMetadatas.ts | 8 ++++---- .../__mocks__/mockObjectMetadataItemsWithFieldMaps.ts | 8 ++++---- .../__tests__/actor-from-auth-context.service.spec.ts | 2 +- .../utils/__tests__/object-record-changed-values.spec.ts | 2 +- .../open-api/utils/__tests__/components.utils.spec.ts | 6 +++--- .../core-modules/open-api/utils/components.utils.ts | 2 +- .../transform-event-batch-to-webhook-events.spec.ts | 2 +- .../src/engine/dataloaders/dataloader.service.ts | 2 +- .../constant/all-metadata-relations.constant.ts | 2 +- ...-related-entity-maps-through-mutation-or-throw.spec.ts | 2 +- ...-related-entity-maps-through-mutation-or-throw.spec.ts | 2 +- ...s-morph-relation-flat-field-metadatas-or-throw.util.ts | 2 +- ...-field-input-to-flat-field-metadatas-to-delete.util.ts | 2 +- .../get-object-field-names-and-join-column-names.util.ts | 2 +- ...e-label-identifier-changes-during-field-update.util.ts | 2 +- ...mpute-index-on-flat-field-metadata-name-update.util.ts | 2 +- ...validate-flat-field-metadata-name-availability.util.ts | 2 +- .../__mocks__/get-flat-object-metadata.mock.ts | 2 +- .../types/flat-object-metadata.type.ts | 6 ++---- ...ct-metadata-and-flat-field-metadatas-to-create.util.ts | 2 +- ...object-input-to-flat-field-metadatas-to-delete.util.ts | 2 +- ...object-metadata-entity-to-flat-object-metadata.util.ts | 4 +--- ...fter-flat-object-metadata-singular-name-update.util.ts | 2 +- ...rch-vector-field-after-label-identifier-update.util.ts | 2 +- ...ame-related-morph-field-on-object-names-update.util.ts | 2 +- .../__tests__/object-permission.service.spec.ts | 4 ++-- .../__tests__/field-permissions.service.spec.ts | 8 ++++---- .../entity-manager/workspace-entity-manager.spec.ts | 2 +- .../twenty-orm/factories/entity-schema-column.factory.ts | 2 +- .../factories/entity-schema-relation.factory.ts | 2 +- .../types/entity-schema-metadata.type.ts | 4 ++-- .../repository/__tests__/workspace.repository.spec.ts | 2 +- .../compute-relation-connect-query-configs.util.spec.ts | 6 +++--- ...-twenty-orm-event-to-database-batch-event.util.spec.ts | 2 +- .../get-column-name-to-field-metadata-id.util.spec.ts | 4 ++-- ...get-field-metadata-id-to-column-names-map.util.spec.ts | 4 ++-- ...tching-rls-row-level-permission-predicate.util.spec.ts | 4 ++-- ...process-field-metadata-for-column-name-mapping.util.ts | 2 +- .../metadata/services/dev-seeder-metadata.service.ts | 4 ++-- .../create-standard-object-flat-metadata.util.ts | 2 +- .../services/delete-object-action-handler.service.ts | 2 +- .../services/update-object-action-handler.service.ts | 2 +- .../is-relation-nested-field-date-kind.util.spec.ts | 6 +++--- .../convert-chart-filter-to-gql-operation-filter.util.ts | 4 ++-- .../utils/is-relation-nested-field-date-kind.util.ts | 2 +- .../utils/generate-object-record-fields.ts | 2 +- .../utils/resolve-rich-text-fields-in-record.util.ts | 2 +- .../record-crud/find-records.workflow-action.ts | 2 +- .../workflow-database-event-trigger.listener.spec.ts | 2 +- .../src/database-events/database-event-payload.type.ts | 2 +- 69 files changed, 93 insertions(+), 97 deletions(-) diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-migrate-standard-invalid-entities.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-migrate-standard-invalid-entities.command.ts index 6a7274bb19..dde6fd2a25 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-migrate-standard-invalid-entities.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-migrate-standard-invalid-entities.command.ts @@ -61,7 +61,7 @@ const findStandardFlatFieldMetadatawOrThrow = ({ }) => { const objectFlatFieldMetadata = findManyFlatEntityByIdInFlatEntityMapsOrThrow( { - flatEntityIds: flatObjectMetadata.fieldMetadataIds, + flatEntityIds: flatObjectMetadata.fieldIds, flatEntityMaps: flatFieldMetadataMaps, }, ); diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-rename-index.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-rename-index.command.ts index 5e0b698dbc..6ab8e6a6b0 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-rename-index.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-13/1-13-rename-index.command.ts @@ -78,7 +78,7 @@ export class RenameIndexNameCommand extends ActiveOrSuspendedWorkspacesMigration }); const flatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ - flatEntityIds: flatObjectMetadata.fieldMetadataIds, + flatEntityIds: flatObjectMetadata.fieldIds, flatEntityMaps: flatFieldMetadataMaps, }); diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-15/1-15-backfill-updated-by-field.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-15/1-15-backfill-updated-by-field.command.ts index 5874354b79..d8f1697862 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-15/1-15-backfill-updated-by-field.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-15/1-15-backfill-updated-by-field.command.ts @@ -112,7 +112,7 @@ export class BackfillUpdatedByFieldCommand extends ActiveOrSuspendedWorkspacesMi } const flatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ - flatEntityIds: flatObjectMetadata.fieldMetadataIds, + flatEntityIds: flatObjectMetadata.fieldIds, flatEntityMaps: flatFieldMetadataMaps, }); diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-16/1-16-backfill-opportunity-owner-field.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-16/1-16-backfill-opportunity-owner-field.command.ts index 55fa5e5c55..df8976ac6d 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-16/1-16-backfill-opportunity-owner-field.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-16/1-16-backfill-opportunity-owner-field.command.ts @@ -96,7 +96,7 @@ export class BackfillOpportunityOwnerFieldCommand extends ActiveOrSuspendedWorks } const flatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ - flatEntityIds: opportunityObjectMetadata.fieldMetadataIds, + flatEntityIds: opportunityObjectMetadata.fieldIds, flatEntityMaps: flatFieldMetadataMaps, }); diff --git a/packages/twenty-server/src/database/commands/upgrade-version-command/1-16/1-16-update-task-on-delete-action.command.ts b/packages/twenty-server/src/database/commands/upgrade-version-command/1-16/1-16-update-task-on-delete-action.command.ts index 0808e6dd7d..4abda192f9 100644 --- a/packages/twenty-server/src/database/commands/upgrade-version-command/1-16/1-16-update-task-on-delete-action.command.ts +++ b/packages/twenty-server/src/database/commands/upgrade-version-command/1-16/1-16-update-task-on-delete-action.command.ts @@ -81,7 +81,7 @@ export class UpdateTaskOnDeleteActionCommand extends ActiveOrSuspendedWorkspaces } const taskTargetFields = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ - flatEntityIds: taskTargetObjectMetadata.fieldMetadataIds, + flatEntityIds: taskTargetObjectMetadata.fieldIds, flatEntityMaps: flatFieldMetadataMaps, }); diff --git a/packages/twenty-server/src/engine/api/common/common-args-handlers/common-query-selected-fields/common-selected-fields.handler.ts b/packages/twenty-server/src/engine/api/common/common-args-handlers/common-query-selected-fields/common-selected-fields.handler.ts index 950ba0f364..f3fb0639f3 100644 --- a/packages/twenty-server/src/engine/api/common/common-args-handlers/common-query-selected-fields/common-selected-fields.handler.ts +++ b/packages/twenty-server/src/engine/api/common/common-args-handlers/common-query-selected-fields/common-selected-fields.handler.ts @@ -89,7 +89,7 @@ export class CommonSelectedFieldsHandler { | { [key: string]: boolean | { [key: string]: boolean } }; } = {}; - for (const fieldId of flatObjectMetadata.fieldMetadataIds) { + for (const fieldId of flatObjectMetadata.fieldIds) { const field = findFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: flatFieldMetadataMaps, flatEntityId: fieldId, diff --git a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/utils/__tests__/get-conflicting-fields.util.spec.ts b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/utils/__tests__/get-conflicting-fields.util.spec.ts index 4cd15e3c93..ad3215575f 100644 --- a/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/utils/__tests__/get-conflicting-fields.util.spec.ts +++ b/packages/twenty-server/src/engine/api/common/common-query-runners/common-create-many-query-runner/utils/__tests__/get-conflicting-fields.util.spec.ts @@ -85,7 +85,7 @@ describe('getConflictingFields', () => { createdAt: new Date(), updatedAt: new Date(), universalIdentifier: objectMetadataId, - fieldMetadataIds: fields.map((f) => f.id), + fieldIds: fields.map((f) => f.id), indexMetadataIds: [], viewIds: [], applicationId: null, diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/__mocks__/mockPersonObjectMetadata.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/__mocks__/mockPersonObjectMetadata.ts index 5d14a17ec3..077a092bce 100644 --- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/__mocks__/mockPersonObjectMetadata.ts +++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/__mocks__/mockPersonObjectMetadata.ts @@ -154,7 +154,7 @@ export const mockPersonFlatObjectMetadata = ( workspaceId, universalIdentifier: objectMetadataId, indexMetadataIds: [], - fieldMetadataIds: mockFieldMetadatas.map((field) => field.id), + fieldIds: mockFieldMetadatas.map((field) => field.id), viewIds: [], applicationId: 'test-application-id', isLabelSyncedWithName: false, diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order-group-by.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order-group-by.parser.ts index 5971949341..4841573eef 100644 --- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order-group-by.parser.ts +++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-order/graphql-query-order-group-by.parser.ts @@ -70,7 +70,7 @@ export class GraphqlQueryOrderGroupByParser { }): Record[] { const parsedOrderBy: Record[] = []; - const fields = this.flatObjectMetadata.fieldMetadataIds + const fields = this.flatObjectMetadata.fieldIds .map((id) => this.flatFieldMetadataMaps.byId[id]) .filter(isDefined); diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields-aggregate.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields-aggregate.parser.ts index f3fb4c620f..8c6af9489d 100644 --- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields-aggregate.parser.ts +++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields-aggregate.parser.ts @@ -17,7 +17,7 @@ export class GraphqlQuerySelectedFieldsAggregateParser { flatFieldMetadataMaps: FlatEntityMaps, accumulator: GraphqlQuerySelectedFieldsResult, ): void { - const fields = flatObjectMetadata.fieldMetadataIds + const fields = flatObjectMetadata.fieldIds .map((id) => flatFieldMetadataMaps.byId[id]) .filter(isDefined); diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields.parser.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields.parser.ts index db6a783f3d..a111c18194 100644 --- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields.parser.ts +++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/graphql-query-parsers/graphql-query-selected-fields/graphql-selected-fields.parser.ts @@ -94,7 +94,7 @@ export class GraphqlQuerySelectedFieldsParser { accumulator: GraphqlQuerySelectedFieldsResult, isFromOneToManyRelation?: boolean, ): void { - for (const fieldMetadataId of flatObjectMetadata.fieldMetadataIds) { + for (const fieldMetadataId of flatObjectMetadata.fieldIds) { const fieldMetadata = findFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityId: fieldMetadataId, flatEntityMaps: this.flatFieldMetadataMaps, diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper.ts index 97b478417b..1551e50965 100644 --- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper.ts +++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/helpers/object-records-to-graphql-connection.helper.ts @@ -173,7 +173,7 @@ export class ObjectRecordsToGraphqlConnectionHelper { // eslint-disable-next-line @typescript-eslint/no-explicit-any const processedObjectRecord: Record = {}; - for (const fieldId of flatObjectMetadata.fieldMetadataIds) { + for (const fieldId of flatObjectMetadata.fieldIds) { const fieldMetadata = findFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityId: fieldId, flatEntityMaps: this.flatFieldMetadataMaps, diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/__tests__/build-columns-to-select.spec.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/__tests__/build-columns-to-select.spec.ts index 2e38db16db..e3bced5743 100644 --- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/__tests__/build-columns-to-select.spec.ts +++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/__tests__/build-columns-to-select.spec.ts @@ -106,7 +106,7 @@ describe('buildColumnsToSelect', () => { createdAt: new Date('2025-07-10T10:58:54.536Z'), updatedAt: new Date('2025-07-10T10:58:54.536Z'), universalIdentifier: personObjectId, - fieldMetadataIds: fieldIds, + fieldIds: fieldIds, indexMetadataIds: [], viewIds: [], applicationId: null, @@ -162,7 +162,7 @@ describe('buildColumnsToSelect', () => { id: companyObjectId, nameSingular: 'company', namePlural: 'companies', - fieldMetadataIds: [], + fieldIds: [], indexMetadataIds: [], viewIds: [], } as unknown as FlatObjectMetadata; diff --git a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-select.ts b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-select.ts index 261d2bc621..37079f5a27 100644 --- a/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-select.ts +++ b/packages/twenty-server/src/engine/api/graphql/graphql-query-runner/utils/build-columns-to-select.ts @@ -50,7 +50,7 @@ const getRequiredRelationColumns = ( ): string[] => { const requiredColumns: string[] = []; - for (const fieldId of flatObjectMetadata.fieldMetadataIds) { + for (const fieldId of flatObjectMetadata.fieldIds) { const fieldMetadata = findFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityId: fieldId, flatEntityMaps: flatFieldMetadataMaps, diff --git a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util.ts b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util.ts index 3c7fcfc596..958434dc9a 100644 --- a/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util.ts +++ b/packages/twenty-server/src/engine/api/graphql/workspace-schema-builder/utils/get-flat-fields-for-flat-object-metadata.util.ts @@ -8,7 +8,7 @@ export const getFlatFieldsFromFlatObjectMetadata = ( flatObjectMetadata: FlatObjectMetadata, flatFieldMetadataMaps: FlatEntityMaps, ): FlatFieldMetadata[] => { - return flatObjectMetadata.fieldMetadataIds + return flatObjectMetadata.fieldIds .map((fieldId) => flatFieldMetadataMaps.byId[fieldId]) .filter(isDefined); }; diff --git a/packages/twenty-server/src/engine/api/rest/core/rest-to-common-args-handlers/selected-fields-handler.ts b/packages/twenty-server/src/engine/api/rest/core/rest-to-common-args-handlers/selected-fields-handler.ts index 2f3fc4fee5..5bebfbc36b 100644 --- a/packages/twenty-server/src/engine/api/rest/core/rest-to-common-args-handlers/selected-fields-handler.ts +++ b/packages/twenty-server/src/engine/api/rest/core/rest-to-common-args-handlers/selected-fields-handler.ts @@ -72,7 +72,7 @@ export class RestToCommonSelectedFieldsHandler { let relationsSelectFields: SelectFields = {}; - for (const fieldId of flatObjectMetadata.fieldMetadataIds) { + for (const fieldId of flatObjectMetadata.fieldIds) { const flatField = findFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: flatFieldMetadataMaps, flatEntityId: fieldId, diff --git a/packages/twenty-server/src/engine/api/rest/core/rest-to-common-args-handlers/utils/__tests__/get-all-selectable-fields.util.spec.ts b/packages/twenty-server/src/engine/api/rest/core/rest-to-common-args-handlers/utils/__tests__/get-all-selectable-fields.util.spec.ts index 80d6b7ef99..0bba326612 100644 --- a/packages/twenty-server/src/engine/api/rest/core/rest-to-common-args-handlers/utils/__tests__/get-all-selectable-fields.util.spec.ts +++ b/packages/twenty-server/src/engine/api/rest/core/rest-to-common-args-handlers/utils/__tests__/get-all-selectable-fields.util.spec.ts @@ -67,7 +67,7 @@ describe('getAllSelectableFields', () => { createdAt: new Date(), updatedAt: new Date(), universalIdentifier: 'object-id', - fieldMetadataIds: fieldIds, + fieldIds: fieldIds, indexMetadataIds: [], viewIds: [], applicationId: null, diff --git a/packages/twenty-server/src/engine/api/rest/core/rest-to-common-args-handlers/utils/get-all-selectable-fields.util.ts b/packages/twenty-server/src/engine/api/rest/core/rest-to-common-args-handlers/utils/get-all-selectable-fields.util.ts index d62d4c0570..bd4ea7f6a2 100644 --- a/packages/twenty-server/src/engine/api/rest/core/rest-to-common-args-handlers/utils/get-all-selectable-fields.util.ts +++ b/packages/twenty-server/src/engine/api/rest/core/rest-to-common-args-handlers/utils/get-all-selectable-fields.util.ts @@ -29,7 +29,7 @@ export const getAllSelectableFields = ({ }): SelectableFieldsStructured => { const result: SelectableFieldsStructured = {}; - for (const fieldId of flatObjectMetadata.fieldMetadataIds) { + for (const fieldId of flatObjectMetadata.fieldIds) { const flatField = findFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: flatFieldMetadataMaps, flatEntityId: fieldId, diff --git a/packages/twenty-server/src/engine/api/utils/__tests__/compute-cursor-arg-filter.utils.spec.ts b/packages/twenty-server/src/engine/api/utils/__tests__/compute-cursor-arg-filter.utils.spec.ts index 25c55c774f..f840ac14c0 100644 --- a/packages/twenty-server/src/engine/api/utils/__tests__/compute-cursor-arg-filter.utils.spec.ts +++ b/packages/twenty-server/src/engine/api/utils/__tests__/compute-cursor-arg-filter.utils.spec.ts @@ -101,7 +101,7 @@ describe('computeCursorArgFilter', () => { createdAt: new Date(), updatedAt: new Date(), universalIdentifier: objectMetadataId, - fieldMetadataIds: ['name-id', 'age-id', 'fullname-id'], + fieldIds: ['name-id', 'age-id', 'fullname-id'], indexMetadataIds: [], viewIds: [], applicationId: null, diff --git a/packages/twenty-server/src/engine/core-modules/__mocks__/mockFlatObjectMetadatas.ts b/packages/twenty-server/src/engine/core-modules/__mocks__/mockFlatObjectMetadatas.ts index 69a0a10493..6c90b26c22 100644 --- a/packages/twenty-server/src/engine/core-modules/__mocks__/mockFlatObjectMetadatas.ts +++ b/packages/twenty-server/src/engine/core-modules/__mocks__/mockFlatObjectMetadatas.ts @@ -28,7 +28,7 @@ export const mockFlatObjectMetadatas: FlatObjectMetadata[] = [ labelIdentifierFieldMetadataId: personNameFieldId, imageIdentifierFieldMetadataId: null, workspaceId, - fieldMetadataIds: [personNameFieldId], + fieldIds: [personNameFieldId], universalIdentifier: 'person-universal-id', applicationId: workspaceId, }), @@ -45,7 +45,7 @@ export const mockFlatObjectMetadatas: FlatObjectMetadata[] = [ labelIdentifierFieldMetadataId: companyNameFieldId, imageIdentifierFieldMetadataId: null, workspaceId, - fieldMetadataIds: [companyNameFieldId, companyDomainNameFieldId], + fieldIds: [companyNameFieldId, companyDomainNameFieldId], universalIdentifier: 'company-universal-id', applicationId: workspaceId, }), @@ -62,7 +62,7 @@ export const mockFlatObjectMetadatas: FlatObjectMetadata[] = [ labelIdentifierFieldMetadataId: customObjectNameFieldId, imageIdentifierFieldMetadataId: customObjectImageFieldId, workspaceId, - fieldMetadataIds: [customObjectNameFieldId, customObjectImageFieldId], + fieldIds: [customObjectNameFieldId, customObjectImageFieldId], universalIdentifier: 'custom-object-universal-id', applicationId: workspaceId, }), @@ -80,7 +80,7 @@ export const mockFlatObjectMetadatas: FlatObjectMetadata[] = [ labelIdentifierFieldMetadataId: null, imageIdentifierFieldMetadataId: null, workspaceId, - fieldMetadataIds: [], + fieldIds: [], universalIdentifier: 'non-searchable-object-universal-id', applicationId: workspaceId, }), diff --git a/packages/twenty-server/src/engine/core-modules/__mocks__/mockObjectMetadataItemsWithFieldMaps.ts b/packages/twenty-server/src/engine/core-modules/__mocks__/mockObjectMetadataItemsWithFieldMaps.ts index 43d4dfed13..431377bbbb 100644 --- a/packages/twenty-server/src/engine/core-modules/__mocks__/mockObjectMetadataItemsWithFieldMaps.ts +++ b/packages/twenty-server/src/engine/core-modules/__mocks__/mockObjectMetadataItemsWithFieldMaps.ts @@ -36,7 +36,7 @@ const personFlatObject = getFlatObjectMetadataMock({ imageIdentifierFieldMetadataId: null, workspaceId, universalIdentifier: '20202020-8dec-43d5-b2ff-6eef05095bec', - fieldMetadataIds: [personNameFieldId], + fieldIds: [personNameFieldId], indexMetadataIds: [], viewIds: [], }); @@ -61,7 +61,7 @@ const companyFlatObject = getFlatObjectMetadataMock({ imageIdentifierFieldMetadataId: null, workspaceId, universalIdentifier: '20202020-c03c-45d6-a4b0-04afe1357c5c', - fieldMetadataIds: [companyNameFieldId, companyDomainNameFieldId], + fieldIds: [companyNameFieldId, companyDomainNameFieldId], indexMetadataIds: [], viewIds: [], }); @@ -86,7 +86,7 @@ const customObjectFlatObject = getFlatObjectMetadataMock({ imageIdentifierFieldMetadataId: customObjectImageFieldId, workspaceId, universalIdentifier: '20202020-3d75-4aab-bacd-ee176c5f63ca', - fieldMetadataIds: [customObjectNameFieldId, customObjectImageFieldId], + fieldIds: [customObjectNameFieldId, customObjectImageFieldId], indexMetadataIds: [], viewIds: [], }); @@ -111,7 +111,7 @@ const nonSearchableFlatObject = getFlatObjectMetadataMock({ imageIdentifierFieldMetadataId: null, workspaceId, universalIdentifier: '20202020-540c-4397-b872-2a90ea2fb809', - fieldMetadataIds: [], + fieldIds: [], indexMetadataIds: [], viewIds: [], }); diff --git a/packages/twenty-server/src/engine/core-modules/actor/services/__tests__/actor-from-auth-context.service.spec.ts b/packages/twenty-server/src/engine/core-modules/actor/services/__tests__/actor-from-auth-context.service.spec.ts index ea7ef01af3..b7fed67665 100644 --- a/packages/twenty-server/src/engine/core-modules/actor/services/__tests__/actor-from-auth-context.service.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/actor/services/__tests__/actor-from-auth-context.service.spec.ts @@ -71,7 +71,7 @@ describe('ActorFromAuthContextService', () => { 'person-id': { id: 'person-id', nameSingular: 'person', - fieldMetadataIds: ['createdBy-id'], + fieldIds: ['createdBy-id'], }, }, }, diff --git a/packages/twenty-server/src/engine/core-modules/event-emitter/utils/__tests__/object-record-changed-values.spec.ts b/packages/twenty-server/src/engine/core-modules/event-emitter/utils/__tests__/object-record-changed-values.spec.ts index 3b6d1553f9..0d063fa4d8 100644 --- a/packages/twenty-server/src/engine/core-modules/event-emitter/utils/__tests__/object-record-changed-values.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/event-emitter/utils/__tests__/object-record-changed-values.spec.ts @@ -20,7 +20,7 @@ const mockObjectMetadata = { isAuditLogged: true, isSearchable: true, indexMetadataIds: [], - fieldMetadataIds: [], + fieldIds: [], viewIds: [], applicationId: 'test-application-id', isLabelSyncedWithName: false, diff --git a/packages/twenty-server/src/engine/core-modules/open-api/utils/__tests__/components.utils.spec.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/__tests__/components.utils.spec.ts index dc3515575d..8e98f8b253 100644 --- a/packages/twenty-server/src/engine/core-modules/open-api/utils/__tests__/components.utils.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/__tests__/components.utils.spec.ts @@ -13,7 +13,7 @@ describe('computeSchemaComponents', () => { const flatObjectMetadata: FlatObjectMetadata = { ...objectMetadataItemMock, universalIdentifier: 'objectName', - fieldMetadataIds: objectMetadataItemMock.fields.map((f) => f.id), + fieldIds: objectMetadataItemMock.fields.map((f) => f.id), } as any; const flatFieldMetadataMaps = { @@ -29,7 +29,7 @@ describe('computeSchemaComponents', () => { nameSingular: 'relationTargetObject', namePlural: 'relationTargetObjects', universalIdentifier: 'relationTargetObject', - fieldMetadataIds: [], + fieldIds: [], } as any; const flatObjectMetadataMaps = { @@ -858,7 +858,7 @@ describe('computeSchemaComponents', () => { nameSingular: 'objectName', namePlural: 'objectsName', universalIdentifier: 'objectName', - fieldMetadataIds: [field.id], + fieldIds: [field.id], } as any; const flatFieldMetadataMaps = { diff --git a/packages/twenty-server/src/engine/core-modules/open-api/utils/components.utils.ts b/packages/twenty-server/src/engine/core-modules/open-api/utils/components.utils.ts index cdd63e32cb..0a1f03422f 100644 --- a/packages/twenty-server/src/engine/core-modules/open-api/utils/components.utils.ts +++ b/packages/twenty-server/src/engine/core-modules/open-api/utils/components.utils.ts @@ -236,7 +236,7 @@ export const computeSchemaComponents = ( const flatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: flatFieldMetadataMaps, - flatEntityIds: item.fieldMetadataIds, + flatEntityIds: item.fieldIds, }); schemas[capitalize(item.nameSingular)] = computeSchemaComponent({ diff --git a/packages/twenty-server/src/engine/core-modules/webhook/utils/__tests__/transform-event-batch-to-webhook-events.spec.ts b/packages/twenty-server/src/engine/core-modules/webhook/utils/__tests__/transform-event-batch-to-webhook-events.spec.ts index 745e40a362..8d8facc1d2 100644 --- a/packages/twenty-server/src/engine/core-modules/webhook/utils/__tests__/transform-event-batch-to-webhook-events.spec.ts +++ b/packages/twenty-server/src/engine/core-modules/webhook/utils/__tests__/transform-event-batch-to-webhook-events.spec.ts @@ -19,7 +19,7 @@ const mockObjectMetadata: FlatObjectMetadata = { createdAt: new Date(), updatedAt: new Date(), universalIdentifier: 'id', - fieldMetadataIds: [], + fieldIds: [], indexMetadataIds: [], viewIds: [], applicationId: null, diff --git a/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts b/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts index f2ada927b1..24e399f2e8 100644 --- a/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts +++ b/packages/twenty-server/src/engine/dataloaders/dataloader.service.ts @@ -370,7 +370,7 @@ export class DataloaderService { }); const objectFlatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ - flatEntityIds: flatObjectMetadata.fieldMetadataIds, + flatEntityIds: flatObjectMetadata.fieldIds, flatEntityMaps: flatFieldMetadataMaps, }); diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-relations.constant.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-relations.constant.ts index cf5eb79456..08f8af965e 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-relations.constant.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/constant/all-metadata-relations.constant.ts @@ -113,7 +113,7 @@ export const ALL_METADATA_RELATIONS = { manyToOne: { object: { metadataName: 'objectMetadata', - flatEntityForeignKeyAggregator: 'fieldMetadataIds', + flatEntityForeignKeyAggregator: 'fieldIds', foreignKey: 'objectMetadataId', }, workspace: null, diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/add-flat-entity-to-flat-entity-and-related-entity-maps-through-mutation-or-throw.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/add-flat-entity-to-flat-entity-and-related-entity-maps-through-mutation-or-throw.spec.ts index be795fc134..b74a35aa92 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/add-flat-entity-to-flat-entity-and-related-entity-maps-through-mutation-or-throw.spec.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/add-flat-entity-to-flat-entity-and-related-entity-maps-through-mutation-or-throw.spec.ts @@ -20,7 +20,7 @@ describe('addFlatEntityToFlatEntityAndRelatedEntityMapsThroughMutationOrThrow', id: objectMetadataId, universalIdentifier: 'object-universal-1', viewIds: [], - fieldMetadataIds: [], + fieldIds: [], workspaceId, imageIdentifierFieldMetadataId: '20202020-9d65-415f-b0e1-216a2e257ea4', labelIdentifierFieldMetadataId: '20202020-1a62-405c-87fa-4d4fd215851b', diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/delete-flat-entity-from-flat-entity-and-related-entity-maps-through-mutation-or-throw.spec.ts b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/delete-flat-entity-from-flat-entity-and-related-entity-maps-through-mutation-or-throw.spec.ts index c7ac089178..1f7d1ca1e8 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/delete-flat-entity-from-flat-entity-and-related-entity-maps-through-mutation-or-throw.spec.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-entity/utils/__tests__/delete-flat-entity-from-flat-entity-and-related-entity-maps-through-mutation-or-throw.spec.ts @@ -21,7 +21,7 @@ describe('deleteFlatEntityFromFlatEntityAndRelatedEntityMapsThroughMutationOrThr id: objectMetadataId, universalIdentifier: 'object-universal-1', viewIds: [viewId, 'something-else'], - fieldMetadataIds: [], + fieldIds: [], workspaceId, imageIdentifierFieldMetadataId: '20202020-9d65-415f-b0e1-216a2e257ea4', labelIdentifierFieldMetadataId: '20202020-1a62-405c-87fa-4d4fd215851b', diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/find-all-others-morph-relation-flat-field-metadatas-or-throw.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/find-all-others-morph-relation-flat-field-metadatas-or-throw.util.ts index 803b38b676..1e9469569c 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/find-all-others-morph-relation-flat-field-metadatas-or-throw.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/find-all-others-morph-relation-flat-field-metadatas-or-throw.util.ts @@ -33,7 +33,7 @@ export const findAllOthersMorphRelationFlatFieldMetadatasOrThrow = ({ const objectFlatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: flatFieldMetadataMaps, - flatEntityIds: flatObjectMetadata.fieldMetadataIds, + flatEntityIds: flatObjectMetadata.fieldIds, }); return objectFlatFieldMetadatas.filter( diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/from-delete-field-input-to-flat-field-metadatas-to-delete.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/from-delete-field-input-to-flat-field-metadatas-to-delete.util.ts index ab78c7f09c..394ca12a0c 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/from-delete-field-input-to-flat-field-metadatas-to-delete.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/from-delete-field-input-to-flat-field-metadatas-to-delete.util.ts @@ -143,7 +143,7 @@ export const fromDeleteFieldInputToFlatFieldMetadatasToDelete = ({ const objectFlatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: existingFlatFieldMetadataMaps, - flatEntityIds: flatObjectMetadata.fieldMetadataIds, + flatEntityIds: flatObjectMetadata.fieldIds, }); const newIndex = generateFlatIndexMetadataWithNameOrThrow({ diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/get-object-field-names-and-join-column-names.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/get-object-field-names-and-join-column-names.util.ts index 2ea3a31553..b1fb3bd0fa 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/get-object-field-names-and-join-column-names.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/get-object-field-names-and-join-column-names.util.ts @@ -23,7 +23,7 @@ export const getObjectFieldNamesAndJoinColumnNames = ({ const objectFlatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: flatFieldMetadataMaps, - flatEntityIds: flatObjectMetadata.fieldMetadataIds, + flatEntityIds: flatObjectMetadata.fieldIds, }); const initialAccumulator: ObjectFieldNamesAndJoinColumnNames = { joinColumnNames: [], diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/handle-label-identifier-changes-during-field-update.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/handle-label-identifier-changes-during-field-update.util.ts index 0158d415eb..53d8b63a33 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/handle-label-identifier-changes-during-field-update.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/handle-label-identifier-changes-during-field-update.util.ts @@ -36,7 +36,7 @@ export const handleLabelIdentifierChangesDuringFieldUpdate = ({ const objectFlatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: flatFieldMetadataMaps, - flatEntityIds: flatObjectMetadata.fieldMetadataIds, + flatEntityIds: flatObjectMetadata.fieldIds, }); const searchVectorField = findOrThrow( diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/recompute-index-on-flat-field-metadata-name-update.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/recompute-index-on-flat-field-metadata-name-update.util.ts index 78f4513a78..6c578101e1 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/recompute-index-on-flat-field-metadata-name-update.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/utils/recompute-index-on-flat-field-metadata-name-update.util.ts @@ -26,7 +26,7 @@ export const recomputeIndexOnFlatFieldMetadataNameUpdate = ({ const objectFlatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: flatFieldMetadataMaps, - flatEntityIds: flatObjectMetadata.fieldMetadataIds, + flatEntityIds: flatObjectMetadata.fieldIds, }); const optimisticObjectFlatFieldMetadatas = objectFlatFieldMetadatas.map( (flatFieldMetadata) => { diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/validate-flat-field-metadata-name-availability.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/validate-flat-field-metadata-name-availability.util.ts index d826869441..5f58a8b4ef 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/validate-flat-field-metadata-name-availability.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-field-metadata/validators/utils/validate-flat-field-metadata-name-availability.util.ts @@ -51,7 +51,7 @@ export const validateFlatFieldMetadataNameAvailability = ({ const objectFlatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: flatFieldMetadataMaps, - flatEntityIds: flatObjectMetadata.fieldMetadataIds, + flatEntityIds: flatObjectMetadata.fieldIds, }); const reservedCompositeFieldsNames = getReservedCompositeFieldNames( objectFlatFieldMetadatas, diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock.ts index 09009340c6..c957c08586 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/__mocks__/get-flat-object-metadata.mock.ts @@ -14,7 +14,7 @@ export const getFlatObjectMetadataMock = ( return { viewIds: [], indexMetadataIds: [], - fieldMetadataIds: [], + fieldIds: [], description: 'default flat object metadata description', icon: 'icon', id: faker.string.uuid(), diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type.ts index 2ca44fc820..4babb563e1 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/types/flat-object-metadata.type.ts @@ -2,7 +2,5 @@ import { type FlatEntityFrom } from 'src/engine/metadata-modules/flat-entity/typ import { type ObjectMetadataEntity } from 'src/engine/metadata-modules/object-metadata/object-metadata.entity'; export type FlatObjectMetadata = FlatEntityFrom< - Omit -> & { - fieldMetadataIds: string[]; -}; + Omit +>; diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-create-object-input-to-flat-object-metadata-and-flat-field-metadatas-to-create.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-create-object-input-to-flat-object-metadata-and-flat-field-metadatas-to-create.util.ts index 1a55c08ac5..a1ca19d957 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-create-object-input-to-flat-object-metadata-and-flat-field-metadatas-to-create.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-create-object-input-to-flat-object-metadata-and-flat-field-metadatas-to-create.util.ts @@ -69,7 +69,7 @@ export const fromCreateObjectInputToFlatObjectMetadataAndFlatFieldMetadatasToCre nameField?.id ?? defaultFlatFieldForCustomObjectMaps.fields.idField.id; const flatObjectMetadataToCreate: FlatObjectMetadata = { - fieldMetadataIds: [], + fieldIds: [], viewIds: [], indexMetadataIds: [], createdAt, diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-delete-object-input-to-flat-field-metadatas-to-delete.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-delete-object-input-to-flat-field-metadatas-to-delete.util.ts index 42cf086c24..97bc5ae29e 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-delete-object-input-to-flat-field-metadatas-to-delete.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-delete-object-input-to-flat-field-metadatas-to-delete.util.ts @@ -55,7 +55,7 @@ export const fromDeleteObjectInputToFlatFieldMetadatasToDelete = ({ const objectFlatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: flatFieldMetadataMaps, - flatEntityIds: flatObjectMetadataToDelete.fieldMetadataIds, + flatEntityIds: flatObjectMetadataToDelete.fieldIds, }); const flatFieldMetadatasToDelete = objectFlatFieldMetadatas.flatMap( (flatFieldMetadata) => { diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-object-metadata-entity-to-flat-object-metadata.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-object-metadata-entity-to-flat-object-metadata.util.ts index 762a62643e..aea22d5f43 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-object-metadata-entity-to-flat-object-metadata.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/from-object-metadata-entity-to-flat-object-metadata.util.ts @@ -22,8 +22,6 @@ export const fromObjectMetadataEntityToFlatObjectMetadata = ( indexMetadataIds: objectMetadataEntity.indexMetadatas.map( (indexEntity) => indexEntity.id, ), - fieldMetadataIds: objectMetadataEntity.fields.map( - (fieldEntity) => fieldEntity.id, - ), + fieldIds: objectMetadataEntity.fields.map((fieldEntity) => fieldEntity.id), }; }; diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/recompute-index-after-flat-object-metadata-singular-name-update.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/recompute-index-after-flat-object-metadata-singular-name-update.util.ts index 06949d2453..2a9f964bd5 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/recompute-index-after-flat-object-metadata-singular-name-update.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/recompute-index-after-flat-object-metadata-singular-name-update.util.ts @@ -32,7 +32,7 @@ export const recomputeIndexAfterFlatObjectMetadataSingularNameUpdate = ({ const objectFlatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: flatFieldMetadataMaps, - flatEntityIds: optimisticFlatObjectMetadata.fieldMetadataIds, + flatEntityIds: optimisticFlatObjectMetadata.fieldIds, }); return allRelatedFlatIndexMetadata.map((flatIndex) => { diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/recompute-search-vector-field-after-label-identifier-update.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/recompute-search-vector-field-after-label-identifier-update.util.ts index e23da5bf68..75c5c353c7 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/recompute-search-vector-field-after-label-identifier-update.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/recompute-search-vector-field-after-label-identifier-update.util.ts @@ -29,7 +29,7 @@ export const recomputeSearchVectorFieldAfterLabelIdentifierUpdate = ({ const objectFlatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: flatFieldMetadataMaps, - flatEntityIds: existingFlatObjectMetadata.fieldMetadataIds, + flatEntityIds: existingFlatObjectMetadata.fieldIds, }); const searchVectorField = findOrThrow( diff --git a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/rename-related-morph-field-on-object-names-update.util.ts b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/rename-related-morph-field-on-object-names-update.util.ts index 5bcc9da6a8..35d82c3685 100644 --- a/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/rename-related-morph-field-on-object-names-update.util.ts +++ b/packages/twenty-server/src/engine/metadata-modules/flat-object-metadata/utils/rename-related-morph-field-on-object-names-update.util.ts @@ -85,7 +85,7 @@ export const renameRelatedMorphFieldOnObjectNamesUpdate = ({ const objectFlatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: flatFieldMetadataMaps, - flatEntityIds: fromFlatObjectMetadata.fieldMetadataIds, + flatEntityIds: fromFlatObjectMetadata.fieldIds, }); const allMorphRelationFlatFieldMetadatas = diff --git a/packages/twenty-server/src/engine/metadata-modules/object-permission/__tests__/object-permission.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/object-permission/__tests__/object-permission.service.spec.ts index 13922e1e7d..5fd1ed91fa 100644 --- a/packages/twenty-server/src/engine/metadata-modules/object-permission/__tests__/object-permission.service.spec.ts +++ b/packages/twenty-server/src/engine/metadata-modules/object-permission/__tests__/object-permission.service.spec.ts @@ -115,7 +115,7 @@ describe('ObjectPermissionService', () => { id: systemObjectMetadataId, isSystem: true, workspaceId, - fieldMetadataIds: [], + fieldIds: [], indexMetadataIds: [], viewIds: [], universalIdentifier: systemObjectMetadataId, @@ -172,7 +172,7 @@ describe('ObjectPermissionService', () => { id: customObjectMetadataId, isSystem: false, workspaceId, - fieldMetadataIds: [], + fieldIds: [], indexMetadataIds: [], viewIds: [], universalIdentifier: customObjectMetadataId, diff --git a/packages/twenty-server/src/engine/metadata-modules/object-permission/field-permission/__tests__/field-permissions.service.spec.ts b/packages/twenty-server/src/engine/metadata-modules/object-permission/field-permission/__tests__/field-permissions.service.spec.ts index d8f338bfdf..2dafceda88 100644 --- a/packages/twenty-server/src/engine/metadata-modules/object-permission/field-permission/__tests__/field-permissions.service.spec.ts +++ b/packages/twenty-server/src/engine/metadata-modules/object-permission/field-permission/__tests__/field-permissions.service.spec.ts @@ -154,7 +154,7 @@ describe('FieldPermissionService', () => { [testObjectMetadataId]: { ...objectMetadataItemMock, id: testObjectMetadataId, - fieldMetadataIds: [testFieldMetadataId], + fieldIds: [testFieldMetadataId], indexMetadataIds: [], viewIds: [], universalIdentifier: testObjectMetadataId, @@ -163,7 +163,7 @@ describe('FieldPermissionService', () => { [fieldRelationMock.objectMetadataId]: { ...objectMetadataItemMock, id: fieldRelationMock.objectMetadataId, - fieldMetadataIds: [fieldRelationMock.id], + fieldIds: [fieldRelationMock.id], indexMetadataIds: [], viewIds: [], universalIdentifier: fieldRelationMock.objectMetadataId, @@ -444,7 +444,7 @@ describe('FieldPermissionService', () => { [testObjectMetadataId]: { ...systemObjectMetadata, id: testObjectMetadataId, - fieldMetadataIds: [], + fieldIds: [], indexMetadataIds: [], viewIds: [], universalIdentifier: testObjectMetadataId, @@ -490,7 +490,7 @@ describe('FieldPermissionService', () => { [testObjectMetadataId]: { ...objectMetadataItemMock, id: testObjectMetadataId, - fieldMetadataIds: [], + fieldIds: [], indexMetadataIds: [], viewIds: [], universalIdentifier: testObjectMetadataId, diff --git a/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts b/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts index 7ad06902ce..560b3b4143 100644 --- a/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts +++ b/packages/twenty-server/src/engine/twenty-orm/entity-manager/workspace-entity-manager.spec.ts @@ -107,7 +107,7 @@ describe('WorkspaceEntityManager', () => { isSystem: false, isActive: true, targetTableName: 'test_entity', - fieldMetadataIds: ['field-id'], + fieldIds: ['field-id'], indexMetadataIds: [], viewIds: [], universalIdentifier: 'test-entity-id', diff --git a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts b/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts index 107817eebf..e96cc6b06e 100644 --- a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts +++ b/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-column.factory.ts @@ -37,7 +37,7 @@ export class EntitySchemaColumnFactory { ): EntitySchemaColumnMap { let entitySchemaColumnMap: EntitySchemaColumnMap = {}; - const fieldMetadataCollection = objectMetadata.fieldMetadataIds + const fieldMetadataCollection = objectMetadata.fieldIds .map((fieldId) => fieldMetadataMaps.byId[fieldId]) .filter(isDefined); diff --git a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-relation.factory.ts b/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-relation.factory.ts index 4e1594b523..d9d8cf2fab 100644 --- a/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-relation.factory.ts +++ b/packages/twenty-server/src/engine/twenty-orm/factories/entity-schema-relation.factory.ts @@ -31,7 +31,7 @@ export class EntitySchemaRelationFactory { ): EntitySchemaRelationMap { const entitySchemaRelationMap: EntitySchemaRelationMap = {}; - const fieldMetadatas = objectMetadata.fieldMetadataIds + const fieldMetadatas = objectMetadata.fieldIds .map((fieldId) => fieldMetadataMaps.byId[fieldId]) .filter(isDefined); diff --git a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/types/entity-schema-metadata.type.ts b/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/types/entity-schema-metadata.type.ts index 868c7ebcf4..61e7bd4ff6 100644 --- a/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/types/entity-schema-metadata.type.ts +++ b/packages/twenty-server/src/engine/twenty-orm/global-workspace-datasource/types/entity-schema-metadata.type.ts @@ -7,7 +7,7 @@ export type EntitySchemaObjectMetadata = Pick< ObjectMetadataEntity, 'id' | 'nameSingular' | 'isCustom' > & { - fieldMetadataIds: string[]; + fieldIds: string[]; }; export type EntitySchemaFieldMetadata< @@ -60,7 +60,7 @@ export const buildEntitySchemaMetadataMaps = ( id: object.id, nameSingular: object.nameSingular, isCustom: object.isCustom, - fieldMetadataIds: fieldIdsByObjectId.get(object.id) ?? [], + fieldIds: fieldIdsByObjectId.get(object.id) ?? [], }; } diff --git a/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/workspace.repository.spec.ts b/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/workspace.repository.spec.ts index 6f735126a7..cdeff22aae 100644 --- a/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/workspace.repository.spec.ts +++ b/packages/twenty-server/src/engine/twenty-orm/repository/__tests__/workspace.repository.spec.ts @@ -167,7 +167,7 @@ describe('WorkspaceRepository', () => { id: 'test-metadata-id', nameSingular: 'test-entity', namePlural: 'test-entities', - fieldMetadataIds: ['test-field-id'], + fieldIds: ['test-field-id'], fieldIdByName: { id: 'test-field-id', }, diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-relation-connect-query-configs.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-relation-connect-query-configs.util.spec.ts index 80dea8d160..6cc385df15 100644 --- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-relation-connect-query-configs.util.spec.ts +++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/compute-relation-connect-query-configs.util.spec.ts @@ -206,7 +206,7 @@ describe('computeRelationConnectQueryConfigs', () => { partial: Partial & { id: string; nameSingular: string; - fieldMetadataIds: string[]; + fieldIds: string[]; indexMetadataIds: string[]; }, ): FlatObjectMetadata => @@ -244,7 +244,7 @@ describe('computeRelationConnectQueryConfigs', () => { id: 'person-object-metadata-id', nameSingular: 'person', indexMetadataIds: [], - fieldMetadataIds: personFields.map((f) => f.id), + fieldIds: personFields.map((f) => f.id), }); const companyMetadata = createFlatObjectMetadata({ @@ -255,7 +255,7 @@ describe('computeRelationConnectQueryConfigs', () => { 'company-domain-index-metadata-id', 'company-composite-index-metadata-id', ], - fieldMetadataIds: companyFields.map((f) => f.id), + fieldIds: companyFields.map((f) => f.id), }); const flatObjectMetadataMaps: FlatEntityMaps = { diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/format-twenty-orm-event-to-database-batch-event.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/format-twenty-orm-event-to-database-batch-event.util.spec.ts index f040bb5685..627a44ab59 100644 --- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/format-twenty-orm-event-to-database-batch-event.util.spec.ts +++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/format-twenty-orm-event-to-database-batch-event.util.spec.ts @@ -71,7 +71,7 @@ describe('formatTwentyOrmEventToDatabaseBatchEvent', () => { createdAt: new Date(), updatedAt: new Date(), universalIdentifier: objectMetadataId, - fieldMetadataIds: ['name-id'], + fieldIds: ['name-id'], indexMetadataIds: [], viewIds: [], applicationId: null, diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-column-name-to-field-metadata-id.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-column-name-to-field-metadata-id.util.spec.ts index 590754a4c9..b818fab63c 100644 --- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-column-name-to-field-metadata-id.util.spec.ts +++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-column-name-to-field-metadata-id.util.spec.ts @@ -7,7 +7,7 @@ import { getColumnNameToFieldMetadataIdMap } from 'src/engine/twenty-orm/utils/g describe('getColumnNameToFieldMetadataIdMap', () => { const createMockFlatObjectMetadata = ( - fieldMetadataIds: string[], + fieldIds: string[], ): FlatObjectMetadata => ({ id: 'test-object-id', @@ -26,7 +26,7 @@ describe('getColumnNameToFieldMetadataIdMap', () => { workspaceId: 'test-workspace-id', universalIdentifier: 'test-object-id', indexMetadataIds: [], - fieldMetadataIds, + fieldIds, viewIds: [], applicationId: 'test-application-id', isLabelSyncedWithName: false, diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-field-metadata-id-to-column-names-map.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-field-metadata-id-to-column-names-map.util.spec.ts index 20dfcf1a01..bbed1e77b8 100644 --- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-field-metadata-id-to-column-names-map.util.spec.ts +++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/get-field-metadata-id-to-column-names-map.util.spec.ts @@ -7,7 +7,7 @@ import { getFieldMetadataIdToColumnNamesMap } from 'src/engine/twenty-orm/utils/ describe('getFieldMetadataIdToColumnNamesMap', () => { const createMockFlatObjectMetadata = ( - fieldMetadataIds: string[], + fieldIds: string[], ): FlatObjectMetadata => ({ id: 'test-object-id', @@ -26,7 +26,7 @@ describe('getFieldMetadataIdToColumnNamesMap', () => { workspaceId: 'test-workspace-id', universalIdentifier: 'test-object-id', indexMetadataIds: [], - fieldMetadataIds, + fieldIds, viewIds: [], applicationId: 'test-application-id', isLabelSyncedWithName: false, diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts index b07b2f894d..98bdb3d48c 100644 --- a/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts +++ b/packages/twenty-server/src/engine/twenty-orm/utils/__tests__/is-record-matching-rls-row-level-permission-predicate.util.spec.ts @@ -7,7 +7,7 @@ import { isRecordMatchingRLSRowLevelPermissionPredicate } from 'src/engine/twent describe('isRecordMatchingRLSRowLevelPermissionPredicate', () => { const createMockFlatObjectMetadata = ( - fieldMetadataIds: string[], + fieldIds: string[], ): FlatObjectMetadata => ({ id: 'test-object-id', @@ -26,7 +26,7 @@ describe('isRecordMatchingRLSRowLevelPermissionPredicate', () => { workspaceId: 'test-workspace-id', universalIdentifier: 'test-object-id', indexMetadataIds: [], - fieldMetadataIds, + fieldIds, viewIds: [], applicationId: 'test-application-id', isLabelSyncedWithName: false, diff --git a/packages/twenty-server/src/engine/twenty-orm/utils/process-field-metadata-for-column-name-mapping.util.ts b/packages/twenty-server/src/engine/twenty-orm/utils/process-field-metadata-for-column-name-mapping.util.ts index bb815ad597..792900b3cd 100644 --- a/packages/twenty-server/src/engine/twenty-orm/utils/process-field-metadata-for-column-name-mapping.util.ts +++ b/packages/twenty-server/src/engine/twenty-orm/utils/process-field-metadata-for-column-name-mapping.util.ts @@ -55,7 +55,7 @@ export function processFieldMetadataForColumnNameMapping( flatFieldMetadataMaps: FlatEntityMaps, processor: ColumnNameProcessor, ) { - for (const fieldMetadataId of flatObjectMetadata.fieldMetadataIds) { + for (const fieldMetadataId of flatObjectMetadata.fieldIds) { const fieldMetadata = findFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: flatFieldMetadataMaps, flatEntityId: fieldMetadataId, diff --git a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/metadata/services/dev-seeder-metadata.service.ts b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/metadata/services/dev-seeder-metadata.service.ts index 3b01544aa6..0509c5e2b7 100644 --- a/packages/twenty-server/src/engine/workspace-manager/dev-seeder/metadata/services/dev-seeder-metadata.service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/dev-seeder/metadata/services/dev-seeder-metadata.service.ts @@ -50,7 +50,7 @@ type JunctionConfigSeed = { // Helper type for flat entity maps type FlatMaps = { fieldMaps: { byId: Record }; - objectMaps: { byId: Record }; + objectMaps: { byId: Record }; objectIdByName: Record; }; @@ -482,7 +482,7 @@ export class DevSeederMetadataService { throw new Error(`Object metadata not found: ${objectName}`); } - for (const fieldId of objectMetadata.fieldMetadataIds) { + for (const fieldId of objectMetadata.fieldIds) { if (flatMaps.fieldMaps.byId[fieldId]?.name === fieldName) { return fieldId; } diff --git a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-object-flat-metadata.util.ts b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-object-flat-metadata.util.ts index c374085f9e..eb0de670a7 100644 --- a/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-object-flat-metadata.util.ts +++ b/packages/twenty-server/src/engine/workspace-manager/twenty-standard-application/utils/object-metadata/create-standard-object-flat-metadata.util.ts @@ -84,7 +84,7 @@ export const createStandardObjectFlatMetadata = < ].id : null, targetTableName: 'DEPRECATED', - fieldMetadataIds: [], + fieldIds: [], indexMetadataIds: [], viewIds: [], createdAt: now, diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/delete-object-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/delete-object-action-handler.service.ts index 0936c38336..3d849d19be 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/delete-object-action-handler.service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/delete-object-action-handler.service.ts @@ -77,7 +77,7 @@ export class DeleteObjectActionHandlerService extends WorkspaceMigrationRunnerAc const objectFlatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: flatFieldMetadataMaps, - flatEntityIds: flatObjectMetadata.fieldMetadataIds, + flatEntityIds: flatObjectMetadata.fieldIds, }); const enumOrCompositeFlatFieldMetadatas = objectFlatFieldMetadatas.filter( (field) => diff --git a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/update-object-action-handler.service.ts b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/update-object-action-handler.service.ts index c9919c4308..a365d3b07f 100644 --- a/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/update-object-action-handler.service.ts +++ b/packages/twenty-server/src/engine/workspace-manager/workspace-migration/workspace-migration-runner/action-handlers/object/services/update-object-action-handler.service.ts @@ -96,7 +96,7 @@ export class UpdateObjectActionHandlerService extends WorkspaceMigrationRunnerAc const objectFlatFieldMetadatas = findManyFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: flatFieldMetadataMaps, - flatEntityIds: updatedObjectMetadata.fieldMetadataIds, + flatEntityIds: updatedObjectMetadata.fieldIds, }); const enumOrCompositeFlatFieldMetadatas = objectFlatFieldMetadatas.filter( diff --git a/packages/twenty-server/src/modules/dashboard/chart-data/utils/__tests__/is-relation-nested-field-date-kind.util.spec.ts b/packages/twenty-server/src/modules/dashboard/chart-data/utils/__tests__/is-relation-nested-field-date-kind.util.spec.ts index 02601d8606..19e7c037f1 100644 --- a/packages/twenty-server/src/modules/dashboard/chart-data/utils/__tests__/is-relation-nested-field-date-kind.util.spec.ts +++ b/packages/twenty-server/src/modules/dashboard/chart-data/utils/__tests__/is-relation-nested-field-date-kind.util.spec.ts @@ -23,7 +23,7 @@ const createMockObjectMetadata = ( id: 'test-object-id', nameSingular: 'testObject', namePlural: 'testObjects', - fieldMetadataIds: [], + fieldIds: [], universalIdentifier: 'test-object-universal-id', ...overrides, }) as FlatObjectMetadata; @@ -51,7 +51,7 @@ describe('isRelationNestedFieldDateKind', () => { id: companyObjectId, nameSingular: 'company', namePlural: 'companies', - fieldMetadataIds: [createdAtFieldId, nameFieldId], + fieldIds: [createdAtFieldId, nameFieldId], }); const relationField = createMockFieldMetadata({ @@ -180,7 +180,7 @@ describe('isRelationNestedFieldDateKind', () => { id: 'object-with-date-id', nameSingular: 'person', namePlural: 'people', - fieldMetadataIds: [dateFieldId], + fieldIds: [dateFieldId], }); const personRelationField = createMockFieldMetadata({ diff --git a/packages/twenty-server/src/modules/dashboard/chart-data/utils/convert-chart-filter-to-gql-operation-filter.util.ts b/packages/twenty-server/src/modules/dashboard/chart-data/utils/convert-chart-filter-to-gql-operation-filter.util.ts index d5633b1141..3861724a88 100644 --- a/packages/twenty-server/src/modules/dashboard/chart-data/utils/convert-chart-filter-to-gql-operation-filter.util.ts +++ b/packages/twenty-server/src/modules/dashboard/chart-data/utils/convert-chart-filter-to-gql-operation-filter.util.ts @@ -43,8 +43,8 @@ export const convertChartFilterToGqlOperationFilter = ({ return {}; } - const fieldMetadataIds = flatObjectMetadata.fieldMetadataIds ?? []; - const fields: PartialFieldMetadataItem[] = fieldMetadataIds + const fieldIds = flatObjectMetadata.fieldIds ?? []; + const fields: PartialFieldMetadataItem[] = fieldIds .map((fieldId: string) => { const field = flatFieldMetadataMaps.byId[fieldId]; diff --git a/packages/twenty-server/src/modules/dashboard/chart-data/utils/is-relation-nested-field-date-kind.util.ts b/packages/twenty-server/src/modules/dashboard/chart-data/utils/is-relation-nested-field-date-kind.util.ts index d6c5863ea7..c789aca272 100644 --- a/packages/twenty-server/src/modules/dashboard/chart-data/utils/is-relation-nested-field-date-kind.util.ts +++ b/packages/twenty-server/src/modules/dashboard/chart-data/utils/is-relation-nested-field-date-kind.util.ts @@ -38,7 +38,7 @@ export const isRelationNestedFieldDateKind = ({ const nestedFieldName = relationNestedFieldName.split('.')[0]; - const targetFieldIds = targetObjectMetadata.fieldMetadataIds; + const targetFieldIds = targetObjectMetadata.fieldIds; const nestedFieldMetadata = targetFieldIds .map((fieldId: string) => flatFieldMetadataMaps.byId[fieldId]) diff --git a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-schema/utils/generate-object-record-fields.ts b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-schema/utils/generate-object-record-fields.ts index 8b9bc95b27..1cb873854d 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-schema/utils/generate-object-record-fields.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-builder/workflow-schema/utils/generate-object-record-fields.ts @@ -17,7 +17,7 @@ export const generateObjectRecordFields = ({ const result: Record = {}; - for (const fieldId of flatObjectMetadata.fieldMetadataIds) { + for (const fieldId of flatObjectMetadata.fieldIds) { const field = findFlatEntityByIdInFlatEntityMapsOrThrow({ flatEntityMaps: flatFieldMetadataMaps, flatEntityId: fieldId, diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/utils/resolve-rich-text-fields-in-record.util.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/utils/resolve-rich-text-fields-in-record.util.ts index 455b4e6f24..de2b3478e8 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-executor/utils/resolve-rich-text-fields-in-record.util.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-executor/utils/resolve-rich-text-fields-in-record.util.ts @@ -11,7 +11,7 @@ export const resolveRichTextFieldsInRecord = ( ): Record => { const { flatObjectMetadata, flatFieldMetadataMaps } = objectMetadataInfo; - const richTextFieldNames = flatObjectMetadata.fieldMetadataIds + const richTextFieldNames = flatObjectMetadata.fieldIds .map((fieldId) => flatFieldMetadataMaps.byId[fieldId]) .filter((field) => field?.type === FieldMetadataType.RICH_TEXT_V2) .map((field) => field?.name) diff --git a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts index 583d739b5f..a1beb196a6 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-executor/workflow-actions/record-crud/find-records.workflow-action.ts @@ -71,7 +71,7 @@ export class FindRecordsWorkflowAction implements WorkflowAction { workspaceId, ); - const fields = flatObjectMetadata.fieldMetadataIds + const fields = flatObjectMetadata.fieldIds .map((fieldId) => { const field = flatFieldMetadataMaps.byId[fieldId]; diff --git a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/__tests__/workflow-database-event-trigger.listener.spec.ts b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/__tests__/workflow-database-event-trigger.listener.spec.ts index a241d5d4d0..01d0c8d597 100644 --- a/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/__tests__/workflow-database-event-trigger.listener.spec.ts +++ b/packages/twenty-server/src/modules/workflow/workflow-trigger/automated-trigger/listeners/__tests__/workflow-database-event-trigger.listener.spec.ts @@ -40,7 +40,7 @@ describe('WorkflowDatabaseEventTriggerListener', () => { updatedAt: new Date().toISOString(), icon: 'Icon123', universalIdentifier: 'test-object-metadata', - fieldMetadataIds: [], + fieldIds: [], indexMetadataIds: [], viewIds: [], applicationId: null, diff --git a/packages/twenty-shared/src/database-events/database-event-payload.type.ts b/packages/twenty-shared/src/database-events/database-event-payload.type.ts index 67350ddb6c..dd1a1e2948 100644 --- a/packages/twenty-shared/src/database-events/database-event-payload.type.ts +++ b/packages/twenty-shared/src/database-events/database-event-payload.type.ts @@ -11,7 +11,7 @@ type SimplifiedFlatObjectMetadata = { universalIdentifier: string; applicationId: string | null; } & { - fieldMetadataIds: string[]; + fieldIds: string[]; indexMetadataIds: string[]; viewIds: string[]; };